Fix NPE when Opentelemetry+Statistics are enabled with inbound endpoints

wso2 · Sep 14, 2023 · 4a9d68b · 4a9d68b
1 parent c62fcca
commit 4a9d68b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...e/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java b/...e/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java
@@ -208,7 +208,10 @@ private void startSpan(StatisticDataUnit statisticDataUnit, MessageContext synCt
         Object statusCode = ((Axis2MessageContext) synCtx).getAxis2MessageContext().getProperty("HTTP_SC");
         Object statusDescription = ((Axis2MessageContext) synCtx).getAxis2MessageContext().getProperty("HTTP_DESC");
         // We only need to extract span context from headers when there are trp headers available
-        if (isOuterLevelSpan(statisticDataUnit, spanStore) && headersMap != null) {
+        if (headersMap == null) {
+            headersMap = new HashMap();
+        }
+        if (isOuterLevelSpan(statisticDataUnit, spanStore)) {
             // Extract span context from headers
             context = extract(headersMap);
         } else {
@@ -274,9 +277,10 @@ private void bufferSequenceContinuationState(StatisticDataUnit statisticDataUnit
      * @return                  Whether the given statistic data unit denotes an outer level span.
      */
     private boolean isOuterLevelSpan(StatisticDataUnit statisticDataUnit, SpanStore spanStore) {
-        return spanStore.getOuterLevelSpanWrapper() == null &&
-                (statisticDataUnit.getComponentType() == ComponentType.PROXYSERVICE ||
-                statisticDataUnit.getComponentType() == ComponentType.API);
+        return spanStore.getOuterLevelSpanWrapper() == null
+                && (statisticDataUnit.getComponentType() == ComponentType.PROXYSERVICE
+                || statisticDataUnit.getComponentType() == ComponentType.API
+                || statisticDataUnit.getComponentType() == ComponentType.INBOUNDENDPOINT);
     }
 
     @Override