Skip to content

Commit

Permalink
Update otel (open-telemetry#36609)
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
Update contrib with latest core.

Of note:
* scraper code was impacted quite a bit by the changes
* generated code changed quite a bit as well

---------

Signed-off-by: Antoine Toulme <[email protected]>
  • Loading branch information
@atoulme @ZenoCC-Peng
atoulme authored and ZenoCC-Peng committed Dec 6, 2024
1 parent 6753da3 commit e46c1c3
Show file tree
Hide file tree
Showing 731 changed files with 17,236 additions and 16,897 deletions.
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
View file
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/v66 v66.0.0
go.opentelemetry.io/collector/confmap v1.20.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.0
go.opentelemetry.io/collector/confmap v1.20.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241130171227-c52d625647be
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
12 changes: 6 additions & 6 deletions cmd/githubgen/go.sum
View file

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

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ 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.20.0
go.opentelemetry.io/collector/config/configtls v1.20.0
go.opentelemetry.io/collector/semconv v0.114.0
go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/semconv v0.114.1-0.20241130171227-c52d625647be
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.26.0
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum
View file

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

10 changes: 5 additions & 5 deletions cmd/telemetrygen/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
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.114.0
go.opentelemetry.io/collector/pdata v1.20.0
go.opentelemetry.io/collector/semconv v0.114.0
go.opentelemetry.io/collector/component v0.114.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/pdata v1.20.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/semconv v0.114.1-0.20241130171227-c52d625647be
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 @@ -44,15 +44,15 @@ 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.114.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
20 changes: 10 additions & 10 deletions cmd/telemetrygen/go.sum
View file

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

62 changes: 31 additions & 31 deletions cmd/telemetrygen/internal/e2etest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.114.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component/componenttest v0.114.0
go.opentelemetry.io/collector/consumer/consumertest v0.114.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.0
go.opentelemetry.io/collector/receiver/receivertest v0.114.0
go.opentelemetry.io/collector/component/componenttest v0.114.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/consumer/consumertest v0.114.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.1-0.20241130171227-c52d625647be
go.opentelemetry.io/collector/receiver/receivertest v0.114.1-0.20241130171227-c52d625647be
)

require (
Expand Down Expand Up @@ -41,32 +41,32 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/collector v0.114.0 // indirect
go.opentelemetry.io/collector/client v1.20.0 // indirect
go.opentelemetry.io/collector/component v0.114.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.114.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.114.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.20.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.114.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.114.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.20.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.20.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.114.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.20.0 // indirect
go.opentelemetry.io/collector/config/internal v0.114.0 // indirect
go.opentelemetry.io/collector/confmap v1.20.0 // indirect
go.opentelemetry.io/collector/consumer v0.114.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.114.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.114.0 // indirect
go.opentelemetry.io/collector/extension v0.114.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.114.0 // indirect
go.opentelemetry.io/collector/featuregate v1.20.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.114.0 // indirect
go.opentelemetry.io/collector/pdata v1.20.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.114.0 // indirect
go.opentelemetry.io/collector/pipeline v0.114.0 // indirect
go.opentelemetry.io/collector/receiver v0.114.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.114.0 // indirect
go.opentelemetry.io/collector v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/client v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/component v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/component/componentstatus v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configauth v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configcompression v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configgrpc v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/confighttp v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/confignet v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/config/internal v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/confmap v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/consumer v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/extension v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/extension/auth v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/featuregate v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/pdata v1.20.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/pipeline v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/receiver v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.114.1-0.20241130171227-c52d625647be // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
Expand All @@ -87,7 +87,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading

0 comments on commit e46c1c3

Please sign in to comment.