Merge pull request #2842 from aws-observability/merge0402

Merge v0.40.x into main

.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.3
+  GO_VERSION: ~1.22.7
 
 
 concurrency:

.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.3
+  GO_VERSION: ~1.22.7
 
 concurrency:
   group: pr-build-${{ github.event.pull_request.number }}

.github/workflows/aws-resources-clean.yml

@@ -24,7 +24,7 @@ on:
         default: "3"
 env:
   DAYS_TO_KEEP: 3
-  GO_VERSION: ~1.22.3
+  GO_VERSION: ~1.22.7
 
 permissions:
   id-token: write

.github/workflows/canary.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
-          go-version: '~1.22.3'
+          go-version: '~1.22.7'
           cache-dependency-path: testing-framework/cmd/aotutil/go.sum
       - name: Build aotutil
         run: cd testing-framework/cmd/aotutil && make build

.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.3
+  GO_VERSION: ~1.22.7
 
 permissions:
   id-token: write

.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.22.3
+          go-version: ~1.22.7
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

VERSION

@@ -1 +1 @@
-v0.40.1
+v0.40.2

docs/releases/v0.40.2.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## [v0.40.2](https://github.com/aws-observability/aws-otel-collector/tree/v0.40.2) (2024-09-17)
+
+[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.40.1...v0.40.2)
+
+**Merged pull requests:**
+
+- Upgrade go version to 1.22.7 [#2839](https://github.com/aws-observability/aws-otel-collector/pull/2839)

tools/packaging/windows/aws-otel-collector.wxs

@@ -3,7 +3,7 @@
     <Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
 UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
 Name="ADOT Collector"
-Version="0.40.1"
+Version="0.40.2"
 Codepage='1252'
 Manufacturer="Amazon.com, Inc."
 Language="1033">