From c45ff948060d674005819295bdee6ca02404ffa2 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 22 Jun 2023 09:55:30 +0100 Subject: [PATCH] Tracing: supply Grafana build version (#69733) * tracing: supply Grafana build version Not etcd client version. * go mod tidy --- go.mod | 2 -- go.sum | 3 --- pkg/infra/tracing/test_helper.go | 2 +- pkg/infra/tracing/tracing.go | 7 +++---- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 5bb4791775a..0b4579b991a 100644 --- a/go.mod +++ b/go.mod @@ -246,7 +246,6 @@ require ( github.com/jmoiron/sqlx v1.3.5 github.com/matryer/is v1.4.0 github.com/urfave/cli v1.22.12 - go.etcd.io/etcd/api/v3 v3.5.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 go.opentelemetry.io/contrib/propagators/jaeger v1.15.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 @@ -388,7 +387,6 @@ require ( github.com/blugelabs/ice v1.0.0 // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect - github.com/coreos/go-semver v0.3.0 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect github.com/docker/docker v23.0.4+incompatible github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect diff --git a/go.sum b/go.sum index 7ad2f5bdecb..9d78ba91b79 100644 --- a/go.sum +++ b/go.sum @@ -479,7 +479,6 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -2525,8 +2524,6 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= -go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= diff --git a/pkg/infra/tracing/test_helper.go b/pkg/infra/tracing/test_helper.go index 19894f2adce..5981fe7d6a8 100644 --- a/pkg/infra/tracing/test_helper.go +++ b/pkg/infra/tracing/test_helper.go @@ -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} diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go index ed12e9f7ba5..8c21375d71d 100644 --- a/pkg/infra/tracing/tracing.go +++ b/pkg/infra/tracing/tracing.go @@ -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(),