From 3838097a3d7b1ed7714b7efc1c6edaa168b59cc2 Mon Sep 17 00:00:00 2001
From: "alejandro.gonzalez" <alejandro.gonzalez@datadoghq.com>
Date: Thu, 20 Jun 2024 17:16:37 +0200
Subject: [PATCH] minor changes

---
 .../main/java/com/datadog/appsec/gateway/GatewayBridge.java   | 4 ++--
 .../main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java | 2 +-
 .../datadog/appsec/gateway/GatewayBridgeSpecification.groovy  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
index c72f1c0af7c..a703e4c0278 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
@@ -172,8 +172,8 @@ public void init() {
                 }
               }
             } else if (hasUserTrackingEvent(traceSeg)) {
-                // Report all collected request headers on user tracking event
-                writeRequestHeaders(traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders());
+              // Report all collected request headers on user tracking event
+              writeRequestHeaders(traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders());
             } else {
               // Report minimum set of collected request headers
               writeRequestHeaders(
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java
index 02078e18de8..d706ba68db9 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java
@@ -457,7 +457,7 @@ public void onDataAvailable(
         Collection<AppSecEvent> events = buildEvents(resultWithData);
 
         if (!events.isEmpty() && !reqCtx.isThrottled(rateLimiter)) {
-          AgentSpan activeSpan = AgentTracer.activeSpan();
+          AgentSpan activeSpan = AgentTracer.get().activeSpan();
           if (activeSpan != null) {
             if (log.isDebugEnabled()) {
               log.debug("Setting force-keep tag on the current span");
diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy
index 1423f0e8e39..e43a9bc7526 100644
--- a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy
+++ b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy
@@ -171,7 +171,6 @@ class GatewayBridgeSpecification extends DDSpecification {
     1 * mockAppSecCtx.isThrottled(_) >> true
     0 * spanInfo.getTags()
     0 * traceSegment.setDataTop("appsec", _)
-
   }
 
   void 'actor ip calculated from headers'() {