Merge pull request #2919 from aws-observability/merge42

[chore] Merge release/v0.42.x to main
aws-observability · Dec 19, 2024 · 15a9183 · 15a9183
2 parents af32fe6 + c37dd16
commit 15a9183
Show file tree

Hide file tree

Showing 21 changed files with 200 additions and 78 deletions.
diff --git 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.7
+  GO_VERSION: ~1.22.10
 
 
 concurrency:

diff --git 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.7
+  GO_VERSION: ~1.22.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
@@ -24,7 +24,7 @@ on:
         default: "3"
 env:
   DAYS_TO_KEEP: 3
-  GO_VERSION: ~1.22.7
+  GO_VERSION: ~1.22.10
 
 permissions:
   id-token: write

diff --git 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.22.7'
+          go-version: '~1.22.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
@@ -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.7
+  GO_VERSION: ~1.22.10
 
 permissions:
   id-token: write

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

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.41.1
+v0.42.0
diff --git a/docs/releases/v0.42.0.md b/docs/releases/v0.42.0.md
@@ -0,0 +1,17 @@
+# Changelog
+
+## [v0.42.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.42.0) (2024-12-17)
+
+[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.41.1...v0.42.0)
+
+**Merged pull requests:**
+
+- \[chore\] Bump OTel Collector and collector contrib v0.115.0, Removed logging exporter and ballast extension  [\#2915](https://github.com/aws-observability/aws-otel-collector/pull/2915) ([vasireddy99](https://github.com/vasireddy99))
+
+**Breaking Changes:**
+
+- The `memory_ballast` extension was removed upstream and ADOT Collector in favor of the `GOMEMLIMIT` environment variable, See the [Go documentation](https://pkg.go.dev/runtime#hdr-Environment_Variables) for more information about `GOMEMLIMIT`'s usage.
+
+- The `logging` exporter has been removed upstream in favor of the `debug` exporter. This release removes the logging exporter. See [#11337](https://github.com/open-telemetry/opentelemetry-collector/issues/11337) to migrate to the debug exporter.
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/go.mod b/go.mod
@@ -503,7 +503,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/term v0.27.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1631,8 +1631,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

diff --git a/testbed/go.mod b/testbed/go.mod
@@ -515,7 +515,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect

diff --git a/testbed/go.sum b/testbed/go.sum
@@ -1681,8 +1681,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/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.41.1"
+Version="0.42.0"
 Codepage='1252'
 Manufacturer="Amazon.com, Inc."
 Language="1033">

diff --git a/vendor/golang.org/x/net/html/doctype.go b/vendor/golang.org/x/net/html/doctype.go
diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go
diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go