Merge remote-tracking branch 'upstream/main' into feat/export-telemet…

…rygen-funcs-for-tests
open-telemetry · Jan 7, 2025 · eeb2b60 · eeb2b60
2 parents 51a2557 + 5a3c58f
commit eeb2b60
Show file tree

Hide file tree

Showing 851 changed files with 22,403 additions and 18,665 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -52,7 +52,7 @@ exporter/azuremonitorexporter/                    @open-telemetry/collector-cont
 exporter/carbonexporter/                          @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
 exporter/cassandraexporter/                       @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac
 exporter/clickhouseexporter/                      @open-telemetry/collector-contrib-approvers @hanjm @dmitryax @Frapschen @SpencerTorres
-exporter/coralogixexporter/                       @open-telemetry/collector-contrib-approvers @povilasv @matej-g
+exporter/coralogixexporter/                       @open-telemetry/collector-contrib-approvers @povilasv
 exporter/datadogexporter/                         @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd
 exporter/datasetexporter/                         @open-telemetry/collector-contrib-approvers @atoulme @martin-majlis-s1 @zdaratom-s1 @tomaz-s1
 exporter/dorisexporter/                           @open-telemetry/collector-contrib-approvers @atoulme @joker-star-l

diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod
@@ -4,8 +4,8 @@ go 1.22.0
 
 require (
 	github.com/google/go-github/v67 v67.0.0
-	go.opentelemetry.io/collector/confmap v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
+	go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -21,6 +21,6 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 )
 
-replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250106214556-67fdcd1f4267
+replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250107062214-ced38e8af2ae
 
-replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250106214556-67fdcd1f4267
+replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae
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,12 +12,12 @@ require (
 	github.com/knadh/koanf/v2 v2.1.2
 	github.com/open-telemetry/opamp-go v0.17.0
 	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/config/configtls v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/confmap v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
-	go.opentelemetry.io/collector/semconv v0.116.1-0.20241220212031-7c2639723f67
+	go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/config/configtls v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sys v0.28.0
@@ -38,6 +38,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 )
 
-replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250106214556-67fdcd1f4267
+replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250107062214-ced38e8af2ae
 
-replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250106214556-67fdcd1f4267
+replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae
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
@@ -13,7 +13,7 @@ dist:
   version: 0.116.0-dev
 
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.116.0
@@ -49,10 +49,10 @@ extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.116.0
 
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.116.0
@@ -99,8 +99,8 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.116.0
 
 processors:
-  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.116.0
@@ -126,8 +126,8 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.116.0
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.116.0
@@ -223,7 +223,7 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.116.0
 
 connectors:
-  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.116.0
@@ -237,11 +237,11 @@ connectors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/sumconnector v0.116.0
 
 providers:
-  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.116.0
 

diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml
@@ -10,14 +10,14 @@ dist:
   version: 0.116.0-dev
 
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.116.0
 
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.116.0
@@ -29,15 +29,15 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.116.0
 
 processors:
-  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.116.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.116.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.116.0
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.1-0.20250107062214-ced38e8af2ae
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.116.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.116.0
@@ -53,11 +53,11 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.116.0
 
 providers:
-  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.1-0.20241220212031-7c2639723f67
-  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.1-0.20241220212031-7c2639723f67
+  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.1-0.20250107062214-ced38e8af2ae
+  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.1-0.20250107062214-ced38e8af2ae
 
 replaces:
   - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage