Skip to content

Commit

Permalink
[chore] Update otel version (open-telemetry#37808)
Browse files Browse the repository at this point in the history
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This is a PR to verify the change in open-telemetry#37706: After running `make
update-otel`, `builder-config.yaml` files are correctly updated in this
PR.

Feel free to close this PR if it's too large to review. (I have no
permission to run the `update-otel` GitHub action and have to run it
manually).
cc @bogdandrutu @codeboten @mx-psi @songy23 
<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Relevant to open-telemetry#37703 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Signed-off-by: Chao <[email protected]>
Co-authored-by: Pablo Baeyens <[email protected]>
  • Loading branch information
2 people authored and khushijain21 committed Feb 14, 2025
1 parent 7b396d6 commit c73e663
Show file tree
Hide file tree
Showing 1,077 changed files with 18,820 additions and 20,197 deletions.
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.22.0

require (
github.com/google/go-github/v68 v68.0.0
go.opentelemetry.io/collector/confmap v1.25.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum

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
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.18.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/config/configopaque v1.25.0
go.opentelemetry.io/collector/config/configtls v1.25.0
go.opentelemetry.io/collector/confmap v1.25.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0
go.opentelemetry.io/collector/semconv v0.119.0
go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/semconv v0.119.1-0.20250210123122-44b3eeda354c
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.30.0
Expand Down
24 changes: 12 additions & 12 deletions cmd/opampsupervisor/go.sum

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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dist:
output_path: ./cmd/otelcontribcol

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.119.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.119.0
Expand Down Expand Up @@ -52,10 +52,10 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/skywalkingencodingextension v0.119.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.119.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.119.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.119.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.119.0
Expand All @@ -130,8 +130,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.119.0
Expand Down Expand Up @@ -228,7 +228,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.119.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0
Expand All @@ -243,11 +243,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.119.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.119.0

Expand Down
24 changes: 12 additions & 12 deletions cmd/oteltestbedcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ dist:
output_path: ./cmd/oteltestbedcol

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.119.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.119.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0
Expand All @@ -30,15 +30,15 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.119.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.119.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.1-0.20250210123122-44b3eeda354c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.119.0
Expand All @@ -54,11 +54,11 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.1-0.20250210123122-44b3eeda354c
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c

# When using `make genoteltestbedcol`, a `replaces` section is appended to this
# file before passing it to OCB, to ensure that local versions are used for all
Expand Down
9 changes: 4 additions & 5 deletions cmd/telemetrygen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.0
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/collector/semconv v0.119.0
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/semconv v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0
Expand Down Expand Up @@ -43,15 +43,14 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/protobuf v1.36.4 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading

0 comments on commit c73e663

Please sign in to comment.