diff --git a/cmd/jaeger/config.yaml b/cmd/jaeger/config.yaml index f94e9e264f0..f7ced7937f5 100644 --- a/cmd/jaeger/config.yaml +++ b/cmd/jaeger/config.yaml @@ -18,8 +18,13 @@ service: port: 8888 logs: level: debug - # TODO Initialize telemetry tracer once OTEL released new feature. - # https://github.com/open-telemetry/opentelemetry-collector/issues/10663 + traces: + processors: + - batch: + exporter: + otlp: + protocol: http/protobuf + endpoint: http://0.0.0.0:4318 extensions: healthcheckv2: diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go index 4705774ca76..d524d414589 100644 --- a/cmd/jaeger/internal/extension/jaegerquery/server.go +++ b/cmd/jaeger/internal/extension/jaegerquery/server.go @@ -11,14 +11,12 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/extensioncapabilities" - "go.opentelemetry.io/otel/trace" "go.uber.org/zap" "github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage" queryapp "github.com/jaegertracing/jaeger/cmd/query/app" "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc" - "github.com/jaegertracing/jaeger/internal/jtracer" "github.com/jaegertracing/jaeger/internal/metrics" "github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled" "github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore" @@ -41,10 +39,10 @@ type server struct { closeTracer func(ctx context.Context) error } -func newServer(config *Config, otel component.TelemetrySettings) *server { +func newServer(config *Config, telset component.TelemetrySettings) *server { return &server{ config: config, - telset: otel, + telset: telset, } } @@ -55,30 +53,7 @@ func (*server) Dependencies() []component.ID { } func (s *server) Start(ctx context.Context, host component.Host) error { - var tp trace.TracerProvider - success := false - tp = jtracer.NoOp().OTEL - if s.config.EnableTracing { - // TODO OTel-collector does not initialize the tracer currently - // https://github.com/open-telemetry/opentelemetry-collector/issues/7532 - //nolint - tracerProvider, err := jtracer.New("jaeger") - if err != nil { - return fmt.Errorf("could not initialize a tracer: %w", err) - } - tp = tracerProvider.OTEL - // make sure to close the tracer if subsequent code exists with error - defer func(ctx context.Context) { - if success { - s.closeTracer = tracerProvider.Close - } else { - tracerProvider.Close(ctx) - } - }(ctx) - } - telset := telemetry.FromOtelComponent(s.telset, host) - telset.TracerProvider = tp telset.Metrics = telset.Metrics. Namespace(metrics.NSOptions{Name: "jaeger"}). Namespace(metrics.NSOptions{Name: "query"}) @@ -136,8 +111,6 @@ func (s *server) Start(ctx context.Context, host component.Host) error { if err := s.server.Start(ctx); err != nil { return fmt.Errorf("could not start jaeger-query: %w", err) } - - success = true return nil }