Merge branch 'master' into alexeyk/groovy-4

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 9352e1855d49 · 2025-11-12T08:48:18.000-05:00
# Conflicts:
#	buildSrc/call-site-instrumentation-plugin/build.gradle.kts
#	dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle
#	telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -36,8 +36,7 @@ dependencies {
 
   testImplementation(libs.bytebuddy)
   testImplementation(libs.bundles.groovy)
-  testImplementation(libs.spock.core)
-  testImplementation("org.objenesis", "objenesis", "3.0.1")
+  testImplementation(libs.bundles.spock)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }
diff --git a/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDClientManager.java b/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDClientManager.java
@@ -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;
@@ -52,8 +54,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) {
diff --git a/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy b/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy
@@ -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')
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /** A store that keeps track of coverage probes allocated for multiple threads. */
 public abstract class ConcurrentCoverageStore<T extends CoverageProbes> implements CoverageStore {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java
@@ -24,9 +24,9 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.jacoco.core.analysis.Analyzer;
 import org.jacoco.core.data.ExecutionDataStore;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java
@@ -2,7 +2,7 @@
 
 import datadog.trace.api.civisibility.domain.BuildModuleLayout;
 import datadog.trace.civisibility.config.ExecutionSettings;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 public class NoOpCoverageProcessor implements CoverageProcessor {
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java
@@ -2,7 +2,7 @@
 
 import datadog.trace.api.civisibility.execution.TestExecutionHistory;
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 class ExecutionOutcomeImpl implements TestExecutionHistory.ExecutionOutcome {
 
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java
@@ -47,13 +47,13 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.agent.builder.AgentBuilder.InitializationStrategy;
 import net.bytebuddy.agent.builder.AgentBuilder.RedefinitionStrategy;
 import net.bytebuddy.agent.builder.AgentBuilder.TypeStrategy;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.matcher.ElementMatcher.Junction.Conjunction;
-import org.jetbrains.annotations.NotNull;
 import org.joor.Reflect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -248,7 +248,7 @@ public void testDuplicateInstrumentations()
     assertEquals(probe1, probe2);
   }
 
-  @NotNull
+  @Nonnull
   private static CodeOriginProbe[] codeOriginProbes(String type) {
     CodeOriginProbe entry =
         new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(type, "entry", "()", "53"));
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java
@@ -30,7 +30,7 @@
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.core.CoreTracer;
 import java.util.stream.Stream;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -109,7 +109,7 @@ public void budgets() {
     }
   }
 
-  @NotNull
+  @Nonnull
   private Result getResult(
       TracerAPI tracer, String sessionId, boolean captureSnapshot, Integer line) {
     BudgetSink sink = new BudgetSink(getConfig(), mock(ProbeStatusSink.class));
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java
@@ -5,13 +5,11 @@
 import java.io.IOException;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.jetbrains.annotations.NotNull;
 
 public class IastOptOutContext implements IastContext {
 
   @Nonnull
   @SuppressWarnings("unchecked")
-  @NotNull
   @Override
   public TaintedObjects getTaintedObjects() {
     return TaintedObjects.NoOp.INSTANCE;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java
@@ -10,8 +10,8 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.function.Function;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.jetbrains.annotations.NotNull;
 
 public class OverheadContext {
 
@@ -28,7 +28,7 @@ public class OverheadContext {
         @Override
         public AtomicIntegerArray computeIfAbsent(
             String key,
-            @NotNull Function<? super String, ? extends AtomicIntegerArray> mappingFunction) {
+            @Nonnull Function<? super String, ? extends AtomicIntegerArray> mappingFunction) {
           if (this.size() >= GLOBAL_MAP_MAX_SIZE) {
             super.clear();
           }
diff --git a/dd-java-agent/agent-llmobs/build.gradle b/dd-java-agent/agent-llmobs/build.gradle
@@ -1,23 +1,11 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   id 'com.gradleup.shadow'
-  id 'org.jetbrains.kotlin.jvm'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
-apply from: "$rootDir/gradle/test-with-kotlin.gradle"
-
-kotlin {
-  compilerOptions {
-    jvmTarget = JvmTarget.JVM_1_8
-    apiVersion = KotlinVersion.KOTLIN_1_6
-    languageVersion = KotlinVersion.KOTLIN_1_6
-  }
-}
 
 minimumBranchCoverage = 0.0
 minimumInstructionCoverage = 0.0
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java
@@ -9,7 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 public abstract class LLMObsEval {
   private static final String METRIC_TYPE_SCORE = "score";
diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java
@@ -7,6 +7,7 @@ public class TestAssumptionLegacy {
 
   @Test
   public void test_fail_assumption_legacy() {
+    // Throw exception from legacy JUnit4 library.
     throw new AssumptionViolatedException("assumption is not fulfilled");
   }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle
@@ -24,7 +24,7 @@ dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
 
-  testImplementation libs.spock.junit4 // This legacy module still needs Spock with JUnit4.
+  testImplementation libs.spock.junit4 // This module still needs Spock with JUnit4.
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java
@@ -3,12 +3,12 @@
 import datadog.context.Context;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import kotlin.coroutines.CoroutineContext;
 import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.AbstractCoroutine;
 import kotlinx.coroutines.ThreadContextElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /** Manages the Datadog context for coroutines, switching contexts as coroutines switch threads. */
 public final class DatadogThreadContextElement implements ThreadContextElement<Context> {
@@ -25,13 +25,13 @@ public static CoroutineContext addDatadogElement(CoroutineContext coroutineConte
   private Context context;
   private AgentScope.Continuation continuation;
 
-  @NotNull
+  @Nonnull
   @Override
   public Key<?> getKey() {
     return DATADOG_KEY;
   }
 
-  public static void captureDatadogContext(@NotNull AbstractCoroutine<?> coroutine) {
+  public static void captureDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
     DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
     if (datadog != null && datadog.context == null) {
       // record context to use for this coroutine
@@ -41,7 +41,7 @@ public static void captureDatadogContext(@NotNull AbstractCoroutine<?> coroutine
     }
   }
 
-  public static void cancelDatadogContext(@NotNull AbstractCoroutine<?> coroutine) {
+  public static void cancelDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
     DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
     if (datadog != null && datadog.continuation != null) {
       // release enclosing trace now the coroutine has completed
@@ -50,7 +50,7 @@ public static void cancelDatadogContext(@NotNull AbstractCoroutine<?> coroutine)
   }
 
   @Override
-  public Context updateThreadContext(@NotNull CoroutineContext coroutineContext) {
+  public Context updateThreadContext(@Nonnull CoroutineContext coroutineContext) {
     if (context == null) {
       // record context to use for this coroutine
       context = Context.current();
@@ -62,31 +62,31 @@ public Context updateThreadContext(@NotNull CoroutineContext coroutineContext) {
 
   @Override
   public void restoreThreadContext(
-      @NotNull CoroutineContext coroutineContext, Context originalContext) {
+      @Nonnull CoroutineContext coroutineContext, Context originalContext) {
     context = originalContext.swap();
   }
 
-  @NotNull
+  @Nonnull
   @Override
-  public CoroutineContext plus(@NotNull CoroutineContext coroutineContext) {
+  public CoroutineContext plus(@Nonnull CoroutineContext coroutineContext) {
     return CoroutineContext.DefaultImpls.plus(this, coroutineContext);
   }
 
   @Override
   public <R> R fold(
-      R initial, @NotNull Function2<? super R, ? super Element, ? extends R> operation) {
+      R initial, @Nonnull Function2<? super R, ? super Element, ? extends R> operation) {
     return CoroutineContext.Element.DefaultImpls.fold(this, initial, operation);
   }
 
   @Nullable
   @Override
-  public <E extends Element> E get(@NotNull Key<E> key) {
+  public <E extends Element> E get(@Nonnull Key<E> key) {
     return CoroutineContext.Element.DefaultImpls.get(this, key);
   }
 
-  @NotNull
+  @Nonnull
   @Override
-  public CoroutineContext minusKey(@NotNull Key<?> key) {
+  public CoroutineContext minusKey(@Nonnull Key<?> key) {
     return CoroutineContext.Element.DefaultImpls.minusKey(this, key);
   }
 }
diff --git a/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy
@@ -135,7 +135,7 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'spring boot dependency'() throws IOException {
     when:
-    String zipPath = zipPath('datadog/telemetry/dependencies/spring-boot-app.jar')
+    URI zipPath = zipPath('datadog/telemetry/dependencies/spring-boot-app.jar')
     URI uri = new URI("jar:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
 
     Dependency dep = DependencyResolver.resolve(uri).get(0)

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ dependencies {`
`36`	`36`
`37`	`37`	`testImplementation(libs.bytebuddy)`
`38`	`38`	`testImplementation(libs.bundles.groovy)`
`39`		`- testImplementation(libs.spock.core)`
`40`		`- testImplementation("org.objenesis", "objenesis", "3.0.1")`
	`39`	`+ testImplementation(libs.bundles.spock)`
`41`	`40`	`testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")`
`42`	`41`	`testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")`
`43`	`42`	`}`