From 5673aa44c6555ae4f7d4a688f63260c6cd0124ab Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Thu, 21 Sep 2023 10:32:33 -0400 Subject: [PATCH] Replace stanza package to include concurrent decode bug fix. --- .github/workflows/otel-fork-replace.yml | 2 ++ go.mod | 2 ++ go.sum | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 34a5360094..1ace1c6315 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -64,6 +64,8 @@ jobs: go mod tidy go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws=github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws@${{ steps.get-latest-commit.outputs.sha }} go mod tidy + go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza=github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza@${{ steps.get-latest-commit.outputs.sha }} + go mod tidy git commit -am "Update OTel fork components to https://github.com/amazon-contributing/opentelemetry-collector-contrib/commit/${{ steps.get-latest-commit.outputs.sha }}" git push -u origin HEAD git config --global --unset user.name diff --git a/go.mod b/go.mod index 93a280b568..5a8d262b09 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/c // Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230906164155-ced73ba61d63 +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230906164155-ced73ba61d63 + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230906164155-ced73ba61d63 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230906164155-ced73ba61d63 diff --git a/go.sum b/go.sum index 5e259db74f..4c9fe83c63 100644 --- a/go.sum +++ b/go.sum @@ -161,6 +161,8 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230906164155-ced73ba61d63/go.mod h1:6Vwl/+yXrD21CtE1emsNFeaAW0cq5GbY+HlXaILADh4= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230906164155-ced73ba61d63 h1:fcaOqpQRygoR24gQMXtowm3OHKCuiySr590OHii30oA= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230906164155-ced73ba61d63/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230906164155-ced73ba61d63 h1:/1L3AJjyZpGnKE0imFd2smlvm4rumtGBYhGccgK4KrA= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230906164155-ced73ba61d63/go.mod h1:nENVAU79yHGHoCe+pUHvYUy5LR+CHeFvhBkfRcNjRZ8= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230906164155-ced73ba61d63 h1:LwzRYmnc6iErbspiZfUExezibLNDIe4Rff4CdhmyH0k= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230906164155-ced73ba61d63/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230906164155-ced73ba61d63 h1:ADezb0grCo4h3Qe7RBivN3pDLq9oZDZ1lhnzRgwrIzs= @@ -974,8 +976,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.79.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.79.0/go.mod h1:/wfeJfzu3oAkC2boitFR3dZcnwNtwzryI/SW1LIhDLo= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.79.0 h1:R9lB4lMuDaCJP9l6SiOA9u0GPJm5nV5Fefb9cPo9gZQ= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.79.0/go.mod h1:KBcxvUZWwgSPwdH3oOub7NGNnwu673UdMDXtgn9xjvU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.77.0 h1:UGgb2bYSrRTbCcLNEOc4ZCbKx2H1uwkKR+FpffQ7d0o= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.77.0/go.mod h1:nENVAU79yHGHoCe+pUHvYUy5LR+CHeFvhBkfRcNjRZ8= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.77.0 h1:0YjNtrlIwAi4YQ5uznZbgZytsO7eTPB1NZGh/Xuv6dU= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.77.0 h1:CFTeCIKxPyypJcH5ZhthAfV93pbi5huF44NEftABnjk= github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.77.0 h1:/6aMxOY14YS3xbm+HuxXI8NFxTnmRHwLf5CARLEzzDw=