From 8daec8b3cb5ce7ada8e2690b7c1dd93ff2c910b7 Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 11 Apr 2024 15:57:05 +0000 Subject: [PATCH 1/7] Remove confighttp from otel fork update workflow. We removed the confighttp override in 0865173b23ba9c7323f6e5616cef62f2e0b8996a. --- .github/workflows/otel-fork-replace.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 553eed7d48..062decd354 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -38,8 +38,6 @@ jobs: git config --global user.name 'Github Action' git config --global user.email 'action@github.com' git checkout -b otel-fork-replace-${{ steps.get-latest-commit.outputs.sha }} - go mod edit -replace go.opentelemetry.io/collector/config/confighttp=github.com/amazon-contributing/opentelemetry-collector-contrib/config/confighttp@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor=github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor@${{ steps.get-latest-commit.outputs.sha }} go mod tidy go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter=github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter@${{ steps.get-latest-commit.outputs.sha }} From badb0ec1cb13110e2f2e2b2e2feab420ab56de96 Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 11 Apr 2024 17:55:44 +0000 Subject: [PATCH 2/7] refactoring --- .github/workflows/otel-fork-replace.yml | 63 +++++++++++++------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 062decd354..2ac4702b65 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -38,36 +38,39 @@ jobs: git config --global user.name 'Github Action' git config --global user.email 'action@github.com' git checkout -b otel-fork-replace-${{ steps.get-latest-commit.outputs.sha }} - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor=github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter=github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter=github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray=github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil=github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight=github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s=github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver=github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver=github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus=github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs=github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter=github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter@${{ steps.get-latest-commit.outputs.sha }} - go mod tidy - go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver=github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver@${{ steps.get-latest-commit.outputs.sha }} - 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 + packages=( + exporter/awscloudwatchlogsexporter + exporter/awsemfexporter + exporter/awsxrayexporter + extension/awsmiddleware + extension/awsproxy + internal/aws/awsutil + internal/aws/containerinsight + internal/aws/cwlogs + internal/aws/k8s + internal/aws/proxy + internal/aws/xray + internal/kubelet + pkg/translator/prometheus + processor/resourcedetectionprocessor + receiver/awscontainerinsightreceiver + receiver/awsxrayreceiver + receiver/prometheusreceiver + ) + for p in ${packages[@]}; do + go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/$p=github.com/amazon-contributing/opentelemetry-collector-contrib/$p@${{ steps.get-latest-commit.outputs.sha }} + go mod tidy + done + + amazonContributingPackages=( + override/aws + pkg/stanza + ) + for p in ${amazonContributingPackages[@]}; do + go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/$p=github.com/amazon-contributing/opentelemetry-collector-contrib/$p@${{ steps.get-latest-commit.outputs.sha }} + go mod tidy + done + 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 From 7149105e850d0ea49c9ec89e6b4b3e779a9b5416 Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 11 Apr 2024 18:18:00 +0000 Subject: [PATCH 3/7] pr comment --- .github/workflows/otel-fork-replace.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 2ac4702b65..86af732f51 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -42,7 +42,6 @@ jobs: exporter/awscloudwatchlogsexporter exporter/awsemfexporter exporter/awsxrayexporter - extension/awsmiddleware extension/awsproxy internal/aws/awsutil internal/aws/containerinsight @@ -51,6 +50,7 @@ jobs: internal/aws/proxy internal/aws/xray internal/kubelet + pkg/stanza pkg/translator/prometheus processor/resourcedetectionprocessor receiver/awscontainerinsightreceiver @@ -63,8 +63,8 @@ jobs: done amazonContributingPackages=( + extension/awsmiddleware override/aws - pkg/stanza ) for p in ${amazonContributingPackages[@]}; do go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/$p=github.com/amazon-contributing/opentelemetry-collector-contrib/$p@${{ steps.get-latest-commit.outputs.sha }} From 4dc87f514c854317a777906da38dd4262ac3d3e6 Mon Sep 17 00:00:00 2001 From: Ben Strauss <81588812+straussb@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:19:04 -0400 Subject: [PATCH 4/7] Update .github/workflows/otel-fork-replace.yml Co-authored-by: Jeffrey Chien --- .github/workflows/otel-fork-replace.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 86af732f51..1a4b71ebd8 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -67,7 +67,7 @@ jobs: override/aws ) for p in ${amazonContributingPackages[@]}; do - go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/$p=github.com/amazon-contributing/opentelemetry-collector-contrib/$p@${{ steps.get-latest-commit.outputs.sha }} + go mod edit -require github.com/amazon-contributing/opentelemetry-collector-contrib/$p@${{ steps.get-latest-commit.outputs.sha }} go mod tidy done From a98d28eac8756cdc1fce97ae1b01bcee951016b8 Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 11 Apr 2024 18:27:16 +0000 Subject: [PATCH 5/7] remove extra lines --- go.mod | 6 +----- go.sum | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f9ff5cc498..e8caa585ee 100644 --- a/go.mod +++ b/go.mod @@ -427,8 +427,4 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) - -replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240405185623-56e778998456 - -replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240405185623-56e778998456 +) \ No newline at end of file diff --git a/go.sum b/go.sum index f3e4c8ebc3..b5aa6578ae 100644 --- a/go.sum +++ b/go.sum @@ -160,6 +160,7 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240405185623-56e778998456/go.mod h1:D6lmFdWbpYRttNnfkZJSs2ZZcAUGfe96/Vrm8tiK3Tw= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240314211421-34bd73a6cac8 h1:YfvkCHbCxqdp+88Yhj2h3Ki3KCUmzTfUZWzRPs+9nkk= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240314211421-34bd73a6cac8/go.mod h1:diyxQYYQtcsGG0zvLkWg4UTCb4hiXMb1usZS/vaC3Uw= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240301221517-9cb314e7d27b/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240405185623-56e778998456 h1:0X4NZmgT+m86lxiWqb2LTyBaL9Yog/T5kky8tcTq900= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240405185623-56e778998456/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240314211421-34bd73a6cac8 h1:3CDyZcJml123gNCJ1XFgxDaB2i3i7Xctqxhyyb84AlQ= From ba36d500ad5d69aa68ec2c860649594cee2edf42 Mon Sep 17 00:00:00 2001 From: Ben Strauss <81588812+straussb@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:36:56 -0400 Subject: [PATCH 6/7] Update .github/workflows/otel-fork-replace.yml Co-authored-by: Jeffrey Chien --- .github/workflows/otel-fork-replace.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml index 1a4b71ebd8..9e22a802ec 100644 --- a/.github/workflows/otel-fork-replace.yml +++ b/.github/workflows/otel-fork-replace.yml @@ -71,7 +71,7 @@ jobs: go mod tidy done - git commit -am "Update OTel fork components to https://github.com/amazon-contributing/opentelemetry-collector-contrib/commit/${{ steps.get-latest-commit.outputs.sha }}" + git commit -am "Update amazon-contributing/opentelemetry-collector-contrib dependencies to @${{ steps.get-latest-commit.outputs.sha }}" git push -u origin HEAD git config --global --unset user.name git config --global --unset user.email From 2c1b511e8247228a331275a0b3c4cf22cf1daa7b Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 11 Apr 2024 18:58:30 +0000 Subject: [PATCH 7/7] go mod tidy --- go.mod | 2 +- go.sum | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e8caa585ee..76ce3667a1 100644 --- a/go.mod +++ b/go.mod @@ -427,4 +427,4 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) \ No newline at end of file +) diff --git a/go.sum b/go.sum index b5aa6578ae..3674c3907e 100644 --- a/go.sum +++ b/go.sum @@ -160,9 +160,8 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240405185623-56e778998456/go.mod h1:D6lmFdWbpYRttNnfkZJSs2ZZcAUGfe96/Vrm8tiK3Tw= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240314211421-34bd73a6cac8 h1:YfvkCHbCxqdp+88Yhj2h3Ki3KCUmzTfUZWzRPs+9nkk= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240314211421-34bd73a6cac8/go.mod h1:diyxQYYQtcsGG0zvLkWg4UTCb4hiXMb1usZS/vaC3Uw= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240301221517-9cb314e7d27b h1:96/K8X5jsdpzbJqTqbOuSR04zjlvrtUvxdxlxT4u9iM= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240301221517-9cb314e7d27b/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240405185623-56e778998456 h1:0X4NZmgT+m86lxiWqb2LTyBaL9Yog/T5kky8tcTq900= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240405185623-56e778998456/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240314211421-34bd73a6cac8 h1:3CDyZcJml123gNCJ1XFgxDaB2i3i7Xctqxhyyb84AlQ= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240314211421-34bd73a6cac8/go.mod h1:7uCHpcHoawJsqoyPLxaFROWsZXPSF6/op3Hmw4pV4WE= github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240405185623-56e778998456 h1:zPlcI2Pco0O1mbu88gCvgOmuabaaHGN4ftpvWFvQlHc=