Skip to content

Commit

Permalink
Test configuration changes
Browse files Browse the repository at this point in the history
Signed-off-by: Wise-Wizard <[email protected]>
  • Loading branch information
Wise-Wizard committed Jul 16, 2024
1 parent 075444f commit 35c9f22
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
14 changes: 13 additions & 1 deletion cmd/jaeger/internal/all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@ service:
receivers: [otlp, jaeger, zipkin]
processors: [batch]
exporters: [jaeger_storage_exporter]

telemetry:
metrics:
level: detailed
traces:
processors:
- batch:
schedule_delay: 1000
exporter:
otlp:
endpoint: http://localhost:4318/v1/traces
protocol: http/protobuf
headers:
Authorization: "Basic ..."
extensions:
jaeger_query:
trace_storage: some_storage
Expand Down
13 changes: 6 additions & 7 deletions cmd/jaeger/internal/extension/jaegerquery/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"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"
"github.com/jaegertracing/jaeger/pkg/jtracer"
"github.com/jaegertracing/jaeger/pkg/telemetery"
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
Expand Down Expand Up @@ -73,14 +72,14 @@ func (s *server) Start(_ context.Context, host component.Host) error {
// 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)
}
s.closeTracer = tracerProvider.Close
// tracerProvider, err := jtracer.New("jaeger")
// if err != nil {
// return fmt.Errorf("could not initialize a tracer: %w", err)
// }
// s.closeTracer = tracerProvider.Close
telset := telemetery.Setting{
Logger: s.telset.Logger,
TracerProvider: tracerProvider.OTEL,
TracerProvider: s.telset.TracerProvider,
ReportStatus: s.telset.ReportStatus,
}

Expand Down

0 comments on commit 35c9f22

Please sign in to comment.