Adding fix for span creation npe

Signed-off-by: Nishchay Malhotra <nishcha@amazon.com>
opensearch-project · Mar 27, 2024 · 47bef14 · 47bef14
1 parent 5c4128b
commit 47bef14
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...s/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelTracingTelemetry.java b/...s/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelTracingTelemetry.java
@@ -74,7 +74,8 @@ private Span createOtelSpan(SpanCreationContext spanCreationContext, Span parent
     private void addInferredAttribute(Span newSpan, SpanCreationContext spanCreationContext) {
         // If the current context has this attribute we need to add the same to the span as well.
         if (Baggage.current().getEntryValue(TracerContextStorage.INFERRED_SAMPLER) != null
-            || spanCreationContext.getAttributes().getAttributesMap().containsKey(TracerContextStorage.INFERRED_SAMPLER)) {
+            || (spanCreationContext.getAttributes() != null
+                && spanCreationContext.getAttributes().getAttributesMap().containsKey(TracerContextStorage.INFERRED_SAMPLER))) {
             newSpan.addAttribute(TracerContextStorage.INFERRED_SAMPLER, true);
         }
     }