public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Traces: Fix timestamp for database query traces (#61109)

Browse Source
This commit is contained in:
Yuri Tseretyan
2023-01-09 09:40:55 -05:00
committed by GitHub
parent 7dcb502b33
commit e7b17cde47
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/database_wrapper.go
+6 -4
View File
@@ -10,13 +10,15 @@ import (
"github.com/gchaincl/sqlhooks" "github.com/gchaincl/sqlhooks"
"github.com/go-sql-driver/mysql" "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/lib/pq"
"github.com/mattn/go-sqlite3" "github.com/mattn/go-sqlite3"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"go.opentelemetry.io/otel/trace"
"xorm.io/core" "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 ( var (
@@ -95,7 +97,7 @@ func (h *databaseQueryWrapper) instrument(ctx context.Context, status string, qu
ctx = log.IncDBCallCounter(ctx) ctx = log.IncDBCallCounter(ctx)
_, span := h.tracer.Start(ctx, "database query") _, span := h.tracer.Start(ctx, "database query", trace.WithTimestamp(begin))
defer span.End() defer span.End()
span.AddEvents([]string{"query", "status"}, []tracing.EventValue{{Str: query}, {Str: status}}) span.AddEvents([]string{"query", "status"}, []tracing.EventValue{{Str: query}, {Str: status}})