Merge remote-tracking branch 'origin/vzakharov/websockets_netty' into vzakharov/websockets_netty

Author: ValentinZakharov

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 2799fa982318da14c9d3e5f722abdc670d2802c3
+default_system_tests_commit: &default_system_tests_commit 761b9e7a82ffb136c4653a4d1623d120d67b005b
 
 parameters:
   nightly:
@@ -932,7 +932,7 @@ jobs:
           command: |
             cd system-tests
             DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
-        
+
       - run:
           name: Run IDM Crossed Tracing Libraries propagation tests for messaging
           environment:
@@ -975,7 +975,7 @@ jobs:
           no_output_timeout: 5m
           command: |
             cd system-tests
-            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY 
+            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
             ./run.sh DEBUGGER_SCENARIOS
 
       - run:

communication/src/main/java/datadog/communication/monitor/DDAgentStatsDClientManager.java

@@ -1,6 +1,5 @@
 package datadog.communication.monitor;
 
-import static datadog.trace.api.ConfigDefaults.DEFAULT_DOGSTATSD_PORT;
 import static datadog.trace.bootstrap.instrumentation.api.WriterConstants.LOGGING_WRITER_TYPE;
 
 import datadog.trace.api.Config;
@@ -22,7 +21,8 @@ public static StatsDClientManager statsDClientManager() {
     return INSTANCE;
   }
 
-  private static final AtomicInteger defaultStatsDPort = new AtomicInteger(DEFAULT_DOGSTATSD_PORT);
+  private static final AtomicInteger defaultStatsDPort =
+      new AtomicInteger(Config.get().getDogsStatsDPort());
 
   public static void setDefaultStatsDPort(final int newPort) {
     if (newPort > 0 && defaultStatsDPort.getAndSet(newPort) != newPort) {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -3,6 +3,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_STARTUP_LOGS_ENABLED;
 import static datadog.trace.api.Platform.isJavaVersionAtLeast;
 import static datadog.trace.api.Platform.isOracleJDK8;
+import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
 import static datadog.trace.bootstrap.Library.WILDFLY;
 import static datadog.trace.bootstrap.Library.detectLibraries;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.JMX_STARTUP;
@@ -44,6 +45,7 @@
 import datadog.trace.util.AgentTaskScheduler;
 import datadog.trace.util.AgentThreadFactory.AgentThread;
 import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -291,6 +293,8 @@ public static void start(
     codeOriginEnabled = isFeatureEnabled(AgentFeature.CODE_ORIGIN);
     agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION);
 
+    patchJPSAccess(inst);
+
     if (profilingEnabled) {
       if (!isOracleJDK8()) {
         // Profiling agent startup code is written in a way to allow `startProfilingAgent` be called
@@ -420,6 +424,23 @@ private static void injectAgentArgsConfig(String agentArgs) {
     }
   }
 
+  @SuppressForbidden
+  public static void patchJPSAccess(Instrumentation inst) {
+    if (Platform.isJavaVersionAtLeast(9)) {
+      // Unclear if supported for J9, may need to revisit
+      try {
+        Class.forName("datadog.trace.util.JPMSJPSAccess")
+            .getMethod("patchModuleAccess", Instrumentation.class)
+            .invoke(null, inst);
+      } catch (Exception e) {
+        log.debug(
+            SEND_TELEMETRY,
+            "Failed to patch module access for jvmstat and Java version "
+                + Platform.getRuntimeVersion());
+      }
+    }
+  }
+
   public static void shutdown(final boolean sync) {
     StaticEventLogger.end("Agent");
     StaticEventLogger.stop();

dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java

@@ -1,6 +1,7 @@
 package datadog.trace.bootstrap.instrumentation.jfr.exceptions;
 
 import datadog.trace.api.Config;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 
 /**
  * JVM-wide singleton exception profiling service. Uses {@linkplain Config} class to configure
@@ -13,6 +14,24 @@ private static final class Holder {
     static final ExceptionProfiling INSTANCE = new ExceptionProfiling(Config.get());
   }
 
+  /**
+   * Support for excluding certain exception types because they are used for control flow or leak
+   * detection.
+   */
+  public static final class Exclusion {
+    public static void enter() {
+      CallDepthThreadLocalMap.incrementCallDepth(Exclusion.class);
+    }
+
+    public static void exit() {
+      CallDepthThreadLocalMap.decrementCallDepth(Exclusion.class);
+    }
+
+    public static boolean isEffective() {
+      return CallDepthThreadLocalMap.getCallDepth(Exclusion.class) > 0;
+    }
+  }
+
   /**
    * Get a pre-configured shared instance.
    *

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java

@@ -15,6 +15,7 @@
 import datadog.trace.api.civisibility.telemetry.NoOpMetricCollector;
 import datadog.trace.api.git.GitInfoProvider;
 import datadog.trace.bootstrap.ContextStore;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.civisibility.config.ExecutionSettings;
 import datadog.trace.civisibility.config.JvmInfo;
 import datadog.trace.civisibility.coverage.file.instrumentation.CoverageClassTransformer;
@@ -41,6 +42,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -101,10 +103,13 @@ public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
 
       CiVisibilityCoverageServices.Child coverageServices =
           new CiVisibilityCoverageServices.Child(services, repoServices, executionSettings);
-      InstrumentationBridge.registerTestEventsHandlerFactory(
-          new TestEventsHandlerFactory(
-              services, repoServices, coverageServices, executionSettings));
+      TestEventsHandlerFactory testEventsHandlerFactory =
+          new TestEventsHandlerFactory(services, repoServices, coverageServices, executionSettings);
+      InstrumentationBridge.registerTestEventsHandlerFactory(testEventsHandlerFactory);
       CoveragePerTestBridge.registerCoverageStoreRegistry(coverageServices.coverageStoreFactory);
+
+      AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
+      tracerAPI.addShutdownListener(testEventsHandlerFactory::shutdown);
     } else {
       InstrumentationBridge.registerTestEventsHandlerFactory(new NoOpTestEventsHandler.Factory());
     }
@@ -147,6 +152,8 @@ private static final class TestEventsHandlerFactory implements TestEventsHandler
     private final CiVisibilityRepoServices repoServices;
     private final TestFrameworkSession.Factory sessionFactory;
 
+    private final Collection<TestEventsHandler<?, ?>> handlers = new CopyOnWriteArrayList<>();
+
     private TestEventsHandlerFactory(
         CiVisibilityServices services,
         CiVisibilityRepoServices repoServices,
@@ -174,12 +181,21 @@ public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
       TestFrameworkSession testSession =
           sessionFactory.startSession(repoServices.moduleName, component, null, capabilities);
       TestFrameworkModule testModule = testSession.testModuleStart(repoServices.moduleName, null);
-      return new TestEventsHandlerImpl<>(
-          services.metricCollector,
-          testSession,
-          testModule,
-          suiteStore != null ? suiteStore : new ConcurrentHashMapContextStore<>(),
-          testStore != null ? testStore : new ConcurrentHashMapContextStore<>());
+      TestEventsHandlerImpl<SuiteKey, TestKey> handler =
+          new TestEventsHandlerImpl<>(
+              services.metricCollector,
+              testSession,
+              testModule,
+              suiteStore != null ? suiteStore : new ConcurrentHashMapContextStore<>(),
+              testStore != null ? testStore : new ConcurrentHashMapContextStore<>());
+      handlers.add(handler);
+      return handler;
+    }
+
+    public void shutdown() {
+      for (TestEventsHandler<?, ?> handler : handlers) {
+        handler.close();
+      }
     }
   }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java

@@ -28,8 +28,6 @@ TestSuiteImpl testSuiteStart(
    */
   boolean isNew(@Nonnull TestIdentifier test);
 
-  boolean isFlaky(@Nonnull TestIdentifier test);
-
   boolean isModified(@Nonnull TestSourceData testSourceData);
 
   boolean isQuarantined(TestIdentifier test);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java

@@ -98,11 +98,6 @@ public boolean isNew(@Nonnull TestIdentifier test) {
     return executionStrategy.isNew(test);
   }
 
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return executionStrategy.isFlaky(test);
-  }
-
   @Override
   public boolean isModified(@Nonnull TestSourceData testSourceData) {
     return executionStrategy.isModified(testSourceData);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java

@@ -84,11 +84,6 @@ public boolean isNew(@Nonnull TestIdentifier test) {
     return executionStrategy.isNew(test);
   }
 
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return executionStrategy.isFlaky(test);
-  }
-
   @Override
   public boolean isModified(@Nonnull TestSourceData testSourceData) {
     return executionStrategy.isModified(testSourceData);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java

@@ -105,16 +105,6 @@ public TestExecutionPolicy executionPolicy(
     return Regular.INSTANCE;
   }
 
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return false;
-  }
-
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return false;
-  }
-
   @Override
   public int executionPriority(
       @Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java

@@ -305,16 +305,6 @@ public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceD
     return testModule.executionPriority(test, testSource);
   }
 
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return testModule.isNew(test);
-  }
-
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return testModule.isFlaky(test);
-  }
-
   @Nullable
   @Override
   public SkipReason skipReason(TestIdentifier test) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java

@@ -60,7 +60,7 @@ public boolean isNew(@Nonnull TestIdentifier test) {
         && !executionSettings.isKnown(test.toFQN());
   }
 
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
+  private boolean isFlaky(@Nonnull TestIdentifier test) {
     return executionSettings.isFlaky(test.toFQN());
   }
 

dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifierScriptInitializer.java

@@ -43,7 +43,7 @@ static void initialize(String onOutOfMemoryVal) {
     Path scriptPath = getOOMEScripPath(onOutOfMemoryVal);
     if (scriptPath == null) {
       LOG.debug(
-          "OOME notifier script value ({}) does not follow the expected format: <path>/dd_ome_notifier.(sh|bat) %p. OOME tracking is disabled.",
+          "OOME notifier script value ({}) does not follow the expected format: <path>/dd_oome_notifier.(sh|bat) %p. OOME tracking is disabled.",
           onOutOfMemoryVal);
       return;
     }

dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh

@@ -1,51 +1,64 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set +e # Disable exit on error
+# Disable exit on error
+set +e
 
 # Check if PID is provided
 if [ -z "$1" ]; then
     echo "Error: No PID provided"
     exit 1
 fi
-HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Get the directory of the script
+
+# Get the directory of the script
+HERE=$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)
 PID=$1
 
-# Get the base name of the script
-scriptName=$(basename "$0" .sh)
+# Get the base name of the script (without .sh)
+scriptName=$(basename "$0")
+scriptName=${scriptName%.sh}
+
 configFile="${HERE}/${scriptName}_pid${PID}.cfg"
 if [ ! -f "$configFile" ]; then
     echo "Error: Configuration file not found: $configFile"
     exit 1
 fi
 
+# Initialize config values
+config_agent=""
+config_tags=""
+config_java_home=""
+
 # Read the configuration file
-# The expected contents are:
-# - agent: Path to the agent jar
-# - tags: Comma-separated list of tags to be sent with the OOME event; key:value pairs are supported
 while IFS="=" read -r key value; do
-    declare "config_$key"="$value"
+    case "$key" in
+        agent) config_agent=$value ;;
+        tags) config_tags=$value ;;
+        java_home) config_java_home=$value ;;
+    esac
 done < "$configFile"
 
 # Exiting early if configuration is missing
-if [ -z "${config_agent}" ] || [ -z "${config_tags}" ] || [ -z "${config_java_home}" ]; then
+if [ -z "$config_agent" ] || [ -z "$config_tags" ] || [ -z "$config_java_home" ]; then
     echo "Error: Missing configuration"
     exit 1
 fi
 
 # Debug: Print the loaded values (Optional)
-echo "Agent Jar: ${config_agent}"
-echo "Tags: ${config_tags}"
-echo "JAVA_HOME: ${config_java_home}"
+echo "Agent Jar: $config_agent"
+echo "Tags: $config_tags"
+echo "JAVA_HOME: $config_java_home"
 echo "PID: $PID"
 
 # Execute the Java command with the loaded values
-"${config_java_home}/bin/java" -Ddd.dogstatsd.start-delay=0 -jar "${config_agent}" sendOomeEvent "${config_tags}"
+"$config_java_home/bin/java" -Ddd.dogstatsd.start-delay=0 -jar "$config_agent" sendOomeEvent "$config_tags"
 RC=$?
-rm -f "${configFile}" # Remove the configuration file
 
-if [ $RC -eq 0 ]; then
+# Remove the configuration file
+rm -f "$configFile"
+
+if [ "$RC" -eq 0 ]; then
     echo "OOME Event generated successfully"
 else
     echo "Error: Failed to generate OOME event"
-    exit $RC
+    exit "$RC"
 fi