Merge branch 'master' into bdu/spotbugs-bump-need-jdk11-min

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -132,12 +132,12 @@ default:
   image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: build
   variables:
-    MAVEN_OPTS: "-Xms64M -Xmx512M"
+    MAVEN_OPTS: "-Xms256M -Xmx1024M"
     GRADLE_WORKERS: 2
-    GRADLE_MEM: 2560M
+    GRADLE_MEM: 3G
     KUBERNETES_CPU_REQUEST: 8
-    KUBERNETES_MEMORY_REQUEST: 8Gi
-    KUBERNETES_MEMORY_LIMIT: 8Gi
+    KUBERNETES_MEMORY_REQUEST: 10Gi
+    KUBERNETES_MEMORY_LIMIT: 10Gi
     CACHE_TYPE: "lib" #default
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "slowest"
@@ -289,8 +289,7 @@ build_tests:
         CACHE_TYPE: "latestdep"
       - GRADLE_TARGET: ":smokeTest"
         CACHE_TYPE: "smoke"
-        MAVEN_OPTS: "-Xms64M -Xmx512M"
-
+        MAVEN_OPTS: "-Xms256M -Xmx1024M"
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.9/apache-maven-3.8.9-bin.zip

.mvn/wrapper/maven-wrapper.jar

@@ -86,8 +86,8 @@ testing {
   suites {
     val test by getting(JvmTestSuite::class) {
       dependencies {
-        implementation(libs.spock.core)
         implementation(libs.groovy)
+        implementation(libs.spock.core)
       }
       targets.configureEach {
         testTask.configure {

.mvn/wrapper/maven-wrapper.properties

@@ -35,9 +35,8 @@ dependencies {
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation(libs.bytebuddy)
-  testImplementation(libs.spock.core)
-  testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation(libs.groovy)
+  testImplementation(libs.bundles.spock)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation(libs.spotbugs.annotations)
 }

buildSrc/build.gradle.kts

@@ -3,10 +3,12 @@
 import static datadog.trace.bootstrap.instrumentation.api.WriterConstants.LOGGING_WRITER_TYPE;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.ProcessTags;
 import datadog.trace.api.StatsDClient;
 import datadog.trace.api.StatsDClientManager;
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -54,8 +56,30 @@ public StatsDClient statsDClient(
       nameMapping = new NameResolver(namespace);
     }
 
-    if (null != constantTags && constantTags.length > 0) {
-      tagMapping = new TagCombiner(constantTags);
+    final List<String> processTags = ProcessTags.getTagsAsStringList();
+    final int processTagSize = processTags != null ? processTags.size() : 0;
+    String[] finalConstantTags = constantTags;
+    if (processTagSize > 0) {
+      final int constantTagSize = constantTags != null ? constantTags.length : 0;
+      if (constantTagSize == 0) {
+        finalConstantTags = processTags.toArray(new String[0]);
+      } else {
+        final int tagSizeSum = processTagSize + constantTagSize;
+        finalConstantTags = new String[tagSizeSum];
+        int pos = 0;
+        // copy constant tags
+        for (; pos < constantTagSize; pos++) {
+          finalConstantTags[pos] = constantTags[pos];
+        }
+        // copy process tags
+        for (int i = 0; i < processTagSize; i++) {
+          finalConstantTags[pos + i] = processTags.get(i);
+        }
+      }
+    }
+
+    if (null != finalConstantTags && finalConstantTags.length > 0) {
+      tagMapping = new TagCombiner(finalConstantTags);
     }
 
     if (USE_LOGGING_CLIENT) {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -1,19 +1,19 @@
 package datadog.communication.http
 
+import static org.junit.jupiter.api.Assertions.assertThrows
+
 import org.junit.jupiter.api.Test
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
 
-import static groovy.test.GroovyAssert.shouldFail
-
 class RejectingExecutorServiceTest {
   ExecutorService executorService = new RejectingExecutorService()
 
   @Test
   void 'execute throws exception'() {
-    shouldFail(RejectedExecutionException) {
+    assertThrows(RejectedExecutionException) {
       executorService.execute({})
     }
   }

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

@@ -1,6 +1,8 @@
 package datadog.communication.monitor
 
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 
+import datadog.trace.api.ProcessTags
 import datadog.trace.test.util.DDSpecification
 
 import static datadog.trace.api.config.GeneralConfig.DOGSTATSD_START_DELAY
@@ -109,13 +111,44 @@ class DDAgentStatsDClientTest extends DDSpecification {
     where:
     // spotless:off
     namespace | constantTags                        | expectedMetricName    | expectedCheckName    | expectedTags
-    null      | null                                | "test.metric"         | "test.check"         | "jmx_domain:java.nio,type:BufferPool"
-    null      | ["lang:java", "lang_version:1.8.0"] | "test.metric"         | "test.check"         | "jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0"
-    "example" | null                                | "example.test.metric" | "example.test.check" | "jmx_domain:java.nio,type:BufferPool"
-    "example" | ["lang:java", "lang_version:1.8.0"] | "example.test.metric" | "example.test.check" | "jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0"
+    null      | null                                | "test.metric"         | "test.check"         | "jmx_domain:java.nio,type:BufferPool,${ProcessTags.getTagsForSerialization().toString()}"
+    null      | ["lang:java", "lang_version:1.8.0"] | "test.metric"         | "test.check"         | "jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0,${ProcessTags.getTagsForSerialization().toString()}"
+    "example" | null                                | "example.test.metric" | "example.test.check" | "jmx_domain:java.nio,type:BufferPool,${ProcessTags.getTagsForSerialization().toString()}"
+    "example" | ["lang:java", "lang_version:1.8.0"] | "example.test.metric" | "example.test.check" | "jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0,${ProcessTags.getTagsForSerialization().toString()}"
     // spotless:on
   }
 
+  def "single statsd client without process tags"() {
+    setup:
+    injectSysConfig(DOGSTATSD_START_DELAY, '0')
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false")
+    def server = new StatsDServer()
+    server.start()
+    ProcessTags.reset()
+
+    def client = statsDClientManager().statsDClient('127.0.0.1', server.socket.localPort, null, namespace, constantTags as String[], false)
+
+    String metricName = "test.metric"
+    String[] tags = ["test:true"]
+
+    when:
+    client.incrementCounter(metricName, tags)
+
+    then:
+    server.waitForMessage().startsWith("$expectedMetricName:1|c|#$expectedTags")
+
+    cleanup:
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
+    ProcessTags.reset()
+    client.close()
+    server.close()
+
+    where:
+    namespace | constantTags                        | expectedMetricName    | expectedTags
+    null      | null                                | "test.metric"         | "test:true"
+    null      | ["lang:java", "lang_version:1.8.0"] | "test.metric"         | "test:true,lang:java,lang_version:1.8.0"
+  }
+
   def "single statsd client with event"() {
     setup:
     injectSysConfig(DOGSTATSD_START_DELAY, '0')

communication/src/test/groovy/datadog/communication/http/RejectingExecutorServiceTest.groovy

@@ -93,6 +93,17 @@ public static boolean isOracleJDK8() {
         && !runtime.name.contains("OpenJDK");
   }
 
+  public static boolean isHotspot() {
+    String prop = SystemProperties.getOrDefault("java.vm.name", "");
+    if (prop.isEmpty()) {
+      return false;
+    }
+    return prop.contains("OpenJDK")
+        || prop.contains("HotSpot")
+        || prop.contains("GraalVM")
+        || prop.contains("Dynamic Code Evolution");
+  }
+
   public static boolean isJ9() {
     return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");
   }