Merge remote-tracking branch 'origin/master' into malvarez/api-10-redirect-support

Author: manuel-alvarez-alvarez

build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
   id("com.github.spotbugs") version "6.4.8"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-  id("com.gradleup.shadow") version "8.3.6" apply false
+  id("com.gradleup.shadow") version "8.3.9" apply false
   id("me.champeau.jmh") version "0.7.3" apply false
   id("org.gradle.playframework") version "0.13" apply false
 }

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

@@ -2,7 +2,7 @@ plugins {
   java
   groovy
   id("com.diffplug.spotless") version "8.1.0"
-  id("com.gradleup.shadow") version "8.3.6"
+  id("com.gradleup.shadow") version "8.3.9"
 }
 
 java {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java

@@ -12,6 +12,7 @@
 import com.datadog.debugger.sink.Snapshot;
 import datadog.trace.api.Pair;
 import datadog.trace.bootstrap.debugger.CapturedContext;
+import datadog.trace.bootstrap.debugger.CapturedContextProbe;
 import datadog.trace.bootstrap.debugger.EvaluationError;
 import datadog.trace.bootstrap.debugger.Limits;
 import datadog.trace.bootstrap.debugger.MethodLocation;
@@ -28,12 +29,27 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SpanDecorationProbe extends ProbeDefinition {
+public class SpanDecorationProbe extends ProbeDefinition implements CapturedContextProbe {
   private static final Logger LOGGER = LoggerFactory.getLogger(SpanDecorationProbe.class);
   private static final String PROBEID_DD_TAGS_FORMAT = "_dd.di.%s.probe_id";
   private static final String EVALERROR_DD_TAGS_FORMAT = "_dd.di.%s.evaluation_error";
   private static final Limits LIMITS = new Limits(1, 3, 255, 5);
 
+  @Override
+  public boolean isCaptureSnapshot() {
+    return false;
+  }
+
+  @Override
+  public boolean hasCondition() {
+    return false;
+  }
+
+  @Override
+  public boolean isReadyToCapture() {
+    return true;
+  }
+
   public enum TargetSpan {
     ACTIVE,
     ROOT

dd-smoke-tests/armeria-grpc/application/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 plugins {
   id 'application'
   id 'java'
-  id 'com.gradleup.shadow' version '8.3.6'
+  id 'com.gradleup.shadow' version '8.3.9'
   id 'com.google.protobuf' version '0.9.3'
 }