From 6555a426c2d84596f76677e41dd66134e9c48524 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Tue, 10 Oct 2023 13:24:50 -0700 Subject: [PATCH 1/8] Upgrade the go version to v1.20.10 --- .github/workflows/CI.yml | 2 +- .github/workflows/PR-build.yml | 2 +- .github/workflows/aws-resources-clean.yml | 2 +- .github/workflows/canary.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/prod-image-mirror.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e30470285d..b340a16307 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 110 BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 concurrency: diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index a59c8dd5ad..a056dd7805 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -25,7 +25,7 @@ env: IMAGE_NAME: aws-otel-collector PACKAGING_ROOT: build/packages TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 concurrency: group: pr-build-${{ github.event.pull_request.number }} diff --git a/.github/workflows/aws-resources-clean.yml b/.github/workflows/aws-resources-clean.yml index 3efc322439..7f4bec0134 100644 --- a/.github/workflows/aws-resources-clean.yml +++ b/.github/workflows/aws-resources-clean.yml @@ -24,7 +24,7 @@ on: default: "3" env: DAYS_TO_KEEP: 3 - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 permissions: id-token: write diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index e2ccb7187a..d700f8ba77 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -57,7 +57,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: '~1.20.8' + go-version: '~1.20.10' cache-dependency-path: testing-framework/cmd/aotutil/go.sum - name: Build aotutil run: cd testing-framework/cmd/aotutil && make build diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 512d6a84ff..c98fbcafdf 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -27,7 +27,7 @@ env: COMMIT_USER: Github Actions COMMIT_EMAIL: actions@github.com TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 permissions: id-token: write diff --git a/.github/workflows/prod-image-mirror.yml b/.github/workflows/prod-image-mirror.yml index c20a72b980..c6bbe0f714 100644 --- a/.github/workflows/prod-image-mirror.yml +++ b/.github/workflows/prod-image-mirror.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: ~1.20.8 + go-version: ~1.20.10 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2.2.0 From 252d1ed71f4f86a9288cb9be09d83bcf507de59d Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Tue, 10 Oct 2023 13:41:29 -0700 Subject: [PATCH 2/8] bump version to v0.33.3 --- VERSION | 2 +- docs/releases/v0.33.3.md | 11 +++++++++++ tools/packaging/windows/aws-otel-collector.wxs | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 docs/releases/v0.33.3.md diff --git a/VERSION b/VERSION index 0122648aa1..a54b6de00b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.33.2 +v0.33.3 diff --git a/docs/releases/v0.33.3.md b/docs/releases/v0.33.3.md new file mode 100644 index 0000000000..7feaabe56c --- /dev/null +++ b/docs/releases/v0.33.3.md @@ -0,0 +1,11 @@ +# Changelog + +## [v0.33.3](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.3) (2023-10-10) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.33.2...v0.33.3) + +**Merged pull requests:** + +- Upgrade the go version to 1.20.10 [\#]() ([humivo](https://github.com/humivo)) + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 1cd36876f6..3e88d4c564 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ From 285b5083cb1e12e9b45f24d49782d02fca5cb6dc Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Tue, 10 Oct 2023 13:51:52 -0700 Subject: [PATCH 3/8] Add link to PR in changelog --- docs/releases/v0.33.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releases/v0.33.3.md b/docs/releases/v0.33.3.md index 7feaabe56c..fdb1e43da7 100644 --- a/docs/releases/v0.33.3.md +++ b/docs/releases/v0.33.3.md @@ -6,6 +6,6 @@ **Merged pull requests:** -- Upgrade the go version to 1.20.10 [\#]() ([humivo](https://github.com/humivo)) +- Upgrade go version to 1.20.10 and collector version [\#2395](https://github.com/aws-observability/aws-otel-collector/pull/2395) ([humivo](https://github.com/humivo)) \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* From ffefe3d7926f951218bd7a6ae8e7497e9dd309d6 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Tue, 10 Oct 2023 17:25:32 -0700 Subject: [PATCH 4/8] Remove collector changes --- VERSION | 2 +- docs/releases/v0.33.3.md | 11 ----------- tools/packaging/windows/aws-otel-collector.wxs | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 docs/releases/v0.33.3.md diff --git a/VERSION b/VERSION index a54b6de00b..0122648aa1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.33.3 +v0.33.2 diff --git a/docs/releases/v0.33.3.md b/docs/releases/v0.33.3.md deleted file mode 100644 index fdb1e43da7..0000000000 --- a/docs/releases/v0.33.3.md +++ /dev/null @@ -1,11 +0,0 @@ -# Changelog - -## [v0.33.3](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.3) (2023-10-10) - -[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.33.2...v0.33.3) - -**Merged pull requests:** - -- Upgrade go version to 1.20.10 and collector version [\#2395](https://github.com/aws-observability/aws-otel-collector/pull/2395) ([humivo](https://github.com/humivo)) - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 3e88d4c564..1cd36876f6 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ From a63b709aca091b2721eef668d735cd672cc965a7 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Tue, 10 Oct 2023 19:47:57 -0700 Subject: [PATCH 5/8] Take away go version upgrade --- .github/workflows/CI.yml | 2 +- .github/workflows/PR-build.yml | 2 +- .github/workflows/aws-resources-clean.yml | 2 +- .github/workflows/canary.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/prod-image-mirror.yml | 2 +- VERSION | 2 +- docs/releases/v0.33.3.md | 11 +++++++++++ tools/packaging/windows/aws-otel-collector.wxs | 2 +- 9 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 docs/releases/v0.33.3.md diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b340a16307..e30470285d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 110 BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE - GO_VERSION: ~1.20.10 + GO_VERSION: ~1.20.9 concurrency: diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index a056dd7805..a59c8dd5ad 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -25,7 +25,7 @@ env: IMAGE_NAME: aws-otel-collector PACKAGING_ROOT: build/packages TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.10 + GO_VERSION: ~1.20.9 concurrency: group: pr-build-${{ github.event.pull_request.number }} diff --git a/.github/workflows/aws-resources-clean.yml b/.github/workflows/aws-resources-clean.yml index 7f4bec0134..3efc322439 100644 --- a/.github/workflows/aws-resources-clean.yml +++ b/.github/workflows/aws-resources-clean.yml @@ -24,7 +24,7 @@ on: default: "3" env: DAYS_TO_KEEP: 3 - GO_VERSION: ~1.20.10 + GO_VERSION: ~1.20.9 permissions: id-token: write diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index d700f8ba77..dcd7882420 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -57,7 +57,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: '~1.20.10' + go-version: '~1.20.9' cache-dependency-path: testing-framework/cmd/aotutil/go.sum - name: Build aotutil run: cd testing-framework/cmd/aotutil && make build diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index c98fbcafdf..512d6a84ff 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -27,7 +27,7 @@ env: COMMIT_USER: Github Actions COMMIT_EMAIL: actions@github.com TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.10 + GO_VERSION: ~1.20.9 permissions: id-token: write diff --git a/.github/workflows/prod-image-mirror.yml b/.github/workflows/prod-image-mirror.yml index c6bbe0f714..65e33c9b1b 100644 --- a/.github/workflows/prod-image-mirror.yml +++ b/.github/workflows/prod-image-mirror.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: ~1.20.10 + go-version: ~1.20.9 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2.2.0 diff --git a/VERSION b/VERSION index 0122648aa1..a54b6de00b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.33.2 +v0.33.3 diff --git a/docs/releases/v0.33.3.md b/docs/releases/v0.33.3.md new file mode 100644 index 0000000000..fdb1e43da7 --- /dev/null +++ b/docs/releases/v0.33.3.md @@ -0,0 +1,11 @@ +# Changelog + +## [v0.33.3](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.3) (2023-10-10) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.33.2...v0.33.3) + +**Merged pull requests:** + +- Upgrade go version to 1.20.10 and collector version [\#2395](https://github.com/aws-observability/aws-otel-collector/pull/2395) ([humivo](https://github.com/humivo)) + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 1cd36876f6..3e88d4c564 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ From 768e7d38aba2f945ce3f5066d73b4eab32aef345 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 11 Oct 2023 13:00:03 -0700 Subject: [PATCH 6/8] Upgrade go version and remove cache --- .github/workflows/CI.yml | 2 +- .github/workflows/PR-build.yml | 6 ++++-- .github/workflows/aws-resources-clean.yml | 2 +- .github/workflows/canary.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/prod-image-mirror.yml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e30470285d..b340a16307 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 110 BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 concurrency: diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index a59c8dd5ad..06bd8d10e5 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -25,7 +25,7 @@ env: IMAGE_NAME: aws-otel-collector PACKAGING_ROOT: build/packages TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 concurrency: group: pr-build-${{ github.event.pull_request.number }} @@ -171,7 +171,9 @@ jobs: # Build and archive binaries into cache. - name: Build Binaries if: ${{ needs.changes.outputs.changed == 'true' && steps.cached_binaries.outputs.cache-hit != 'true' }} - run: make build + run: | + rm -rf /opt/hostedtoolcache + make build # upload the binaries to artifact as well because cache@v2 hasn't support windows - name: Upload diff --git a/.github/workflows/aws-resources-clean.yml b/.github/workflows/aws-resources-clean.yml index 3efc322439..7f4bec0134 100644 --- a/.github/workflows/aws-resources-clean.yml +++ b/.github/workflows/aws-resources-clean.yml @@ -24,7 +24,7 @@ on: default: "3" env: DAYS_TO_KEEP: 3 - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 permissions: id-token: write diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index dcd7882420..d700f8ba77 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -57,7 +57,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: '~1.20.9' + go-version: '~1.20.10' cache-dependency-path: testing-framework/cmd/aotutil/go.sum - name: Build aotutil run: cd testing-framework/cmd/aotutil && make build diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 512d6a84ff..c98fbcafdf 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -27,7 +27,7 @@ env: COMMIT_USER: Github Actions COMMIT_EMAIL: actions@github.com TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework - GO_VERSION: ~1.20.9 + GO_VERSION: ~1.20.10 permissions: id-token: write diff --git a/.github/workflows/prod-image-mirror.yml b/.github/workflows/prod-image-mirror.yml index 65e33c9b1b..c6bbe0f714 100644 --- a/.github/workflows/prod-image-mirror.yml +++ b/.github/workflows/prod-image-mirror.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: ~1.20.9 + go-version: ~1.20.10 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2.2.0 From 0b0e98dc8c5dcfd2b8cb9fc9d47c84e53b938749 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 11 Oct 2023 13:27:05 -0700 Subject: [PATCH 7/8] Move rm cache line --- .github/workflows/PR-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index 06bd8d10e5..cf7de7353c 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -134,6 +134,9 @@ jobs: runs-on: ubuntu-latest needs: [changes] steps: + - name: Remove cache + run: rm -rf /opt/hostedtoolcache + - name: Checkout if: ${{ needs.changes.outputs.changed == 'true' }} uses: actions/checkout@v3 @@ -171,9 +174,7 @@ jobs: # Build and archive binaries into cache. - name: Build Binaries if: ${{ needs.changes.outputs.changed == 'true' && steps.cached_binaries.outputs.cache-hit != 'true' }} - run: | - rm -rf /opt/hostedtoolcache - make build + run: make build # upload the binaries to artifact as well because cache@v2 hasn't support windows - name: Upload From ce9f540aa2f43c3d193fb017b1dd96dace0640e4 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 11 Oct 2023 14:27:50 -0700 Subject: [PATCH 8/8] Add remove cache step to CI --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b340a16307..8dc7794f41 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -130,6 +130,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Remove cache + run: rm -rf /opt/hostedtoolcache + - uses: actions/checkout@v3 - name: apply patches