Skip to content
Draft
Changes from all commits
Commits
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
30 changes: 7 additions & 23 deletions cmd/jaeger/internal/extension/jaegerquery/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/extensioncapabilities"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop"
"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"
Expand All @@ -41,10 +41,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,
}
}

Expand All @@ -56,25 +56,11 @@ 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
tp = noop.NewTracerProvider()

if s.config.EnableTracing {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this setting? Can it not be controlled from telemetry section of otel config?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be removed from QueryOptions struct as well?

// 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)
// Getting Tracer from OTEL
tp = s.telset.TracerProvider
}

telset := telemetry.FromOtelComponent(s.telset, host)
Expand Down Expand Up @@ -136,8 +122,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
}

Expand Down
Loading