Merge main into release

.github/dependabot.yml

@@ -28,6 +28,9 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+    ignore:
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
+      - dependency-name: "go.opentelemetry.io/collector*"
   - package-ecosystem: gomod
     directory: /testbed
     labels:
@@ -37,6 +40,9 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+    ignore:
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
+      - dependency-name: "go.opentelemetry.io/collector*"
   - package-ecosystem: gomod
     directory: /tools/release/image-mirror
     labels:
@@ -46,6 +52,9 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+    ignore:
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
+      - dependency-name: "go.opentelemetry.io/collector*"
   - package-ecosystem: gomod
     directory: /tools/workflow/cleaner
     labels:
@@ -55,6 +64,9 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+    ignore:
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
+      - dependency-name: "go.opentelemetry.io/collector*"
   - package-ecosystem: gomod
     directory: /tools/workflow/linters
     labels:
@@ -64,3 +76,6 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+    ignore:
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
+      - dependency-name: "go.opentelemetry.io/collector*"

VERSION

@@ -1 +1 @@
-v0.37.3
+v0.38.1

docs/releases/v0.38.0.md

@@ -0,0 +1,17 @@
+# Changelog
+
+## [v0.38.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.38.0) (2024-02-21)
+
+[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.37.1...v0.38.0)
+
+**Closed issues:**
+
+- Add release to fix CVE-2024-21626 [\#2643](https://github.com/aws-observability/aws-otel-collector/issues/2643)
+
+**Merged pull requests:**
+
+- Update go dependencies [\#2638](https://github.com/aws-observability/aws-otel-collector/pull/2638) ([bryan-aguilar](https://github.com/bryan-aguilar))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

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

pkg/config/config_factory.go

@@ -45,11 +45,11 @@ func GetConfigProvider(flags *flag.FlagSet) otelcol.ConfigProvider {
 
 	// generate the MapProviders for the Config Provider Settings
 	providers := []confmap.Provider{
-		fileprovider.New(),
-		envprovider.New(),
-		yamlprovider.New(),
-		httpprovider.New(),
-		httpsprovider.New(),
+		fileprovider.NewWithSettings(confmap.ProviderSettings{}),
+		envprovider.NewWithSettings(confmap.ProviderSettings{}),
+		yamlprovider.NewWithSettings(confmap.ProviderSettings{}),
+		httpprovider.NewWithSettings(confmap.ProviderSettings{}),
+		httpsprovider.NewWithSettings(confmap.ProviderSettings{}),
 		s3provider.New(),
 	}
 
@@ -63,7 +63,7 @@ func GetConfigProvider(flags *flag.FlagSet) otelcol.ConfigProvider {
 		ResolverSettings: confmap.ResolverSettings{
 			URIs:       loc,
 			Providers:  mapProviders,
-			Converters: []confmap.Converter{expandconverter.New()},
+			Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})},
 		},
 	}