[chore] Update otel (open-telemetry#31020)

**Description:** - Handles the `GRPCClientSettings` -> `ClientSettings` breaking change - Handles the `GRPCServerSettings` -> `ServerSettings` breaking change - Handles the `HTTPClientConfig` -> `ClientConfig` change - Handles the `HTTPServerConfig` -> `ServerConfig` change **Link to tracking Issue:** <Issue number if applicable> **Testing:** <Describe what testing was performed and which tests were added.> **Documentation:** <Describe the documentation added.> --------- Signed-off-by: Tyler Helmuth <[email protected]>
zdelagrange · Feb 2, 2024 · c4ca4f9 · c4ca4f9
1 parent 4e63de5
commit c4ca4f9
Show file tree

Hide file tree

Showing 842 changed files with 9,696 additions and 9,673 deletions.
diff --git a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json
@@ -14,7 +14,7 @@
  "Fields": [
  {
  "Name": "grpc",
- "Type": "*configgrpc.GRPCServerSettings",
+ "Type": "*configgrpc.ServerConfig",
  "Kind": "ptr",
  "Default": null,
  "Doc": "",
@@ -261,7 +261,7 @@
  },
  {
  "Name": "http",
- "Type": "*confighttp.HTTPServerConfig",
+ "Type": "*confighttp.ServerConfig",
  "Kind": "ptr",
  "Default": null,
  "Doc": "",

diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -10,10 +10,10 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib v0.93.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.93.0
  github.com/stretchr/testify v1.8.4
- go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f
- go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f
- go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f
- go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f
+ go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d
+ go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d
+ go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d
+ go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d
  go.uber.org/goleak v1.3.0
  golang.org/x/mod v0.14.0
  golang.org/x/text v0.14.0
@@ -173,8 +173,8 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 // indirect
  github.com/samber/lo v1.38.1 // indirect
  github.com/shoenig/go-m1cpu v0.1.6 // indirect
- go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect
+ go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect
 )
 
 require (
@@ -621,35 +621,35 @@ require (
  go.mongodb.org/atlas v0.36.0 // indirect
  go.mongodb.org/mongo-driver v1.13.1 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect
- go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect
- go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect
- go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect
+ go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect
+ go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect
+ go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect
+ go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect
  go.opentelemetry.io/contrib/config v0.2.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.47.0 // indirect