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

Fix linter errors from deprecations in OTEL 0.110 #6016

Merged
merged 2 commits into from
Sep 24, 2024
+209 −196
Merged

Fix linter errors from deprecations in OTEL 0.110 #6016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c855919
fix(deps): update all otel collector packages #6012 && linter errors …
Sep 24, 2024
a723311
fix : uninitialized variables
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/collector/app/handler/otlp_receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pipeline"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/otel/metric"
Expand Down Expand Up @@ -192,15 +193,15 @@ func (h *otelHost) ReportFatalError(err error) {
h.logger.Fatal("OTLP receiver error", zap.Error(err))
}

func (*otelHost) GetFactory(_ component.Kind, _ component.Type) component.Factory {
func (*otelHost) GetFactory(_ component.Kind, _ pipeline.Signal) component.Factory {
return nil
}

func (*otelHost) GetExtensions() map[component.ID]extension.Extension {
return nil
}

func (*otelHost) GetExporters() map[component.DataType]map[component.ID]component.Component {
func (*otelHost) GetExporters() map[pipeline.Signal]map[component.ID]component.Component {
return nil
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/collector/app/handler/otlp_receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pipeline"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"

Expand Down Expand Up @@ -138,7 +139,7 @@ func TestOtelHost_ReportFatalError(t *testing.T) {

func TestOtelHost(t *testing.T) {
host := &otelHost{}
assert.Nil(t, host.GetFactory(component.KindReceiver, component.DataTypeTraces))
assert.Nil(t, host.GetFactory(component.KindReceiver, pipeline.SignalTraces))
assert.Nil(t, host.GetExtensions())
assert.Nil(t, host.GetExporters())
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/jaeger/internal/exporters/storageexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func createTracesExporter(ctx context.Context, set exporter.Settings, config com
ex.pushTraces,
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
// Disable Timeout/RetryOnFailure and SendingQueue
exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
exporterhelper.WithRetry(configretry.BackOffConfig{Enabled: false}),
exporterhelper.WithQueue(exporterhelper.QueueSettings{Enabled: false}),
exporterhelper.WithQueue(exporterhelper.QueueConfig{Enabled: false}),
exporterhelper.WithStart(ex.start),
exporterhelper.WithShutdown(ex.close),
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/remotesampling/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host

func (ext *rsExtension) startGRPCServer(ctx context.Context, host component.Host) error {
var err error
if ext.grpcServer, err = ext.cfg.GRPC.ToServer(ctx, host, ext.telemetry); err != nil {
if ext.grpcServer, err = ext.cfg.GRPC.ToServerWithOptions(ctx, host, ext.telemetry); err != nil {
return err
}

Expand Down
126 changes: 64 additions & 62 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,36 +43,36 @@ require (
github.com/stretchr/testify v1.9.0
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/xdg-go/scram v1.1.2
go.opentelemetry.io/collector/component v0.109.0
go.opentelemetry.io/collector/component/componentstatus v0.109.0
go.opentelemetry.io/collector/config/configauth v0.109.0
go.opentelemetry.io/collector/config/configgrpc v0.109.0
go.opentelemetry.io/collector/config/confighttp v0.109.0
go.opentelemetry.io/collector/config/configretry v1.15.0
go.opentelemetry.io/collector/config/configtls v1.15.0
go.opentelemetry.io/collector/confmap v1.15.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0
go.opentelemetry.io/collector/connector v0.109.0
go.opentelemetry.io/collector/connector/forwardconnector v0.109.0
go.opentelemetry.io/collector/consumer v0.109.0
go.opentelemetry.io/collector/consumer/consumertest v0.109.0
go.opentelemetry.io/collector/exporter v0.109.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0
go.opentelemetry.io/collector/extension v0.109.0
go.opentelemetry.io/collector/component v0.110.0
go.opentelemetry.io/collector/component/componentstatus v0.110.0
go.opentelemetry.io/collector/config/configauth v0.110.0
go.opentelemetry.io/collector/config/configgrpc v0.110.0
go.opentelemetry.io/collector/config/confighttp v0.110.0
go.opentelemetry.io/collector/config/configretry v1.16.0
go.opentelemetry.io/collector/config/configtls v1.16.0
go.opentelemetry.io/collector/confmap v1.16.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.110.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.110.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.110.0
go.opentelemetry.io/collector/connector v0.110.0
go.opentelemetry.io/collector/connector/forwardconnector v0.110.0
go.opentelemetry.io/collector/consumer v0.110.0
go.opentelemetry.io/collector/consumer/consumertest v0.110.0
go.opentelemetry.io/collector/exporter v0.110.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0
go.opentelemetry.io/collector/extension v0.110.0
go.opentelemetry.io/collector/extension/ballastextension v0.108.1
go.opentelemetry.io/collector/extension/zpagesextension v0.109.0
go.opentelemetry.io/collector/otelcol v0.109.0
go.opentelemetry.io/collector/pdata v1.15.0
go.opentelemetry.io/collector/processor v0.109.0
go.opentelemetry.io/collector/processor/batchprocessor v0.109.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0
go.opentelemetry.io/collector/receiver v0.109.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0
go.opentelemetry.io/collector/extension/zpagesextension v0.110.0
go.opentelemetry.io/collector/otelcol v0.110.0
go.opentelemetry.io/collector/pdata v1.16.0
go.opentelemetry.io/collector/processor v0.110.0
go.opentelemetry.io/collector/processor/batchprocessor v0.110.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.110.0
go.opentelemetry.io/collector/receiver v0.110.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0
Expand All @@ -99,6 +99,8 @@ require (
require (
github.com/elastic/lunes v0.1.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.109.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
)

require (
Expand Down Expand Up @@ -208,39 +210,39 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.109.0 // indirect
go.opentelemetry.io/collector/client v1.15.0 // indirect
go.opentelemetry.io/collector/component/componentprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.15.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.109.0
go.opentelemetry.io/collector/config/configopaque v1.15.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.109.0
go.opentelemetry.io/collector/config/internal v0.109.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.109.0
go.opentelemetry.io/collector/exporter/exporterprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.109.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.109.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.109.0
go.opentelemetry.io/collector/featuregate v1.15.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.109.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.109.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.109.0 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/semconv v0.109.0 // indirect
go.opentelemetry.io/collector/service v0.109.0 // indirect
go.opentelemetry.io/contrib/config v0.9.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.29.0 // indirect
go.opentelemetry.io/contrib/zpages v0.54.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.5.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 // indirect
go.opentelemetry.io/otel/log v0.5.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.5.0 // 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/config/configcompression v1.16.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.16.0
go.opentelemetry.io/collector/config/configopaque v1.16.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.0
go.opentelemetry.io/collector/config/internal v0.110.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.110.0
go.opentelemetry.io/collector/exporter/exporterprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.110.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.110.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.110.0
go.opentelemetry.io/collector/featuregate v1.16.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.110.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.110.0 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0 // indirect
go.opentelemetry.io/collector/semconv v0.110.0 // indirect
go.opentelemetry.io/collector/service v0.110.0 // indirect
go.opentelemetry.io/contrib/config v0.10.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.30.0 // indirect
go.opentelemetry.io/contrib/zpages v0.55.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.6.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.30.0 // indirect
go.opentelemetry.io/otel/log v0.6.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.6.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand Down
Loading
Loading