Merge branch 'master' into andrea.marziali/jms-npe

Author: amarziali

dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java

@@ -5,12 +5,9 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 import java.net.URI;
-import java.net.URISyntaxException;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.HttpJspPage;
 import org.apache.jasper.JspCompilationContext;
-import org.slf4j.LoggerFactory;
 
 public class JSPDecorator extends BaseDecorator {
   public static final CharSequence JSP_COMPILE = UTF8BytesString.create("jsp.compile");
@@ -68,11 +65,14 @@ public void onRender(final AgentSpan span, final HttpServletRequest req) {
     // HttpServletRequest#getRequestURL(),
     // normalizing the URL should remove those symbols for readability and consistency
     try {
-      span.setTag(
-          "jsp.requestURL", (new URI(req.getRequestURL().toString())).normalize().toString());
-    } catch (final URISyntaxException uriSE) {
-      LoggerFactory.getLogger(HttpJspPage.class)
-          .debug("Failed to get and normalize request URL: {}", uriSE.getMessage());
+      // note: getRequestURL is supposed to always be nonnull - however servlet wrapping can happen
+      // and we never know if ever this can happen
+      final StringBuffer requestURL = req.getRequestURL();
+      if (requestURL != null && requestURL.length() > 0) {
+        span.setTag("jsp.requestURL", (new URI(requestURL.toString())).normalize().toString());
+      }
+    } catch (final Throwable ignored) {
+      // logging here will be too verbose
     }
   }
 }

dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java

@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.function.Function;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
 
 public final class SpringMessageExtractAdapter
     implements AgentPropagation.ContextVisitor<Message<?>> {
@@ -33,7 +34,12 @@ public String apply(String key) {
 
   @Override
   public void forEachKey(Message<?> carrier, AgentPropagation.KeyClassifier classifier) {
-    for (Map.Entry<String, ?> header : carrier.getHeaders().entrySet()) {
+    final MessageHeaders messageHeaders = carrier.getHeaders();
+    if (messageHeaders == null || messageHeaders.isEmpty()) {
+      return;
+    }
+
+    for (Map.Entry<String, ?> header : messageHeaders.entrySet()) {
       Object headerValue = header.getValue();
       if ("_datadog".equals(header.getKey())) {
         if (headerValue instanceof String) {

remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ProductState.java

@@ -58,8 +58,10 @@ public boolean apply(
     errors = null;
 
     List<ParsedConfigKey> configBeenUsedByProduct = new ArrayList<>();
+    List<ParsedConfigKey> changedKeys = new ArrayList<>();
     boolean changesDetected = false;
 
+    // Step 1: Detect all changes
     for (ParsedConfigKey configKey : relevantKeys) {
       try {
         RemoteConfigResponse.Targets.ConfigTarget target =
@@ -68,14 +70,28 @@ public boolean apply(
 
         if (isTargetChanged(configKey, target)) {
           changesDetected = true;
-          byte[] content = getTargetFileContent(fleetResponse, configKey);
-          callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+          changedKeys.add(configKey);
         }
       } catch (ReportableException e) {
         recordError(e);
       }
     }
 
+    // Step 2: For products other than ASM_DD, apply changes immediately
+    if (product != Product.ASM_DD) {
+      for (ParsedConfigKey configKey : changedKeys) {
+        try {
+          byte[] content = getTargetFileContent(fleetResponse, configKey);
+          callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+        } catch (ReportableException e) {
+          recordError(e);
+        }
+      }
+    }
+
+    // Step 3: Remove obsolete configurations (for all products)
+    // For ASM_DD, this is critical: removes MUST happen before applies to prevent
+    // duplicate rule warnings from the ddwaf rule parser and causing memory spikes.
     List<ParsedConfigKey> keysToRemove =
         cachedTargetFiles.keySet().stream()
             .filter(configKey -> !configBeenUsedByProduct.contains(configKey))
@@ -86,6 +102,22 @@ public boolean apply(
       callListenerRemoveTarget(hinter, configKey);
     }
 
+    // Step 4: For ASM_DD, apply changes AFTER removes
+    // TODO: This is a temporary solution. The proper fix requires better synchronization
+    // between remove and add/update operations. This should be discussed
+    // with the guild to determine the best long-term design approach.
+    if (product == Product.ASM_DD) {
+      for (ParsedConfigKey configKey : changedKeys) {
+        try {
+          byte[] content = getTargetFileContent(fleetResponse, configKey);
+          callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+        } catch (ReportableException e) {
+          recordError(e);
+        }
+      }
+    }
+
+    // Step 5: Commit if there were changes
     if (changesDetected) {
       try {
         callListenerCommit(hinter);