diff --git a/collector/config.yaml b/collector/config.yaml index de306165c9..c2dceee0fb 100644 --- a/collector/config.yaml +++ b/collector/config.yaml @@ -18,6 +18,3 @@ service: metrics: receivers: [otlp] exporters: [debug] - telemetry: - metrics: - address: localhost:8888 diff --git a/collector/go.mod b/collector/go.mod index a098565292..52c718b583 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -238,9 +238,11 @@ require ( go.opentelemetry.io/collector/semconv v0.128.0 // indirect go.opentelemetry.io/collector/service v0.143.0 // indirect go.opentelemetry.io/collector/service/hostcapabilities v0.143.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.38.0 // indirect go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect diff --git a/collector/go.sum b/collector/go.sum index 67d2f662f1..f6167d33b6 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -657,6 +657,8 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE= go.opentelemetry.io/otel/log v0.15.0 h1:0VqVnc3MgyYd7QqNVIldC3dsLFKgazR6P3P3+ypkyDY= go.opentelemetry.io/otel/log v0.15.0/go.mod h1:9c/G1zbyZfgu1HmQD7Qj84QMmwTp2QCQsZH1aeoWDE4= +go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= +go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0= go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18= diff --git a/collector/lambdacomponents/custom.go b/collector/lambdacomponents/custom.go index 1bd1b219da..8713ea0540 100644 --- a/collector/lambdacomponents/custom.go +++ b/collector/lambdacomponents/custom.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/otelcol" + "go.opentelemetry.io/collector/service/telemetry/otelconftelemetry" "go.uber.org/multierr" ) @@ -63,6 +64,7 @@ func Components(extensionID string) (otelcol.Factories, error) { Exporters: exporters, Extensions: extensions, Connectors: connectors, + Telemetry: otelconftelemetry.NewFactory(), } return factories, multierr.Combine(errs...) diff --git a/collector/lambdacomponents/default.go b/collector/lambdacomponents/default.go index e054bcbea4..7d4cddfd12 100644 --- a/collector/lambdacomponents/default.go +++ b/collector/lambdacomponents/default.go @@ -34,6 +34,7 @@ import ( "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" "go.opentelemetry.io/collector/receiver/otlpreceiver" + "go.opentelemetry.io/collector/service/telemetry/otelconftelemetry" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-lambda/collector/processor/coldstartprocessor" @@ -89,6 +90,7 @@ func Components(extensionID string) (otelcol.Factories, error) { Exporters: exporters, Processors: processors, Extensions: extensions, + Telemetry: otelconftelemetry.NewFactory(), } return factories, multierr.Combine(errs...) diff --git a/collector/lambdacomponents/go.mod b/collector/lambdacomponents/go.mod index adecb78307..56b453d02a 100644 --- a/collector/lambdacomponents/go.mod +++ b/collector/lambdacomponents/go.mod @@ -28,6 +28,7 @@ require ( go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.143.0 go.opentelemetry.io/collector/receiver v1.49.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.0 + go.opentelemetry.io/collector/service v0.143.0 go.uber.org/multierr v1.11.0 ) @@ -205,11 +206,12 @@ require ( go.opentelemetry.io/collector/receiver/receivertest v0.143.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.143.0 // indirect go.opentelemetry.io/collector/semconv v0.128.0 // indirect - go.opentelemetry.io/collector/service v0.143.0 // indirect go.opentelemetry.io/collector/service/hostcapabilities v0.143.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.38.0 // indirect go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect diff --git a/collector/lambdacomponents/go.sum b/collector/lambdacomponents/go.sum index 6195e84661..5eeaf1959f 100644 --- a/collector/lambdacomponents/go.sum +++ b/collector/lambdacomponents/go.sum @@ -639,6 +639,8 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE= go.opentelemetry.io/otel/log v0.15.0 h1:0VqVnc3MgyYd7QqNVIldC3dsLFKgazR6P3P3+ypkyDY= go.opentelemetry.io/otel/log v0.15.0/go.mod h1:9c/G1zbyZfgu1HmQD7Qj84QMmwTp2QCQsZH1aeoWDE4= +go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= +go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0= go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=