Merge branch 'master' into alexeyk/refactored-env-vars-to-be-testable

Author: AlexeyKuznetsov-DD

.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/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

@@ -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;

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -8,7 +8,7 @@ dependencies {
   api group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
   api group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
   api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
-  api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
+  api libs.jackson.databind
   api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
   api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
 }

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle

@@ -23,7 +23,7 @@ dependencies {
 
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.mockito
+  testImplementation libs.jackson.databind
   testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
-  testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
 }
 

dd-java-agent/agent-crashtracking/build.gradle

@@ -37,8 +37,7 @@ dependencies {
   testImplementation project(':utils:test-utils')
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.mockito
+  testImplementation libs.jackson.databind
   testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
-
-  testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
 }
 

dd-java-agent/agent-profiling/profiling-uploader/build.gradle

@@ -23,7 +23,7 @@ dependencies {
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
   testImplementation group: 'com.flipkart.zjsonpatch', name: 'zjsonpatch', version: '0.4.11'
   testImplementation libs.logback.classic
-  testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
+  testImplementation libs.jackson.databind
 }
 
 shadowJar {

dd-java-agent/appsec/build.gradle

@@ -27,14 +27,12 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
-  testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
   // Required for older versions of finatra on JDKs >= 11
   testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
 
   latestPre207TestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '[,20.7.0)'
 
   latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
-  latestDepTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0'
 }
 
 tasks.named("compileLatestDepTestGroovy").configure {