fix span to log

Signed-off-by: Callum Styan <[email protected]>
grafana · Mar 28, 2024 · b51ff81 · b51ff81
1 parent 03ff9b7
commit b51ff81
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkg/querier/queryrange/codec.go b/pkg/querier/queryrange/codec.go
@@ -83,8 +83,8 @@ func (r *LokiRequest) WithShards(shards logql.Shards) *LokiRequest {
 func (r *LokiRequest) LogToSpan(sp opentracing.Span) {
 	sp.LogFields(
 		otlog.String("query", r.GetQuery()),
-		otlog.String("start", timestamp.Time(r.GetStart().UnixNano()).String()),
-		otlog.String("end", timestamp.Time(r.GetEnd().UnixNano()).String()),
+		otlog.String("start", timestamp.Time(r.StartTs.UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
+		otlog.String("end", timestamp.Time(r.GetEnd().UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
 		otlog.Int64("step (ms)", r.GetStep()),
 		otlog.Int64("interval (ms)", r.GetInterval()),
 		otlog.Int64("limit", int64(r.GetLimit())),
@@ -178,8 +178,8 @@ func (r *LokiSeriesRequest) GetStep() int64 {
 func (r *LokiSeriesRequest) LogToSpan(sp opentracing.Span) {
 	sp.LogFields(
 		otlog.String("matchers", strings.Join(r.GetMatch(), ",")),
-		otlog.String("start", timestamp.Time(r.GetStart().UnixNano()).String()),
-		otlog.String("end", timestamp.Time(r.GetEnd().UnixNano()).String()),
+		otlog.String("start", timestamp.Time(r.GetStart().UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
+		otlog.String("end", timestamp.Time(r.GetEnd().UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
 		otlog.String("shards", strings.Join(r.GetShards(), ",")),
 	)
 }
@@ -249,8 +249,8 @@ func (r *LabelRequest) WithQuery(query string) queryrangebase.Request {
 
 func (r *LabelRequest) LogToSpan(sp opentracing.Span) {
 	sp.LogFields(
-		otlog.String("start", timestamp.Time(r.GetStart().UnixNano()).String()),
-		otlog.String("end", timestamp.Time(r.GetEnd().UnixNano()).String()),
+		otlog.String("start", timestamp.Time(r.Start.UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
+		otlog.String("end", timestamp.Time(r.End.UnixNano()/(int64(time.Millisecond)/int64(time.Nanosecond))).String()),
 	)
 }