From 00bf7ebc82f8a5a5ec035e9acc753fcce40de3c2 Mon Sep 17 00:00:00 2001 From: Anthony Mirabella Date: Fri, 8 Mar 2024 11:33:44 -0500 Subject: [PATCH] [chore] Prepare v0.38.1 release (#2679) * Update minimum Go version to 1.22.1 in workflows Signed-off-by: Anthony J Mirabella * update google.golang.org/protobuf to 1.33.0 Signed-off-by: Anthony J Mirabella * bump version to v0.38.1 Signed-off-by: Anthony J Mirabella * more protobuf updates Signed-off-by: Anthony J Mirabella * update path for wixtoolset Signed-off-by: Anthony J Mirabella --------- Signed-off-by: Anthony J Mirabella --- .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.38.1.md | 10 ++++++++++ go.mod | 2 +- go.sum | 4 ++-- testbed/go.mod | 2 +- testbed/go.sum | 4 ++-- tools/packaging/windows/aws-otel-collector.wxs | 2 +- tools/packaging/windows/create_msi.ps1 | 2 +- tools/workflow/linters/go.mod | 2 +- tools/workflow/linters/go.sum | 4 ++-- 16 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 docs/releases/v0.38.1.md diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4e3fec755b..d3da0ad8ad 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.22.0 + GO_VERSION: ~1.22.1 concurrency: diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index b70be44797..70e73466e1 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.22.0 + GO_VERSION: ~1.22.1 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 89101e6ccc..5cbce36379 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.22.0 + GO_VERSION: ~1.22.1 permissions: id-token: write diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 068f8cb991..7a37cbc16b 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@v5 with: - go-version: '~1.20.12' + go-version: '~1.22.1' 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 1b54f19bd0..2a4392f28b 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.22.0 + GO_VERSION: ~1.22.1 permissions: id-token: write diff --git a/.github/workflows/prod-image-mirror.yml b/.github/workflows/prod-image-mirror.yml index d79e02f670..8d5ef27371 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@v5 with: - go-version: ~1.20.12 + go-version: ~1.22.1 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/VERSION b/VERSION index 765098dc40..b4a466a810 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.38.0 +v0.38.1 diff --git a/docs/releases/v0.38.1.md b/docs/releases/v0.38.1.md new file mode 100644 index 0000000000..aba8ed1d25 --- /dev/null +++ b/docs/releases/v0.38.1.md @@ -0,0 +1,10 @@ +# Changelog + +## [v0.38.1](https://github.com/aws-observability/aws-otel-collector/tree/v0.38.1) (2024-03-07) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.38.0...v0.38.1) + +**Updates:** + +- Update Go to 1.22.1 +- Update google.golang.org/protobuf to 1.33.0 \ No newline at end of file diff --git a/go.mod b/go.mod index dbfeb94569..9efe28211a 100644 --- a/go.mod +++ b/go.mod @@ -393,7 +393,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/grpc v1.61.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index ada4c4f0a6..312e5e5fe7 100644 --- a/go.sum +++ b/go.sum @@ -1649,8 +1649,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/testbed/go.mod b/testbed/go.mod index 5584e1b83b..4dd0ca3a87 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -406,7 +406,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/grpc v1.61.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index da7e27242c..be1a1c3c25 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1697,8 +1697,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 931c728142..2e35247ec5 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ diff --git a/tools/packaging/windows/create_msi.ps1 b/tools/packaging/windows/create_msi.ps1 index 8a22ea7eb6..0da892aac9 100644 --- a/tools/packaging/windows/create_msi.ps1 +++ b/tools/packaging/windows/create_msi.ps1 @@ -14,7 +14,7 @@ # Install the required software mkdir -p .\build\packages\windows\amd64\ choco install wixtoolset --force -y -$env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin" +$env:Path += ";C:\Program Files (x86)\WiX Toolset v3.14\bin" refreshenv # create msi diff --git a/tools/workflow/linters/go.mod b/tools/workflow/linters/go.mod index 32c861539f..01a418204a 100644 --- a/tools/workflow/linters/go.mod +++ b/tools/workflow/linters/go.mod @@ -186,7 +186,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/workflow/linters/go.sum b/tools/workflow/linters/go.sum index 979eb4a668..a0c347045a 100644 --- a/tools/workflow/linters/go.sum +++ b/tools/workflow/linters/go.sum @@ -912,8 +912,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=