Skip to content

Commit

Permalink
fix(deps): update all otel collector packages (#6665)
Browse files Browse the repository at this point in the history
  • Loading branch information
@renovate-bot
renovate-bot authored Feb 4, 2025
1 parent 384203d commit c37dfcb
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 167 deletions.
3 changes: 1 addition & 2 deletions cmd/collector/app/handler/otlp_receiver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"go.opentelemetry.io/collector/component/componentstatus"
"go.opentelemetry.io/collector/config/confignet"
"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"
Expand Down Expand Up @@ -135,7 +134,7 @@ func (*otelHost) GetFactory(_ component.Kind, _ pipeline.Signal) component.Facto
return nil
}

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

Expand Down
9 changes: 3 additions & 6 deletions cmd/collector/app/server/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/gorilla/mux"
"go.opentelemetry.io/collector/config/confighttp"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
samplinghttp "github.com/jaegertracing/jaeger/internal/sampling/http"
Expand Down Expand Up @@ -40,11 +39,9 @@ func StartHTTPServer(params *HTTPServerParams) (*http.Server, error) {
if err != nil {
return nil, err
}
errorLog, _ := zap.NewStdLogAt(params.Logger, zapcore.ErrorLevel)
server, err := params.ToServer(context.Background(), nil, telemetry.NoopSettings().ToOtelComponent(),
nil)

server.ErrorLog = errorLog
settings := telemetry.NoopSettings().ToOtelComponent()
settings.Logger = params.Logger
server, err := params.ToServer(context.Background(), nil, settings, nil)
if err != nil {
return nil, err
}
Expand Down
4 changes: 3 additions & 1 deletion cmd/collector/app/server/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ func TestSpanCollectorHTTP(t *testing.T) {
Logger: logger,
}

server, _ := params.ToServer(context.Background(), nil, component.TelemetrySettings{}, nil)
server, _ := params.ToServer(context.Background(), nil, component.TelemetrySettings{
Logger: logger,
}, nil)
listener, _ := params.ToListener(context.Background())

serveHTTP(server, listener, params)
Expand Down
104 changes: 52 additions & 52 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,42 +44,42 @@ require (
github.com/stretchr/testify v1.10.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.118.0
go.opentelemetry.io/collector/component/componentstatus v0.118.0
go.opentelemetry.io/collector/component/componenttest v0.118.0
go.opentelemetry.io/collector/config/configauth v0.118.0
go.opentelemetry.io/collector/config/configgrpc v0.118.0
go.opentelemetry.io/collector/config/confighttp v0.118.0
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.118.0
go.opentelemetry.io/collector/config/configretry v1.24.0
go.opentelemetry.io/collector/config/configtls v1.24.0
go.opentelemetry.io/collector/confmap v1.24.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.0
go.opentelemetry.io/collector/component v0.119.0
go.opentelemetry.io/collector/component/componentstatus v0.119.0
go.opentelemetry.io/collector/component/componenttest v0.119.0
go.opentelemetry.io/collector/config/configauth v0.119.0
go.opentelemetry.io/collector/config/configgrpc v0.119.0
go.opentelemetry.io/collector/config/confighttp v0.119.0
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.119.0
go.opentelemetry.io/collector/config/configretry 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.24.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.24.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.0
go.opentelemetry.io/collector/connector v0.118.0
go.opentelemetry.io/collector/connector/forwardconnector v0.118.0
go.opentelemetry.io/collector/consumer v1.24.0
go.opentelemetry.io/collector/consumer/consumertest v0.118.0
go.opentelemetry.io/collector/exporter v0.118.0
go.opentelemetry.io/collector/exporter/exportertest v0.118.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0
go.opentelemetry.io/collector/connector v0.119.0
go.opentelemetry.io/collector/connector/forwardconnector v0.119.0
go.opentelemetry.io/collector/consumer v1.25.0
go.opentelemetry.io/collector/consumer/consumertest v0.119.0
go.opentelemetry.io/collector/exporter v0.119.0
go.opentelemetry.io/collector/exporter/exportertest v0.119.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0
go.opentelemetry.io/collector/extension v0.118.0
go.opentelemetry.io/collector/extension/extensiontest v0.118.0
go.opentelemetry.io/collector/extension v0.119.0
go.opentelemetry.io/collector/extension/extensiontest v0.119.0
go.opentelemetry.io/collector/extension/zpagesextension v0.118.0
go.opentelemetry.io/collector/featuregate v1.24.0
go.opentelemetry.io/collector/featuregate v1.25.0
go.opentelemetry.io/collector/otelcol v0.118.0
go.opentelemetry.io/collector/pdata v1.24.0
go.opentelemetry.io/collector/pipeline v0.118.0
go.opentelemetry.io/collector/processor v0.118.0
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/collector/pipeline v0.119.0
go.opentelemetry.io/collector/processor v0.119.0
go.opentelemetry.io/collector/processor/batchprocessor v0.118.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0
go.opentelemetry.io/collector/processor/processortest v0.118.0
go.opentelemetry.io/collector/receiver v0.118.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0
go.opentelemetry.io/collector/processor/processortest v0.119.0
go.opentelemetry.io/collector/receiver v0.119.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
go.opentelemetry.io/contrib/samplers/jaegerremote v0.28.0
Expand All @@ -105,7 +105,7 @@ require (

require (
github.com/gogo/googleapis v1.4.1 // indirect
go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect
)

require (
Expand Down Expand Up @@ -236,31 +236,31 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector v0.118.0 // indirect
go.opentelemetry.io/collector/client v1.24.0
go.opentelemetry.io/collector/config/configcompression v1.24.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.24.0
go.opentelemetry.io/collector/config/configopaque v1.24.0
go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.118.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.118.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect
go.opentelemetry.io/collector v0.119.0 // indirect
go.opentelemetry.io/collector/client v1.25.0
go.opentelemetry.io/collector/config/configcompression v1.25.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.25.0
go.opentelemetry.io/collector/config/configopaque v1.25.0
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.119.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.118.0
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.118.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.119.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.118.0
go.opentelemetry.io/collector/internal/fanoutconsumer v0.118.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.118.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.118.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
go.opentelemetry.io/collector/semconv v0.118.0 // indirect
go.opentelemetry.io/collector/service v0.118.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
Expand Down
Loading

0 comments on commit c37dfcb

Please sign in to comment.