From 007110c5993ae00cc8ec54bee0ff1047bbcfd543 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:58:18 -0500 Subject: [PATCH] [v9.3.x] Traces: Fix timestamp for database query traces (#61162) Traces: Fix timestamp for database query traces (#61109) (cherry picked from commit e7b17cde478354d2cdcda7c855f8722e01a4e422) Co-authored-by: Yuri Tseretyan --- pkg/services/sqlstore/database_wrapper.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/services/sqlstore/database_wrapper.go b/pkg/services/sqlstore/database_wrapper.go index 279e0e122f6..44d4e349a50 100644 --- a/pkg/services/sqlstore/database_wrapper.go +++ b/pkg/services/sqlstore/database_wrapper.go @@ -10,13 +10,15 @@ import ( "github.com/gchaincl/sqlhooks" "github.com/go-sql-driver/mysql" - "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/infra/tracing" - "github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/lib/pq" "github.com/mattn/go-sqlite3" "github.com/prometheus/client_golang/prometheus" + "go.opentelemetry.io/otel/trace" "xorm.io/core" + + "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/infra/tracing" + "github.com/grafana/grafana/pkg/services/sqlstore/migrator" ) var ( @@ -95,7 +97,7 @@ func (h *databaseQueryWrapper) instrument(ctx context.Context, status string, qu ctx = log.IncDBCallCounter(ctx) - _, span := h.tracer.Start(ctx, "database query") + _, span := h.tracer.Start(ctx, "database query", trace.WithTimestamp(begin)) defer span.End() span.AddEvents([]string{"query", "status"}, []tracing.EventValue{{Str: query}, {Str: status}})