Merge branch 'master' into mhlidd/telemetry_otel_handling

Author: mhlidd

.github/workflows/run-system-tests.yaml

@@ -63,8 +63,6 @@ jobs:
     - build
     # If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
     uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned on release branches only
-    secrets:
-      TEST_OPTIMIZATION_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
     permissions:
       contents: read
       id-token: write
@@ -78,7 +76,7 @@ jobs:
       scenarios_groups: tracer-release
       excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING  # exclude flaky scenarios
       skip_empty_scenarios: true
-      push_to_test_optimization: true
+      push_to_test_optimization: false # disabled to avoid pushing to Test Optimization while API key is transitioning to system-tests
 
   # Ensure the main job is run to completion
   check:

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

@@ -54,6 +54,9 @@ echo "PID: $PID"
 unset JDK_JAVA_OPTIONS
 unset JAVA_TOOL_OPTIONS
 unset _JAVA_OPTIONS
+# Prevent the instrumentation injector from re-injecting the agent into the child JVM
+unset LD_PRELOAD
+unset DYLD_INSERT_LIBRARIES
 
 # Execute the Java command with the loaded values
 "$config_java_home/bin/java" -Ddd.dogstatsd.start-delay=0 -jar "$config_agent" sendOomeEvent "$config_tags"

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

@@ -11,6 +11,9 @@ if [ -z "$1" ]; then
   unset JDK_JAVA_OPTIONS
   unset JAVA_TOOL_OPTIONS
   unset _JAVA_OPTIONS
+  # Prevent the instrumentation injector from re-injecting the agent into the child JVM
+  unset LD_PRELOAD
+  unset DYLD_INSERT_LIBRARIES
 
   "!JAVA_HOME!/bin/java" -jar "!AGENT_JAR!" uploadCrash "!JAVA_ERROR_FILE!"
   if [ $? -eq 0 ]; then
@@ -129,6 +132,9 @@ echo "PID: $PID"
 unset JDK_JAVA_OPTIONS
 unset JAVA_TOOL_OPTIONS
 unset _JAVA_OPTIONS
+# Prevent the instrumentation injector from re-injecting the agent into the child JVM
+unset LD_PRELOAD
+unset DYLD_INSERT_LIBRARIES
 
 # Execute the Java command with the loaded values
 "$config_java_home/bin/java" -jar "$config_agent" uploadCrash -c "$configFile" "$config_hs_err"

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java

@@ -32,12 +32,14 @@ public static String fingerprint(Throwable t, ClassNameFilter classNameFiltering
     String typeName = clazz.getTypeName();
     digest.update(typeName.getBytes());
     StackTraceElement[] stackTrace = t.getStackTrace();
-    for (StackTraceElement stackTraceElement : stackTrace) {
-      String className = stackTraceElement.getClassName();
-      if (classNameFiltering.isExcluded(className)) {
-        continue;
+    if (stackTrace != null) {
+      for (StackTraceElement stackTraceElement : stackTrace) {
+        String className = stackTraceElement.getClassName();
+        if (classNameFiltering.isExcluded(className)) {
+          continue;
+        }
+        digest.update(stackTraceElement.toString().getBytes());
       }
-      digest.update(stackTraceElement.toString().getBytes());
     }
     return bytesToHex(digest.digest());
   }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FingerprinterTest.java

@@ -69,6 +69,20 @@ void emptyStacktrace() {
         Fingerprinter.fingerprint(new EmptyException("test"), classNameFiltering));
   }
 
+  @Test
+  void nullStacktrace() {
+    assertEquals(
+        "35ae5d9aa4d7179a7d36838ca6266ea459a7cbb6ebc92afc24098bc85cad586",
+        Fingerprinter.fingerprint(
+            new RuntimeException("test") {
+              @Override
+              public StackTraceElement[] getStackTrace() {
+                return null;
+              }
+            },
+            classNameFiltering));
+  }
+
   static class EmptyException extends Exception {
     public EmptyException(String message) {
       super(message, null, false, false);

dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java

@@ -1,6 +1,7 @@
 package datadog.trace.llmobs.domain;
 
 import datadog.context.ContextScope;
+import datadog.trace.api.Config;
 import datadog.trace.api.DDSpanTypes;
 import datadog.trace.api.DDTraceApiInfo;
 import datadog.trace.api.DDTraceId;
@@ -74,6 +75,11 @@ public DDLLMObsSpan(
 
     span = spanBuilder.start();
 
+    // set global dd_tags as base layer so UST and span-level tags can override them
+    for (Map.Entry<String, String> entry : Config.get().getGlobalTags().entrySet()) {
+      span.setTag(LLMOBS_TAG_PREFIX + entry.getKey(), entry.getValue());
+    }
+
     // set UST (unified service tags, env, service, version)
     span.setTag(ENV, wellKnownTags.getEnv());
     span.setTag(SERVICE, wellKnownTags.getService());

dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy

@@ -411,6 +411,17 @@ class DDLLMObsSpanTest  extends DDSpecification{
     null          | "has_session_id:0"
   }
 
+  def "global dd_tags are included in LLMObs span tags"() {
+    setup:
+    injectSysConfig("trace.global.tags", "team:backend,owner:ml-platform")
+    def test = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "test-span")
+
+    expect:
+    def innerSpan = (AgentSpan) test.span
+    innerSpan.getTag(LLMOBS_TAG_PREFIX + "team") == "backend"
+    innerSpan.getTag(LLMOBS_TAG_PREFIX + "owner") == "ml-platform"
+  }
+
   private LLMObsSpan llmObsSpan(String kind, name) {
     llmObsSpan(kind, name, null)
   }

dd-java-agent/agent-otel/otel-bootstrap/build.gradle

@@ -74,9 +74,6 @@ dependencies {
 
   implementation project(':dd-java-agent:agent-bootstrap')
   implementation project(':utils:logging-utils')
-  implementation project(':communication')
-
-  testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0'
 }
 
 tasks.named("shadowJar", ShadowJar) {
@@ -109,6 +106,7 @@ tasks.named("shadowJar", ShadowJar) {
   exclude 'io/opentelemetry/javaagent/bootstrap/internal/InClassLoaderMatcher*'
   exclude 'io/opentelemetry/javaagent/bootstrap/internal/InstrumentationConfig*'
   include 'datadog/trace/bootstrap/otel/**'
+  include 'datadog/trace/bootstrap/otlp/**'
 
   relocate 'io.opentelemetry.api', 'datadog.trace.bootstrap.otel.api'
   relocate 'io.opentelemetry.context', 'datadog.trace.bootstrap.otel.context'

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java

@@ -13,7 +13,7 @@ public final class OtelInstrumentDescriptor {
   @Nullable private final UTF8BytesString description;
   @Nullable private final UTF8BytesString unit;
 
-  OtelInstrumentDescriptor(
+  public OtelInstrumentDescriptor(
       String instrumentName,
       OtelInstrumentType instrumentType,
       boolean longValues,

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java

@@ -1,5 +1,7 @@
 package datadog.trace.bootstrap.otel.metrics.data;
 
+import datadog.trace.bootstrap.otlp.metrics.OtlpDataPoint;
+
 /** Common behaviour shared across all aggregators. */
 abstract class OtelAggregator {
   private volatile boolean empty = true;