fixup! probers: initiate traces for browser, scripted, and multihttp checks

nadiamoe · nadiamoe · commit 2973a75c8c9d · 2024-10-09T15:07:54.000+02:00
diff --git a/internal/prober/browser/browser.go b/internal/prober/browser/browser.go
@@ -62,7 +62,7 @@ func (p Prober) Name() string {
 }
 
 func (p Prober) Probe(ctx context.Context, target string, registry *prometheus.Registry, logger logger.Logger) (bool, float64) {
-	ctx, probeSpan := tracing.TracerProvider(ctx).Tracer("").Start(ctx, "browser check")
+	ctx, probeSpan := tracing.TracerProviderFromContext(ctx).Tracer("").Start(ctx, p.Name()+" check")
 	defer probeSpan.End()
 
 	success, err := p.processor.Run(ctx, registry, logger, p.logger)
diff --git a/internal/prober/multihttp/multihttp.go b/internal/prober/multihttp/multihttp.go
@@ -85,7 +85,7 @@ func (p Prober) Name() string {
 }
 
 func (p Prober) Probe(ctx context.Context, target string, registry *prometheus.Registry, logger logger.Logger) (bool, float64) {
-	ctx, probeSpan := tracing.TracerProvider(ctx).Tracer("").Start(ctx, "multihttp check")
+	ctx, probeSpan := tracing.TracerProviderFromContext(ctx).Tracer("").Start(ctx, p.Name()+" check")
 	defer probeSpan.End()
 
 	success, err := p.processor.Run(ctx, registry, logger, p.logger)
diff --git a/internal/prober/scripted/scripted.go b/internal/prober/scripted/scripted.go
@@ -62,7 +62,7 @@ func (p Prober) Name() string {
 }
 
 func (p Prober) Probe(ctx context.Context, target string, registry *prometheus.Registry, logger logger.Logger) (bool, float64) {
-	ctx, probeSpan := tracing.TracerProvider(ctx).Tracer("").Start(ctx, "scripted check")
+	ctx, probeSpan := tracing.TracerProviderFromContext(ctx).Tracer("").Start(ctx, p.Name()+" check")
 	defer probeSpan.End()
 
 	success, err := p.processor.Run(ctx, registry, logger, p.logger)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (p Prober) Name() string {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func (p Prober) Probe(ctx context.Context, target string, registry *prometheus.Registry, logger logger.Logger) (bool, float64) {`
`65`		`- ctx, probeSpan := tracing.TracerProvider(ctx).Tracer("").Start(ctx, "browser check")`
	`65`	`+ ctx, probeSpan := tracing.TracerProviderFromContext(ctx).Tracer("").Start(ctx, p.Name()+" check")`
`66`	`66`	`defer probeSpan.End()`
`67`	`67`
`68`	`68`	`success, err := p.processor.Run(ctx, registry, logger, p.logger)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func (p Prober) Name() string {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`func (p Prober) Probe(ctx context.Context, target string, registry *prometheus.Registry, logger logger.Logger) (bool, float64) {`
`88`		`- ctx, probeSpan := tracing.TracerProvider(ctx).Tracer("").Start(ctx, "multihttp check")`
	`88`	`+ ctx, probeSpan := tracing.TracerProviderFromContext(ctx).Tracer("").Start(ctx, p.Name()+" check")`
`89`	`89`	`defer probeSpan.End()`
`90`	`90`
`91`	`91`	`success, err := p.processor.Run(ctx, registry, logger, p.logger)`