Ensure we handle the scenario where there is currently no active span for e.g. #2124

Author: keyoke

src/payment/index.js

@@ -4,12 +4,20 @@ const grpc = require('@grpc/grpc-js')
 const protoLoader = require('@grpc/proto-loader')
 const health = require('grpc-js-health-check')
 const opentelemetry = require('@opentelemetry/api')
+const tracer = opentelemetry.trace.getTracer(process.env.OTEL_SERVICE_NAME);
 
 const charge = require('./charge')
 const logger = require('./logger')
 
 async function chargeServiceHandler(call, callback) {
-  const span = opentelemetry.trace.getActiveSpan();
+  // Check if we have an active span if not start a new one
+  let span = opentelemetry.trace.getActiveSpan();
+  let startedSpan = false;
+  if (!span)
+  {
+    span = tracer.startSpan('chargeServiceHandler');
+    startedSpan = true;
+  }
 
   try {
     const amount = call.request.amount
@@ -26,7 +34,10 @@ async function chargeServiceHandler(call, callback) {
 
     span.recordException(err)
     span.setStatus({ code: opentelemetry.SpanStatusCode.ERROR })
-
+    // Make sure we cleanup by closing the span if we started it.
+    if (startedSpan) {
+      span.end();
+    }
     callback(err)
   }
 }