update core to e014c1e (#33956)

This unblocks contrib tests in core by also updating the code in the geoipreceiver that was causing build failures --------- Signed-off-by: Alex Boten <[email protected]>
open-telemetry · Jul 9, 2024 · 6575f8a · 6575f8a
1 parent 52a1313
commit 6575f8a
Show file tree

Hide file tree

Showing 511 changed files with 19,984 additions and 19,132 deletions.
diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod
@@ -4,8 +4,8 @@ go 1.21.0
 
 require (
 	github.com/google/go-github/v62 v62.0.0
-	go.opentelemetry.io/collector/confmap v0.104.0
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0
+	go.opentelemetry.io/collector/confmap v0.104.1-0.20240705135726-e014c1ed756c
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -18,7 +18,7 @@ require (
 	github.com/knadh/koanf/v2 v2.1.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.11.1-0.20240705135726-e014c1ed756c // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 )
diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum
diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod
@@ -12,9 +12,9 @@ require (
 	github.com/knadh/koanf/v2 v2.1.1
 	github.com/open-telemetry/opamp-go v0.15.0
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/config/configopaque v1.11.0
-	go.opentelemetry.io/collector/config/configtls v0.104.0
-	go.opentelemetry.io/collector/semconv v0.104.0
+	go.opentelemetry.io/collector/config/configopaque v1.11.1-0.20240705135726-e014c1ed756c
+	go.opentelemetry.io/collector/config/configtls v0.104.1-0.20240705135726-e014c1ed756c
+	go.opentelemetry.io/collector/semconv v0.104.1-0.20240705135726-e014c1ed756c
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/protobuf v1.34.2

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
@@ -14,8 +14,8 @@ dist:
   otelcol_version: 0.104.0
 
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.0
-  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.0
+  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.1-0.20240705135726-e014c1ed756c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.104.0
@@ -53,10 +53,10 @@ extensions:
     import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension
 
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.0
-  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0
+  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.1-0.20240705135726-e014c1ed756c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.104.0
@@ -103,8 +103,8 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.104.0
 
 processors:
-  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.0
-  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.0
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.1-0.20240705135726-e014c1ed756c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.104.0
@@ -127,8 +127,8 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.104.0
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0
-  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0
+  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.1-0.20240705135726-e014c1ed756c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.104.0
@@ -219,7 +219,7 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.104.0
 
 connectors:
-  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.0
+  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.1-0.20240705135726-e014c1ed756c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.104.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.104.0
@@ -231,13 +231,13 @@ connectors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0
 
 providers:
-  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.0
+  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.1-0.20240705135726-e014c1ed756c
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.1-0.20240705135726-e014c1ed756c
 
 replaces:
   - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage