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

Jump to bottom

Upgrade core to latest #35598

Merged
merged 6 commits into from
Oct 4, 2024
Merged

Upgrade core to latest #35598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de8c682
[chore] multimod update stable modules
bogdandrutu Oct 4, 2024
66448bf
[chore] multimod update beta modules
bogdandrutu Oct 4, 2024
1619996
Upgrade otel core to latest
bogdandrutu Oct 4, 2024
ef1b0bd
Replace deprecated calls to Create*[Processor|Receiver]
bogdandrutu Oct 4, 2024
ef7be4a
Remove WithOptions from WithOptions prefix from deprecated
bogdandrutu Oct 4, 2024
5f03d30
Run make generate, remove extension deprecated calls
bogdandrutu Oct 4, 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/v65 v65.0.0
go.opentelemetry.io/collector/confmap v1.16.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0
go.opentelemetry.io/collector/confmap v1.16.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.1-0.20241004063257-d6cd5935eefc
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.

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.16.0
go.opentelemetry.io/collector/config/configtls v1.16.0
go.opentelemetry.io/collector/semconv v0.110.0
go.opentelemetry.io/collector/config/configopaque v1.16.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/config/configtls v1.16.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/semconv v0.110.1-0.20241004063257-d6cd5935eefc
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.25.0
Expand Down
12 changes: 6 additions & 6 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.

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 @@ -7,9 +7,9 @@ require (
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.110.0
go.opentelemetry.io/collector/pdata v1.16.0
go.opentelemetry.io/collector/semconv v0.110.0
go.opentelemetry.io/collector/component v0.110.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/pdata v1.16.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/semconv v0.110.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/otel v1.30.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.6.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0
Expand Down Expand Up @@ -43,9 +43,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.110.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand Down
20 changes: 8 additions & 12 deletions cmd/telemetrygen/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cmd/telemetrygen/internal/e2etest/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestGenerateTraces(t *testing.T) {
rCfg := f.CreateDefaultConfig()
endpoint := testutil.GetAvailableLocalAddress(t)
rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
r, err := f.CreateTracesReceiver(context.Background(), receivertest.NewNopSettings(), rCfg, sink)
r, err := f.CreateTraces(context.Background(), receivertest.NewNopSettings(), rCfg, sink)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.NoError(t, err)
Expand Down
57 changes: 28 additions & 29 deletions cmd/telemetrygen/internal/e2etest/go.mod
View file
Open in desktop
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.110.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.110.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.110.0
go.opentelemetry.io/collector/consumer/consumertest v0.110.0
go.opentelemetry.io/collector/receiver v0.110.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0
go.opentelemetry.io/collector/component v0.110.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/consumer/consumertest v0.110.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/receiver v0.110.1-0.20241004063257-d6cd5935eefc
go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.1-0.20241004063257-d6cd5935eefc
)

require (
Expand All @@ -28,7 +28,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
Expand All @@ -40,30 +40,29 @@ 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.110.0 // indirect
go.opentelemetry.io/collector/client v1.16.0 // indirect
go.opentelemetry.io/collector/component/componentprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.110.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.110.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.16.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.110.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.110.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.16.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.16.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.16.0 // indirect
go.opentelemetry.io/collector/config/internal v0.110.0 // indirect
go.opentelemetry.io/collector/confmap v1.16.0 // indirect
go.opentelemetry.io/collector/consumer v0.110.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/extension v0.110.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.110.0 // indirect
go.opentelemetry.io/collector/featuregate v1.16.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
go.opentelemetry.io/collector/pdata v1.16.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0 // indirect
go.opentelemetry.io/collector v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/client v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/component/componentstatus v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configauth v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configcompression v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configgrpc v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/confighttp v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/confignet v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configopaque v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/configtls v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/config/internal v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/confmap v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/consumer v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/extension v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/extension/auth v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/featuregate v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/pdata v1.16.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/pipeline v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.1-0.20241004063257-d6cd5935eefc // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
Expand Down
Loading