fix: null check the span logger

grafana · Nov 15, 2024 · 6e6597f · 6e6597f
1 parent 235473c
commit 6e6597f
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
@@ -567,12 +567,20 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log
 			maybeShardStreams(stream, lbs, pushSize)
 		}
 
-		sp.LogKV(fmt.Sprintf("number of stream labels sampled in distributor (limited to %d)", streamSampleSize), len(streamLblSample))
-		streamLblsSampleSlice := make([]string, 0, len(streamLblSample))
-		for k := range streamLblSample {
-			streamLblsSampleSlice = append(streamLblsSampleSlice, k)
+		if sp != nil {
+			sp.LogKV(
+				fmt.Sprintf(
+					"number of stream labels sampled in distributor (limited to %d)",
+					streamSampleSize,
+				),
+				len(streamLblSample),
+			)
+			streamLblsSampleSlice := make([]string, 0, len(streamLblSample))
+			for k := range streamLblSample {
+				streamLblsSampleSlice = append(streamLblsSampleSlice, k)
+			}
+			sp.LogKV("stream labels", strings.Join(streamLblsSampleSlice, ","))
 		}
-		sp.LogKV("stream labels", strings.Join(streamLblsSampleSlice, ","))
 	}()
 
 	var validationErr error