[v10.0.x] Tracing: supply Grafana build version (#70489)

Tracing: supply Grafana build version (#69733)

* tracing: supply Grafana build version

Not etcd client version.

* go mod tidy

(cherry picked from commit c45ff94806)

Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-06-22 12:12:48 +03:00
committed by GitHub
co-authored by Bryan Boreham
parent c87b7233b8
commit d7b7e47f6c
4 changed files with 4 additions and 10 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func InitializeTracerForTest() Tracer {
exp := tracetest.NewInMemoryExporter()
tp, _ := initTracerProvider(exp)
tp, _ := initTracerProvider(exp, "testing")
otel.SetTracerProvider(tp)
ots := &Opentelemetry{Propagation: "jaeger,w3c", tracerProvider: tp}
+3 -4
View File
@@ -11,7 +11,6 @@ import (
"sync"
"time"
"go.etcd.io/etcd/api/v3/version"
jaegerpropagator "go.opentelemetry.io/contrib/propagators/jaeger"
"go.opentelemetry.io/contrib/samplers/jaegerremote"
"go.opentelemetry.io/otel"
@@ -320,15 +319,15 @@ func (ots *Opentelemetry) initOTLPTracerProvider() (*tracesdk.TracerProvider, er
return nil, err
}
return initTracerProvider(exp, ots.customAttribs...)
return initTracerProvider(exp, ots.Cfg.BuildVersion, ots.customAttribs...)
}
func initTracerProvider(exp tracesdk.SpanExporter, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
func initTracerProvider(exp tracesdk.SpanExporter, version string, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
res, err := resource.New(
context.Background(),
resource.WithAttributes(
semconv.ServiceNameKey.String("grafana"),
semconv.ServiceVersionKey.String(version.Version),
semconv.ServiceVersionKey.String(version),
),
resource.WithAttributes(customAttribs...),
resource.WithProcessRuntimeDescription(),