update go dependencies to point to my fork

open-telemetry · May 10, 2024 · 68ae508 · 68ae508
1 parent 21ae9d1
commit 68ae508
Show file tree

Hide file tree

Showing 506 changed files with 1,011 additions and 474 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -1227,3 +1227,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/graf
 replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver => ../../receiver/splunkenterprisereceiver
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod
@@ -20,3 +20,5 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 )
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum
diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod
@@ -34,3 +34,5 @@ require (
 	golang.org/x/sys v0.18.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum
diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml
@@ -460,3 +460,4 @@ replaces:
   - github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
   - github.com/open-telemetry/opentelemetry-collector-contrib/extension/googleclientauthextension => ../../extension/googleclientauthextension
   - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver => ../../receiver/splunkenterprisereceiver
+  - go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap remove_top_level_block
diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -4,8 +4,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
 
 go 1.21.0
 
-toolchain go1.21.10
-
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.100.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.100.0
@@ -1284,3 +1282,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/acke
 replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/googleclientauthextension => ../../extension/googleclientauthextension
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver => ../../receiver/splunkenterprisereceiver
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum
diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod
@@ -396,3 +396,5 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum
diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod
@@ -66,3 +66,5 @@ retract (
 
 // IMPORTANT NOTE: Do not add replace statements to this go.mod. This will break go install.
 // See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27855.
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum
diff --git a/cmd/telemetrygen/internal/e2etest/go.mod b/cmd/telemetrygen/internal/e2etest/go.mod
@@ -95,3 +95,5 @@ retract (
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../../internal/common
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen => ../..
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/cmd/telemetrygen/internal/e2etest/go.sum b/cmd/telemetrygen/internal/e2etest/go.sum
diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod
@@ -46,3 +46,5 @@ retract (
 	v0.76.1
 	v0.65.0
 )
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum
diff --git a/confmap/provider/secretsmanagerprovider/go.mod b/confmap/provider/secretsmanagerprovider/go.mod
@@ -27,3 +27,5 @@ require (
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba
diff --git a/confmap/provider/secretsmanagerprovider/go.sum b/confmap/provider/secretsmanagerprovider/go.sum
diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod
@@ -80,3 +80,5 @@ retract (
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
+
+replace go.opentelemetry.io/collector/confmap => github.com/atoulme/opentelemetry-collector/confmap v0.0.0-20240503145806-395864958aba