Tracing: supply Grafana build version (#69733)
* tracing: supply Grafana build version Not etcd client version. * go mod tidy
This commit is contained in:
@@ -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}
|
||||
|
||||
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user