Merge remote-tracking branch 'origin/release/v0.94.x' into chore/merg…

…e_941
open-telemetry · Feb 7, 2024 · cfb213e · cfb213e
2 parents aaf8b1e + 5ef560b
commit cfb213e
Show file tree

Hide file tree

Showing 40 changed files with 288 additions and 288 deletions.
diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -5,11 +5,11 @@ go 1.20
 require (
 	github.com/google/go-cmp v0.6.0
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/confmap v0.94.0
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/confmap v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
-	go.opentelemetry.io/collector/receiver v0.94.0
-	go.opentelemetry.io/collector/semconv v0.94.0
+	go.opentelemetry.io/collector/receiver v0.94.1
+	go.opentelemetry.io/collector/semconv v0.94.1
 	go.opentelemetry.io/otel/metric v1.23.0
 	go.opentelemetry.io/otel/trace v1.23.0
 	go.uber.org/multierr v1.11.0
@@ -40,8 +40,8 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.94.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/consumer v0.94.1 // indirect
 	go.opentelemetry.io/otel v1.23.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.23.0 // indirect

diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml
@@ -2,25 +2,25 @@ dist:
   module: go.opentelemetry.io/collector/cmd/otelcorecol
   name: otelcorecol
   description: Local OpenTelemetry Collector binary, testing only.
-  version: 0.94.0-dev
-  otelcol_version: 0.94.0
+  version: 0.94.1-dev
+  otelcol_version: 0.94.1
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.0
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.1
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.94.0
-  - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.94.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.94.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.0
+  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.94.1
+  - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.94.1
+  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.94.1
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.1
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.94.0
-  - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.94.0
-  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.94.0
+  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.94.1
+  - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.94.1
+  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.94.1
 processors:
-  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.94.0
-  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.94.0
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.94.1
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.94.1
 connectors:
-  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.94.0
+  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.94.1
 
 replaces:
   - go.opentelemetry.io/collector => ../../

diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -6,24 +6,24 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/connector v0.94.0
-	go.opentelemetry.io/collector/connector/forwardconnector v0.94.0
-	go.opentelemetry.io/collector/exporter v0.94.0
-	go.opentelemetry.io/collector/exporter/debugexporter v0.94.0
-	go.opentelemetry.io/collector/exporter/loggingexporter v0.94.0
-	go.opentelemetry.io/collector/exporter/otlpexporter v0.94.0
-	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.0
-	go.opentelemetry.io/collector/extension v0.94.0
-	go.opentelemetry.io/collector/extension/ballastextension v0.94.0
-	go.opentelemetry.io/collector/extension/memorylimiterextension v0.94.0
-	go.opentelemetry.io/collector/extension/zpagesextension v0.94.0
-	go.opentelemetry.io/collector/otelcol v0.94.0
-	go.opentelemetry.io/collector/processor v0.94.0
-	go.opentelemetry.io/collector/processor/batchprocessor v0.94.0
-	go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.94.0
-	go.opentelemetry.io/collector/receiver v0.94.0
-	go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.0
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/connector v0.94.1
+	go.opentelemetry.io/collector/connector/forwardconnector v0.94.1
+	go.opentelemetry.io/collector/exporter v0.94.1
+	go.opentelemetry.io/collector/exporter/debugexporter v0.94.1
+	go.opentelemetry.io/collector/exporter/loggingexporter v0.94.1
+	go.opentelemetry.io/collector/exporter/otlpexporter v0.94.1
+	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.1
+	go.opentelemetry.io/collector/extension v0.94.1
+	go.opentelemetry.io/collector/extension/ballastextension v0.94.1
+	go.opentelemetry.io/collector/extension/memorylimiterextension v0.94.1
+	go.opentelemetry.io/collector/extension/zpagesextension v0.94.1
+	go.opentelemetry.io/collector/otelcol v0.94.1
+	go.opentelemetry.io/collector/processor v0.94.1
+	go.opentelemetry.io/collector/processor/batchprocessor v0.94.1
+	go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.94.1
+	go.opentelemetry.io/collector/receiver v0.94.1
+	go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.1
 	go.uber.org/goleak v1.3.0
 	golang.org/x/sys v0.16.0
 )
@@ -75,27 +75,27 @@ require (
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configauth v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configcompression v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configgrpc v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/confighttp v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/confignet v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configopaque v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configretry v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configtls v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/internal v0.94.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.94.0 // indirect
-	go.opentelemetry.io/collector/extension/auth v0.94.0 // indirect
+	go.opentelemetry.io/collector v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configauth v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configcompression v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configgrpc v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/confighttp v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/confignet v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configopaque v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configretry v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configtls v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/internal v0.94.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
+	go.opentelemetry.io/collector/consumer v0.94.1 // indirect
+	go.opentelemetry.io/collector/extension/auth v0.94.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.1.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.1.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.94.0 // indirect
-	go.opentelemetry.io/collector/service v0.94.0 // indirect
+	go.opentelemetry.io/collector/semconv v0.94.1 // indirect
+	go.opentelemetry.io/collector/service v0.94.1 // indirect
 	go.opentelemetry.io/contrib/config v0.3.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.23.0 // indirect
 	go.opentelemetry.io/contrib/zpages v0.48.0 // indirect
 	go.opentelemetry.io/otel v1.23.0 // indirect

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go
diff --git a/component/go.mod b/component/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/prometheus/client_model v0.5.0
 	github.com/prometheus/common v0.46.0
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0
-	go.opentelemetry.io/collector/confmap v0.94.0
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1
+	go.opentelemetry.io/collector/confmap v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
 	go.opentelemetry.io/otel v1.23.0
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1

diff --git a/config/configauth/go.mod b/config/configauth/go.mod
@@ -4,9 +4,9 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/extension v0.94.0
-	go.opentelemetry.io/collector/extension/auth v0.94.0
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/extension v0.94.1
+	go.opentelemetry.io/collector/extension/auth v0.94.1
 	go.uber.org/goleak v1.3.0
 )
 
@@ -22,8 +22,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
 	go.opentelemetry.io/collector/pdata v1.1.0 // indirect
 	go.opentelemetry.io/otel v1.23.0 // indirect
 	go.opentelemetry.io/otel/metric v1.23.0 // indirect

diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod
@@ -5,15 +5,15 @@ go 1.20
 require (
 	github.com/mostynb/go-grpc-compression v1.2.2
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector v0.94.0
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/config/configauth v0.94.0
-	go.opentelemetry.io/collector/config/configcompression v0.94.0
-	go.opentelemetry.io/collector/config/confignet v0.94.0
-	go.opentelemetry.io/collector/config/configopaque v0.94.0
-	go.opentelemetry.io/collector/config/configtls v0.94.0
-	go.opentelemetry.io/collector/config/internal v0.94.0
-	go.opentelemetry.io/collector/extension/auth v0.94.0
+	go.opentelemetry.io/collector v0.94.1
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/config/configauth v0.94.1
+	go.opentelemetry.io/collector/config/configcompression v0.94.1
+	go.opentelemetry.io/collector/config/confignet v0.94.1
+	go.opentelemetry.io/collector/config/configopaque v0.94.1
+	go.opentelemetry.io/collector/config/configtls v0.94.1
+	go.opentelemetry.io/collector/config/internal v0.94.1
+	go.opentelemetry.io/collector/extension/auth v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0
 	go.opentelemetry.io/otel v1.23.0
@@ -50,9 +50,9 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
-	go.opentelemetry.io/collector/extension v0.94.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
+	go.opentelemetry.io/collector/extension v0.94.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.1.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
 	go.opentelemetry.io/otel/metric v1.23.0 // indirect

diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod
@@ -7,16 +7,16 @@ require (
 	github.com/klauspost/compress v1.17.6
 	github.com/rs/cors v1.10.1
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector v0.94.0
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/config/configauth v0.94.0
-	go.opentelemetry.io/collector/config/configcompression v0.94.0
-	go.opentelemetry.io/collector/config/configopaque v0.94.0
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0
-	go.opentelemetry.io/collector/config/configtls v0.94.0
-	go.opentelemetry.io/collector/config/internal v0.94.0
-	go.opentelemetry.io/collector/extension/auth v0.94.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0
+	go.opentelemetry.io/collector v0.94.1
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/config/configauth v0.94.1
+	go.opentelemetry.io/collector/config/configcompression v0.94.1
+	go.opentelemetry.io/collector/config/configopaque v0.94.1
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1
+	go.opentelemetry.io/collector/config/configtls v0.94.1
+	go.opentelemetry.io/collector/config/internal v0.94.1
+	go.opentelemetry.io/collector/extension/auth v0.94.1
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0
 	go.opentelemetry.io/otel v1.23.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.26.0
@@ -46,8 +46,8 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
-	go.opentelemetry.io/collector/extension v0.94.0 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
+	go.opentelemetry.io/collector/extension v0.94.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.1.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.1.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect

diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum
diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/confmap v0.94.0
+	go.opentelemetry.io/collector/confmap v0.94.1
 	go.uber.org/goleak v1.3.0
 	gopkg.in/yaml.v3 v3.0.1
 )

diff --git a/config/configtls/go.mod b/config/configtls/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/config/configopaque v0.94.0
+	go.opentelemetry.io/collector/config/configopaque v0.94.1
 )
 
 require (

diff --git a/config/internal/go.mod b/config/internal/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector v0.94.0
+	go.opentelemetry.io/collector v0.94.1
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.26.0
 )

diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod
@@ -4,9 +4,9 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/connector v0.94.0
-	go.opentelemetry.io/collector/consumer v0.94.0
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/connector v0.94.1
+	go.opentelemetry.io/collector/consumer v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
 	go.opentelemetry.io/otel/metric v1.23.0
 	go.opentelemetry.io/otel/trace v1.23.0
@@ -36,9 +36,9 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	go.opentelemetry.io/collector v0.94.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
+	go.opentelemetry.io/collector v0.94.1 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
 	go.opentelemetry.io/otel v1.23.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.23.0 // indirect

diff --git a/connector/go.mod b/connector/go.mod
@@ -4,9 +4,9 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector v0.94.0
-	go.opentelemetry.io/collector/component v0.94.0
-	go.opentelemetry.io/collector/consumer v0.94.0
+	go.opentelemetry.io/collector v0.94.1
+	go.opentelemetry.io/collector/component v0.94.1
+	go.opentelemetry.io/collector/consumer v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/multierr v1.11.0
@@ -36,8 +36,8 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
 	go.opentelemetry.io/otel v1.23.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
 	go.opentelemetry.io/otel/metric v1.23.0 // indirect

diff --git a/consumer/go.mod b/consumer/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector v0.94.0
+	go.opentelemetry.io/collector v0.94.1
 	go.opentelemetry.io/collector/pdata v1.1.0
 	go.uber.org/goleak v1.3.0
 )