Merge branch 'master' into sarahchen6/test-graalvm25

Author: sarahchen6

.github/CODEOWNERS

@@ -28,8 +28,10 @@
 /internal-api/src/test/groovy/datadog/trace/api/sampling        @DataDog/apm-sdk-api-java
 
 # @DataDog/apm-serverless
-/dd-trace-core/src/main/java/datadog/trace/lambda/   @DataDog/apm-serverless
-/dd-trace-core/src/test/groovy/datadog/trace/lambda/ @DataDog/apm-serverless
+/dd-trace-core/src/main/java/datadog/trace/lambda/              @DataDog/apm-serverless
+/dd-trace-core/src/test/groovy/datadog/trace/lambda/            @DataDog/apm-serverless
+**/InferredProxy*.java                                          @DataDog/apm-serverless
+**/InferredProxy*.groovy                                        @DataDog/apm-serverless
 
 # @DataDog/apm-lang-platform-java
 /.circleci/                            @DataDog/apm-lang-platform-java

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

@@ -3,10 +3,18 @@ name: Run system tests
 on:
   pull_request:
   workflow_dispatch:
+  schedule:
+    - cron: 0 4 * * *
+  push:
+    branches:
+      - master
 
 # Cancel long-running jobs when a new commit is pushed
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # this ensures that only one workflow runs at a time for a given branch on pull requests
+  # as the group key is the workflow name and the branch name
+  # for scheduled runs and pushes to master, we use the run id to ensure that all runs are executed
+  group: ${{ (github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref)) || format('{0}-{1}', github.workflow, github.run_id) }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/update-gradle-dependencies.yaml

@@ -48,7 +48,7 @@ jobs:
           GH_ADD_ARGS=""
           COUNT=0
           BRANCH_HEAD=$(git rev-parse HEAD)
-          for lockfile in $(git status --porcelain=v1 | awk '{ print $NF }'); do
+          for lockfile in $(git status --porcelain=v1 -- ':(glob)**/gradle.lockfile' | awk '{ print $NF }'); do
             echo "Found lockfile: $lockfile"
             GH_ADD_ARGS="$GH_ADD_ARGS --add $lockfile"
             COUNT=$((COUNT+1))

.gitlab/macrobenchmarks.yml

@@ -142,4 +142,4 @@ notify-slo-breaches:
       when: never
     - when: always
   variables:
-    CHANNEL: "apm-release-platform"
+    CHANNEL: "apm-java"

boolean-conversion-proposal.md

@@ -76,7 +76,6 @@ testing {
     val integTest by registering(JvmTestSuite::class) {
       dependencies {
         implementation(gradleTestKit())
-        implementation("org.assertj:assertj-core:3.25.3")
       }
       // Makes the gradle plugin publish its declared plugins to this source set
       gradlePlugin.testSourceSet(sources)

buildSrc/build.gradle.kts

@@ -1,10 +1,8 @@
 package datadog.gradle.plugin.version
 
-import org.assertj.core.api.Assertions.assertThat
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
 import java.io.IOException
@@ -289,7 +287,7 @@ class TracerVersionIntegrationTest {
       // .withDebug(true)
       .build()
 
-    assertThat(buildResult.output).isEqualToIgnoringNewLines(expectedVersion)
+    assertEquals(expectedVersion, buildResult.output.lines().first())
   }
 
   private fun exec(workingDirectory: File, vararg args: String) {

buildSrc/src/integTest/kotlin/datadog/gradle/plugin/version/TracerVersionIntegrationTest.kt

@@ -23,7 +23,6 @@ dependencies {
 
   testImplementation(project(":utils:test-utils"))
   testImplementation(libs.bundles.junit5)
-  testImplementation(libs.truth)
   testImplementation(libs.bytebuddy)
   testImplementation("org.msgpack:msgpack-core:0.8.20")
   testImplementation("org.msgpack:jackson-dataformat-msgpack:0.8.20")

communication/build.gradle.kts

@@ -1,31 +1,34 @@
 package datadog.communication.http
 
-import com.google.common.truth.Truth
 import okhttp3.Request
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
+import static org.junit.jupiter.api.Assertions.assertFalse
+import static org.junit.jupiter.api.Assertions.assertThrows
+import static org.junit.jupiter.api.Assertions.assertTrue
+
 class SafeRequestBuilderTest {
   Request.Builder testBuilder = new Request.Builder()
 
   @Test
   void "test adding bad header"() {
     def name = 'bad'
     def password = 'very-secret-password'
-    IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException, {
+    IllegalArgumentException ex = assertThrows(IllegalArgumentException, {
       testBuilder.url("http:localhost").addHeader(name, "$password\n")
     })
-    Truth.assertThat(ex).hasMessageThat().contains(name)
-    Truth.assertThat(ex).hasMessageThat().doesNotContain(password)
+    assertTrue(ex.getMessage().contains(name))
+    assertFalse(ex.getMessage().contains(password))
   }
+
   @Test
   void "test adding bad header2"(){
     def name = '\u0019'
     def password = 'very-secret-password'
-    IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException, {
+    IllegalArgumentException ex = assertThrows(IllegalArgumentException, {
       testBuilder.url("http:localhost").addHeader(name, "\u0080$password")
     })
-    Truth.assertThat(ex).hasMessageThat().contains(name)
-    Truth.assertThat(ex).hasMessageThat().doesNotContain(password)
+    assertTrue(ex.getMessage().contains(name))
+    assertFalse(ex.getMessage().contains(password))
   }
 }

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

@@ -20,6 +20,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.Flow.Action.RequestBlockingAction;
 import datadog.trace.api.gateway.IGSpanInfo;
+import datadog.trace.api.gateway.InferredProxySpan;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
 import datadog.trace.api.naming.SpanNaming;
@@ -147,21 +148,32 @@ public Context startSpan(REQUEST_CARRIER carrier, Context parentContext) {
         instrumentationNames != null && instrumentationNames.length > 0
             ? instrumentationNames[0]
             : DEFAULT_INSTRUMENTATION_NAME;
-    AgentSpanContext.Extracted extracted =
-        callIGCallbackStart(getExtractedSpanContext(parentContext));
+    AgentSpanContext extracted = getExtractedSpanContext(parentContext);
+    // Call IG callbacks
+    extracted = callIGCallbackStart(extracted);
+    // Create gateway inferred span if needed
+    extracted = startInferredProxySpan(parentContext, extracted);
     AgentSpan span =
         tracer().startSpan(instrumentationName, spanName(), extracted).setMeasured(true);
+    // Apply RequestBlockingAction if any
     Flow<Void> flow = callIGCallbackRequestHeaders(span, carrier);
     if (flow.getAction() instanceof RequestBlockingAction) {
       span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
     }
-    AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (null != carrier && null != getter) {
-      tracer().getDataStreamsMonitoring().setCheckpoint(span, forHttpServer());
-    }
+    // DSM Checkpoint
+    tracer().getDataStreamsMonitoring().setCheckpoint(span, forHttpServer());
     return parentContext.with(span);
   }
 
+  protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanContext extracted) {
+    InferredProxySpan span;
+    if (!Config.get().isInferredProxyPropagationEnabled()
+        || (span = InferredProxySpan.fromContext(context)) == null) {
+      return extracted;
+    }
+    return span.start(extracted);
+  }
+
   public AgentSpan onRequest(
       final AgentSpan span,
       final CONNECTION connection,
@@ -390,8 +402,7 @@ public AgentSpan onResponse(final AgentSpan span, final RESPONSE response) {
     return span;
   }
 
-  private AgentSpanContext.Extracted callIGCallbackStart(
-      @Nullable final AgentSpanContext.Extracted extracted) {
+  private AgentSpanContext callIGCallbackStart(@Nullable final AgentSpanContext extracted) {
     AgentTracer.TracerAPI tracer = tracer();
     Supplier<Flow<Object>> startedCbAppSec =
         tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
@@ -527,10 +538,20 @@ private Flow<Void> callIGCallbackURI(
 
   @Override
   public AgentSpan beforeFinish(AgentSpan span) {
+    // TODO Migrate beforeFinish to Context API
     onRequestEndForInstrumentationGateway(span);
+    // Close Serverless Gateway Inferred Span if any
+    // finishInferredProxySpan(context);
     return super.beforeFinish(span);
   }
 
+  protected void finishInferredProxySpan(Context context) {
+    InferredProxySpan span;
+    if ((span = InferredProxySpan.fromContext(context)) != null) {
+      span.finish();
+    }
+  }
+
   private void onRequestEndForInstrumentationGateway(@Nonnull final AgentSpan span) {
     if (span.getLocalRootSpan() != span) {
       return;