Added null check

kr-igor · kr-igor · commit 6761cc30ac74 · 2024-10-23T14:18:53.000-05:00
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -1194,7 +1194,9 @@ private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDat
 
   private static void reportKafkaOffsets(
       final String appName, final AgentSpan span, final SourceProgress progress) {
-    if (!span.traceConfig().isDataStreamsEnabled() || progress == null) {
+    if (!span.traceConfig().isDataStreamsEnabled()
+        || progress == null
+        || progress.description() == null) {
       return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1194,7 +1194,9 @@ private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDat`
`1194`	`1194`
`1195`	`1195`	`private static void reportKafkaOffsets(`
`1196`	`1196`	`final String appName, final AgentSpan span, final SourceProgress progress) {`
`1197`		`- if (!span.traceConfig().isDataStreamsEnabled() \|\| progress == null) {`
	`1197`	`+ if (!span.traceConfig().isDataStreamsEnabled()`
	`1198`	`+ \|\| progress == null`
	`1199`	`+ \|\| progress.description() == null) {`
`1198`	`1200`	`return;`
`1199`	`1201`	`}`
`1200`	`1202`