Merge branch 'master' into alexeyk/groovy-4

# Conflicts:
#	gradle/libs.versions.toml

Author: AlexeyKuznetsov-DD

.github/CODEOWNERS

@@ -114,6 +114,23 @@
 /internal-api/src/test/groovy/datadog/trace/api/datastreams                  @DataDog/data-streams-monitoring
 **/datastreams/                                                              @DataDog/data-streams-monitoring
 **/DataStreams*                                                              @DataDog/data-streams-monitoring
+**/dsmTest/**                                                                @DataDog/data-streams-monitoring
+
+/dd-java-agent/instrumentation/confluent-schema-registry/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/avro/                            @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/protobuf-3.0/                    @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/               @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/google-pubsub/                   @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/         @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/grpc-1.5/                        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 
 # @DataDog/feature-flagging-and-experimentation-sdk
 /dd-smoke-tests/openfeature/                                    @DataDog/feature-flagging-and-experimentation-sdk

.gitlab-ci.yml

@@ -565,7 +565,7 @@ muzzle-dep-report:
       export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
       fi
     - *prepare_test_env
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djava.util.prefs.userRoot=/tmp/.java/.userPrefs-${CI_JOB_ID}' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
     - ./gradlew --version
     - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -Pslot=$CI_NODE_INDEX/$CI_NODE_TOTAL $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
   after_script:
@@ -1002,7 +1002,7 @@ validate_supported_configurations_v2_local_file:
   extends: .validate_supported_configurations_v2_local_file
   variables:
     LOCAL_JSON_PATH: "metadata/supported-configurations.json"
-    BACKFILLED: "true"
+    BACKFILLED: "false"
 
 update_central_configurations_version_range_v2:
   extends: .update_central_configurations_version_range_v2

.gitlab/macrobenchmarks.yml

@@ -143,4 +143,4 @@ notify-slo-breaches:
       when: never
     - when: always
   variables:
-    CHANNEL: "apm-java"
+    CHANNEL: "apm-java-ops-bot"

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseSupportedConfigurationsTask.kt

@@ -28,7 +28,7 @@ class CommandLine {
   final String name = getCommandName();
   final List<String> arguments = getCommandArguments();
 
-  @SuppressForbidden // split on single-character uses fast path
+  @SuppressForbidden // split on single-character uses a fast path
   private List<String> findFullCommand() {
     String command = SystemProperties.getOrDefault(SUN_JAVA_COMMAND_PROPERTY, "").trim();
     return command.isEmpty() ? emptyList() : Arrays.asList(command.split(" "));

components/environment/src/main/java/datadog/environment/CommandLine.java

@@ -24,7 +24,7 @@ class JvmOptions {
   final String[] PROCFS_CMDLINE = readProcFsCmdLine();
   final List<String> VM_OPTIONS = findVmOptions();
 
-  @SuppressForbidden // split on single-character uses fast path
+  @SuppressForbidden // split on single-character uses a fast path
   private String[] readProcFsCmdLine() {
     if (isLinux()) {
       try {
@@ -85,7 +85,7 @@ private List<String> findVmOptions() {
       return ManagementFactory.getRuntimeMXBean().getInputArguments();
     } catch (final Throwable t) {
       // Throws InvocationTargetException on modularized applications
-      // with non-opened java.management module
+      // with a non-opened java.management module
       System.err.println("WARNING: Unable to get VM args using managed beans");
     }
     return emptyList();
@@ -95,9 +95,9 @@ private List<String> findVmOptions() {
   // executable
   // Visible for testing
   List<String> findVmOptionsFromProcFs(String[] procfsCmdline) {
-    // Create list of VM options
+    // Create the list of VM options
     List<String> vmOptions = new ArrayList<>();
-    // Look for first self-standing argument that is not prefixed with "-" or end of VM options
+    // Look for the first self-standing argument that is not prefixed with "-" or end of VM options
     // while simultaneously, collect all arguments in the VM options
     // Starts from 1 as 0 is the java command itself (or native-image)
     for (int index = 1; index < procfsCmdline.length; index++) {
@@ -115,7 +115,7 @@ else if ("-jar".equals(argument) || !argument.startsWith("-")) {
         // End of VM options
         break;
       }
-      // Otherwise add as VM option
+      // Otherwise add as a VM option
       else {
         vmOptions.add(argument);
       }
@@ -142,7 +142,7 @@ private static List<String> getArgumentsFromFile(String argFile) {
     List<String> args = new ArrayList<>();
     try {
       for (String line : Files.readAllLines(path)) {
-        // Use default delimiters that matches argfiles separator specification
+        // Use default delimiters that match argfiles separator specification
         StringTokenizer tokenizer = new StringTokenizer(line);
         while (tokenizer.hasMoreTokens()) {
           args.add(tokenizer.nextToken());
@@ -207,13 +207,4 @@ static List<String> parseOptions(String javaToolOptions) {
     }
     return options;
   }
-
-  private static List<String> split(String str, String delimiter) {
-    List<String> parts = new ArrayList<>();
-    StringTokenizer tokenizer = new StringTokenizer(str, delimiter);
-    while (tokenizer.hasMoreTokens()) {
-      parts.add(tokenizer.nextToken());
-    }
-    return parts;
-  }
 }

components/environment/src/main/java/datadog/environment/JvmOptions.java

@@ -106,9 +106,9 @@ dependencies {
   testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
   testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
-  testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
+  testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
+  testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
+  testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
 
   baseTestImplementation project(':utils:test-utils')
   baseTestImplementation libs.scala211

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

@@ -66,9 +66,9 @@ dependencies {
   testImplementation libs.scala213
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
   testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
-  testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
+  testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
   testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
+  testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
 
   latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
   latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'