Merge pull request #45 from CoderPoet/fix/log-span

fix(logger): check span context
hertz-contrib · Jan 17, 2024 · a7ae768 · a7ae768
2 parents e7127e1 + 2d6005f
commit a7ae768
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/logging/logrus/hook.go b/logging/logrus/hook.go
@@ -61,10 +61,16 @@ func (h *TraceHook) Fire(entry *logrus.Entry) error {
 
 	span := trace.SpanFromContext(entry.Context)
 
+	// check span context
+	spanContext := span.SpanContext()
+	if !spanContext.IsValid() {
+		return nil
+	}
+
 	// attach span context to log entry data fields
-	entry.Data[traceIDKey] = span.SpanContext().TraceID()
-	entry.Data[spanIDKey] = span.SpanContext().SpanID()
-	entry.Data[traceFlagsKey] = span.SpanContext().TraceFlags()
+	entry.Data[traceIDKey] = spanContext.TraceID()
+	entry.Data[spanIDKey] = spanContext.SpanID()
+	entry.Data[traceFlagsKey] = spanContext.TraceFlags()
 
 	// non recording spans do not support modifying
 	if !span.IsRecording() {