Merge branch 'master' into sezen.leblay/apm-metrics-tag

Author: sezen-datadog

dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json

@@ -181,11 +181,5 @@
     "fields": [
       {"name": "consumerIndex", "allowUnsafeAccess": true}
     ]
-  },
-  {
-    "name" : "datadog.jctools.maps.NonBlockingHashMap",
-    "fields": [
-      {"name": "_kvs", "allowUnsafeAccess": true}
-    ]
   }
 ]

dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/parser/MetadataEvent.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.jctools.maps.NonBlockingHashMapLong;
 
 /**
  * JFR Chunk metadata
@@ -17,10 +16,6 @@ public final class MetadataEvent {
   public final long duration;
   public final long metadataId;
 
-  private final NonBlockingHashMapLong<String> eventTypeNameMapBacking =
-      new NonBlockingHashMapLong<>(256);
-  private final LongMapping<String> eventTypeMap;
-
   MetadataEvent(RecordingStream stream) throws IOException {
     size = (int) stream.readVarint();
     long typeId = stream.readVarint();
@@ -31,16 +26,6 @@ public final class MetadataEvent {
     duration = stream.readVarint();
     metadataId = stream.readVarint();
     readElements(stream, readStringTable(stream));
-    eventTypeMap = eventTypeNameMapBacking::get;
-  }
-
-  /**
-   * Lazily compute and return the mappings of event type ids to event type names
-   *
-   * @return mappings of event type ids to event type names
-   */
-  public LongMapping<String> getEventTypeNameMap() {
-    return eventTypeMap;
   }
 
   private String[] readStringTable(RecordingStream stream) throws IOException {
@@ -76,10 +61,6 @@ private void readElements(RecordingStream stream, String[] stringConstants) thro
         }
       }
     }
-    // only event types are currently collected
-    if (name != null && id != null && "jdk.jfr.Event".equals(superType)) {
-      eventTypeNameMapBacking.put(Long.parseLong(id), name);
-    }
     // now inspect all the enclosed elements
     int elemCount = (int) stream.readVarint();
     for (int i = 0; i < elemCount; i++) {

dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle

@@ -68,6 +68,6 @@ configurations.matching({ it.name.startsWith('akka23') }).each({
 
 
 // Run 2.3 tests along with the rest of unit tests
-tasks.named("test") {
+tasks.named("test", Test) {
   dependsOn "akka23Test"
 }

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

@@ -22,12 +22,12 @@ addTestSuiteForDir 'version101IastTest', 'iastTest'
 addTestSuiteForDir 'version102IastTest', 'iastTest'
 addTestSuiteForDir 'latestDepIastTest', 'iastTest'
 
-compileLagomTestJava {
+tasks.named("compileLagomTestJava", JavaCompile) {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-compileLagomTestGroovy {
+tasks.named("compileLagomTestGroovy", GroovyCompile) {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }
@@ -170,32 +170,32 @@ dependencies {
   lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0'
 }
 
-compileBaseTestGroovy {
+tasks.named("compileBaseTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
   dependsOn "compileBaseTestScala"
 }
 
-compileBaseForkedTestGroovy {
+tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
   dependsOn "compileBaseTestScala"
 }
 
-compileVersion101TestGroovy {
+tasks.named("compileVersion101TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
   dependsOn "compileVersion101TestScala"
 }
 
-compileVersion101ForkedTestGroovy {
+tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
   dependsOn "compileVersion101TestScala"
 }
 
-compileVersion102Scala213TestGroovy {
+tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))
   dependsOn "compileVersion102Scala213TestScala"
 }
 
-compileLatestDepTestGroovy {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
   dependsOn "compileLatestDepTestScala"
 }

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle

@@ -42,7 +42,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
 apply from: "$rootDir/gradle/configure_tests.gradle"
 
-latestDepTest {
+tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
 

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

@@ -92,6 +92,4 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
-
-
 }

dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle

@@ -10,15 +10,15 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-test {
+tasks.named("test", Test) {
   environment "_HANDLER", "Handler"
 }
 
-forkedTest {
+tasks.named("forkedTest", Test) {
   environment "_HANDLER", "Handler"
 }
 
-latestDepTest {
+tasks.named("latestDepTest", Test) {
   environment "_HANDLER", "Handler"
 }
 

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle

@@ -103,10 +103,10 @@ dependencies {
   latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'
 }
 
-tasks.named("test") {
+tasks.named("test", Test) {
   dependsOn "test_before_1_11_106"
 }
 
-tasks.named("forkedTest") {
+tasks.named("forkedTest", Test) {
   dependsOn "test_before_1_11_106ForkedTest"
 }

dd-java-agent/instrumentation/build.gradle

@@ -31,7 +31,7 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 
 
-tasks.register("latestDepTest")
+tasks.register("latestDepTest", Test)
 
 Project parent_project = project
 subprojects { Project subProj ->
@@ -129,7 +129,7 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep
 }
 
 
-tasks.named('shadowJar') {
+tasks.named('shadowJar', ShadowJar) {
   duplicatesStrategy = DuplicatesStrategy.FAIL
   dependencies {
     // the tracer is now in a separate shadow jar

dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle

@@ -31,7 +31,7 @@ dependencies {
   latestDepTestImplementation group: 'io.netty', name: 'netty-transport', version: '+'
 }
 
-tasks.named("latestDepTest") {
+tasks.named("latestDepTest", Test) {
   dependsOn "latestDep4Test"
 }