Skip to content

[chore] Update otel #39563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2025
Merged

[chore] Update otel #39563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
143a48d
[chore] multimod update stable modules
songy23 Apr 22, 2025
6f2ec31
[chore] multimod update beta modules
songy23 Apr 22, 2025
47a94f9
tidy
songy23 Apr 22, 2025
fc8e8ee
add replace
songy23 Apr 22, 2025
24139a7
tidy
songy23 Apr 22, 2025
9237e1b
add replace to otelcontribcol & oteltestbedcol
songy23 Apr 22, 2025
e8b49be
revert cmd/telemetrygen/go.mod
songy23 Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
141 changes: 75 additions & 66 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ require (
github.com/open-telemetry/opamp-go v0.19.0
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.124.1
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v1.30.0
go.opentelemetry.io/collector/config/configopaque v1.30.0
go.opentelemetry.io/collector/config/configtelemetry v0.124.0
go.opentelemetry.io/collector/config/configtls v1.30.0
go.opentelemetry.io/collector/confmap v1.30.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.30.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.30.0
go.opentelemetry.io/collector/pdata v1.30.0
go.opentelemetry.io/collector/semconv v0.124.0
go.opentelemetry.io/collector/service v0.124.0
go.opentelemetry.io/collector/component v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/config/configopaque v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/config/configtelemetry v0.124.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/config/configtls v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/confmap v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/confmap/provider/envprovider v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/pdata v1.30.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/semconv v0.124.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/collector/service v0.124.1-0.20250422165940-c47951a8bf71
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0
go.opentelemetry.io/contrib/otelconf v0.15.0
go.opentelemetry.io/otel v1.35.0
Expand Down Expand Up @@ -76,7 +76,7 @@ require (
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/leodido/go-syslog/v4 v4.2.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
Expand Down Expand Up @@ -129,61 +129,63 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector v0.124.0 // indirect
go.opentelemetry.io/collector/client v1.30.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.124.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.124.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.124.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.30.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.124.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.124.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.30.0 // indirect
go.opentelemetry.io/collector/config/configretry v1.30.0 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.124.0 // indirect
go.opentelemetry.io/collector/connector v0.124.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.124.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.124.0 // indirect
go.opentelemetry.io/collector/consumer v1.30.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.124.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.124.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.124.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.124.0 // indirect
go.opentelemetry.io/collector/exporter v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.124.0 // indirect
go.opentelemetry.io/collector/extension v1.30.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.30.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.124.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.124.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.124.0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.124.0 // indirect
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.124.0 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.124.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.124.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.124.0 // indirect
go.opentelemetry.io/collector/otelcol v0.124.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.124.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.124.0 // indirect
go.opentelemetry.io/collector/pipeline v0.124.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
go.opentelemetry.io/collector/processor v1.30.0 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.124.0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.124.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.124.0 // indirect
go.opentelemetry.io/collector/receiver v1.30.0 // indirect
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.124.0 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.124.0 // indirect
go.opentelemetry.io/collector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/client v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/component/componenttest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/configauth v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/configcompression v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/confighttp v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/confignet v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/config/configretry v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/connector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/consumer v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension/extensionmiddleware v1.30.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension/xextension v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/featuregate v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/otelcol v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/pipeline v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/processorhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/processortest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/receiver v1.30.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.124.1-0.20250422165940-c47951a8bf71 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
Expand Down Expand Up @@ -212,6 +214,7 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
google.golang.org/grpc v1.72.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver
Expand Down Expand Up @@ -305,3 +308,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/m
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter

replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.0.0-00010101000000-000000000000 => go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.0.0-20250422165940-c47951a8bf71

replace go.opentelemetry.io/collector/config/configmiddleware v0.0.0-00010101000000-000000000000 => go.opentelemetry.io/collector/config/configmiddleware v0.0.0-20250422165940-c47951a8bf71

replace go.opentelemetry.io/collector/extension/extensionmiddleware v1.30.0 => go.opentelemetry.io/collector/extension/extensionmiddleware v0.0.0-20250422165940-c47951a8bf71
Loading
Loading