Skip to content
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

[chore] make update-otel #36851

Merged
merged 9 commits into from
Dec 16, 2024
Merged

[chore] make update-otel #36851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b23f57d
[chore] multimod update stable modules
songy23 Dec 16, 2024
8c3bf53
[chore] multimod update beta modules
songy23 Dec 16, 2024
47a5e0e
make gotidy
songy23 Dec 16, 2024
e188b88
fix deprecation
songy23 Dec 16, 2024
0321900
more version fixes
songy23 Dec 16, 2024
ee0ef07
Merge branch 'main' into update-otel
songy23 Dec 16, 2024
825cb7b
more deprecations
songy23 Dec 16, 2024
394a332
Merge branch 'main' into update-otel
songy23 Dec 16, 2024
f15c9ef
more deprecations
songy23 Dec 16, 2024
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/google/go-github/v67 v67.0.0
go.opentelemetry.io/collector/confmap v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/confmap v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241216091623-8ac40a01a5ff
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/config/configtls v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/confmap v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/semconv v0.115.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/config/configopaque v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/config/configtls v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/confmap v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/semconv v0.115.1-0.20241216091623-8ac40a01a5ff
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.28.0
Expand Down
24 changes: 12 additions & 12 deletions cmd/opampsupervisor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dist:
version: 0.115.0-dev

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.115.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.115.0
Expand Down Expand Up @@ -49,10 +49,10 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.115.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.115.0
Expand Down Expand Up @@ -99,8 +99,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.115.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.115.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.115.0
Expand All @@ -126,8 +126,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.115.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.115.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.115.0
Expand Down Expand Up @@ -222,7 +222,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.115.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.115.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.115.0
Expand All @@ -236,11 +236,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/sumconnector v0.115.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.115.0

Expand Down
24 changes: 12 additions & 12 deletions cmd/oteltestbedcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ dist:
version: 0.115.0-dev

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.115.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.115.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.115.0
Expand All @@ -29,15 +29,15 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.115.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.115.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.115.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.1-0.20241216091623-8ac40a01a5ff
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.115.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.115.0
Expand All @@ -53,11 +53,11 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.115.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.1-0.20241216091623-8ac40a01a5ff
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.1-0.20241216091623-8ac40a01a5ff

replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage
Expand Down
10 changes: 4 additions & 6 deletions cmd/telemetrygen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetryge

go 1.22.7

toolchain go1.22.8

require (
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.115.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/pdata v1.21.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/semconv v0.115.1-0.20241206185113-3f3e208e71b8
go.opentelemetry.io/collector/component v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/pdata v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/semconv v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0
Expand Down Expand Up @@ -46,7 +44,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.115.1-0.20241206185113-3f3e208e71b8 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.31.0 // indirect
Expand Down
Loading
Loading