chore: fix CHANGELOG entry + sync changes

Signed-off-by: hainenber <[email protected]>
grafana · Nov 25, 2023 · bbb86f6 · bbb86f6
1 parent 038798e
commit bbb86f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -207,7 +207,7 @@ v0.38.0 (2023-11-21)
 - `loki.source.windowsevent` and `loki.source.*` changed to use a more robust positions file to prevent corruption on reboots when writing
   the positions file. (@mattdurham)
 
-- Fix CVE-2023-47108 by bumping `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` to v0.46.0 and correspondingly refactor. (hainenber)
+- Fix CVE-2023-47108 by bumping `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` to v0.46.0 and correspondingly refactor. (@hainenber)
 
 v0.37.4 (2023-11-06)
 -----------------

diff --git a/pkg/flow/tracing/tracing.go b/pkg/flow/tracing/tracing.go
@@ -16,7 +16,6 @@ import (
 	tracesdk "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
 	"go.opentelemetry.io/otel/trace"
-	"go.opentelemetry.io/otel/trace/embedded"
 )
 
 const serviceName = "grafana-agent"
@@ -77,7 +76,7 @@ func (opts *JaegerRemoteSamplerOptions) SetToDefault() {
 // [trace.TracerProvider] and can be used to forward internally generated
 // traces to a OpenTelemetry Collector-compatible Flow component.
 type Tracer struct {
-	embedded.TracerProvider
+	trace.TracerProvider
 	sampler *lazySampler
 	client  *client
 	exp     *otlptrace.Exporter