From 26fa6b125739e52d4c477afa44d24ca6e1e605d7 Mon Sep 17 00:00:00 2001
From: dtremper <dtremper@yieldstreet.com>
Date: Fri, 20 Jun 2025 15:09:44 -0300
Subject: [PATCH 1/2] fix: NPE DatadogServerRequestResponseFlowWrapper triggers
 NPE

Closes #9017
---
 .../akkahttp/DatadogServerRequestResponseFlowWrapper.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
index f0c211e86bd..01838d2c849 100644
--- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
+++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
@@ -168,8 +168,8 @@ public void onUpstreamFinish() throws Exception {
               @Override
               public void onUpstreamFailure(final Throwable ex) throws Exception {
                 ContextScope scope = scopes.poll();
-                AgentSpan span = AgentSpan.fromContext(scope.context());
                 if (scope != null) {
+                  AgentSpan span = AgentSpan.fromContext(scope.context());
                   // Mark the span as failed
                   DatadogWrapperHelper.finishSpan(span, ex);
                 }

From b1113e69c64153920fab6798f4c629c60f3204ae Mon Sep 17 00:00:00 2001
From: dtremper <dtremper@yieldstreet.com>
Date: Fri, 20 Jun 2025 15:31:30 -0300
Subject: [PATCH 2/2] fix: NPE on DatadogServerRequestResponseFlowWrapper

---
 .../akkahttp/DatadogServerRequestResponseFlowWrapper.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
index 01838d2c849..c8683b8c888 100644
--- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
+++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
@@ -177,7 +177,7 @@ public void onUpstreamFailure(final Throwable ex) throws Exception {
                 // remaining spans
                 scope = scopes.poll();
                 while (scope != null) {
-                  span.finish();
+                  AgentSpan.fromContext(scope.context()).finish();
                   scope = scopes.poll();
                 }
                 fail(responseOutlet, ex);