close span on exception handling in pekko test server

vandonr · vandonr · commit fc8d09bc7aa1 · 2025-09-15T11:30:18.000+02:00
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala b/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala
@@ -136,7 +136,11 @@ object PekkoHttpTestWebServer {
   private val exceptionHandler = ExceptionHandler {
     case e: Exception =>
       val span = activeSpan()
-      TraceUtils.handleException(span, e)
+      if (span != null) {
+        // The exception handler is bypassing the normal instrumentation flow, so we need to handle things here
+        TraceUtils.handleException(span, e)
+        span.finish()
+      }
       complete(
         HttpResponse(status = EXCEPTION.getStatus, entity = e.getMessage)
       )
