Add null checks (#867)

thpierce · web-flow · commit a066565737c2 · 2024-08-16T16:20:50.000-07:00
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AttributePropagatingSpanProcessor.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AttributePropagatingSpanProcessor.java
@@ -103,9 +103,9 @@ public void onStart(Context parentContext, ReadWriteSpan span) {
       if (!isServerKind(spanData)) {
         propagationData = propagationDataExtractor.apply(spanData);
       }
-    } else if (isServerKind(parentReadableSpan.toSpanData())) {
+    } else if (parentReadableSpan != null && isServerKind(parentReadableSpan.toSpanData())) {
       propagationData = propagationDataExtractor.apply(parentReadableSpan.toSpanData());
-    } else {
+    } else if (parentReadableSpan != null) {
       propagationData = parentReadableSpan.getAttribute(propagationDataKey);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,9 @@ public void onStart(Context parentContext, ReadWriteSpan span) {`
`103`	`103`	`if (!isServerKind(spanData)) {`
`104`	`104`	`propagationData = propagationDataExtractor.apply(spanData);`
`105`	`105`	`}`
`106`		`- } else if (isServerKind(parentReadableSpan.toSpanData())) {`
	`106`	`+ } else if (parentReadableSpan != null && isServerKind(parentReadableSpan.toSpanData())) {`
`107`	`107`	`propagationData = propagationDataExtractor.apply(parentReadableSpan.toSpanData());`
`108`		`- } else {`
	`108`	`+ } else if (parentReadableSpan != null) {`
`109`	`109`	`propagationData = parentReadableSpan.getAttribute(propagationDataKey);`
`110`	`110`	`}`
`111`	`111`