public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracing: Fix OpenTelemetry Jaeger context propagation (#53269)

Browse Source 
* fix otel jaeger context propagation

* add back launch.json

* add back launch.json
This commit is contained in:
zhichli
2022-08-11 16:11:34 +02:00
committed by GitHub
parent 44ea98b24f
commit 806fb8ab7a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/tracing/opentelemetry_tracing.go
+2 -2
View File
@@ -96,11 +96,11 @@ func (ots *Opentelemetry) parseSettingsOpentelemetry() error {
ots.enabled = noopExporter
ots.address = section.Key("address").MustString("")
ots.propagation = section.Key("propagation").MustString("")
if ots.address != "" {
ots.enabled = jaegerExporter
return nil
}
ots.propagation = section.Key("propagation").MustString("")
section, err = ots.Cfg.Raw.GetSection("tracing.opentelemetry.otlp")
if err != nil {
@@ -234,7 +234,7 @@ func (ots *Opentelemetry) Run(ctx context.Context) error {
}
func (ots *Opentelemetry) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, Span) {
ctx, span := ots.tracer.Start(ctx, spanName)
ctx, span := ots.tracer.Start(ctx, spanName, opts...)
opentelemetrySpan := OpentelemetrySpan{
span: span,
}