diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
index 4a3d002d2b8..39b2f5aa91e 100644
--- a/.circleci/config.continue.yml.j2
+++ b/.circleci/config.continue.yml.j2
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit edfea31b7a9ceaed03b705de34a4e525853444c0
+default_system_tests_commit: &default_system_tests_commit ca7566bf7e66c0afdf29b0d3c07b2972e5869997
 
 parameters:
   nightly:
@@ -735,6 +735,7 @@ jobs:
           name: Generate muzzle dep report
           command: >-
             SKIP_BUILDSCAN="true"
+            GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
             ./gradlew generateMuzzleReport muzzleInstrumentationReport
       - run:
           name: Collect Reports
@@ -1193,6 +1194,15 @@ build_test_jobs: &build_test_jobs
       stage: smoke
       cacheType: smoke
       testJvm: "graalvm17"
+  
+  - tests:
+      requires:
+        - ok_to_test
+      name: test_graalvm21_smoke
+      gradleTarget: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "graalvm21"
 
   - tests:
       requires:
diff --git a/.circleci/render_config.py b/.circleci/render_config.py
index 51cd43d413d..9be71879b92 100755
--- a/.circleci/render_config.py
+++ b/.circleci/render_config.py
@@ -28,7 +28,7 @@
 }
 # Version to use for all the base Docker images, see
 # https://github.com/DataDog/dd-trace-java-docker-build/pkgs/container/dd-trace-java-docker-build
-DOCKER_IMAGE_VERSION="v23.09"
+DOCKER_IMAGE_VERSION="v23.10"
 
 # Get labels from pull requests to override some defaults for jobs to run.
 # `run-tests: all` will run all tests.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 658580cf016..b0076b4541c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,6 +19,7 @@ dd-java-agent/instrumentation/cucumber/    @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/jacoco/      @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/junit-4.10/  @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/junit-5.3/   @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/karate/      @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/testng/      @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/gradle/      @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java
@@ -36,6 +37,11 @@ dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java
 dd-java-agent/agent-iast/              @DataDog/asm-java
 dd-java-agent/instrumentation/*iast*   @DataDog/asm-java
 dd-java-agent/instrumentation/*appsec* @DataDog/asm-java
+dd-java-agent/instrumentation/json/    @DataDog/asm-java
+dd-smoke-tests/iast-util/              @DataDog/asm-java
+dd-smoke-tests/spring-security/        @DataDog/asm-java
+dd-java-agent/instrumentation/commons-fileupload/    @DataDog/asm-java
+dd-java-agent/instrumentation/spring-security-5/ @DataDog/asm-java
 **/appsec/                             @DataDog/asm-java
 **/iast/                               @DataDog/asm-java
 **/Iast*.java                          @DataDog/asm-java
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 69460820818..f125629f6e6 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -6,7 +6,7 @@ This lists and describes the repository GitHub actions.
 
 ### add-assets-to-release [🔗](add-assets-to-release.yaml)
 
-_Trigger:_ When a release is published
+_Trigger:_ When a release is published.
 
 _Actions:_
 * Ensure the release name is properly formatted (using `x.y.z` format),
@@ -16,7 +16,7 @@ _Recovery:_ Download artifacts and upload them manually to the release.
 
 ### add-milestone-to-pull-requests [🔗](add-milestone-to-pull-requests.yaml)
 
-_Trigger:_ When a PR to `master` is closed
+_Trigger:_ When a PR to `master` is closed.
 
 _Action:_ Get the last (by name) opened milestone and affect it to the closed pull request.
 
@@ -24,7 +24,7 @@ _Recovery:_ Attach the milestone by hand to the PR.
 
 ### create-next-milestone [🔗](create-next-milestone.yaml)
 
-_Trigger:_ When closing a milestone
+_Trigger:_ When closing a milestone.
 
 _Action:_ Create a new milestone by incrementing minor version.
 
@@ -44,7 +44,7 @@ _Recovery:_ Manually trigger the action again on the relevant tag.
 
 ## increment-milestones-on-tag [🔗](increment-milestones-on-tag.yaml)
 
-_Trigger:_ When creating a tag
+_Trigger:_ When creating a tag.
 
 _Actions:_
 * Close the milestone related to the tag,
@@ -57,7 +57,7 @@ As there is no milestone for _patch_ releases, it won't close and create _patch_
 
 ## update-download-releases [🔗](update-download-releases.yaml)
 
-_Trigger:_ When a release is published
+_Trigger:_ When a release is published.
 
 _Action:_ Update the _download releases_ with the latest release artifact.
 
@@ -67,7 +67,7 @@ _Notes:_ _Download releases_ are special GitHub releases with fixed URL and tags
 
 ## update-issues-on-release [🔗](update-issues-on-release.yaml)
 
-_Trigger:_ When a release is published
+_Trigger:_ When a release is published.
 
 _Action:_
 * Find all issues related to the release by checking the related milestone,
@@ -78,15 +78,21 @@ _Recovery:_ Check at the milestone for the related issues and update them manual
 
 ## Code Quality and Security
 
+### comment-on-submodule-update [🔗](comment-on-submodule-update.yaml)
+
+_Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a Git Submodule update.
+
+_Action:_ Notify the PR author through comments that about the Git Submodule update.
+
 ### codeql-analysis [🔗](codeql-analysis.yml)
 
-_Trigger:_ When pushing commits to `master` or any pull request to `master`
+_Trigger:_ When pushing commits to `master` or any pull request to `master`.
 
 _Action:_ Run GitHub CodeQL action and upload result to GitHub security tab.
 
 ### trivy-analysis [🔗](trivy-analysis.yml)
 
-_Trigger:_ When pushing commits to `master` or any pull request to `master`
+_Trigger:_ When pushing commits to `master` or any pull request to `master`.
 
 _Action:_ Run Trivy security scanner on built artifacts and upload result to GitHub security tab.
 
@@ -100,7 +106,7 @@ _Comment:_ To delete?
 
 ### lib-injection [🔗](lib-injection.yaml)
 
-_Trigger:_ When pushing commits to `master`, release branches or any PR targetting `master`, and when creating tags
+_Trigger:_ When pushing commits to `master`, release branches or any PR targetting `master`, and when creating tags.
 
 _Actions:_
 * Build and publish to GHCR a Docker image with the Java tracer agent,
@@ -108,13 +114,13 @@ _Actions:_
 
 ### lib-injection-manual-release [🔗](lib-injection-manual-release.yaml)
 
-_Trigger:_ When manually triggered
+_Trigger:_ When manually triggered.
 
 _Action:_ Build and publish to GHCR a Docker image with the given Java tracer version.
 
 ### lib-injection-prune-registry [🔗](lib-injection-prune-registry.yaml)
 
-_Trigger:_ Every week or manually
+_Trigger:_ Every week or manually.
 
 _Action:_ Clean up old lib-injection Docker images from GHCR.
 
diff --git a/.github/workflows/comment-on-submodule-update.yaml b/.github/workflows/comment-on-submodule-update.yaml
new file mode 100644
index 00000000000..df60b2044b0
--- /dev/null
+++ b/.github/workflows/comment-on-submodule-update.yaml
@@ -0,0 +1,29 @@
+name: Comment on Submodule Update
+
+on:
+  pull_request:
+    branches:
+        - 'master'
+        - 'release/**'
+    paths:
+      - 'dd-java-agent/agent-jmxfetch/integrations-core'
+
+jobs:
+  comment_on_submodule_update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Post comment on submodule update
+        uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # 6.3.3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Hi! 👋 Looks like you updated a Git Submodule.\n' +
+                'If this was not intentional please make sure to:\n\n' +
+                '* Update the submodule to the latest commit on the master branch using the `git submodule update` command,\n' +
+                '* Check you [properly set up your environment for contributing](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#git-submodule-setup).'
+            })
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3be67d8c675..4043b3131e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ cache: &default_cache
 
 .gradle_build: &gradle_build
   <<: *common
-  image: ghcr.io/datadog/dd-trace-java-docker-build:base
+  image: ghcr.io/datadog/dd-trace-java-docker-build:v23.10-base
   before_script:
     - export GRADLE_USER_HOME=`pwd`/.gradle
 
@@ -82,6 +82,12 @@ package:
   script:
     - ../.gitlab/build_java_package.sh
 
+package-arm:
+  extends: .package-arm
+  when: on_success # this can't use 'needs: [build]', since build is not available in the scheduled pipeline
+  script:
+    - ../.gitlab/build_java_package.sh
+
 .release-package:
   stage: deploy
   variables:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7c903bdffab..57b14e7aef2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -220,11 +220,11 @@ Suggested plugins and settings:
 
 To run tests on a different JVM than the one used for doing the build, you need two things:
 
-1) An environment variable pointing to the JVM to use on the form `JAVA_[JDKNAME]_HOME`, i.e. `JAVA_ZULU15_HOME`
+1) An environment variable pointing to the JVM to use on the form `JAVA_[JDKNAME]_HOME`, e.g. `JAVA_ZULU15_HOME`, `JAVA_GRAALVM17_HOME`
 
-2) A command line option to the gradle task on the form `-PtestJvm=[JDKNAME]`, i.e. `-PtestJvm=ZULU15`
+2) A command line option to the gradle task on the form `-PtestJvm=[JDKNAME]`, e.g. `-PtestJvm=ZULU15`, `-PtestJvm=GRAALVM17`
 
-Please note that the JDK name needs to end with the JDK version, i.e. `11`, `ZULU15`, `ORACLE8`, et.c.
+Please note that the JDK name needs to end with the JDK version, e.g. `11`, `ZULU15`, `ORACLE8`, `GRAALVM17`, etc.
 
 ## The APM Test Agent
 
diff --git a/buildSrc/src/main/groovy/InstrumentPlugin.groovy b/buildSrc/src/main/groovy/InstrumentPlugin.groovy
index d19514e6543..34e41e48faa 100644
--- a/buildSrc/src/main/groovy/InstrumentPlugin.groovy
+++ b/buildSrc/src/main/groovy/InstrumentPlugin.groovy
@@ -116,7 +116,9 @@ abstract class InstrumentTask extends DefaultTask {
       parameters.buildStartedTime.set(invocationDetails.buildStartedTime)
       parameters.pluginClassPath.setFrom(project.configurations.findByName('instrumentPluginClasspath') ?: [])
       parameters.plugins.set(extension.plugins)
-      parameters.instrumentingClassPath.setFrom(project.configurations.compileClasspath.findAll {
+      def matcher = instrumentTask.name =~ /instrument([A-Z].+)Java/
+      def cfgName = matcher.matches() ? "${matcher.group(1).uncapitalize()}CompileClasspath" : 'compileClasspath'
+      parameters.instrumentingClassPath.setFrom(project.configurations[cfgName].findAll {
         it.name != 'previous-compilation-data.bin' && !it.name.endsWith(".gz")
       } + sourceDirectory + (extension.additionalClasspath[instrumentTask.name] ?: [])*.get())
       parameters.sourceDirectory.set(sourceDirectory.asFile)
diff --git a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
index 1f1f73f1b7a..ae3c375875e 100644
--- a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
+++ b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
@@ -47,6 +47,8 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
 
   public static final String DEBUGGER_ENDPOINT = "debugger/v1/input";
 
+  public static final String TELEMETRY_PROXY_ENDPOINT = "telemetry/proxy/";
+
   private static final long MIN_FEATURE_DISCOVERY_INTERVAL_MILLIS = 60 * 1000;
 
   private final OkHttpClient client;
@@ -58,6 +60,7 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
   private final boolean metricsEnabled;
   private final String[] dataStreamsEndpoints = {V01_DATASTREAMS_ENDPOINT};
   private final String[] evpProxyEndpoints = {V2_EVP_PROXY_ENDPOINT};
+  private final String[] telemetryProxyEndpoints = {TELEMETRY_PROXY_ENDPOINT};
 
   private volatile String traceEndpoint;
   private volatile String metricsEndpoint;
@@ -69,6 +72,7 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
   private volatile String debuggerEndpoint;
   private volatile String evpProxyEndpoint;
   private volatile String version;
+  private volatile String telemetryProxyEndpoint;
 
   private long lastTimeDiscovered;
 
@@ -100,6 +104,7 @@ private void reset() {
     evpProxyEndpoint = null;
     version = null;
     lastTimeDiscovered = 0;
+    telemetryProxyEndpoint = null;
   }
 
   /** Run feature discovery, unconditionally. */
@@ -162,14 +167,15 @@ private void doDiscovery() {
 
     if (log.isDebugEnabled()) {
       log.debug(
-          "discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, evpProxyEndpoint={}",
+          "discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
           traceEndpoint,
           metricsEndpoint,
           supportsDropping,
           supportsLongRunning,
           dataStreamsEndpoint,
           configEndpoint,
-          evpProxyEndpoint);
+          evpProxyEndpoint,
+          telemetryProxyEndpoint);
     }
   }
 
@@ -247,6 +253,13 @@ private boolean processInfoResponse(String response) {
         }
       }
 
+      for (String endpoint : telemetryProxyEndpoints) {
+        if (endpoints.contains(endpoint) || endpoints.contains("/" + endpoint)) {
+          telemetryProxyEndpoint = endpoint;
+          break;
+        }
+      }
+
       supportsLongRunning = Boolean.TRUE.equals(map.getOrDefault("long_running_spans", false));
 
       if (metricsEnabled) {
@@ -352,4 +365,8 @@ public String state() {
   public boolean active() {
     return supportsMetrics() && supportsDropping;
   }
+
+  public boolean supportsTelemetryProxy() {
+    return telemetryProxyEndpoint != null;
+  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
index e00b1260e04..5491f999da2 100644
--- a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
+++ b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -39,10 +39,15 @@ public void createRemaining(Config config) {
       String namedPipe = config.getAgentNamedPipe();
       okHttpClient =
           OkHttpUtils.buildHttpClient(
-              agentUrl,
-              unixDomainSocket,
-              namedPipe,
-              TimeUnit.SECONDS.toMillis(config.getAgentTimeout()));
+              agentUrl, unixDomainSocket, namedPipe, getHttpClientTimeout(config));
+    }
+  }
+
+  private static long getHttpClientTimeout(Config config) {
+    if (!config.isCiVisibilityEnabled() || !config.isCiVisibilityAgentlessEnabled()) {
+      return TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
+    } else {
+      return config.getCiVisibilityBackendApiTimeoutMillis();
     }
   }
 
diff --git a/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java b/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java
index 0455e2ec3ad..e4dbe099ca2 100644
--- a/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java
+++ b/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java
@@ -115,7 +115,6 @@ private void doConnect() {
         // when using UDS, set "entity-id" to "none" to avoid having the DogStatsD
         // server add origin tags (see https://github.com/DataDog/jmxfetch/pull/264)
         if (this.port == 0) {
-          clientBuilder.constantTags("dd.internal.card:none");
           clientBuilder.entityID("none");
         } else {
           clientBuilder.entityID(null);
diff --git a/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy b/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy
index af9b865d1b4..70b5519d355 100644
--- a/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy
+++ b/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy
@@ -15,7 +15,6 @@ import spock.lang.Shared
 
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.util.concurrent.CountDownLatch
 
 import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT
 import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V6_METRICS_ENDPOINT
@@ -38,6 +37,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
   static final String INFO_WITHOUT_DATA_STREAMS_RESPONSE = loadJsonFile("agent-info-without-data-streams.json")
   static final String INFO_WITHOUT_DATA_STREAMS_STATE = Strings.sha256(INFO_WITHOUT_DATA_STREAMS_RESPONSE)
   static final String INFO_WITH_LONG_RUNNING_SPANS = loadJsonFile("agent-info-with-long-running-spans.json")
+  static final String INFO_WITH_TELEMETRY_PROXY_RESPONSE = loadJsonFile("agent-info-with-telemetry-proxy.json")
   static final String PROBE_STATE = "probestate"
 
   def "test parse /info response"() {
@@ -62,6 +62,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.supportsEvpProxy()
     features.getVersion() == "0.99.0"
     !features.supportsLongRunning()
+    !features.supportsTelemetryProxy()
     0 * _
   }
 
@@ -89,6 +90,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.supportsEvpProxy()
     features.getVersion() == "0.99.0"
     !features.supportsLongRunning()
+    !features.supportsTelemetryProxy()
     0 * _
   }
 
@@ -384,17 +386,22 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     // but we don't permit dropping anyway
     !(features as DroppingPolicy).active()
     features.state() == INFO_WITHOUT_METRICS_STATE
+    !features.supportsTelemetryProxy()
     0 * _
   }
 
-  def countingNotFound(Request request, CountDownLatch latch) {
-    latch.countDown()
-    return notFound(request)
-  }
+  def "test parse /info response with telemetry proxy"() {
+    setup:
+    OkHttpClient client = Mock(OkHttpClient)
+    DDAgentFeaturesDiscovery features = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, true, true)
 
-  def countingInfoResponse(Request request, String json, CountDownLatch latch) {
-    latch.countDown()
-    return infoResponse(request, json)
+    when: "/info available"
+    features.discover()
+
+    then:
+    1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_WITH_TELEMETRY_PROXY_RESPONSE) }
+    features.supportsTelemetryProxy()
+    0 * _
   }
 
   def infoResponse(Request request, String json) {
diff --git a/communication/src/test/resources/agent-features/agent-info-with-telemetry-proxy.json b/communication/src/test/resources/agent-features/agent-info-with-telemetry-proxy.json
new file mode 100644
index 00000000000..55e493e8316
--- /dev/null
+++ b/communication/src/test/resources/agent-features/agent-info-with-telemetry-proxy.json
@@ -0,0 +1,62 @@
+{
+  "version": "0.99.0",
+  "git_commit": "fab047e10",
+  "build_date": "2020-12-04 15:57:06.74187 +0200 EET m=+0.029001792",
+  "endpoints": [
+    "/v0.3/traces",
+    "/v0.3/services",
+    "/v0.4/traces",
+    "/v0.4/services",
+    "/v0.5/traces",
+    "/v0.6/stats",
+    "/profiling/v1/input",
+    "/telemetry/proxy/",
+    "/v0.1/pipeline_stats",
+    "/evp_proxy/v1/",
+    "/evp_proxy/v2/",
+    "/debugger/v1/input",
+    "/v0.7/config"
+  ],
+  "feature_flags": [
+    "feature_flag"
+  ],
+  "config": {
+    "default_env": "prod",
+    "bucket_interval": 1000000000,
+    "extra_aggregators": [
+      "agg:val"
+    ],
+    "extra_sample_rate": 2.4,
+    "target_tps": 11,
+    "max_eps": 12,
+    "receiver_port": 8111,
+    "receiver_socket": "/sock/path",
+    "connection_limit": 12,
+    "receiver_timeout": 100,
+    "max_request_bytes": 123,
+    "statsd_port": 123,
+    "max_memory": 1000000,
+    "max_cpu": 12345,
+    "analyzed_rate_by_service_legacy": {
+      "X": 1.2
+    },
+    "analyzed_spans_by_service": {
+      "X": {
+        "Y": 2.4
+      }
+    },
+    "obfuscation": {
+      "elastic_search": true,
+      "mongo": true,
+      "sql_exec_plan": true,
+      "sql_exec_plan_normalize": true,
+      "http": {
+        "remove_query_string": true,
+        "remove_path_digits": true
+      },
+      "remove_stack_traces": false,
+      "redis": true,
+      "memcached": false
+    }
+  }
+}
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
index 90f1336a04c..9f27142f049 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -150,7 +150,13 @@ public static void start(final Instrumentation inst, final URL agentJarURL, Stri
     createAgentClassloader(agentJarURL);
 
     if (Platform.isNativeImageBuilder()) {
+      // these default services are not used during native-image builds
+      jmxFetchEnabled = false;
+      remoteConfigEnabled = false;
+      telemetryEnabled = false;
+      // apply trace instrumentation, but skip starting other services
       startDatadogAgent(inst);
+      StaticEventLogger.end("Agent.start");
       return;
     }
 
@@ -847,15 +853,29 @@ public void withTracer(TracerAPI tracer) {
    * on JFR.
    */
   private static ProfilingContextIntegration createProfilingContextIntegration() {
-    if (Config.get().isProfilingEnabled() && !Platform.isWindows()) {
-      try {
-        return (ProfilingContextIntegration)
-            AGENT_CLASSLOADER
-                .loadClass("com.datadog.profiling.ddprof.DatadogProfilingIntegration")
-                .getDeclaredConstructor()
-                .newInstance();
-      } catch (Throwable t) {
-        log.debug("Profiling context labeling not available. {}", t.getMessage());
+    if (Config.get().isProfilingEnabled()) {
+      if (Config.get().isDatadogProfilerEnabled() && !Platform.isWindows()) {
+        try {
+          return (ProfilingContextIntegration)
+              AGENT_CLASSLOADER
+                  .loadClass("com.datadog.profiling.ddprof.DatadogProfilingIntegration")
+                  .getDeclaredConstructor()
+                  .newInstance();
+        } catch (Throwable t) {
+          log.debug("ddprof-based profiling context labeling not available. {}", t.getMessage());
+        }
+      }
+      if (Config.get().isProfilingTimelineEventsEnabled()) {
+        // important: note that this will not initialise JFR until onStart is called
+        try {
+          return (ProfilingContextIntegration)
+              AGENT_CLASSLOADER
+                  .loadClass("com.datadog.profiling.controller.openjdk.JFREventContextIntegration")
+                  .getDeclaredConstructor()
+                  .newInstance();
+        } catch (Throwable t) {
+          log.debug("JFR event-based profiling context labeling not available. {}", t.getMessage());
+        }
       }
     }
     return ProfilingContextIntegration.NoOp.INSTANCE;
@@ -916,6 +936,7 @@ public void withTracer(TracerAPI tracer) {
                                 .getDeclaredConstructor()
                                 .newInstance());
                   }
+                  tracer.getProfilingContext().onStart();
                 } catch (Throwable e) {
                   if (e instanceof InvocationTargetException) {
                     e = e.getCause();
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecorator.java
index 26f074a1548..08a04402e26 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecorator.java
@@ -6,12 +6,35 @@
 import datadog.trace.api.DDTags;
 import datadog.trace.api.UserEventTrackingMode;
 import datadog.trace.api.internal.TraceSegment;
+import datadog.trace.bootstrap.ActiveSubsystems;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import java.util.Map;
 import javax.annotation.Nonnull;
 
 public class AppSecUserEventDecorator {
 
+  public boolean isEnabled() {
+    if (!ActiveSubsystems.APPSEC_ACTIVE) {
+      return false;
+    }
+    UserEventTrackingMode mode = Config.get().getAppSecUserEventsTrackingMode();
+    if (mode == DISABLED) {
+      return false;
+    }
+    return true;
+  }
+
+  public void onUserNotFound() {
+    if (!isEnabled()) {
+      return;
+    }
+    TraceSegment segment = getSegment();
+    if (segment == null) {
+      return;
+    }
+    segment.setTagTop("appsec.events.users.login.failure.usr.exists", false);
+  }
+
   public void onLoginSuccess(String userId, Map<String, String> metadata) {
     TraceSegment segment = getSegment();
     if (segment == null) {
@@ -24,7 +47,7 @@ public void onLoginSuccess(String userId, Map<String, String> metadata) {
     onEvent(segment, "users.login.success", metadata);
   }
 
-  public void onLoginFailure(String userId, Map<String, String> metadata, boolean userExists) {
+  public void onLoginFailure(String userId, Map<String, String> metadata) {
     TraceSegment segment = getSegment();
     if (segment == null) {
       return;
@@ -33,7 +56,7 @@ public void onLoginFailure(String userId, Map<String, String> metadata, boolean
     if (userId != null) {
       segment.setTagTop("appsec.events.users.login.failure.usr.id", userId);
     }
-    segment.setTagTop("appsec.events.users.login.failure.usr.exists", userExists);
+
     onEvent(segment, "users.login.failure", metadata);
   }
 
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
index 777dfcacb65..334b2d665ba 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
@@ -143,7 +143,7 @@ public AgentSpan startSpan(
     }
     AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
     if (null != carrier && null != getter) {
-      tracer().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0);
+      tracer().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
     }
     return span;
   }
@@ -250,7 +250,7 @@ public AgentSpan onRequest(
     }
 
     String inferredAddressStr = null;
-    if (clientIpResolverEnabled) {
+    if (clientIpResolverEnabled && context != null) {
       InetAddress inferredAddress = ClientIpAddressResolver.resolve(context, span);
       // the peer address should be used if:
       // 1. the headers yield nothing, regardless of whether it is public or not
@@ -269,6 +269,17 @@ public AgentSpan onRequest(
         inferredAddressStr = inferredAddress.getHostAddress();
         span.setTag(Tags.HTTP_CLIENT_IP, inferredAddressStr);
       }
+    } else if (clientIpResolverEnabled && span.getLocalRootSpan() != span) {
+      // in this case context == null
+      // If there is no context we can't do anything but use the peer addr.
+      // Additionally, context == null arises on subspans for which the resolution
+      // likely already happened on the top span, so we don't need to do the resolution
+      // again. Instead, copy from the top span, should it exist
+      AgentSpan localRootSpan = span.getLocalRootSpan();
+      Object clientIp = localRootSpan.getTag(Tags.HTTP_CLIENT_IP);
+      if (clientIp != null) {
+        span.setTag(Tags.HTTP_CLIENT_IP, clientIp);
+      }
     }
 
     if (peerIp != null) {
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
index 5fdbe0d6053..2bfd2de0f8d 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
@@ -6,6 +6,7 @@ public class DBInfo {
   public static DBInfo DEFAULT = new Builder().type("database").build();
   private final String type;
   private final String subtype;
+  private final boolean fullPropagationSupport;
   private final String url;
   private final String user;
   private final String instance;
@@ -16,6 +17,7 @@ public class DBInfo {
   DBInfo(
       String type,
       String subtype,
+      boolean fullPropagationSupport,
       String url,
       String user,
       String instance,
@@ -24,6 +26,7 @@ public class DBInfo {
       Integer port) {
     this.type = type;
     this.subtype = subtype;
+    this.fullPropagationSupport = fullPropagationSupport;
     this.url = url;
     this.user = user;
     this.instance = instance;
@@ -35,6 +38,9 @@ public class DBInfo {
   public static class Builder {
     private String type;
     private String subtype;
+    // most DBs do support full propagation (inserting trace ID in query comments), so we default to
+    // true. See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm
+    private boolean fullPropagationSupport = true;
     private String url;
     private String user;
     private String instance;
@@ -47,6 +53,7 @@ public static class Builder {
     Builder(
         String type,
         String subtype,
+        boolean fullPropagationSupport,
         String url,
         String user,
         String instance,
@@ -55,6 +62,7 @@ public static class Builder {
         Integer port) {
       this.type = type;
       this.subtype = subtype;
+      this.fullPropagationSupport = fullPropagationSupport;
       this.url = url;
       this.user = user;
       this.instance = instance;
@@ -65,6 +73,9 @@ public static class Builder {
 
     public Builder type(String type) {
       this.type = type;
+      // Those DBs use the full text of the query including the comments as a cache key,
+      // so we disable full propagation support for them to avoid destroying the cache.
+      if (type.equals("oracle") || type.equals("sqlserver")) this.fullPropagationSupport = false;
       return this;
     }
 
@@ -73,6 +84,11 @@ public Builder subtype(String subtype) {
       return this;
     }
 
+    public Builder fullPropagationSupport(boolean fullPropagationSupport) {
+      this.fullPropagationSupport = fullPropagationSupport;
+      return this;
+    }
+
     public Builder url(String url) {
       this.url = url;
       return this;
@@ -104,7 +120,7 @@ public Builder port(Integer port) {
     }
 
     public DBInfo build() {
-      return new DBInfo(type, subtype, url, user, instance, db, host, port);
+      return new DBInfo(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
     }
   }
 
@@ -116,6 +132,10 @@ public String getSubtype() {
     return subtype;
   }
 
+  public boolean getFullPropagationSupport() {
+    return fullPropagationSupport;
+  }
+
   public String getUrl() {
     return url;
   }
@@ -141,7 +161,7 @@ public Integer getPort() {
   }
 
   public Builder toBuilder() {
-    return new Builder(type, subtype, url, user, instance, db, host, port);
+    return new Builder(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
   }
 
   @Override
@@ -151,6 +171,7 @@ public boolean equals(Object o) {
     DBInfo dbInfo = (DBInfo) o;
     return Objects.equals(type, dbInfo.type)
         && Objects.equals(subtype, dbInfo.subtype)
+        && fullPropagationSupport == dbInfo.fullPropagationSupport
         && Objects.equals(url, dbInfo.url)
         && Objects.equals(user, dbInfo.user)
         && Objects.equals(instance, dbInfo.instance)
@@ -161,6 +182,6 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(type, subtype, url, user, instance, db, host, port);
+    return Objects.hash(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
   }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
index c27b73e85bf..846d8e381c3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
@@ -1,10 +1,15 @@
 package datadog.trace.bootstrap.instrumentation.jfr;
 
+import datadog.trace.api.Platform;
+
 public final class InstrumentationBasedProfiling {
   private static volatile boolean isJFRReady;
 
   public static void enableInstrumentationBasedProfiling() {
-    isJFRReady = true;
+    // ignore the enablement when running in native image builder
+    if (!Platform.isNativeImageBuilder()) {
+      isJFRReady = true;
+    }
   }
 
   public static boolean isJFRReady() {
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
index f48afc17856..f6489a29c2f 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
@@ -13,10 +13,14 @@ public class WindowSampler<E extends Event> {
 
   protected WindowSampler(
       Duration windowDuration, int samplesPerWindow, int lookback, Class<E> eventType) {
-    sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, 16);
+    sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, 16, false);
     sampleType = EventType.getEventType(eventType);
   }
 
+  public void start() {
+    sampler.start();
+  }
+
   public boolean sample() {
     return sampleType.isEnabled() && sampler.sample();
   }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
index 0cabe247278..d147017aedd 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
@@ -42,13 +42,17 @@ private ExceptionProfiling(final Config config) {
     this.recordExceptionMessage = recordExceptionMessage;
   }
 
-  public ExceptionSampleEvent process(final Throwable t, final int stackDepth) {
+  public void start() {
+    sampler.start();
+  }
+
+  public ExceptionSampleEvent process(final Throwable t) {
     // always record the exception in histogram
     final boolean firstHit = histogram.record(t);
 
     final boolean sampled = sampler.sample();
     if (firstHit || sampled) {
-      return new ExceptionSampleEvent(t, stackDepth, sampled, firstHit);
+      return new ExceptionSampleEvent(t, sampled, firstHit);
     }
     return null;
   }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
index 57de3176207..7dfbeaedb01 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
@@ -18,10 +18,6 @@ public class ExceptionSampleEvent extends Event implements ContextualEvent {
   @Label("Exception message")
   private final String message;
 
-  /** JFR may truncate the stack trace - so store original length as well. */
-  @Label("Exception stackdepth")
-  private final int stackDepth;
-
   @Label("Sampled")
   private final boolean sampled;
 
@@ -34,8 +30,7 @@ public class ExceptionSampleEvent extends Event implements ContextualEvent {
   @Label("Span Id")
   private long spanId;
 
-  public ExceptionSampleEvent(
-      Throwable e, final int stackDepth, boolean sampled, boolean firstOccurrence) {
+  public ExceptionSampleEvent(Throwable e, boolean sampled, boolean firstOccurrence) {
     /*
      * TODO: we should have some tests for this class.
      * Unfortunately at the moment this is not easily possible because we cannot build tests with groovy that
@@ -44,7 +39,6 @@ public ExceptionSampleEvent(
      */
     this.type = e.getClass().getName();
     this.message = getMessage(e);
-    this.stackDepth = stackDepth;
     this.sampled = sampled;
     this.firstOccurrence = firstOccurrence;
     captureContext();
diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecoratorTest.groovy
index da0f5887491..a97f9008b48 100644
--- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecoratorTest.groovy
+++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/AppSecUserEventDecoratorTest.groovy
@@ -1,6 +1,7 @@
 package datadog.trace.bootstrap.instrumentation.decorator
 
 import datadog.trace.api.internal.TraceSegment
+import datadog.trace.bootstrap.ActiveSubsystems
 import datadog.trace.test.util.DDSpecification
 
 import static datadog.trace.api.config.AppSecConfig.APPSEC_AUTOMATED_USER_EVENTS_TRACKING
@@ -9,6 +10,17 @@ class AppSecUserEventDecoratorTest extends DDSpecification {
 
   def traceSegment = Mock(TraceSegment)
 
+  Boolean appsecActiveOriginal = null
+
+  def setup() {
+    appsecActiveOriginal = ActiveSubsystems.APPSEC_ACTIVE
+    ActiveSubsystems.APPSEC_ACTIVE = true
+  }
+
+  def cleanup() {
+    ActiveSubsystems.APPSEC_ACTIVE = appsecActiveOriginal
+  }
+
   def "test onSignup [#mode]"() {
     setup:
     injectSysConfig(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, mode)
@@ -59,23 +71,62 @@ class AppSecUserEventDecoratorTest extends DDSpecification {
     def decorator = newDecorator()
 
     when:
-    decorator.onLoginFailure('user', ['key1': 'value1', 'key2': 'value2'], (boolean)userExists)
+    decorator.onLoginFailure('user', ['key1': 'value1', 'key2': 'value2'])
 
     then:
     1 * traceSegment.setTagTop('_dd.appsec.events.users.login.failure.auto.mode', modeTag)
     1 * traceSegment.setTagTop('appsec.events.users.login.failure.track', true, true)
     1 * traceSegment.setTagTop('manual.keep', true)
     1 * traceSegment.setTagTop('appsec.events.users.login.failure.usr.id', 'user')
-    1 * traceSegment.setTagTop("appsec.events.users.login.failure.usr.exists", userExists)
     1 * traceSegment.setTagTop('appsec.events.users.login.failure', ['key1':'value1', 'key2':'value2'])
     0 * _
 
     where:
-    mode        | modeTag       | userExists    | description
-    'safe'      | 'SAFE'        | true          | 'with existing user'
-    'safe'      | 'SAFE'        | false         | 'user doesn\'t exist'
-    'extended'  | 'EXTENDED'    | true          | 'with existing user'
-    'extended'  | 'EXTENDED'    | false         | 'user doesn\'t exist'
+    mode       | modeTag    | description
+    'safe'     | 'SAFE'     | 'with existing user'
+    'safe'     | 'SAFE'     | 'user doesn\'t exist'
+    'extended' | 'EXTENDED' | 'with existing user'
+    'extended' | 'EXTENDED' | 'user doesn\'t exist'
+  }
+
+  def "test onUserNotFound [#mode]"() {
+    setup:
+    injectSysConfig(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, mode)
+    def decorator = newDecorator()
+
+    when:
+    decorator.onUserNotFound()
+
+    then:
+    1 * traceSegment.setTagTop("appsec.events.users.login.failure.usr.exists", false)
+    0 * _
+
+    where:
+    mode       | modeTag
+    'safe'     | 'SAFE'
+    'extended' | 'EXTENDED'
+  }
+
+  def "test isEnabled (appsec = #appsec, mode = #mode)"() {
+    setup:
+    ActiveSubsystems.APPSEC_ACTIVE = appsec
+    injectSysConfig(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, mode)
+    def decorator = newDecorator()
+
+    when:
+    def enabled = decorator.isEnabled()
+
+    then:
+    enabled == result
+
+    where:
+    appsec | mode       | result
+    false  | "disabled" | false
+    false  | "safe"     | false
+    false  | "extended" | false
+    true   | "disabled" | false
+    true   | "safe"     | true
+    true   | "extended" | true
   }
 
   def newDecorator() {
diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy
index 28379f84cb1..fcbba105a5a 100644
--- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy
+++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy
@@ -23,6 +23,7 @@ import datadog.trace.core.datastreams.DataStreamsMonitoring
 import java.util.function.Function
 import java.util.function.Supplier
 
+import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_QUERY_STRING
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_RESOURCE
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_TAG_QUERY_STRING
@@ -63,6 +64,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
     } else {
       1 * this.span.getRequestContext()
     }
+    _ * this.span.getLocalRootSpan() >> this.span
     0 * _
 
     where:
@@ -102,6 +104,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
       1 * this.span.setResourceName({ it as String == expectedPath })
     }
     1 * this.span.setTag(Tags.HTTP_METHOD, null)
+    _ * this.span.getLocalRootSpan() >> this.span
     0 * _
 
     where:
@@ -141,18 +144,34 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
     2 * this.span.getRequestContext()
     1 * this.span.setResourceName({ it as String == expectedResource }, ResourceNamePriorities.HTTP_PATH_NORMALIZER)
     1 * this.span.setTag(Tags.HTTP_METHOD, null)
+    _ * this.span.getLocalRootSpan() >> this.span
     0 * _
 
     where:
     rawQuery | rawResource | url                             | expectedUrl           | expectedQuery | expectedResource
-    false    | false       | "http://host/p%20ath?query%3F?" | "http://host/p ath"   | "query??"     | "/path"
+    false    | false       | "http://host/p%20ath?query%3F?" | "http://host/p ath"   | "query??"     | "/p ath"
     false    | true        | "http://host/p%20ath?query%3F?" | "http://host/p%20ath" | "query??"     | "/p%20ath"
-    true     | false       | "http://host/p%20ath?query%3F?" | "http://host/p ath"   | "query%3F?"   | "/path"
+    true     | false       | "http://host/p%20ath?query%3F?" | "http://host/p ath"   | "query%3F?"   | "/p ath"
     true     | true        | "http://host/p%20ath?query%3F?" | "http://host/p%20ath" | "query%3F?"   | "/p%20ath"
 
     req = [url: url == null ? null : new URI(url)]
   }
 
+  void 'url handling without space preservation'() {
+    setup:
+    injectSysConfig(HTTP_SERVER_RAW_RESOURCE, 'false')
+    injectSysConfig(HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES, 'false')
+    def decorator = newDecorator()
+
+    when:
+    decorator.onRequest(this.span, null, [url: new URI('http://host/p%20ath')], null)
+
+    then:
+    1 * this.span.setResourceName({ it as String == '/path' }, ResourceNamePriorities.HTTP_PATH_NORMALIZER)
+    _ * this.span.getLocalRootSpan() >> this.span
+    _ * _
+  }
+
   def "test onConnection"() {
     setup:
     def ctx = Mock(AgentSpan.Context.Extracted)
@@ -269,6 +288,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
     when:
     decorator.onRequest(this.span, [peerIp: '4.4.4.4'], null, ctx)
 
+    _ * this.span.getLocalRootSpan() >> this.span
     then:
     2 * ctx.getXForwardedFor() >> '2.3.4.5'
     1 * this.span.setTag(Tags.HTTP_CLIENT_IP, '2.3.4.5')
diff --git a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index fe4673541e3..22bd6116cbd 100644
--- a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -11,8 +11,8 @@
 import datadog.trace.agent.tooling.usm.UsmExtractorImpl;
 import datadog.trace.agent.tooling.usm.UsmMessageFactoryImpl;
 import datadog.trace.api.InstrumenterConfig;
-import datadog.trace.api.IntegrationsCollector;
 import datadog.trace.api.ProductActivation;
+import datadog.trace.api.telemetry.IntegrationsCollector;
 import datadog.trace.bootstrap.FieldBackedContextAccessor;
 import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
 import datadog.trace.util.AgentTaskScheduler;
diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle
index 9917f17cbdb..a22f1a052f2 100644
--- a/dd-java-agent/agent-ci-visibility/build.gradle
+++ b/dd-java-agent/agent-ci-visibility/build.gradle
@@ -27,11 +27,12 @@ excludedClassesCoverage += [
   "datadog.trace.civisibility.ci.CIInfo",
   "datadog.trace.civisibility.ci.CIInfo.Builder",
   "datadog.trace.civisibility.communication.*",
-  "datadog.trace.civisibility.config.JvmInfoFactory",
+  "datadog.trace.civisibility.config.CachingJvmInfoFactory",
+  "datadog.trace.civisibility.config.JvmInfoFactoryImpl",
+  "datadog.trace.civisibility.config.JvmInfoFactoryImpl.JvmVersionOutputParser",
   "datadog.trace.civisibility.config.ConfigurationApi",
   "datadog.trace.civisibility.config.ModuleExecutionSettingsFactory",
   "datadog.trace.civisibility.config.JvmInfo",
-  "datadog.trace.civisibility.config.JvmInfoFactory.JvmVersionOutputParser",
   "datadog.trace.civisibility.config.CachingModuleExecutionSettingsFactory",
   "datadog.trace.civisibility.config.CachingModuleExecutionSettingsFactory.Key",
   "datadog.trace.civisibility.config.CiVisibilitySettings",
@@ -67,12 +68,16 @@ excludedClassesCoverage += [
   "datadog.trace.civisibility.ipc.SignalClient.Factory",
   "datadog.trace.civisibility.ipc.SkippableTestsResponse",
   "datadog.trace.civisibility.ipc.TestFramework",
-  "datadog.trace.civisibility.source.MethodLinesResolver.MethodLines",
   "datadog.trace.civisibility.source.index.PackageTree.Node",
   "datadog.trace.civisibility.source.index.RepoIndex",
   "datadog.trace.civisibility.source.index.RepoIndexBuilder.RepoIndexingFileVisitor",
   "datadog.trace.civisibility.source.index.RepoIndexFetcher",
   "datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver",
+  "datadog.trace.civisibility.source.BestEffortSourcePathResolver",
+  "datadog.trace.civisibility.source.MethodLinesResolver.MethodLines",
+  "datadog.trace.civisibility.source.NoOpSourcePathResolver",
+  "datadog.trace.civisibility.source.SourcePathResolver.1",
+  "datadog.trace.civisibility.source.Utils",
   "datadog.trace.civisibility.utils.ShellCommandExecutor",
   "datadog.trace.civisibility.utils.ShellCommandExecutor.OutputParser",
   "datadog.trace.civisibility.utils.SpanUtils"
@@ -95,6 +100,12 @@ dependencies {
 
   testFixturesApi project(':dd-java-agent:testing')
   testFixturesApi project(':utils:test-utils')
+
+  testFixturesApi group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
+  testFixturesApi group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
+  testFixturesApi group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
+  testFixturesApi group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
+  testFixturesApi group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
 }
 
 shadowJar {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
index 7f0c82c9304..dfcc42e0006 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
@@ -1,6 +1,7 @@
 package datadog.trace.civisibility;
 
 import datadog.communication.ddagent.SharedCommunicationObjects;
+import datadog.communication.ddagent.TracerVersion;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.CIVisibility;
 import datadog.trace.api.civisibility.InstrumentationBridge;
@@ -17,10 +18,12 @@
 import datadog.trace.civisibility.codeowners.CodeownersProvider;
 import datadog.trace.civisibility.communication.BackendApi;
 import datadog.trace.civisibility.communication.BackendApiFactory;
+import datadog.trace.civisibility.config.CachingJvmInfoFactory;
 import datadog.trace.civisibility.config.CachingModuleExecutionSettingsFactory;
 import datadog.trace.civisibility.config.ConfigurationApi;
 import datadog.trace.civisibility.config.ConfigurationApiImpl;
 import datadog.trace.civisibility.config.JvmInfoFactory;
+import datadog.trace.civisibility.config.JvmInfoFactoryImpl;
 import datadog.trace.civisibility.config.ModuleExecutionSettingsFactory;
 import datadog.trace.civisibility.config.ModuleExecutionSettingsFactoryImpl;
 import datadog.trace.civisibility.coverage.CoverageProbeStoreFactory;
@@ -46,13 +49,20 @@
 import datadog.trace.civisibility.source.CompilerAidedMethodLinesResolver;
 import datadog.trace.civisibility.source.CompilerAidedSourcePathResolver;
 import datadog.trace.civisibility.source.MethodLinesResolver;
+import datadog.trace.civisibility.source.NoOpSourcePathResolver;
 import datadog.trace.civisibility.source.SourcePathResolver;
+import datadog.trace.civisibility.source.index.ConventionBasedResourceResolver;
+import datadog.trace.civisibility.source.index.PackageResolver;
+import datadog.trace.civisibility.source.index.PackageResolverImpl;
 import datadog.trace.civisibility.source.index.RepoIndexBuilder;
 import datadog.trace.civisibility.source.index.RepoIndexFetcher;
 import datadog.trace.civisibility.source.index.RepoIndexProvider;
 import datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver;
+import datadog.trace.civisibility.source.index.ResourceResolver;
 import datadog.trace.util.Strings;
+import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
 import java.net.InetSocketAddress;
+import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -74,6 +84,19 @@ public static void start(SharedCommunicationObjects sco) {
       return;
     }
 
+    String injectedTracerVersion = config.getCiVisibilityInjectedTracerVersion();
+    if (injectedTracerVersion != null
+        && !injectedTracerVersion.equals(TracerVersion.TRACER_VERSION)) {
+      throw new FatalAgentMisconfigurationError(
+          "Running JVM with tracer version "
+              + TracerVersion.TRACER_VERSION
+              + " however parent process attempted to inject "
+              + injectedTracerVersion
+              + ". Do not inject the tracer into the forked JVMs manually, or ensure the manually injected version is the same as the one injected automatically");
+    }
+
+    sco.createRemaining(config);
+
     GitClient.Factory gitClientFactory = buildGitClientFactory(config);
     CoverageProbeStoreFactory coverageProbeStoreFactory = buildTestProbesFactory(config);
 
@@ -117,10 +140,11 @@ private static BuildEventsHandler.Factory buildEventsHandlerFactory(
     DDBuildSystemSession.Factory sessionFactory =
         buildSystemSessionFactory(
             config, sco, gitInfoProvider, coverageProbeStoreFactory, gitClientFactory);
+    JvmInfoFactory jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
     return new BuildEventsHandler.Factory() {
       @Override
       public <U> BuildEventsHandler<U> create() {
-        return new BuildEventsHandlerImpl<>(sessionFactory, new JvmInfoFactory());
+        return new BuildEventsHandlerImpl<>(sessionFactory, jvmInfoFactory);
       }
     };
   }
@@ -132,8 +156,6 @@ private static DDBuildSystemSession.Factory buildSystemSessionFactory(
       CoverageProbeStoreFactory coverageProbeStoreFactory,
       GitClient.Factory gitClientFactory) {
     BackendApiFactory backendApiFactory = new BackendApiFactory(config, sco);
-    BackendApi backendApi = backendApiFactory.createBackendApi();
-
     return (String projectName,
         Path projectRoot,
         String startCommand,
@@ -150,9 +172,15 @@ private static DDBuildSystemSession.Factory buildSystemSessionFactory(
       CIInfo ciInfo = ciProviderInfo.buildCIInfo();
       String repoRoot = ciInfo.getCiWorkspace();
 
-      RepoIndexProvider indexProvider =
-          new RepoIndexBuilder(projectRoot.toString(), FileSystems.getDefault());
-      SourcePathResolver sourcePathResolver = getSourcePathResolver(repoRoot, indexProvider);
+      FileSystem fileSystem = FileSystems.getDefault();
+      PackageResolver packageResolver = new PackageResolverImpl(fileSystem);
+      ResourceResolver resourceResolver =
+          new ConventionBasedResourceResolver(
+              fileSystem, config.getCiVisibilityResourceFolderNames());
+      RepoIndexBuilder indexBuilder =
+          new RepoIndexBuilder(repoRoot, packageResolver, resourceResolver, fileSystem);
+
+      SourcePathResolver sourcePathResolver = getSourcePathResolver(repoRoot, indexBuilder);
       Codeowners codeowners = getCodeowners(repoRoot);
 
       MethodLinesResolver methodLinesResolver =
@@ -163,11 +191,12 @@ private static DDBuildSystemSession.Factory buildSystemSessionFactory(
       TestDecorator testDecorator = new TestDecoratorImpl(buildSystemName, ciTags);
       TestModuleRegistry testModuleRegistry = new TestModuleRegistry();
 
+      BackendApi backendApi = backendApiFactory.createBackendApi();
       GitDataUploader gitDataUploader =
           buildGitDataUploader(config, gitInfoProvider, gitClientFactory, backendApi, repoRoot);
       ModuleExecutionSettingsFactory moduleExecutionSettingsFactory =
           buildModuleExecutionSettingsFactory(
-              config, backendApi, gitDataUploader, indexProvider, repoRoot);
+              config, backendApi, gitDataUploader, indexBuilder, repoRoot);
 
       String signalServerHost = config.getCiVisibilitySignalServerHost();
       int signalServerPort = config.getCiVisibilitySignalServerPort();
@@ -176,7 +205,6 @@ private static DDBuildSystemSession.Factory buildSystemSessionFactory(
       // only start Git data upload in parent process
       gitDataUploader.startOrObserveGitDataUpload();
 
-      RepoIndexBuilder indexBuilder = new RepoIndexBuilder(repoRoot, FileSystems.getDefault());
       return new DDBuildSystemSessionImpl(
           projectName,
           repoRoot,
@@ -210,7 +238,9 @@ private static TestEventsHandler.Factory testEventsHandlerFactory(
       CIInfo ciInfo = ciProviderInfo.buildCIInfo();
       String repoRoot = ciInfo.getCiWorkspace();
       String moduleName =
-          (repoRoot != null) ? Paths.get(repoRoot).relativize(path).toString() : path.toString();
+          repoRoot != null && path.startsWith(repoRoot)
+              ? Paths.get(repoRoot).relativize(path).toString()
+              : config.getServiceName();
 
       DDTestFrameworkSession testSession =
           sessionFactory.startSession(moduleName, path, component, null);
@@ -226,8 +256,6 @@ private static DDTestFrameworkSession.Factory testFrameworkSessionFactory(
       CoverageProbeStoreFactory coverageProbeStoreFactory,
       GitClient.Factory gitClientFactory) {
     BackendApiFactory backendApiFactory = new BackendApiFactory(config, sco);
-    BackendApi backendApi = backendApiFactory.createBackendApi();
-
     return (String projectName, Path projectRoot, String component, Long startTime) -> {
       CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(config);
       CIProviderInfo ciProviderInfo = ciProviderInfoFactory.createCIProviderInfo(projectRoot);
@@ -273,9 +301,17 @@ private static DDTestFrameworkSession.Factory testFrameworkSessionFactory(
       // either we are in the build system
       // or we are in the tests JVM and the build system is not instrumented
       if (parentProcessSessionId == null || parentProcessModuleId == null) {
+        FileSystem fileSystem = FileSystems.getDefault();
+        PackageResolver packageResolver = new PackageResolverImpl(fileSystem);
+        ResourceResolver resourceResolver =
+            new ConventionBasedResourceResolver(
+                fileSystem, config.getCiVisibilityResourceFolderNames());
+        RepoIndexProvider indexProvider =
+            new RepoIndexBuilder(repoRoot, packageResolver, resourceResolver, fileSystem);
+
+        BackendApi backendApi = backendApiFactory.createBackendApi();
         GitDataUploader gitDataUploader =
             buildGitDataUploader(config, gitInfoProvider, gitClientFactory, backendApi, repoRoot);
-        RepoIndexProvider indexProvider = new RepoIndexBuilder(repoRoot, FileSystems.getDefault());
         ModuleExecutionSettingsFactory moduleExecutionSettingsFactory =
             buildModuleExecutionSettingsFactory(
                 config, backendApi, gitDataUploader, indexProvider, repoRoot);
@@ -346,7 +382,14 @@ private static CIVisibility.SessionFactory apiSessionFactory(
 
       Map<String, String> ciTags = new CITagsProvider().getCiTags(ciInfo);
       TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags);
-      RepoIndexProvider indexProvider = new RepoIndexBuilder(repoRoot, FileSystems.getDefault());
+
+      FileSystem fileSystem = FileSystems.getDefault();
+      PackageResolver packageResolver = new PackageResolverImpl(fileSystem);
+      ResourceResolver resourceResolver =
+          new ConventionBasedResourceResolver(
+              fileSystem, config.getCiVisibilityResourceFolderNames());
+      RepoIndexProvider indexProvider =
+          new RepoIndexBuilder(repoRoot, packageResolver, resourceResolver, fileSystem);
       SourcePathResolver sourcePathResolver = getSourcePathResolver(repoRoot, indexProvider);
 
       return new DDTestSessionImpl(
@@ -418,7 +461,7 @@ private static SourcePathResolver getSourcePathResolver(
       return new BestEffortSourcePathResolver(
           new CompilerAidedSourcePathResolver(repoRoot), indexSourcePathResolver);
     } else {
-      return clazz -> null;
+      return NoOpSourcePathResolver.INSTANCE;
     }
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDBuildSystemModuleImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDBuildSystemModuleImpl.java
index e1c2a0714a5..88e19ea7d1c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDBuildSystemModuleImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDBuildSystemModuleImpl.java
@@ -10,7 +10,6 @@
 import datadog.trace.civisibility.coverage.CoverageUtils;
 import datadog.trace.civisibility.decorator.TestDecorator;
 import datadog.trace.civisibility.ipc.ModuleExecutionResult;
-import datadog.trace.civisibility.ipc.TestFramework;
 import datadog.trace.civisibility.source.MethodLinesResolver;
 import datadog.trace.civisibility.source.SourcePathResolver;
 import datadog.trace.civisibility.source.index.RepoIndexProvider;
@@ -141,10 +140,7 @@ public void onModuleExecutionResultReceived(ModuleExecutionResult result) {
       }
     }
 
-    for (TestFramework testFramework : result.getTestFrameworks()) {
-      SpanUtils.mergeTag(span, Tags.TEST_FRAMEWORK, testFramework.getName());
-      SpanUtils.mergeTag(span, Tags.TEST_FRAMEWORK_VERSION, testFramework.getVersion());
-    }
+    SpanUtils.mergeTestFrameworks(span, result.getTestFrameworks());
   }
 
   @Override
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkModuleProxy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkModuleProxy.java
index f6cf2224685..c7ab6cd7a11 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkModuleProxy.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkModuleProxy.java
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.LongAdder;
 import javax.annotation.Nullable;
@@ -132,7 +133,7 @@ private void sendModuleExecutionResult() {
             coverageEnabled,
             itrEnabled,
             testsSkippedTotal,
-            testFrameworks,
+            new TreeSet<>(testFrameworks),
             coverageData);
 
     try (SignalClient signalClient = new SignalClient(signalServerAddress)) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkSessionImpl.java
index 237c6ea2fb3..354a1ce688b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkSessionImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/DDTestFrameworkSessionImpl.java
@@ -1,6 +1,9 @@
 package datadog.trace.civisibility;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.DDTags;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.civisibility.codeowners.Codeowners;
 import datadog.trace.civisibility.config.ModuleExecutionSettingsFactory;
 import datadog.trace.civisibility.coverage.CoverageProbeStoreFactory;
@@ -56,6 +59,18 @@ public DDTestFrameworkModuleImpl testModuleStart(String moduleName, @Nullable Lo
         methodLinesResolver,
         coverageProbeStoreFactory,
         moduleExecutionSettingsFactory,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        this::propagateModuleTags);
+  }
+
+  private void propagateModuleTags(AgentSpan moduleSpan) {
+    SpanUtils.propagateCiVisibilityTags(span, moduleSpan);
+    SpanUtils.propagateTags(
+        span,
+        moduleSpan,
+        Tags.TEST_CODE_COVERAGE_ENABLED,
+        Tags.TEST_ITR_TESTS_SKIPPING_ENABLED,
+        Tags.TEST_ITR_TESTS_SKIPPING_TYPE,
+        Tags.TEST_ITR_TESTS_SKIPPING_COUNT,
+        DDTags.CI_ITR_TESTS_SKIPPED);
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
index 1220f2b6995..e66fae7c8cf 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
@@ -1,5 +1,7 @@
 package datadog.trace.civisibility.ci;
 
+import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -87,7 +89,7 @@ public Builder ciEnvVars(String... ciEnvVarKeysArray) {
 
       ciEnvVars = new HashMap<>();
       for (String ciEnvVarKey : ciEnvVarKeysArray) {
-        final String envVarVal = System.getenv(ciEnvVarKey);
+        final String envVarVal = filterSensitiveInfo(System.getenv(ciEnvVarKey));
         if (envVarVal != null && !envVarVal.isEmpty()) {
           ciEnvVars.put(ciEnvVarKey, envVarVal);
         }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
index 2dabe00a5e4..3779ac9930d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci;
 
+import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
 import static datadog.trace.api.git.GitUtils.isTagReference;
 import static datadog.trace.api.git.GitUtils.normalizeBranch;
 import static datadog.trace.api.git.GitUtils.normalizeTag;
@@ -28,7 +29,8 @@ class GithubActionsInfo implements CIProviderInfo {
   @Override
   public GitInfo buildCIGitInfo() {
     return new GitInfo(
-        buildGitRepositoryUrl(System.getenv(GHACTIONS_URL), System.getenv(GHACTIONS_REPOSITORY)),
+        buildGitRepositoryUrl(
+            filterSensitiveInfo(System.getenv(GHACTIONS_URL)), System.getenv(GHACTIONS_REPOSITORY)),
         buildGitBranch(),
         buildGitTag(),
         new CommitInfo(System.getenv(GHACTIONS_SHA)));
@@ -38,13 +40,13 @@ public GitInfo buildCIGitInfo() {
   public CIInfo buildCIInfo() {
     final String pipelineUrl =
         buildPipelineUrl(
-            System.getenv(GHACTIONS_URL),
+            filterSensitiveInfo(System.getenv(GHACTIONS_URL)),
             System.getenv(GHACTIONS_REPOSITORY),
             System.getenv(GHACTIONS_PIPELINE_ID),
             System.getenv(GHACTIONS_PIPELINE_RETRY));
     final String jobUrl =
         buildJobUrl(
-            System.getenv(GHACTIONS_URL),
+            filterSensitiveInfo(System.getenv(GHACTIONS_URL)),
             System.getenv(GHACTIONS_REPOSITORY),
             System.getenv(GHACTIONS_SHA));
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
index 1e16adcad00..c5a1c2e4274 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
@@ -4,6 +4,8 @@
 
 import datadog.trace.api.git.GitInfo;
 import java.nio.file.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class is the strategy to use when the CI provider used to execute the tests cannot be
@@ -21,6 +23,8 @@
  */
 class UnknownCIInfo implements CIProviderInfo {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(UnknownCIInfo.class);
+
   public static final String UNKNOWN_PROVIDER_NAME = "unknown";
 
   private final String targetFolder;
@@ -42,11 +46,17 @@ public GitInfo buildCIGitInfo() {
 
   @Override
   public CIInfo buildCIInfo() {
-    final Path workspace = findParentPathBackwards(getCurrentPath(), getTargetFolder(), true);
+    Path workspace = findParentPathBackwards(getCurrentPath(), getTargetFolder(), true);
     if (workspace == null) {
       return CIInfo.NOOP;
     }
 
+    try {
+      workspace = workspace.toRealPath();
+    } catch (Exception e) {
+      LOGGER.debug("Could not get real path for workspace folder {}", workspace, e);
+    }
+
     return CIInfo.builder().ciWorkspace(workspace.toAbsolutePath().toString()).build();
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/BackendApiFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/BackendApiFactory.java
index c79fb8d65ab..934e68868ee 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/BackendApiFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/BackendApiFactory.java
@@ -23,7 +23,6 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
   }
 
   public @Nullable BackendApi createBackendApi() {
-    long timeoutMillis = config.getCiVisibilityBackendApiTimeoutMillis();
     HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
 
     if (config.isCiVisibilityAgentlessEnabled()) {
@@ -33,15 +32,20 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
         throw new FatalAgentMisconfigurationError(
             "Agentless mode is enabled and api key is not set. Please set application key");
       }
-      return new IntakeApi(site, apiKey, timeoutMillis, retryPolicyFactory);
+      long timeoutMillis = config.getCiVisibilityBackendApiTimeoutMillis();
+      String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
+      return new IntakeApi(site, apiKey, traceId, timeoutMillis, retryPolicyFactory);
     }
 
     DDAgentFeaturesDiscovery featuresDiscovery =
         sharedCommunicationObjects.featuresDiscovery(config);
+    featuresDiscovery.discoverIfOutdated();
     if (featuresDiscovery.supportsEvpProxy()) {
+      String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
       String evpProxyEndpoint = featuresDiscovery.getEvpProxyEndpoint();
       HttpUrl evpProxyUrl = sharedCommunicationObjects.agentUrl.resolve(evpProxyEndpoint);
-      return new EvpProxyApi(evpProxyUrl, timeoutMillis, retryPolicyFactory);
+      return new EvpProxyApi(
+          traceId, evpProxyUrl, retryPolicyFactory, sharedCommunicationObjects.okHttpClient);
     }
 
     log.warn(
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/EvpProxyApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/EvpProxyApi.java
index 589c0811f22..2329b86b061 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/EvpProxyApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/EvpProxyApi.java
@@ -19,17 +19,24 @@ public class EvpProxyApi implements BackendApi {
 
   private static final String API_VERSION = "v2";
   private static final String X_DATADOG_EVP_SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain";
+  private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
+  private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
   private static final String API_SUBDOMAIN = "api";
 
+  private final String traceId;
   private final HttpRetryPolicy.Factory retryPolicyFactory;
   private final HttpUrl evpProxyUrl;
   private final OkHttpClient httpClient;
 
   public EvpProxyApi(
-      HttpUrl evpProxyUrl, long timeoutMillis, HttpRetryPolicy.Factory retryPolicyFactory) {
+      String traceId,
+      HttpUrl evpProxyUrl,
+      HttpRetryPolicy.Factory retryPolicyFactory,
+      OkHttpClient httpClient) {
+    this.traceId = traceId;
     this.evpProxyUrl = evpProxyUrl.resolve(String.format("api/%s/", API_VERSION));
     this.retryPolicyFactory = retryPolicyFactory;
-    httpClient = OkHttpUtils.buildHttpClient(evpProxyUrl, timeoutMillis);
+    this.httpClient = httpClient;
   }
 
   @Override
@@ -41,6 +48,8 @@ public <T> T post(
         new Request.Builder()
             .url(url)
             .addHeader(X_DATADOG_EVP_SUBDOMAIN_HEADER, API_SUBDOMAIN)
+            .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
+            .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId)
             .post(requestBody)
             .build();
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/IntakeApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/IntakeApi.java
index d8617376b9c..55728a277d2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/IntakeApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/IntakeApi.java
@@ -20,15 +20,23 @@ public class IntakeApi implements BackendApi {
 
   private static final String API_VERSION = "v2";
   private static final String DD_API_KEY_HEADER = "dd-api-key";
+  private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
+  private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
 
   private final String apiKey;
+  private final String traceId;
   private final HttpRetryPolicy.Factory retryPolicyFactory;
   private final HttpUrl hostUrl;
   private final OkHttpClient httpClient;
 
   public IntakeApi(
-      String site, String apiKey, long timeoutMillis, HttpRetryPolicy.Factory retryPolicyFactory) {
+      String site,
+      String apiKey,
+      String traceId,
+      long timeoutMillis,
+      HttpRetryPolicy.Factory retryPolicyFactory) {
     this.apiKey = apiKey;
+    this.traceId = traceId;
     this.retryPolicyFactory = retryPolicyFactory;
 
     final String ciVisibilityAgentlessUrlStr = Config.get().getCiVisibilityAgentlessUrl();
@@ -47,7 +55,12 @@ public <T> T post(
       throws IOException {
     HttpUrl url = hostUrl.resolve(uri);
     Request.Builder requestBuilder =
-        new Request.Builder().url(url).post(requestBody).addHeader(DD_API_KEY_HEADER, apiKey);
+        new Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader(DD_API_KEY_HEADER, apiKey)
+            .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
+            .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId);
 
     Request request = requestBuilder.build();
     HttpRetryPolicy retryPolicy = retryPolicyFactory.create();
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java
new file mode 100644
index 00000000000..62204a42aec
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java
@@ -0,0 +1,23 @@
+package datadog.trace.civisibility.config;
+
+import datadog.trace.api.Config;
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
+import java.nio.file.Path;
+
+public class CachingJvmInfoFactory implements JvmInfoFactory {
+
+  private final DDCache<Path, JvmInfo> cache;
+  private final JvmInfoFactoryImpl delegate;
+
+  public CachingJvmInfoFactory(Config config, JvmInfoFactoryImpl delegate) {
+    this.delegate = delegate;
+    this.cache =
+        DDCaches.newFixedSizeCache(config.getCiVisibilityModuleExecutionSettingsCacheSize());
+  }
+
+  @Override
+  public JvmInfo getJvmInfo(Path jvmExecutablePath) {
+    return cache.computeIfAbsent(jvmExecutablePath, delegate::getJvmInfo);
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
index 5d3566a1bb3..1f4c3b512ef 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
@@ -6,10 +6,12 @@ public class CiVisibilitySettings {
 
   private final boolean code_coverage;
   private final boolean tests_skipping;
+  private final boolean require_git;
 
-  public CiVisibilitySettings(boolean code_coverage, boolean tests_skipping) {
+  public CiVisibilitySettings(boolean code_coverage, boolean tests_skipping, boolean require_git) {
     this.code_coverage = code_coverage;
     this.tests_skipping = tests_skipping;
+    this.require_git = require_git;
   }
 
   public boolean isCodeCoverageEnabled() {
@@ -20,6 +22,10 @@ public boolean isTestsSkippingEnabled() {
     return tests_skipping;
   }
 
+  public boolean isGitUploadRequired() {
+    return require_git;
+  }
+
   public interface Factory {
     CiVisibilitySettings create(Path path);
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
index ead6ce0a6ca..80fda0022d0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
@@ -11,7 +11,7 @@ public interface ConfigurationApi {
       new ConfigurationApi() {
         @Override
         public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) {
-          return new CiVisibilitySettings(false, false);
+          return new CiVisibilitySettings(false, false, false);
         }
 
         @Override
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJson.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJson.java
index b1cfd999ef4..49c861a466a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJson.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJson.java
@@ -4,6 +4,7 @@
 import com.squareup.moshi.Json;
 import com.squareup.moshi.ToJson;
 import datadog.trace.api.civisibility.config.Configurations;
+import java.util.Map;
 
 public final class ConfigurationsJson {
   @Json(name = "os.platform")
@@ -33,6 +34,9 @@ public final class ConfigurationsJson {
   @Json(name = "test.bundle")
   private final String testBundle;
 
+  @Json(name = "custom")
+  private final Map<String, String> custom;
+
   public ConfigurationsJson(
       String osPlatform,
       String osArchitecture,
@@ -41,7 +45,8 @@ public ConfigurationsJson(
       String runtimeVersion,
       String runtimeVendor,
       String runtimeArchitecture,
-      String testBundle) {
+      String testBundle,
+      Map<String, String> custom) {
     this.osPlatform = osPlatform;
     osArch = osArchitecture;
     this.osArchitecture = osArchitecture;
@@ -51,6 +56,7 @@ public ConfigurationsJson(
     this.runtimeVendor = runtimeVendor;
     this.runtimeArchitecture = runtimeArchitecture;
     this.testBundle = testBundle;
+    this.custom = custom;
   }
 
   public static final class ConfigurationsJsonAdapter {
@@ -64,7 +70,8 @@ public Configurations fromJson(ConfigurationsJson configurationsJson) {
           configurationsJson.runtimeVersion,
           configurationsJson.runtimeVendor,
           configurationsJson.runtimeArchitecture,
-          configurationsJson.testBundle);
+          configurationsJson.testBundle,
+          configurationsJson.custom);
     }
 
     @ToJson
@@ -77,7 +84,8 @@ public ConfigurationsJson toJson(Configurations configurations) {
           configurations.getRuntimeVersion(),
           configurations.getRuntimeVendor(),
           configurations.getRuntimeArchitecture(),
-          configurations.getTestBundle());
+          configurations.getTestBundle(),
+          configurations.getCustom());
     }
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
index 6a62ce3927d..99a26b3a885 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
@@ -1,89 +1,7 @@
 package datadog.trace.civisibility.config;
 
-import datadog.trace.civisibility.utils.ShellCommandExecutor;
-import datadog.trace.util.ProcessUtils;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class JvmInfoFactory {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(JvmInfoFactory.class);
-
-  private static final int JVM_VERSION_LAUNCH_TIMEOUT = 5_000;
-
-  // provide some confidence
-  public JvmInfo getJvmInfo(Path jvmExecutablePath) {
-    String currentJvm =
-        ProcessUtils.getCurrentJvmPath(); // might be home dir or full executable path
-    // if we cannot determine forked JVM,
-    // we assume it is the same as current one,
-    // which is the most common case
-    if (jvmExecutablePath == null
-        || currentJvm != null && jvmExecutablePath.startsWith(currentJvm)) {
-      return JvmInfo.CURRENT_JVM;
-    } else {
-      return doGetJvmInfo(jvmExecutablePath);
-    }
-  }
-
-  static JvmInfo doGetJvmInfo(Path jvmExecutablePath) {
-    Path jvmExecutableFolder = jvmExecutablePath.getParent();
-    ShellCommandExecutor commandExecutor =
-        new ShellCommandExecutor(jvmExecutableFolder.toFile(), JVM_VERSION_LAUNCH_TIMEOUT);
-    try {
-      return commandExecutor.executeCommandReadingError(
-          new JvmVersionOutputParser(), "./java", "-XshowSettings:properties", "-version");
-
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.warn(
-          "Interrupted while waiting for JVM runtime info for {}, assuming {}",
-          jvmExecutablePath,
-          JvmInfo.CURRENT_JVM);
-      return JvmInfo.CURRENT_JVM;
-
-    } catch (Exception e) {
-      LOGGER.warn(
-          "Could not determine JVM runtime info for {}, assuming {}",
-          jvmExecutablePath,
-          JvmInfo.CURRENT_JVM,
-          e);
-      return JvmInfo.CURRENT_JVM;
-    }
-  }
-
-  private static final class JvmVersionOutputParser
-      implements ShellCommandExecutor.OutputParser<JvmInfo> {
-    @Override
-    public JvmInfo parse(InputStream inputStream) throws IOException {
-      String name = null;
-      String version = null;
-      String vendor = null;
-
-      BufferedReader bis =
-          new BufferedReader(new InputStreamReader(inputStream, Charset.defaultCharset()));
-      String line;
-      while ((line = bis.readLine()) != null) {
-        if (line.contains("java.runtime.name ")) {
-          name = getPropertyValue(line);
-        } else if (line.contains("java.version ")) {
-          version = getPropertyValue(line);
-        } else if (line.contains("java.vendor ")) {
-          vendor = getPropertyValue(line);
-        }
-      }
-      return new JvmInfo(name, version, vendor);
-    }
-
-    private String getPropertyValue(String line) {
-      // format of the input is: "    property.name = propertyValue"
-      return line.substring(line.indexOf('=') + 2);
-    }
-  }
+public interface JvmInfoFactory {
+  JvmInfo getJvmInfo(Path jvmExecutablePath);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java
new file mode 100644
index 00000000000..0a3a4a28519
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java
@@ -0,0 +1,89 @@
+package datadog.trace.civisibility.config;
+
+import datadog.trace.civisibility.utils.ShellCommandExecutor;
+import datadog.trace.util.ProcessUtils;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JvmInfoFactoryImpl implements JvmInfoFactory {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(JvmInfoFactoryImpl.class);
+
+  private static final int JVM_VERSION_LAUNCH_TIMEOUT = 5_000;
+
+  @Override
+  public JvmInfo getJvmInfo(Path jvmExecutablePath) {
+    String currentJvm =
+        ProcessUtils.getCurrentJvmPath(); // might be home dir or full executable path
+    // if we cannot determine forked JVM,
+    // we assume it is the same as current one,
+    // which is the most common case
+    if (jvmExecutablePath == null
+        || currentJvm != null && jvmExecutablePath.startsWith(currentJvm)) {
+      return JvmInfo.CURRENT_JVM;
+    } else {
+      return doGetJvmInfo(jvmExecutablePath);
+    }
+  }
+
+  static JvmInfo doGetJvmInfo(Path jvmExecutablePath) {
+    Path jvmExecutableFolder = jvmExecutablePath.getParent();
+    ShellCommandExecutor commandExecutor =
+        new ShellCommandExecutor(jvmExecutableFolder.toFile(), JVM_VERSION_LAUNCH_TIMEOUT);
+    try {
+      return commandExecutor.executeCommandReadingError(
+          new JvmVersionOutputParser(), "./java", "-XshowSettings:properties", "-version");
+
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      LOGGER.warn(
+          "Interrupted while waiting for JVM runtime info for {}, assuming {}",
+          jvmExecutablePath,
+          JvmInfo.CURRENT_JVM);
+      return JvmInfo.CURRENT_JVM;
+
+    } catch (Exception e) {
+      LOGGER.warn(
+          "Could not determine JVM runtime info for {}, assuming {}",
+          jvmExecutablePath,
+          JvmInfo.CURRENT_JVM,
+          e);
+      return JvmInfo.CURRENT_JVM;
+    }
+  }
+
+  private static final class JvmVersionOutputParser
+      implements ShellCommandExecutor.OutputParser<JvmInfo> {
+    @Override
+    public JvmInfo parse(InputStream inputStream) throws IOException {
+      String name = null;
+      String version = null;
+      String vendor = null;
+
+      BufferedReader bis =
+          new BufferedReader(new InputStreamReader(inputStream, Charset.defaultCharset()));
+      String line;
+      while ((line = bis.readLine()) != null) {
+        if (line.contains("java.runtime.name ")) {
+          name = getPropertyValue(line);
+        } else if (line.contains("java.version ")) {
+          version = getPropertyValue(line);
+        } else if (line.contains("java.vendor ")) {
+          vendor = getPropertyValue(line);
+        }
+      }
+      return new JvmInfo(name, version, vendor);
+    }
+
+    private String getPropertyValue(String line) {
+      // format of the input is: "    property.name = propertyValue"
+      return line.substring(line.indexOf('=') + 2);
+    }
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ModuleExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ModuleExecutionSettingsFactoryImpl.java
index 6122ac1aabe..c4ead81887d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ModuleExecutionSettingsFactoryImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ModuleExecutionSettingsFactoryImpl.java
@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.config;
 
+import datadog.communication.ddagent.TracerVersion;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.config.Configurations;
 import datadog.trace.api.civisibility.config.ModuleExecutionSettings;
@@ -31,6 +32,7 @@ public class ModuleExecutionSettingsFactoryImpl implements ModuleExecutionSettin
 
   private static final Logger LOGGER =
       LoggerFactory.getLogger(ModuleExecutionSettingsFactoryImpl.class);
+  private static final String TEST_CONFIGURATION_TAG_PREFIX = "test.configuration.";
 
   private final Config config;
   private final ConfigurationApi configurationApi;
@@ -87,11 +89,21 @@ private TracerEnvironment buildTracerEnvironment(
       String repositoryRoot, JvmInfo jvmInfo, @Nullable String moduleName) {
     GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(repositoryRoot);
 
+    TracerEnvironment.Builder builder = TracerEnvironment.builder();
+    for (Map.Entry<String, String> e : config.getGlobalTags().entrySet()) {
+      String key = e.getKey();
+      if (key.startsWith(TEST_CONFIGURATION_TAG_PREFIX)) {
+        String configurationKey = key.substring(TEST_CONFIGURATION_TAG_PREFIX.length());
+        String configurationValue = e.getValue();
+        builder.customTag(configurationKey, configurationValue);
+      }
+    }
+
     /*
      * IMPORTANT: JVM and OS properties should match tags
      * set in datadog.trace.civisibility.decorator.TestDecorator
      */
-    return TracerEnvironment.builder()
+    return builder
         .service(config.getServiceName())
         .env(config.getEnv())
         .repositoryUrl(gitInfo.getRepositoryURL())
@@ -109,12 +121,23 @@ private TracerEnvironment buildTracerEnvironment(
 
   private CiVisibilitySettings getCiVisibilitySettings(TracerEnvironment tracerEnvironment) {
     try {
-      return configurationApi.getSettings(tracerEnvironment);
+      CiVisibilitySettings settings = configurationApi.getSettings(tracerEnvironment);
+      if (settings.isGitUploadRequired()) {
+        LOGGER.info("Git data upload needs to finish before remote settings can be retrieved");
+        gitDataUploader
+            .startOrObserveGitDataUpload()
+            .get(config.getCiVisibilityGitUploadTimeoutMillis(), TimeUnit.MILLISECONDS);
+
+        return configurationApi.getSettings(tracerEnvironment);
+      } else {
+        return settings;
+      }
+
     } catch (Exception e) {
       LOGGER.warn(
           "Could not obtain CI Visibility settings, will default to disabled code coverage and tests skipping");
       LOGGER.debug("Error while obtaining CI Visibility settings", e);
-      return new CiVisibilitySettings(false, false);
+      return new CiVisibilitySettings(false, false, false);
     }
   }
 
@@ -123,8 +146,11 @@ private boolean isItrEnabled(CiVisibilitySettings ciVisibilitySettings) {
   }
 
   private boolean isCodeCoverageEnabled(CiVisibilitySettings ciVisibilitySettings) {
-    return ciVisibilitySettings.isCodeCoverageEnabled()
-        && config.isCiVisibilityCodeCoverageEnabled();
+    return config.isCiVisibilityCodeCoverageEnabled()
+        && (ciVisibilitySettings.isCodeCoverageEnabled() // coverage enabled via backend settings
+            || config
+                .isCiVisibilityJacocoPluginVersionProvided() // coverage enabled via tracer settings
+        );
   }
 
   private Map<String, String> getPropertiesPropagatedToChildProcess(
@@ -156,6 +182,11 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
             CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED),
         Boolean.toString(false));
 
+    propagatedSystemProperties.put(
+        Strings.propertyNameToSystemPropertyName(
+            CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
+        TracerVersion.TRACER_VERSION);
+
     return propagatedSystemProperties;
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializer.java
index 3250f3a6389..e01e56785c9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializer.java
@@ -26,10 +26,10 @@ public static ByteBuffer serialize(Collection<SkippableTest> skippableTests) {
       String name = test.getName();
       String parameters = test.getParameters();
 
-      length += suite.length();
-      length += name.length();
+      length += suite.getBytes(CHARSET).length;
+      length += name.getBytes(CHARSET).length;
       if (parameters != null) {
-        length += parameters.length();
+        length += parameters.getBytes(CHARSET).length;
       }
     }
 
@@ -41,14 +41,18 @@ public static ByteBuffer serialize(Collection<SkippableTest> skippableTests) {
       String name = test.getName();
       String parameters = test.getParameters();
 
-      buffer.putInt(suite.length());
-      buffer.put(suite.getBytes(CHARSET));
-      buffer.putInt(name.length());
-      buffer.put(name.getBytes(CHARSET));
+      byte[] suiteBytes = suite.getBytes(CHARSET);
+      buffer.putInt(suiteBytes.length);
+      buffer.put(suiteBytes);
+
+      byte[] nameBytes = name.getBytes(CHARSET);
+      buffer.putInt(nameBytes.length);
+      buffer.put(nameBytes);
 
       if (parameters != null) {
-        buffer.putInt(parameters.length());
-        buffer.put(parameters.getBytes(CHARSET));
+        byte[] parametersBytes = parameters.getBytes(CHARSET);
+        buffer.putInt(parametersBytes.length);
+        buffer.put(parametersBytes);
       } else {
         buffer.putInt(-1);
       }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
index 6240aea6264..319c95a454e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
@@ -2,6 +2,8 @@
 
 import com.squareup.moshi.Json;
 import datadog.trace.api.civisibility.config.Configurations;
+import java.util.HashMap;
+import java.util.Map;
 
 public class TracerEnvironment {
 
@@ -13,6 +15,10 @@ public class TracerEnvironment {
 
   private final String branch;
   private final String sha;
+
+  @Json(name = "test_level")
+  private final String testLevel = "test";
+
   private final Configurations configurations;
 
   private TracerEnvironment(
@@ -52,6 +58,7 @@ public static final class Builder {
     private String runtimeVendor;
     private String runtimeArchitecture;
     private String testBundle;
+    private final Map<String, String> customTags = new HashMap<>();
 
     public Builder service(String service) {
       this.service = service;
@@ -118,6 +125,11 @@ public Builder testBundle(String testBundle) {
       return this;
     }
 
+    public Builder customTag(String key, String value) {
+      this.customTags.put(key, value);
+      return this;
+    }
+
     public TracerEnvironment build() {
       return new TracerEnvironment(
           service,
@@ -133,7 +145,8 @@ public TracerEnvironment build() {
               runtimeVersion,
               runtimeVendor,
               runtimeArchitecture,
-              testBundle));
+              testBundle,
+              customTags));
     }
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/NoopCoverageProbeStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/NoopCoverageProbeStore.java
index 111cf8eff35..dc68fe42234 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/NoopCoverageProbeStore.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/NoopCoverageProbeStore.java
@@ -11,6 +11,9 @@ public class NoopCoverageProbeStore implements CoverageProbeStore {
   @Override
   public void record(Class<?> clazz, long classId, String className, int probeId) {}
 
+  @Override
+  public void recordNonCodeResource(String absolutePath) {}
+
   @Override
   public void report(Long testSessionId, Long testSuiteId, long spanId) {}
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SegmentlessTestProbes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SegmentlessTestProbes.java
index cb133bd1e55..5407b786742 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SegmentlessTestProbes.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SegmentlessTestProbes.java
@@ -5,10 +5,12 @@
 import datadog.trace.api.civisibility.coverage.TestReportFileEntry;
 import datadog.trace.civisibility.source.SourcePathResolver;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,12 +21,14 @@ public class SegmentlessTestProbes implements CoverageProbeStore {
 
   // Unbounded data structure that only exists within a single test span
   private final Set<Class<?>> coveredClasses;
+  private final Collection<String> nonCodeResources;
   private final SourcePathResolver sourcePathResolver;
   private volatile TestReport testReport;
 
   SegmentlessTestProbes(SourcePathResolver sourcePathResolver) {
     this.sourcePathResolver = sourcePathResolver;
     coveredClasses = ConcurrentHashMap.newKeySet();
+    nonCodeResources = new ConcurrentLinkedQueue<>();
   }
 
   @Override
@@ -32,6 +36,11 @@ public void record(Class<?> clazz, long classId, String className, int probeId)
     coveredClasses.add(clazz);
   }
 
+  @Override
+  public void recordNonCodeResource(String absolutePath) {
+    nonCodeResources.add(absolutePath);
+  }
+
   @Override
   public void report(Long testSessionId, Long testSuiteId, long spanId) {
     List<TestReportFileEntry> fileEntries = new ArrayList<>(coveredClasses.size());
@@ -47,6 +56,20 @@ public void report(Long testSessionId, Long testSuiteId, long spanId) {
       TestReportFileEntry fileEntry = new TestReportFileEntry(sourcePath, Collections.emptyList());
       fileEntries.add(fileEntry);
     }
+
+    for (String nonCodeResource : nonCodeResources) {
+      String resourcePath = sourcePathResolver.getResourcePath(nonCodeResource);
+      if (resourcePath == null) {
+        log.debug(
+            "Skipping coverage reporting for {} because resource path could not be determined",
+            nonCodeResource);
+        continue;
+      }
+      TestReportFileEntry fileEntry =
+          new TestReportFileEntry(resourcePath, Collections.emptyList());
+      fileEntries.add(fileEntry);
+    }
+
     testReport = new TestReport(testSessionId, testSuiteId, spanId, fileEntries);
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/TestProbes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/TestProbes.java
index d0fa5a731f4..55a4a68e871 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/TestProbes.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/TestProbes.java
@@ -7,11 +7,14 @@
 import datadog.trace.civisibility.source.Utils;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import javax.annotation.Nullable;
 import org.jacoco.core.analysis.Analyzer;
 import org.jacoco.core.data.ExecutionDataStore;
@@ -26,12 +29,14 @@ public class TestProbes implements CoverageProbeStore {
 
   // Unbounded data structure that only exists within a single test span
   private final Map<Class<?>, ExecutionDataAdapter> probeActivations;
+  private final Collection<String> nonCodeResources;
   private final SourcePathResolver sourcePathResolver;
   private volatile TestReport testReport;
 
   TestProbes(SourcePathResolver sourcePathResolver) {
     this.sourcePathResolver = sourcePathResolver;
     probeActivations = new ConcurrentHashMap<>();
+    nonCodeResources = new ConcurrentLinkedQueue<>();
   }
 
   @Override
@@ -41,6 +46,11 @@ public void record(Class<?> clazz, long classId, String className, int probeId)
         .record(probeId);
   }
 
+  @Override
+  public void recordNonCodeResource(String absolutePath) {
+    nonCodeResources.add(absolutePath);
+  }
+
   @Override
   public void report(Long testSessionId, Long testSuiteId, long spanId) {
     Map<String, List<TestReportFileEntry.Segment>> segmentsBySourcePath = new HashMap<>();
@@ -96,6 +106,19 @@ public void report(Long testSessionId, Long testSuiteId, long spanId) {
       fileEntries.add(new TestReportFileEntry(sourcePath, compressedSegments));
     }
 
+    for (String nonCodeResource : nonCodeResources) {
+      String resourcePath = sourcePathResolver.getResourcePath(nonCodeResource);
+      if (resourcePath == null) {
+        log.debug(
+            "Skipping coverage reporting for {} because resource path could not be determined",
+            nonCodeResource);
+        continue;
+      }
+      TestReportFileEntry fileEntry =
+          new TestReportFileEntry(resourcePath, Collections.emptyList());
+      fileEntries.add(fileEntry);
+    }
+
     testReport = new TestReport(testSessionId, testSuiteId, spanId, fileEntries);
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
index 8cd2afcd20d..2220d831d6c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
@@ -40,9 +40,19 @@ public void onTestSessionStart(
       final Path projectRoot,
       final String startCommand,
       final String buildSystemName,
-      final String buildSystemVersion) {
+      final String buildSystemVersion,
+      Map<String, Object> additionalTags) {
     DDBuildSystemSession testSession =
         sessionFactory.startSession(projectName, projectRoot, startCommand, buildSystemName, null);
+
+    if (additionalTags != null) {
+      for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
+        String tag = e.getKey();
+        Object value = e.getValue();
+        testSession.setTag(tag, value);
+      }
+    }
+
     testSession.setTag(Tags.TEST_TOOLCHAIN, buildSystemName + ":" + buildSystemVersion);
     inProgressTestSessions.put(sessionKey, testSession);
   }
@@ -139,4 +149,9 @@ public ModuleExecutionSettings getModuleExecutionSettings(T sessionKey, Path jvm
     JvmInfo jvmInfo = jvmInfoFactory.getJvmInfo(jvmExecutablePath);
     return testSession.getModuleExecutionSettings(jvmInfo);
   }
+
+  @Override
+  public ModuleInfo getModuleInfo(T sessionKey, String moduleName) {
+    return getTestModule(sessionKey, moduleName).getModuleInfo();
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
index ca142328102..e8da31861f5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
@@ -81,7 +81,11 @@ public Future<Void> startOrObserveGitDataUpload() {
 
   private void uploadGitData() {
     try {
-      if (config.isCiVisibilityGitUnshallowEnabled() && gitClient.isShallow()) {
+      LOGGER.info("Starting git data upload, {}", gitClient);
+
+      if (config.isCiVisibilityGitUnshallowEnabled()
+          && !config.isCiVisibilityGitUnshallowDefer()
+          && gitClient.isShallow()) {
         unshallowRepository();
       }
 
@@ -89,12 +93,28 @@ private void uploadGitData() {
       String remoteUrl = gitInfo.getRepositoryURL();
       List<String> latestCommits = gitClient.getLatestCommits();
       if (latestCommits.isEmpty()) {
-        LOGGER.debug("No commits in the last month");
+        LOGGER.info("No commits in the last month, skipping git data upload");
         callback.complete(null);
         return;
       }
 
       Collection<String> commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
+      if (commitsToSkip.size() == latestCommits.size()) {
+        LOGGER.info(
+            "Backend already knows of the {} local commits, skipping git data upload",
+            latestCommits.size());
+        callback.complete(null);
+        return;
+      }
+
+      if (config.isCiVisibilityGitUnshallowEnabled()
+          && config.isCiVisibilityGitUnshallowDefer()
+          && gitClient.isShallow()) {
+        unshallowRepository();
+        latestCommits = gitClient.getLatestCommits();
+        commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
+      }
+
       Collection<String> commitsToInclude =
           new ArrayList<>(latestCommits.size() - commitsToSkip.size());
       for (String commit : latestCommits) {
@@ -105,7 +125,7 @@ private void uploadGitData() {
 
       List<String> objectHashes = gitClient.getObjects(commitsToSkip, commitsToInclude);
       if (objectHashes.isEmpty()) {
-        LOGGER.debug("No git objects to upload");
+        LOGGER.info("No git objects to upload");
         callback.complete(null);
         return;
       }
@@ -128,7 +148,7 @@ private void uploadGitData() {
         FileUtils.delete(packFilesDirectory);
       }
 
-      LOGGER.info("Git data upload finished, {}", gitClient);
+      LOGGER.info("Git data upload finished");
       callback.complete(null);
 
     } catch (Exception e) {
@@ -140,6 +160,7 @@ private void uploadGitData() {
   }
 
   private void unshallowRepository() throws IOException, TimeoutException, InterruptedException {
+    long unshallowStart = System.currentTimeMillis();
     try {
       gitClient.unshallow(GitClient.HEAD);
       return;
@@ -158,6 +179,7 @@ private void unshallowRepository() throws IOException, TimeoutException, Interru
           e);
       gitClient.unshallow(null);
     }
+    LOGGER.info("Repository unshallowing took {} ms", System.currentTimeMillis() - unshallowStart);
   }
 
   private void waitForUploadToFinish() {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
index 7130c3cdac5..5efe3a2313e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
@@ -2,7 +2,7 @@
 
 import java.util.Objects;
 
-public final class TestFramework {
+public final class TestFramework implements Comparable<TestFramework> {
   private final String name;
   private final String version;
 
@@ -35,4 +35,10 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(name, version);
   }
+
+  @Override
+  public int compareTo(TestFramework o) {
+    int nameComparison = name.compareTo(o.name);
+    return nameComparison != 0 ? nameComparison : version.compareTo(o.version);
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
index 9d83ddc2cbf..fba9c191596 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
@@ -22,4 +22,16 @@ public String getSourcePath(@Nonnull Class<?> c) {
     }
     return null;
   }
+
+  @Nullable
+  @Override
+  public String getResourcePath(@Nullable String relativePath) {
+    for (SourcePathResolver delegate : delegates) {
+      String resourcePath = delegate.getResourcePath(relativePath);
+      if (resourcePath != null) {
+        return resourcePath;
+      }
+    }
+    return null;
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
index c8000a10ce8..a675db70b93 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
@@ -23,4 +23,10 @@ public String getSourcePath(@Nonnull Class<?> c) {
       return null;
     }
   }
+
+  @Nullable
+  @Override
+  public String getResourcePath(String relativePath) {
+    return null;
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java
new file mode 100644
index 00000000000..a7b9e18f7bf
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java
@@ -0,0 +1,21 @@
+package datadog.trace.civisibility.source;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class NoOpSourcePathResolver implements SourcePathResolver {
+
+  public static final SourcePathResolver INSTANCE = new NoOpSourcePathResolver();
+
+  @Nullable
+  @Override
+  public String getSourcePath(@Nonnull Class<?> c) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public String getResourcePath(@Nullable String relativePath) {
+    return null;
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
index 23c0f2682c8..60e5d6f81d0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
@@ -4,11 +4,32 @@
 import javax.annotation.Nullable;
 
 public interface SourcePathResolver {
-
   /**
    * @return path to the source file corresponding to the provided class, relative to repository
    *     root. {@code null} is returned if the path could not be resolved
    */
   @Nullable
   String getSourcePath(@Nonnull Class<?> c);
+
+  /**
+   * @param relativePath Path to a resource in current run's repository, relative to a resource root
+   * @return Path relative to repository root
+   */
+  @Nullable
+  String getResourcePath(@Nullable String relativePath);
+
+  SourcePathResolver NO_OP =
+      new SourcePathResolver() {
+        @Nullable
+        @Override
+        public String getSourcePath(@Nonnull Class<?> c) {
+          return null;
+        }
+
+        @Nullable
+        @Override
+        public String getResourcePath(@Nullable String relativePath) {
+          return null;
+        }
+      };
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
index f9023ab5b60..8c826776656 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
@@ -7,7 +7,26 @@ public abstract class Utils {
 
   public static InputStream getClassStream(Class<?> clazz) throws IOException {
     String className = clazz.getName();
-    String classPath = "/" + className.replace('.', '/') + ".class";
-    return clazz.getResourceAsStream(classPath);
+    InputStream classStream = clazz.getResourceAsStream(toResourceName(className));
+    if (classStream != null) {
+      return classStream;
+    } else {
+      // might be auto-generated inner class (e.g. Mockito mock)
+      String topLevelClassName = stripNestedClassNames(clazz.getName());
+      return clazz.getResourceAsStream(toResourceName(topLevelClassName));
+    }
+  }
+
+  private static String toResourceName(String className) {
+    return "/" + className.replace('.', '/') + ".class";
+  }
+
+  public static String stripNestedClassNames(String className) {
+    int innerClassNameIdx = className.indexOf('$');
+    if (innerClassNameIdx >= 0) {
+      return className.substring(0, innerClassNameIdx);
+    } else {
+      return className;
+    }
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java
new file mode 100644
index 00000000000..2d70fa7962c
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java
@@ -0,0 +1,41 @@
+package datadog.trace.civisibility.source.index;
+
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.Path;
+import java.util.List;
+
+public class ConventionBasedResourceResolver implements ResourceResolver {
+
+  private final FileSystem fileSystem;
+  private final List<String> resourceFolderNames;
+
+  public ConventionBasedResourceResolver(FileSystem fileSystem, List<String> resourceFolderNames) {
+    this.fileSystem = fileSystem;
+    this.resourceFolderNames = resourceFolderNames;
+  }
+
+  /**
+   * Given absolute path to a resource file, returns resource root - the enclosing folder that is
+   * considered as a resource folder by the project's build system. Resource folder is a folder
+   * containing non-code resources that are copied to a target/build folder during the project's
+   * build.
+   *
+   * <p>The implementation of this method is very naive: it examines the resource's path looking for
+   * segments that match conventional resource folder names ("resources/", "java/", etc.).
+   *
+   * @param resourceFile Absolute path to a resource file
+   * @return Resource root
+   */
+  @Override
+  public Path getResourceRoot(Path resourceFile) throws IOException {
+    String pathAsString = resourceFile.toString();
+    for (String resourceFolderName : resourceFolderNames) {
+      int idx = pathAsString.indexOf(resourceFolderName);
+      if (idx >= 0) {
+        return fileSystem.getPath(pathAsString.substring(0, idx + resourceFolderName.length()));
+      }
+    }
+    return null;
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
index 6aedf77370a..1da3595d38a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
@@ -8,12 +8,12 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 
-class PackageResolverImpl implements PackageResolver {
+public class PackageResolverImpl implements PackageResolver {
 
   private static final String PACKAGE_KEYWORD = "package";
   private final FileSystem fileSystem;
 
-  PackageResolverImpl(FileSystem fileSystem) {
+  public PackageResolverImpl(FileSystem fileSystem) {
     this.fileSystem = fileSystem;
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
index d8010aeb072..6144c39b605 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
@@ -50,7 +50,7 @@ public List<String> getRootPackages() {
 
   @Nullable
   public String getSourcePath(@Nonnull Class<?> c) {
-    String topLevelClassName = stripNestedClassNames(c.getName());
+    String topLevelClassName = Utils.stripNestedClassNames(c.getName());
     SourceType sourceType = detectSourceType(c);
     String extension = sourceType.getExtension();
     String classNameWithExtension = topLevelClassName + extension;
@@ -107,15 +107,6 @@ private SourceType detectSourceType(Class<?> c) {
     return SourceType.JAVA;
   }
 
-  private String stripNestedClassNames(String className) {
-    int innerClassNameIdx = className.indexOf('$');
-    if (innerClassNameIdx >= 0) {
-      return className.substring(0, innerClassNameIdx);
-    } else {
-      return className;
-    }
-  }
-
   /**
    * Names of package-private classes do not have to correspond to the names of their source code
    * files. For such classes filename is extracted from SourceFile attribute that is available in
@@ -126,6 +117,10 @@ private String getSourcePathForPackagePrivateOrNonJavaClass(Class<?> c) {
       SourceFileAttributeVisitor sourceFileAttributeVisitor = new SourceFileAttributeVisitor();
 
       try (InputStream classStream = Utils.getClassStream(c)) {
+        if (classStream == null) {
+          log.debug("Could not get input stream for class {}", c.getName());
+          return null;
+        }
         ClassReader classReader = new ClassReader(classStream);
         classReader.accept(
             sourceFileAttributeVisitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
@@ -157,6 +152,17 @@ private String getSourcePathForPackagePrivateOrNonJavaClass(Class<?> c) {
     }
   }
 
+  public String getResourcePath(String relativePath) {
+    int sourceRootIdx = trie.apply(relativePath);
+    if (sourceRootIdx < 0) {
+      log.debug("Could not find source root for resource {}", relativePath);
+      return null;
+    }
+
+    String sourceRoot = sourceRoots.get(sourceRootIdx);
+    return sourceRoot + File.separator + relativePath;
+  }
+
   private static final class SourceFileAttributeVisitor extends ClassVisitor {
     private String source;
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
index d0d0675e001..6c6aef603cb 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
@@ -22,20 +22,20 @@ public class RepoIndexBuilder implements RepoIndexProvider {
 
   private final String repoRoot;
   private final PackageResolver packageResolver;
+  private final ResourceResolver resourceResolver;
   private final FileSystem fileSystem;
 
   private final Object indexInitializationLock = new Object();
   private volatile RepoIndex index;
 
-  public RepoIndexBuilder(String repoRoot, FileSystem fileSystem) {
-    this.repoRoot = repoRoot;
-    this.packageResolver = new PackageResolverImpl(fileSystem);
-    this.fileSystem = fileSystem;
-  }
-
-  RepoIndexBuilder(String repoRoot, PackageResolver packageResolver, FileSystem fileSystem) {
+  public RepoIndexBuilder(
+      String repoRoot,
+      PackageResolver packageResolver,
+      ResourceResolver resourceResolver,
+      FileSystem fileSystem) {
     this.repoRoot = repoRoot;
     this.packageResolver = packageResolver;
+    this.resourceResolver = resourceResolver;
     this.fileSystem = fileSystem;
   }
 
@@ -60,7 +60,7 @@ private RepoIndex doGetIndex() {
 
     Path repoRootPath = fileSystem.getPath(repoRoot);
     RepoIndexingFileVisitor repoIndexingFileVisitor =
-        new RepoIndexingFileVisitor(packageResolver, repoRootPath);
+        new RepoIndexingFileVisitor(packageResolver, resourceResolver, repoRootPath);
 
     long startTime = System.currentTimeMillis();
     try {
@@ -77,10 +77,11 @@ private RepoIndex doGetIndex() {
     RepoIndexingStats stats = repoIndexingFileVisitor.indexingStats;
     RepoIndex index = repoIndexingFileVisitor.getIndex();
     log.info(
-        "Indexing took {} ms. Files visited: {}, source files visited: {}, source roots found: {}, root packages found: {}",
+        "Indexing took {} ms. Files visited: {}, source files visited: {}, resource files visited: {}, source roots found: {}, root packages found: {}",
         duration,
         stats.filesVisited,
         stats.sourceFilesVisited,
+        stats.resourceFilesVisited,
         repoIndexingFileVisitor.sourceRoots.size(),
         index.getRootPackages());
     return index;
@@ -91,14 +92,17 @@ private static final class RepoIndexingFileVisitor implements FileVisitor<Path>
     private static final Logger log = LoggerFactory.getLogger(RepoIndexingFileVisitor.class);
 
     private final PackageResolver packageResolver;
+    private final ResourceResolver resourceResolver;
     private final ClassNameTrie.Builder trieBuilder;
     private final LinkedHashSet<String> sourceRoots;
     private final PackageTree packageTree;
     private final RepoIndexingStats indexingStats;
     private final Path repoRoot;
 
-    private RepoIndexingFileVisitor(PackageResolver packageResolver, Path repoRoot) {
+    private RepoIndexingFileVisitor(
+        PackageResolver packageResolver, ResourceResolver resourceResolver, Path repoRoot) {
       this.packageResolver = packageResolver;
+      this.resourceResolver = resourceResolver;
       this.repoRoot = repoRoot;
       trieBuilder = new ClassNameTrie.Builder();
       sourceRoots = new LinkedHashSet<>();
@@ -116,18 +120,11 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
       indexingStats.filesVisited++;
 
       try {
-        String fileName = file.getFileName().toString();
-        SourceType sourceType = SourceType.getByFileName(fileName);
-        if (sourceType != null) {
-          indexingStats.sourceFilesVisited++;
-
-          Path packagePath = packageResolver.getPackage(file);
-          packageTree.add(packagePath);
+        Path sourceRoot = getSourceRoot(file);
+        if (sourceRoot != null) {
+          sourceRoots.add(repoRoot.relativize(sourceRoot).toString());
 
-          Path currentSourceRoot = getSourceRoot(file, packagePath);
-          sourceRoots.add(repoRoot.relativize(currentSourceRoot).toString());
-
-          Path relativePath = currentSourceRoot.relativize(file);
+          Path relativePath = sourceRoot.relativize(file);
           String classNameWithExtension = relativePath.toString().replace(File.separatorChar, '.');
           if (!classNameWithExtension.isEmpty()) {
             trieBuilder.put(classNameWithExtension, sourceRoots.size() - 1);
@@ -139,6 +136,24 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
       return FileVisitResult.CONTINUE;
     }
 
+    private Path getSourceRoot(Path file) throws IOException {
+      String fileName = file.getFileName().toString();
+      SourceType sourceType = SourceType.getByFileName(fileName);
+      if (sourceType == null) {
+        return null;
+
+      } else if (!sourceType.isResource()) {
+        indexingStats.sourceFilesVisited++;
+        Path packagePath = packageResolver.getPackage(file);
+        packageTree.add(packagePath);
+        return getSourceRoot(file, packagePath);
+
+      } else {
+        indexingStats.resourceFilesVisited++;
+        return resourceResolver.getResourceRoot(file);
+      }
+    }
+
     private Path getSourceRoot(Path file, Path packagePath) {
       Path folder = file.getParent();
       // remove package path suffix from folder path to get source root
@@ -172,5 +187,6 @@ public RepoIndex getIndex() {
   private static final class RepoIndexingStats {
     int filesVisited;
     int sourceFilesVisited;
+    int resourceFilesVisited;
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
index 5ccea333d79..65ca637c17b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
@@ -20,9 +20,13 @@ public RepoIndexSourcePathResolver(String repoRoot, RepoIndexProvider indexProvi
   }
 
   RepoIndexSourcePathResolver(
-      String repoRoot, PackageResolver packageResolver, FileSystem fileSystem) {
+      String repoRoot,
+      PackageResolver packageResolver,
+      ResourceResolver resourceResolver,
+      FileSystem fileSystem) {
     this.repoRoot = repoRoot;
-    this.indexProvider = new RepoIndexBuilder(repoRoot, packageResolver, fileSystem);
+    this.indexProvider =
+        new RepoIndexBuilder(repoRoot, packageResolver, resourceResolver, fileSystem);
   }
 
   @Nullable
@@ -35,6 +39,12 @@ public String getSourcePath(@Nonnull Class<?> c) {
     return indexProvider.getIndex().getSourcePath(c);
   }
 
+  @Nullable
+  @Override
+  public String getResourcePath(@Nullable String relativePath) {
+    return indexProvider.getIndex().getResourcePath(relativePath);
+  }
+
   private boolean isLocatedInsideRepository(Class<?> c) {
     ProtectionDomain protectionDomain = c.getProtectionDomain();
     if (protectionDomain == null) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java
new file mode 100644
index 00000000000..1fbc8635a9e
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java
@@ -0,0 +1,8 @@
+package datadog.trace.civisibility.source.index;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public interface ResourceResolver {
+  Path getResourceRoot(Path resourceFile) throws IOException;
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/SourceType.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/SourceType.java
index 792dba71118..a1debe75041 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/SourceType.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/SourceType.java
@@ -1,23 +1,30 @@
 package datadog.trace.civisibility.source.index;
 
 enum SourceType {
-  JAVA(".java"),
-  GROOVY(".groovy"),
-  KOTLIN(".kt"),
-  SCALA(".scala");
+  JAVA(".java", false),
+  GROOVY(".groovy", false),
+  KOTLIN(".kt", false),
+  SCALA(".scala", false),
+  GHERKIN(".feature", true);
 
   private static final SourceType[] UNIVERSE = SourceType.values();
 
   private final String extension;
+  private final boolean resource;
 
-  SourceType(String extension) {
+  SourceType(String extension, boolean resource) {
     this.extension = extension;
+    this.resource = resource;
   }
 
   public String getExtension() {
     return extension;
   }
 
+  public boolean isResource() {
+    return resource;
+  }
+
   static SourceType getByFileName(String fileName) {
     for (SourceType sourceType : UNIVERSE) {
       if (fileName.endsWith(sourceType.extension)) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
index 479ac19a1cb..32cdcb5dbbe 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
@@ -3,8 +3,12 @@
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
+import datadog.trace.civisibility.ipc.TestFramework;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.TreeSet;
 import java.util.function.Consumer;
 
 public class SpanUtils {
@@ -15,49 +19,81 @@ public static Consumer<AgentSpan> propagateCiVisibilityTagsTo(AgentSpan parentSp
   }
 
   public static void propagateCiVisibilityTags(AgentSpan parentSpan, AgentSpan childSpan) {
-    mergeTag(parentSpan, childSpan, Tags.TEST_FRAMEWORK);
-    mergeTag(parentSpan, childSpan, Tags.TEST_FRAMEWORK_VERSION);
+    mergeTestFrameworks(parentSpan, getFrameworks(childSpan));
     propagateStatus(parentSpan, childSpan);
   }
 
-  public static void mergeTag(AgentSpan parentSpan, AgentSpan childSpan, String tagName) {
-    mergeTag(parentSpan, tagName, childSpan.getTag(tagName));
+  public static void mergeTestFrameworks(AgentSpan span, Collection<TestFramework> testFrameworks) {
+    Collection<TestFramework> spanFrameworks = getFrameworks(span);
+    Collection<TestFramework> merged = merge(spanFrameworks, testFrameworks);
+    setFrameworks(span, merged);
   }
 
-  public static void mergeTag(AgentSpan span, String tagName, Object tagValue) {
-    if (tagValue == null) {
-      return;
+  private static Collection<TestFramework> getFrameworks(AgentSpan span) {
+    Object nameTag = span.getTag(Tags.TEST_FRAMEWORK);
+    Object versionTag = span.getTag(Tags.TEST_FRAMEWORK_VERSION);
+    if (nameTag == null && versionTag == null) {
+      return Collections.emptyList();
     }
 
-    Object existingValue = span.getTag(tagName);
-    if (existingValue == null) {
-      span.setTag(tagName, tagValue);
-      return;
-    }
+    Collection<TestFramework> frameworks = new ArrayList<>();
+    if (nameTag instanceof String) {
+      frameworks.add(new TestFramework((String) nameTag, (String) versionTag));
 
-    if (existingValue.equals(tagValue)) {
-      return;
-    }
+    } else if (nameTag instanceof Collection) {
+      Iterator<String> names = ((Collection<String>) nameTag).iterator();
+      Iterator<String> versions = ((Collection<String>) versionTag).iterator();
+      while (names.hasNext()) {
+        frameworks.add(new TestFramework(names.next(), versions.next()));
+      }
 
-    Collection<Object> updatedValue = new ArrayList<>();
-    if (existingValue instanceof Collection) {
-      updatedValue.addAll((Collection<Object>) existingValue);
     } else {
-      updatedValue.add(existingValue);
+      throw new IllegalArgumentException(
+          "Unexpected tag type(s): "
+              + Tags.TEST_FRAMEWORK
+              + " ("
+              + nameTag
+              + ") "
+              + Tags.TEST_FRAMEWORK_VERSION
+              + " ("
+              + versionTag
+              + ")");
     }
+    return frameworks;
+  }
 
-    if (tagValue instanceof Collection) {
-      for (Object value : (Collection<Object>) tagValue) {
-        if (!updatedValue.contains(value)) {
-          updatedValue.add(value);
-        }
-      }
-    } else {
-      if (!updatedValue.contains(tagValue)) {
-        updatedValue.add(tagValue);
-      }
+  private static Collection<TestFramework> merge(
+      Collection<TestFramework> parentFrameworks, Collection<TestFramework> childFrameworks) {
+    if (parentFrameworks.isEmpty()) {
+      return childFrameworks;
     }
-    span.setTag(tagName, updatedValue);
+    if (childFrameworks.isEmpty()) {
+      return parentFrameworks;
+    }
+    Collection<TestFramework> merged = new TreeSet<>();
+    merged.addAll(parentFrameworks);
+    merged.addAll(childFrameworks);
+    return merged;
+  }
+
+  private static void setFrameworks(AgentSpan span, Collection<TestFramework> frameworks) {
+    if (frameworks.isEmpty()) {
+      return;
+    }
+    if (frameworks.size() == 1) {
+      TestFramework framework = frameworks.iterator().next();
+      span.setTag(Tags.TEST_FRAMEWORK, framework.getName());
+      span.setTag(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+      return;
+    }
+    Collection<String> names = new ArrayList<>(frameworks.size());
+    Collection<String> versions = new ArrayList<>(frameworks.size());
+    for (TestFramework framework : frameworks) {
+      names.add(framework.getName());
+      versions.add(framework.getVersion());
+    }
+    span.setTag(Tags.TEST_FRAMEWORK, names);
+    span.setTag(Tags.TEST_FRAMEWORK_VERSION, versions);
   }
 
   private static void propagateStatus(AgentSpan parentSpan, AgentSpan childSpan) {
@@ -85,4 +121,10 @@ private static void propagateStatus(AgentSpan parentSpan, AgentSpan childSpan) {
         break;
     }
   }
+
+  public static void propagateTags(AgentSpan parentSpan, AgentSpan childSpan, String... tagNames) {
+    for (String tagName : tagNames) {
+      parentSpan.setTag(tagName, childSpan.getTag(tagName));
+    }
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/DDTestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/DDTestImplTest.groovy
index a372f5c42df..0d81f97a786 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/DDTestImplTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/DDTestImplTest.groovy
@@ -10,6 +10,7 @@ import datadog.trace.civisibility.codeowners.CodeownersImpl
 import datadog.trace.civisibility.coverage.NoopCoverageProbeStore
 import datadog.trace.civisibility.decorator.TestDecoratorImpl
 import datadog.trace.civisibility.source.MethodLinesResolver
+import datadog.trace.civisibility.source.SourcePathResolver
 import datadog.trace.civisibility.utils.SpanUtils
 import datadog.trace.common.writer.ListWriter
 import datadog.trace.core.CoreTracer
@@ -107,7 +108,6 @@ class DDTestImplTest extends DDSpecification {
 
     def config = Config.get()
     def testDecorator = new TestDecoratorImpl("component", [:])
-    def sourcePathResolver = { it -> null }
     def methodLinesResolver = { it -> MethodLinesResolver.MethodLines.EMPTY }
     def codeowners = CodeownersImpl.EMPTY
     def coverageProbeStoreFactory = new NoopCoverageProbeStore.NoopCoverageProbeStoreFactory()
@@ -123,7 +123,7 @@ class DDTestImplTest extends DDSpecification {
       null,
       config,
       testDecorator,
-      sourcePathResolver,
+      SourcePathResolver.NO_OP,
       methodLinesResolver,
       codeowners,
       coverageProbeStoreFactory,
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
index 72539841faa..ed089c234a9 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
@@ -2,12 +2,14 @@ package datadog.trace.civisibility.config
 
 import com.squareup.moshi.Moshi
 import datadog.communication.http.HttpRetryPolicy
+import datadog.communication.http.OkHttpUtils
 import datadog.trace.agent.test.server.http.TestHttpServer
 import datadog.trace.api.civisibility.config.Configurations
 import datadog.trace.api.civisibility.config.SkippableTest
 import datadog.trace.civisibility.communication.BackendApi
 import datadog.trace.civisibility.communication.EvpProxyApi
 import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.lang.Specification
@@ -37,6 +39,7 @@ class ConfigurationApiImplTest extends Specification {
               "repository_url": "https://github.com/DataDog/foo",
               "branch"        : "prod",
               "sha"           : "d64185e45d1722ab3a53c45be47accae",
+              "test_level"    : "test",
               "configurations": [
                 "os.platform"         : "linux",
                 "os.architecture"     : "amd64",
@@ -45,14 +48,17 @@ class ConfigurationApiImplTest extends Specification {
                 "runtime.name"        : "runtimeName",
                 "runtime.version"     : "runtimeVersion",
                 "runtime.vendor"      : "vendor",
-                "runtime.architecture": "amd64"
+                "runtime.architecture": "amd64",
+                "custom": [
+                  "customTag": "customValue"
+                ]
               ]
             ]
           ]
         ]
 
         if (expectedRequest) {
-          response.status(200).send('{ "data": { "type": "ci_app_tracers_test_service_settings", "id": "uuid", "attributes": { "code_coverage": true, "tests_skipping": true } } }')
+          response.status(200).send('{ "data": { "type": "ci_app_tracers_test_service_settings", "id": "uuid", "attributes": { "code_coverage": true, "tests_skipping": true, "require_git": true } } }')
         } else {
           response.status(400).send()
         }
@@ -70,6 +76,7 @@ class ConfigurationApiImplTest extends Specification {
               "repository_url": "https://github.com/DataDog/foo",
               "branch"        : "prod",
               "sha"           : "d64185e45d1722ab3a53c45be47accae",
+              "test_level"    : "test",
               "configurations": [
                 "os.platform"         : "linux",
                 "os.architecture"     : "amd64",
@@ -78,7 +85,10 @@ class ConfigurationApiImplTest extends Specification {
                 "runtime.name"        : "runtimeName",
                 "runtime.version"     : "runtimeVersion",
                 "runtime.vendor"      : "vendor",
-                "runtime.architecture": "amd64"
+                "runtime.architecture": "amd64",
+                "custom": [
+                  "customTag": "customValue"
+                ]
               ]
             ]
           ]
@@ -87,9 +97,9 @@ class ConfigurationApiImplTest extends Specification {
         if (expectedRequest) {
           response.status(200).send('{ "data": [' +
             '{ "id": "49968354e2091cdb", "type": "test", "attributes": ' +
-            '{ "configurations": { "test.bundle": "testBundle-a" }, "suite": "suite-a", "name": "name-a", "parameters": "parameters-a" } },' +
+            '{ "configurations": { "test.bundle": "testBundle-a", "custom": { "customTag": "customValue" } }, "suite": "suite-a", "name": "name-a", "parameters": "parameters-a" } },' +
             '{ "id": "49968354e2091cdc", "type": "test", "attributes": ' +
-            '   { "configurations": { "test.bundle": "testBundle-b" }, "suite": "suite-b", "name": "name-b", "parameters": "parameters-b" } }' +
+            '   { "configurations": { "test.bundle": "testBundle-b", "custom": { "customTag": "customValue" } }, "suite": "suite-b", "name": "name-b", "parameters": "parameters-b" } }' +
             '] }')
         } else {
           response.status(400).send()
@@ -110,6 +120,7 @@ class ConfigurationApiImplTest extends Specification {
     then:
     settings.codeCoverageEnabled
     settings.testsSkippingEnabled
+    settings.gitUploadRequired
   }
 
   def "test skippable tests request"() {
@@ -125,17 +136,19 @@ class ConfigurationApiImplTest extends Specification {
     skippableTests == [
       new SkippableTest("suite-a", "name-a", "parameters-a",
       new Configurations(null, null, null, null, null,
-      null, null, "testBundle-a")),
+      null, null, "testBundle-a", Collections.singletonMap("customTag", "customValue"))),
       new SkippableTest("suite-b", "name-b", "parameters-b",
       new Configurations(null, null, null, null, null,
-      null, null, "testBundle-b"))
+      null, null, "testBundle-b", Collections.singletonMap("customTag", "customValue")))
     ]
   }
 
   private BackendApi givenEvpProxy() {
+    String traceId = "a-trace-id"
     HttpUrl proxyUrl = HttpUrl.get(intakeServer.address)
     HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0)
-    return new EvpProxyApi(proxyUrl, REQUEST_TIMEOUT_MILLIS, retryPolicyFactory)
+    OkHttpClient client = OkHttpUtils.buildHttpClient(proxyUrl, REQUEST_TIMEOUT_MILLIS)
+    return new EvpProxyApi(traceId, proxyUrl, retryPolicyFactory, client)
   }
 
   private static TracerEnvironment givenTracerEnvironment() {
@@ -152,6 +165,7 @@ class ConfigurationApiImplTest extends Specification {
     .runtimeVersion("runtimeVersion")
     .runtimeVendor("vendor")
     .runtimeArchitecture("amd64")
+    .customTag("customTag", "customValue")
     .build()
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/JvmInfoFactoryTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/JvmInfoFactoryTest.groovy
index db6a991d2df..1d438fc2780 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/JvmInfoFactoryTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/JvmInfoFactoryTest.groovy
@@ -15,7 +15,7 @@ class JvmInfoFactoryTest extends Specification {
     def currentJvmExecutable = getCurrentJvmExecutable()
 
     when:
-    def jvmInfo = JvmInfoFactory.doGetJvmInfo(currentJvmExecutable)
+    def jvmInfo = JvmInfoFactoryImpl.doGetJvmInfo(currentJvmExecutable)
 
     then:
     jvmInfo == JvmInfo.CURRENT_JVM
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy
similarity index 90%
rename from dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy
rename to dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy
index db382fc92a1..76494f2c43b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/SkippableTestsSerializerTest.groovy
@@ -22,6 +22,8 @@ class SkippableTestsSerializerTest extends Specification {
     tests << [
       // single test
       [["suite", "name", null]],
+      [["suite", "𝕄 add user properties 𝕎 addUserProperties()", null]],
+      // non-ASCII characters
       [["suite", "name", "parameters"]],
       [["suite", "name", "{\"metadata\":{\"test_name\":\"test display name with #a #b #c\"}}"]],
       // multiple tests
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitDataApiTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitDataApiTest.groovy
index aba6ce092fa..c280fe51f76 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitDataApiTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitDataApiTest.groovy
@@ -2,11 +2,13 @@ package datadog.trace.civisibility.git.tree
 
 import com.squareup.moshi.Moshi
 import datadog.communication.http.HttpRetryPolicy
+import datadog.communication.http.OkHttpUtils
 import datadog.trace.agent.test.server.http.TestHttpServer
 import datadog.trace.civisibility.communication.BackendApi
 import datadog.trace.civisibility.communication.EvpProxyApi
 import datadog.trace.test.util.MultipartRequestParser
 import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.lang.Specification
@@ -112,9 +114,11 @@ class GitDataApiTest extends Specification {
   }
 
   private BackendApi givenEvpProxy() {
+    String traceId = "a-trace-id"
     HttpUrl proxyUrl = HttpUrl.get(intakeServer.address)
     HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0)
-    return new EvpProxyApi(proxyUrl, REQUEST_TIMEOUT_MILLIS, retryPolicyFactory)
+    OkHttpClient client = OkHttpUtils.buildHttpClient(proxyUrl, REQUEST_TIMEOUT_MILLIS)
+    return new EvpProxyApi(traceId, proxyUrl, retryPolicyFactory, client)
   }
 
   private Path givenPackFile() {
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/ConventionBasedResourceResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/ConventionBasedResourceResolverTest.groovy
new file mode 100644
index 00000000000..cba076096a1
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/ConventionBasedResourceResolverTest.groovy
@@ -0,0 +1,28 @@
+package datadog.trace.civisibility.source.index
+
+import com.google.common.jimfs.Configuration
+import com.google.common.jimfs.Jimfs
+import datadog.trace.api.Config
+import spock.lang.Specification
+
+class ConventionBasedResourceResolverTest extends Specification {
+
+  def "test resource root resolution: #path"() {
+    setup:
+    def fileSystem = Jimfs.newFileSystem(Configuration.unix())
+    def resourcePath = fileSystem.getPath(path)
+
+    when:
+    def resourceResolver = new ConventionBasedResourceResolver(fileSystem, Config.get().ciVisibilityResourceFolderNames)
+    def resourceRoot = resourceResolver.getResourceRoot(resourcePath)
+
+    then:
+    resourceRoot == fileSystem.getPath(expectedResourceRoot)
+
+    where:
+    path                                               | expectedResourceRoot
+    "/root/src/test/groovy/features/MyFeature.feature" | "/root/src/test/groovy"
+    "/root/src/main/java/junit.properties"             | "/root/src/main/java"
+    "/root/src/main/resources/my/package/fixture.json" | "/root/src/main/resources"
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolverTest.groovy
index 59a29662254..0dde87251a2 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolverTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolverTest.groovy
@@ -11,6 +11,7 @@ import java.nio.file.Path
 class RepoIndexSourcePathResolverTest extends Specification {
 
   def packageResolver = Stub(PackageResolver)
+  def resourceResolver = Stub(ResourceResolver)
   def fileSystem = Jimfs.newFileSystem(Configuration.unix())
   def repoRoot = getRepoRoot()
 
@@ -19,7 +20,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(RepoIndexSourcePathResolverTest) == expectedSourcePath
@@ -30,7 +31,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(InnerClass) == expectedSourcePath
@@ -41,7 +42,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(InnerClass.NestedInnerClass) == expectedSourcePath
@@ -52,7 +53,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
     def r = new Runnable() {
         void run() {}
       }
@@ -66,18 +67,29 @@ class RepoIndexSourcePathResolverTest extends Specification {
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(PackagePrivateClass) == expectedSourcePath
   }
 
+  def "test source path resolution for class nested into package-private class"() {
+    setup:
+    def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
+
+    when:
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
+
+    then:
+    sourcePathResolver.getSourcePath(PackagePrivateClass.NestedIntoPackagePrivateClass) == expectedSourcePath
+  }
+
   def "test source path resolution for non-java class whose file name is different from class name"() {
     setup:
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(PublicClassWhoseNameDoesNotCorrespondToFileName) == expectedSourcePath
@@ -87,7 +99,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     setup:
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(RepoIndexSourcePathResolver) == null
@@ -97,7 +109,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     setup:
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(PackagePrivateClass) == null
@@ -112,7 +124,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     Files.write(classPath, "STUB CLASS BODY".getBytes())
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(RepoIndexSourcePathResolverTest) == null
@@ -126,7 +138,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
     givenRepoFile(fileSystem.getPath(repoRoot, "README.md"))
 
     when:
-    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, resourceResolver, fileSystem)
 
     then:
     sourcePathResolver.getSourcePath(RepoIndexSourcePathResolverTest) == expectedSourcePathOne
@@ -173,6 +185,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
 
 @PackageScope
 class PackagePrivateClass {
+  class NestedIntoPackagePrivateClass {}
 }
 
 class PublicClassWhoseNameDoesNotCorrespondToFileName {
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/azurepipelines.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/azurepipelines.json
index 9262c329866..594da6d147b 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/azurepipelines.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/azurepipelines.json
@@ -677,5 +677,201 @@
       "git.commit.message": "azure-pipelines-commit-message",
       "git.repository_url": "https://dev.azure.com/fabrikamfiber/repo.git"
     }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "https://user:password@dev.azure.com:1234/fabrikamfiber/repo.git",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "https://dev.azure.com:1234/fabrikamfiber/repo.git"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "https://user:password@1.1.1.1:1234/fabrikamfiber/repo.git",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "https://1.1.1.1:1234/fabrikamfiber/repo.git"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "https://user:password@1.1.1.1:1234/fabrikamfiber/repo_with_@_yeah.git",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "https://1.1.1.1:1234/fabrikamfiber/repo_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "https://user@dev.azure.com/fabrikamfiber/repo.git",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "https://dev.azure.com/fabrikamfiber/repo.git"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "ssh://user@host.xz:port/path/to/repo.git/",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BUILD_BUILDID": "azure-pipelines-build-id",
+      "BUILD_DEFINITIONNAME": "azure-pipelines-name",
+      "BUILD_REPOSITORY_URI": "ssh://user:password@1.1.1.1:port/path/to/repo.git/",
+      "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
+      "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
+      "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
+      "SYSTEM_JOBID": "azure-pipelines-job-id",
+      "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
+      "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
+      "SYSTEM_TEAMPROJECTID": "azure-pipelines-project-id",
+      "TF_BUILD": "True"
+    },
+    {
+      "_dd.ci.env_vars": "{\"SYSTEM_TEAMPROJECTID\":\"azure-pipelines-project-id\",\"BUILD_BUILDID\":\"azure-pipelines-build-id\",\"SYSTEM_JOBID\":\"azure-pipelines-job-id\"}",
+      "ci.job.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id&view=logs&j=azure-pipelines-job-id&t=azure-pipelines-task-id",
+      "ci.pipeline.id": "azure-pipelines-build-id",
+      "ci.pipeline.name": "azure-pipelines-name",
+      "ci.pipeline.number": "azure-pipelines-build-id",
+      "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id",
+      "ci.provider.name": "azurepipelines",
+      "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "azure-pipelines-commit-author",
+      "git.commit.message": "azure-pipelines-commit-message",
+      "git.repository_url": "ssh://1.1.1.1:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitbucket.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitbucket.json
index 4b3c7e52c93..72d47cdff00 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitbucket.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitbucket.json
@@ -418,5 +418,138 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.repository_url": "https://bitbucket.org/DataDog/dogweb.git"
     }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "https://user@bitbucket.org/DataDog/dogweb.git",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://bitbucket.org/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "https://user:password@bitbucket.org:1234/DataDog/dogweb.git",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://bitbucket.org:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "https://user:password@1.1.1.1/DataDog/dogweb.git",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "ssh://user@host.xz:port/path/to/repo.git/",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num",
+      "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BITBUCKET_GIT_HTTP_ORIGIN": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
+      "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo"
+    },
+    {
+      "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.pipeline.id": "bitbucket-uuid",
+      "ci.pipeline.name": "bitbucket-repo",
+      "ci.pipeline.number": "bitbucket-build-num",
+      "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
+      "ci.provider.name": "bitbucket",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitrise.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitrise.json
index 5563094dc01..6f5b52cdf90 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitrise.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitrise.json
@@ -499,5 +499,152 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.repository_url": "https://github.com/DataDog/dogweb.git"
     }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "https://user@github.com/DataDog/dogweb.git"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "https://user:password@github.com:1234/DataDog/dogweb.git"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "ssh://user@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number",
+      "BITRISE_BUILD_SLUG": "bitrise-pipeline-id",
+      "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
+      "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
+      "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
+      "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_REPOSITORY_URL": "ssh://user:password@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "ci.pipeline.id": "bitrise-pipeline-id",
+      "ci.pipeline.name": "bitrise-pipeline-name",
+      "ci.pipeline.number": "bitrise-pipeline-number",
+      "ci.pipeline.url": "https://bitrise-build-url.com//",
+      "ci.provider.name": "bitrise",
+      "git.commit.message": "bitrise-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buddy.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buddy.json
index 26bf616455b..007cc196652 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buddy.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buddy.json
@@ -177,5 +177,245 @@
       "git.repository_url": "git@github.com:DataDog/userrepo.git",
       "git.tag": "v1.0"
     }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user:password@github.com/buddyworks/my-project.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/buddyworks/my-project.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user@github.com/buddyworks/my-project.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/buddyworks/my-project.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user:password@github.com:1234/buddyworks/my-project.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/buddyworks/my-project.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user:password@1.1.1.1/buddyworks/my-project.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/buddyworks/my-project.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user:password@1.1.1.1:1234/buddyworks/my-project.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/buddyworks/my-project.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "https://user:password@1.1.1.1:1234/buddyworks/my-project_with_@_yeah.git"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/buddyworks/my-project_with_@_yeah.git",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "ssh://user@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/",
+      "git.tag": "v1.0"
+    }
+  ],
+  [
+    {
+      "BUDDY": "true",
+      "BUDDY_EXECUTION_BRANCH": "master",
+      "BUDDY_EXECUTION_ID": "buddy-execution-id",
+      "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works",
+      "BUDDY_EXECUTION_REVISION_COMMITTER_NAME": "Mike Benson",
+      "BUDDY_EXECUTION_REVISION_MESSAGE": "Create buddy.yml",
+      "BUDDY_EXECUTION_TAG": "v1.0",
+      "BUDDY_EXECUTION_URL": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "BUDDY_PIPELINE_ID": "456",
+      "BUDDY_PIPELINE_NAME": "Deploy to Production",
+      "BUDDY_SCM_URL": "ssh://user:password@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "ci.pipeline.id": "456/buddy-execution-id",
+      "ci.pipeline.name": "Deploy to Production",
+      "ci.pipeline.number": "buddy-execution-id",
+      "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08",
+      "ci.provider.name": "buddy",
+      "git.branch": "master",
+      "git.commit.committer.email": "mikebenson@buddy.works",
+      "git.commit.committer.name": "Mike Benson",
+      "git.commit.message": "Create buddy.yml",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/",
+      "git.tag": "v1.0"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buildkite.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buildkite.json
index c332fd740d7..421904b20e6 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buildkite.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/buildkite.json
@@ -704,6 +704,223 @@
       "git.repository_url": "https://github.com/DataDog/dogweb.git"
     }
   ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "https://user@github.com/DataDog/dogweb.git",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "https://user:password@github.com:1234/DataDog/dogweb.git",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "https://user:password@1.1.1.1/DataDog/dogweb.git",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "ssh://user@host.xz:port/path/to/repo.git/",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BUILDKITE": "true",
+      "BUILDKITE_BRANCH": "",
+      "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name",
+      "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com",
+      "BUILDKITE_BUILD_ID": "buildkite-pipeline-id",
+      "BUILDKITE_BUILD_NUMBER": "buildkite-pipeline-number",
+      "BUILDKITE_BUILD_URL": "https://buildkite-build-url.com",
+      "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "BUILDKITE_JOB_ID": "buildkite-job-id",
+      "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
+      "BUILDKITE_REPO": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "BUILDKITE_TAG": ""
+    },
+    {
+      "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
+      "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
+      "ci.pipeline.id": "buildkite-pipeline-id",
+      "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.number": "buildkite-pipeline-number",
+      "ci.pipeline.url": "https://buildkite-build-url.com",
+      "ci.provider.name": "buildkite",
+      "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com",
+      "git.commit.author.name": "buildkite-git-commit-author-name",
+      "git.commit.message": "buildkite-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
   [
     {
       "BUILDKITE": "true",
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/circleci.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/circleci.json
index 8efa8c353f0..b9065be3bd6 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/circleci.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/circleci.json
@@ -541,5 +541,166 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.repository_url": "https://github.com/DataDog/dogweb.git"
     }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "https://user@github.com/DataDog/dogweb.git",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "https://user:password@github.com:1234/DataDog/dogweb.git",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "ssh://user@host.xz:port/path/to/repo.git/",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "CIRCLECI": "circleCI",
+      "CIRCLE_BUILD_NUM": "circleci-pipeline-number",
+      "CIRCLE_BUILD_URL": "https://circleci-build-url.com/",
+      "CIRCLE_JOB": "circleci-job-name",
+      "CIRCLE_PROJECT_REPONAME": "circleci-pipeline-name",
+      "CIRCLE_REPOSITORY_URL": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
+      "ci.job.name": "circleci-job-name",
+      "ci.job.url": "https://circleci-build-url.com/",
+      "ci.pipeline.id": "circleci-pipeline-id",
+      "ci.pipeline.name": "circleci-pipeline-name",
+      "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
+      "ci.provider.name": "circleci",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/codefresh.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/codefresh.json
index d719df10592..7b1367b4f09 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/codefresh.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/codefresh.json
@@ -158,5 +158,167 @@
       "git.repository_url": "git@github.com:DataDog/userrepo.git",
       "git.tag": "0.0.2"
     }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@github.com/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user@github.com/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@github.com:1234/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "ssh://user@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "CF_BUILD_ID": "6410367cee516146a4c4c66e",
+      "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline",
+      "CF_STEP_NAME": "mah-job-name",
+      "DD_GIT_REPOSITORY_URL": "ssh://user:password@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CF_BUILD_ID\":\"6410367cee516146a4c4c66e\"}",
+      "ci.job.name": "mah-job-name",
+      "ci.pipeline.id": "6410367cee516146a4c4c66e",
+      "ci.pipeline.name": "My simple project/Example Java Project Pipeline",
+      "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
+      "ci.provider.name": "codefresh",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/github.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/github.json
index e5df52c58ba..3dd5ac62d54 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/github.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/github.json
@@ -5,6 +5,7 @@
       "GITHUB_JOB": "github-job-name",
       "GITHUB_REF": "master",
       "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
       "GITHUB_RUN_ID": "ghactions-pipeline-id",
       "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
       "GITHUB_SERVER_URL": "https://ghenterprise.com",
@@ -13,13 +14,13 @@
       "GITHUB_WORKSPACE": "/foo/bar"
     },
     {
-      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://ghenterprise.com\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\"}",
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://ghenterprise.com\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
       "ci.job.name": "github-job-name",
       "ci.job.url": "https://ghenterprise.com/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
       "ci.pipeline.id": "ghactions-pipeline-id",
       "ci.pipeline.name": "ghactions-pipeline-name",
       "ci.pipeline.number": "ghactions-pipeline-number",
-      "ci.pipeline.url": "https://ghenterprise.com/ghactions-repo/actions/runs/ghactions-pipeline-id",
+      "ci.pipeline.url": "https://ghenterprise.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
       "ci.provider.name": "github",
       "ci.workspace_path": "/foo/bar",
       "git.branch": "master",
@@ -560,5 +561,154 @@
       "git.repository_url": "git@github.com:DataDog/userrepo.git",
       "git.tag": "0.0.2"
     }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://github.com",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://github.com\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://github.com/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/ghactions-repo.git"
+    }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://user:password@github.com",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://github.com\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://github.com/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/ghactions-repo.git"
+    }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://user@github.com",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://github.com\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://github.com/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/ghactions-repo.git"
+    }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://user:password@github.com:1234",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://github.com:1234\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://github.com:1234/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://github.com:1234/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/ghactions-repo.git"
+    }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://user:password@1.1.1.1",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://1.1.1.1\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://1.1.1.1/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://1.1.1.1/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/ghactions-repo.git"
+    }
+  ],
+  [
+    {
+      "GITHUB_ACTION": "run",
+      "GITHUB_JOB": "github-job-name",
+      "GITHUB_REPOSITORY": "ghactions-repo",
+      "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt",
+      "GITHUB_RUN_ID": "ghactions-pipeline-id",
+      "GITHUB_RUN_NUMBER": "ghactions-pipeline-number",
+      "GITHUB_SERVER_URL": "https://user:password@1.1.1.1:1234",
+      "GITHUB_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GITHUB_WORKFLOW": "ghactions-pipeline-name"
+    },
+    {
+      "_dd.ci.env_vars": "{\"GITHUB_SERVER_URL\":\"https://1.1.1.1:1234\",\"GITHUB_REPOSITORY\":\"ghactions-repo\",\"GITHUB_RUN_ID\":\"ghactions-pipeline-id\",\"GITHUB_RUN_ATTEMPT\":\"ghactions-run-attempt\"}",
+      "ci.job.name": "github-job-name",
+      "ci.job.url": "https://1.1.1.1:1234/ghactions-repo/commit/b9f0fb3fdbb94c9d24b2c75b49663122a529e123/checks",
+      "ci.pipeline.id": "ghactions-pipeline-id",
+      "ci.pipeline.name": "ghactions-pipeline-name",
+      "ci.pipeline.number": "ghactions-pipeline-number",
+      "ci.pipeline.url": "https://1.1.1.1:1234/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt",
+      "ci.provider.name": "github",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/ghactions-repo.git"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/gitlab.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/gitlab.json
index c1879ed80bd..400d99c977d 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/gitlab.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/gitlab.json
@@ -668,17 +668,7 @@
       "CI_PROJECT_DIR": "/foo/bar",
       "CI_PROJECT_PATH": "gitlab-pipeline-name",
       "CI_PROJECT_URL": "https://gitlab.com/repo",
-      "CI_REPOSITORY_URL": "https://gitlab.com/repo/myrepo.git",
-      "DD_GIT_BRANCH": "user-supplied-branch",
-      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
-      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
-      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
-      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
-      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
-      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
-      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
-      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
-      "DD_GIT_REPOSITORY_URL": "git@github.com:DataDog/userrepo.git",
+      "CI_REPOSITORY_URL": "http://user:pwd@hostname.com:1234/repo.git",
       "GITLAB_CI": "gitlab"
     },
     {
@@ -692,16 +682,133 @@
       "ci.provider.name": "gitlab",
       "ci.stage.name": "gitlab-stage-name",
       "ci.workspace_path": "/foo/bar",
-      "git.branch": "user-supplied-branch",
-      "git.commit.author.date": "usersupplied-authordate",
-      "git.commit.author.email": "usersupplied-authoremail",
-      "git.commit.author.name": "usersupplied-authorname",
-      "git.commit.committer.date": "usersupplied-comitterdate",
-      "git.commit.committer.email": "usersupplied-comitteremail",
-      "git.commit.committer.name": "usersupplied-comittername",
-      "git.commit.message": "usersupplied-message",
+      "git.branch": "master",
+      "git.commit.author.date": "2021-07-21T11:43:07-04:00",
+      "git.commit.author.email": "john@doe.com",
+      "git.commit.author.name": "John Doe",
+      "git.commit.message": "gitlab-git-commit-message",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
-      "git.repository_url": "git@github.com:DataDog/userrepo.git"
+      "git.repository_url": "http://hostname.com:1234/repo.git"
+    }
+  ],
+  [
+    {
+      "CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
+      "CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
+      "CI_COMMIT_REF_NAME": "origin/master",
+      "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
+      "CI_JOB_ID": "gitlab-job-id",
+      "CI_JOB_NAME": "gitlab-job-name",
+      "CI_JOB_STAGE": "gitlab-stage-name",
+      "CI_JOB_URL": "https://gitlab.com/job",
+      "CI_PIPELINE_ID": "gitlab-pipeline-id",
+      "CI_PIPELINE_IID": "gitlab-pipeline-number",
+      "CI_PIPELINE_URL": "https://foo/repo/-/pipelines/1234",
+      "CI_PROJECT_DIR": "/foo/bar",
+      "CI_PROJECT_PATH": "gitlab-pipeline-name",
+      "CI_PROJECT_URL": "https://gitlab.com/repo",
+      "CI_REPOSITORY_URL": "http://user:pwd@1.1.1.1/repo.git",
+      "GITLAB_CI": "gitlab"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CI_PROJECT_URL\":\"https://gitlab.com/repo\",\"CI_PIPELINE_ID\":\"gitlab-pipeline-id\",\"CI_JOB_ID\":\"gitlab-job-id\"}",
+      "ci.job.name": "gitlab-job-name",
+      "ci.job.url": "https://gitlab.com/job",
+      "ci.pipeline.id": "gitlab-pipeline-id",
+      "ci.pipeline.name": "gitlab-pipeline-name",
+      "ci.pipeline.number": "gitlab-pipeline-number",
+      "ci.pipeline.url": "https://foo/repo/-/pipelines/1234",
+      "ci.provider.name": "gitlab",
+      "ci.stage.name": "gitlab-stage-name",
+      "ci.workspace_path": "/foo/bar",
+      "git.branch": "master",
+      "git.commit.author.date": "2021-07-21T11:43:07-04:00",
+      "git.commit.author.email": "john@doe.com",
+      "git.commit.author.name": "John Doe",
+      "git.commit.message": "gitlab-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "http://1.1.1.1/repo.git"
+    }
+  ],
+  [
+    {
+      "CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
+      "CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
+      "CI_COMMIT_REF_NAME": "origin/master",
+      "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
+      "CI_JOB_ID": "gitlab-job-id",
+      "CI_JOB_NAME": "gitlab-job-name",
+      "CI_JOB_STAGE": "gitlab-stage-name",
+      "CI_JOB_URL": "https://gitlab.com/job",
+      "CI_PIPELINE_ID": "gitlab-pipeline-id",
+      "CI_PIPELINE_IID": "gitlab-pipeline-number",
+      "CI_PIPELINE_URL": "https://foo/repo/-/pipelines/1234",
+      "CI_PROJECT_DIR": "/foo/bar",
+      "CI_PROJECT_PATH": "gitlab-pipeline-name",
+      "CI_PROJECT_URL": "https://gitlab.com/repo",
+      "CI_REPOSITORY_URL": "http://user:pwd@1.1.1.1:1234/repo.git",
+      "GITLAB_CI": "gitlab"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CI_PROJECT_URL\":\"https://gitlab.com/repo\",\"CI_PIPELINE_ID\":\"gitlab-pipeline-id\",\"CI_JOB_ID\":\"gitlab-job-id\"}",
+      "ci.job.name": "gitlab-job-name",
+      "ci.job.url": "https://gitlab.com/job",
+      "ci.pipeline.id": "gitlab-pipeline-id",
+      "ci.pipeline.name": "gitlab-pipeline-name",
+      "ci.pipeline.number": "gitlab-pipeline-number",
+      "ci.pipeline.url": "https://foo/repo/-/pipelines/1234",
+      "ci.provider.name": "gitlab",
+      "ci.stage.name": "gitlab-stage-name",
+      "ci.workspace_path": "/foo/bar",
+      "git.branch": "master",
+      "git.commit.author.date": "2021-07-21T11:43:07-04:00",
+      "git.commit.author.email": "john@doe.com",
+      "git.commit.author.name": "John Doe",
+      "git.commit.message": "gitlab-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "http://1.1.1.1:1234/repo.git"
+    }
+  ],
+  [
+    {
+      "CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
+      "CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
+      "CI_COMMIT_REF_NAME": "origin/master",
+      "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
+      "CI_JOB_ID": "gitlab-job-id",
+      "CI_JOB_NAME": "gitlab-job-name",
+      "CI_JOB_STAGE": "gitlab-stage-name",
+      "CI_JOB_URL": "https://gitlab.com/job",
+      "CI_PIPELINE_ID": "gitlab-pipeline-id",
+      "CI_PIPELINE_IID": "gitlab-pipeline-number",
+      "CI_PIPELINE_URL": "https://foo/repo/-/pipelines/1234",
+      "CI_PROJECT_DIR": "/foo/bar",
+      "CI_PROJECT_PATH": "gitlab-pipeline-name",
+      "CI_PROJECT_URL": "https://gitlab.com/repo",
+      "CI_REPOSITORY_URL": "http://user:pwd@1.1.1.1:1234/repo_with_@_yeah.git",
+      "GITLAB_CI": "gitlab"
+    },
+    {
+      "_dd.ci.env_vars": "{\"CI_PROJECT_URL\":\"https://gitlab.com/repo\",\"CI_PIPELINE_ID\":\"gitlab-pipeline-id\",\"CI_JOB_ID\":\"gitlab-job-id\"}",
+      "ci.job.name": "gitlab-job-name",
+      "ci.job.url": "https://gitlab.com/job",
+      "ci.pipeline.id": "gitlab-pipeline-id",
+      "ci.pipeline.name": "gitlab-pipeline-name",
+      "ci.pipeline.number": "gitlab-pipeline-number",
+      "ci.pipeline.url": "https://foo/repo/-/pipelines/1234",
+      "ci.provider.name": "gitlab",
+      "ci.stage.name": "gitlab-stage-name",
+      "ci.workspace_path": "/foo/bar",
+      "git.branch": "master",
+      "git.commit.author.date": "2021-07-21T11:43:07-04:00",
+      "git.commit.author.email": "john@doe.com",
+      "git.commit.author.name": "John Doe",
+      "git.commit.message": "gitlab-git-commit-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "http://1.1.1.1:1234/repo_with_@_yeah.git"
     }
   ],
   [
@@ -722,6 +829,7 @@
       "CI_PROJECT_PATH": "gitlab-pipeline-name",
       "CI_PROJECT_URL": "https://gitlab.com/repo",
       "CI_REPOSITORY_URL": "https://gitlab.com/repo/myrepo.git",
+      "DD_GIT_BRANCH": "user-supplied-branch",
       "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
       "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
       "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
@@ -731,7 +839,6 @@
       "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
       "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "DD_GIT_REPOSITORY_URL": "git@github.com:DataDog/userrepo.git",
-      "DD_GIT_TAG": "0.0.2",
       "GITLAB_CI": "gitlab"
     },
     {
@@ -745,7 +852,7 @@
       "ci.provider.name": "gitlab",
       "ci.stage.name": "gitlab-stage-name",
       "ci.workspace_path": "/foo/bar",
-      "git.branch": "master",
+      "git.branch": "user-supplied-branch",
       "git.commit.author.date": "usersupplied-authordate",
       "git.commit.author.email": "usersupplied-authoremail",
       "git.commit.author.name": "usersupplied-authorname",
@@ -754,8 +861,7 @@
       "git.commit.committer.name": "usersupplied-comittername",
       "git.commit.message": "usersupplied-message",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
-      "git.repository_url": "git@github.com:DataDog/userrepo.git",
-      "git.tag": "0.0.2"
+      "git.repository_url": "git@github.com:DataDog/userrepo.git"
     }
   ],
   [
@@ -775,7 +881,17 @@
       "CI_PROJECT_DIR": "/foo/bar",
       "CI_PROJECT_PATH": "gitlab-pipeline-name",
       "CI_PROJECT_URL": "https://gitlab.com/repo",
-      "CI_REPOSITORY_URL": "https://user:password@gitlab.com/DataDog/dogweb.git",
+      "CI_REPOSITORY_URL": "https://gitlab.com/repo/myrepo.git",
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "git@github.com:DataDog/userrepo.git",
+      "DD_GIT_TAG": "0.0.2",
       "GITLAB_CI": "gitlab"
     },
     {
@@ -790,12 +906,16 @@
       "ci.stage.name": "gitlab-stage-name",
       "ci.workspace_path": "/foo/bar",
       "git.branch": "master",
-      "git.commit.author.date": "2021-07-21T11:43:07-04:00",
-      "git.commit.author.email": "john@doe.com",
-      "git.commit.author.name": "John Doe",
-      "git.commit.message": "gitlab-git-commit-message",
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
-      "git.repository_url": "https://gitlab.com/DataDog/dogweb.git"
+      "git.repository_url": "git@github.com:DataDog/userrepo.git",
+      "git.tag": "0.0.2"
     }
   ],
   [
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/jenkins.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/jenkins.json
index 3e791b5f7ff..f87cdbd2a36 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/jenkins.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/jenkins.json
@@ -687,6 +687,153 @@
       "git.repository_url": "https://github.com/DataDog/dogweb.git"
     }
   ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "https://user@github.com/DataDog/dogweb.git",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "https://user:password@github.com:1234/DataDog/dogweb.git",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "https://user:password@1.1.1.1/DataDog/dogweb.git",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "ssh://user@host.xz:port/path/to/repo.git/",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BUILD_NUMBER": "jenkins-pipeline-number",
+      "BUILD_TAG": "jenkins-pipeline-id",
+      "BUILD_URL": "https://jenkins.com/pipeline",
+      "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
+      "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "GIT_URL_1": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "JENKINS_URL": "jenkins",
+      "JOB_URL": "https://jenkins.com/job"
+    },
+    {
+      "_dd.ci.env_vars": "{\"DD_CUSTOM_TRACE_ID\":\"jenkins-custom-trace-id\"}",
+      "ci.pipeline.id": "jenkins-pipeline-id",
+      "ci.pipeline.number": "jenkins-pipeline-number",
+      "ci.pipeline.url": "https://jenkins.com/pipeline",
+      "ci.provider.name": "jenkins",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
   [
     {
       "BUILD_NUMBER": "jenkins-pipeline-number",
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/teamcity.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/teamcity.json
index 086c1c16de1..037887c4ae0 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/teamcity.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/teamcity.json
@@ -74,5 +74,117 @@
       "git.repository_url": "git@github.com:DataDog/userrepo.git",
       "git.tag": "0.0.2"
     }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@github.com/DataDog/dogweb.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user@github.com/DataDog/dogweb.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@github.com:1234/DataDog/dogweb.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "ssh://user@host.xz:port/path/to/repo.git/",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "BUILD_URL": "https://teamcity.com/repo",
+      "DD_GIT_REPOSITORY_URL": "ssh://user:password@host.xz:port/path/to/repo.git/",
+      "TEAMCITY_BUILDCONF_NAME": "Test 1",
+      "TEAMCITY_VERSION": "2022.10 (build 116751)"
+    },
+    {
+      "ci.job.name": "Test 1",
+      "ci.job.url": "https://teamcity.com/repo",
+      "ci.provider.name": "teamcity",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/usersupplied.json b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/usersupplied.json
index 3e770927ebf..464c4158558 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/usersupplied.json
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/usersupplied.json
@@ -178,5 +178,173 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.repository_url": "https://github.com/DataDog/dogweb.git"
     }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "https://user@github.com/DataDog/dogweb.git"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@github.com:1234/DataDog/dogweb.git"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://github.com:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1/DataDog/dogweb.git"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb.git"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb.git"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "https://user:password@1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "https://1.1.1.1:1234/DataDog/dogweb_with_@_yeah.git"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "ssh://user@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
+  ],
+  [
+    {
+      "DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
+      "DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
+      "DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
+      "DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
+      "DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
+      "DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
+      "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
+      "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "DD_GIT_REPOSITORY_URL": "ssh://user:password@host.xz:port/path/to/repo.git/"
+    },
+    {
+      "git.commit.author.date": "usersupplied-authordate",
+      "git.commit.author.email": "usersupplied-authoremail",
+      "git.commit.author.name": "usersupplied-authorname",
+      "git.commit.committer.date": "usersupplied-comitterdate",
+      "git.commit.committer.email": "usersupplied-comitteremail",
+      "git.commit.committer.name": "usersupplied-comittername",
+      "git.commit.message": "usersupplied-message",
+      "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
+      "git.repository_url": "ssh://host.xz:port/path/to/repo.git/"
+    }
   ]
 ]
diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy
new file mode 100644
index 00000000000..cff25d8f037
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy
@@ -0,0 +1,222 @@
+package datadog.trace.civisibility
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import datadog.communication.serialization.GrowableBuffer
+import datadog.communication.serialization.msgpack.MsgPackWriter
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.Config
+import datadog.trace.api.civisibility.InstrumentationBridge
+import datadog.trace.api.civisibility.config.ModuleExecutionSettings
+import datadog.trace.api.civisibility.config.SkippableTest
+import datadog.trace.api.config.CiVisibilityConfig
+import datadog.trace.api.config.GeneralConfig
+import datadog.trace.civisibility.codeowners.Codeowners
+import datadog.trace.civisibility.config.JvmInfo
+import datadog.trace.civisibility.config.JvmInfoFactoryImpl
+import datadog.trace.civisibility.config.ModuleExecutionSettingsFactory
+import datadog.trace.civisibility.coverage.SegmentlessTestProbes
+import datadog.trace.civisibility.decorator.TestDecorator
+import datadog.trace.civisibility.decorator.TestDecoratorImpl
+import datadog.trace.civisibility.events.BuildEventsHandlerImpl
+import datadog.trace.civisibility.events.TestEventsHandlerImpl
+import datadog.trace.civisibility.ipc.SignalServer
+import datadog.trace.civisibility.source.MethodLinesResolver
+import datadog.trace.civisibility.source.SourcePathResolver
+import datadog.trace.civisibility.source.index.RepoIndexBuilder
+import datadog.trace.civisibility.writer.ddintake.CiTestCovMapperV2
+import datadog.trace.civisibility.writer.ddintake.CiTestCycleMapperV1
+import datadog.trace.common.writer.RemoteMapper
+import datadog.trace.core.DDSpan
+import org.msgpack.jackson.dataformat.MessagePackFactory
+import spock.lang.Unroll
+
+import java.lang.reflect.Method
+import java.nio.ByteBuffer
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+
+@Unroll
+abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
+
+  static String dummyModule
+  static final String DUMMY_CI_TAG = "dummy_ci_tag"
+  static final String DUMMY_CI_TAG_VALUE = "dummy_ci_tag_value"
+  static final String DUMMY_SOURCE_PATH = "dummy_source_path"
+  static final int DUMMY_TEST_METHOD_START = 12
+  static final int DUMMY_TEST_METHOD_END = 18
+  static final Collection<String> DUMMY_CODE_OWNERS = ["owner1", "owner2"]
+
+  private static Path agentKeyFile
+
+  private static final List<SkippableTest> skippableTests = new ArrayList<>()
+  private static volatile boolean itrEnabled = false
+
+  def setupSpec() {
+    def currentPath = Paths.get("").toAbsolutePath()
+    def rootPath = currentPath.parent
+    dummyModule = rootPath.relativize(currentPath)
+
+    def sourcePathResolver = Stub(SourcePathResolver)
+    sourcePathResolver.getSourcePath(_ as Class) >> DUMMY_SOURCE_PATH
+    sourcePathResolver.getResourcePath(_ as String) >> {
+      String path -> path
+    }
+
+    def codeowners = Stub(Codeowners)
+    codeowners.getOwners(DUMMY_SOURCE_PATH) >> DUMMY_CODE_OWNERS
+
+    def methodLinesResolver = Stub(MethodLinesResolver)
+    methodLinesResolver.getLines(_ as Method) >> new MethodLinesResolver.MethodLines(DUMMY_TEST_METHOD_START, DUMMY_TEST_METHOD_END)
+
+    def moduleExecutionSettingsFactory = Stub(ModuleExecutionSettingsFactory)
+    moduleExecutionSettingsFactory.create(_ as JvmInfo, _ as String) >> {
+      Map<String, String> properties = [
+        (CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED): String.valueOf(itrEnabled)
+      ]
+      return new ModuleExecutionSettings(false, itrEnabled, properties, Collections.singletonMap(dummyModule, skippableTests), Collections.emptyList())
+    }
+
+    def coverageProbeStoreFactory = new SegmentlessTestProbes.SegmentlessTestProbesFactory()
+    DDTestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, Path projectRoot, String component, Long startTime) -> {
+      def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE]
+      TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags)
+      return new DDTestFrameworkSessionImpl(
+      projectName,
+      startTime,
+      Config.get(),
+      testDecorator,
+      sourcePathResolver,
+      codeowners,
+      methodLinesResolver,
+      coverageProbeStoreFactory,
+      moduleExecutionSettingsFactory,
+      )
+    }
+
+    InstrumentationBridge.registerTestEventsHandlerFactory {
+      component, path ->
+      DDTestFrameworkSession testSession = testFrameworkSessionFactory.startSession(dummyModule, path, component, null)
+      DDTestFrameworkModule testModule = testSession.testModuleStart(dummyModule, null)
+      new TestEventsHandlerImpl(testSession, testModule)
+    }
+
+    DDBuildSystemSession.Factory buildSystemSessionFactory = (String projectName, Path projectRoot, String startCommand, String component, Long startTime) -> {
+      def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE]
+      TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags)
+      TestModuleRegistry testModuleRegistry = new TestModuleRegistry()
+      SignalServer signalServer = new SignalServer()
+      RepoIndexBuilder repoIndexBuilder = Stub(RepoIndexBuilder)
+      return new DDBuildSystemSessionImpl(
+      projectName,
+      rootPath.toString(),
+      startCommand,
+      startTime,
+      Config.get(),
+      testModuleRegistry,
+      testDecorator,
+      sourcePathResolver,
+      codeowners,
+      methodLinesResolver,
+      moduleExecutionSettingsFactory,
+      coverageProbeStoreFactory,
+      signalServer,
+      repoIndexBuilder
+      )
+    }
+
+    InstrumentationBridge.registerBuildEventsHandlerFactory {
+      decorator -> new BuildEventsHandlerImpl<>(buildSystemSessionFactory, new JvmInfoFactoryImpl())
+    }
+
+    InstrumentationBridge.registerCoverageProbeStoreRegistry(coverageProbeStoreFactory)
+  }
+
+  @Override
+  void setup() {
+    skippableTests.clear()
+    itrEnabled = false
+  }
+
+  def givenSkippableTests(List<SkippableTest> tests) {
+    skippableTests.addAll(tests)
+    itrEnabled = true
+  }
+
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+
+    agentKeyFile = Files.createTempFile("TestFrameworkTest", "dummy_agent_key")
+    Files.write(agentKeyFile, "dummy".getBytes())
+
+    injectSysConfig(GeneralConfig.API_KEY_FILE, agentKeyFile.toString())
+    injectSysConfig(CiVisibilityConfig.CIVISIBILITY_ENABLED, "true")
+    injectSysConfig(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true")
+  }
+
+  def cleanupSpec() {
+    Files.deleteIfExists(agentKeyFile)
+  }
+
+  def assertSpansData(String testcaseName, int expectedTracesCount) {
+    TEST_WRITER.waitForTraces(expectedTracesCount)
+    def traces = TEST_WRITER.toList()
+
+    def events = getEventsAsJson(traces)
+    def coverages = getCoveragesAsJson(traces)
+    def additionalReplacements = [
+      "content.meta.['test.framework_version']": instrumentedLibraryVersion(),
+      "content.meta.['test.toolchain']": "${instrumentedLibraryName()}:${instrumentedLibraryVersion()}"
+    ]
+
+    // uncomment to generate expected data templates
+    //        def baseTemplatesPath = CiVisibilityInstrumentationTest.classLoader
+    //          .getResource("test-succeed")
+    //          .toURI()
+    //          .schemeSpecificPart
+    //          .replace('build/resources/test', 'src/test/resources')
+    //          .replace('build/resources/latestDepTest', 'src/test/resources')
+    //          .replace("test-succeed", testcaseName)
+    //        CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
+
+    CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements)
+    return true
+  }
+
+  def getEventsAsJson(List<List<DDSpan>> traces) {
+    return getSpansAsJson(new CiTestCycleMapperV1(Config.get().getWellKnownTags()), traces)
+  }
+
+  def getCoveragesAsJson(List<List<DDSpan>> traces) {
+    return getSpansAsJson(new CiTestCovMapperV2(), traces)
+  }
+
+  def getSpansAsJson(RemoteMapper mapper, List<List<DDSpan>> traces) {
+    def buffer = new GrowableBuffer(8192)
+    def writer = new MsgPackWriter(buffer)
+    def msgPackMapper = new ObjectMapper(new MessagePackFactory())
+    def jsonSpans = []
+    for (List<DDSpan> trace : traces) {
+      for (DDSpan span : trace) {
+        writer.format([span], mapper)
+
+        ByteBuffer slicedBuffer = buffer.slice()
+        buffer.reset()
+
+        if (slicedBuffer.remaining() == 0) {
+          continue
+        }
+
+        byte[] bytes = new byte[slicedBuffer.remaining()]
+        slicedBuffer.get(bytes)
+        jsonSpans += msgPackMapper.readValue(bytes, Map)
+      }
+    }
+    return jsonSpans
+  }
+
+  abstract String instrumentedLibraryName()
+
+  abstract String instrumentedLibraryVersion()
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
new file mode 100644
index 00000000000..b9e92ab2c0b
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
@@ -0,0 +1,122 @@
+package datadog.trace.civisibility
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import datadog.trace.agent.test.server.http.TestHttpServer
+import datadog.trace.test.util.MultipartRequestParser
+import org.msgpack.jackson.dataformat.MessagePackFactory
+import spock.lang.AutoCleanup
+import spock.lang.Shared
+import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
+
+import java.util.concurrent.ConcurrentLinkedQueue
+
+import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
+
+abstract class CiVisibilitySmokeTest extends Specification {
+
+  @Shared
+  ObjectMapper msgPackMapper = new ObjectMapper(new MessagePackFactory())
+
+  @Shared
+  Queue<Map<String, Object>> receivedTraces = new ConcurrentLinkedQueue<>()
+
+  @Shared
+  Queue<Map<String, Object>> receivedCoverages = new ConcurrentLinkedQueue<>()
+
+  def setup() {
+    receivedTraces.clear()
+    receivedCoverages.clear()
+  }
+
+  def cleanup() {
+    receivedTraces.clear()
+    receivedCoverages.clear()
+  }
+
+  @Shared
+  @AutoCleanup
+  protected TestHttpServer intakeServer = httpServer {
+    handlers {
+      prefix("/api/v2/citestcycle") {
+        def decodedEvent = msgPackMapper.readValue(request.body, Map)
+        receivedTraces.add(decodedEvent)
+
+        response.status(200).send()
+      }
+
+      prefix("/api/v2/citestcov") {
+        def parsed = MultipartRequestParser.parseRequest(request.body, request.headers.get("Content-Type"))
+        def coverages = parsed.get("coverage1")
+        for (def coverage : coverages) {
+          def decodedCoverage = msgPackMapper.readValue(coverage.get(), Map)
+          receivedCoverages.add(decodedCoverage)
+        }
+
+        response.status(202).send()
+      }
+
+      prefix("/api/v2/libraries/tests/services/setting") {
+        response.status(200).send('{ "data": { "type": "ci_app_tracers_test_service_settings", "id": "uuid", "attributes": { "code_coverage": true, "tests_skipping": true } } }')
+      }
+
+      prefix("/api/v2/ci/tests/skippable") {
+        response.status(200).send('{ "data": [{' +
+          '  "id": "d230520a0561ee2f",' +
+          '  "type": "test",' +
+          '  "attributes": {' +
+          '    "configurations": {},' +
+          '    "name": "test_to_skip_with_itr",' +
+          '    "suite": "datadog.smoke.TestSucceed"' +
+          '  }' +
+          '}] }')
+      }
+    }
+  }
+
+  protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, int expectedEventsCount, int expectedCoveragesCount) {
+    def events = waitForEvents(expectedEventsCount)
+    def coverages = waitForCoverages(expectedCoveragesCount)
+
+    def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"]
+
+    // uncomment to generate expected data templates
+    //        def baseTemplatesPath = AbstractCiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources')
+    //        CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
+
+    CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements)
+    return true
+  }
+
+  protected List<Map<String, Object>> waitForEvents(int expectedEventsSize) {
+    def traceReceiveConditions = new PollingConditions(timeout: 15, initialDelay: 1, delay: 0.5, factor: 1)
+    traceReceiveConditions.eventually {
+      int eventsSize = 0
+      for (Map<String, Object> trace : receivedTraces) {
+        eventsSize += trace["events"].size()
+      }
+      assert eventsSize == expectedEventsSize
+    }
+
+    List<Map<String, Object>> events = new ArrayList<>()
+    while (!receivedTraces.isEmpty()) {
+      def trace = receivedTraces.poll()
+      events.addAll((List<Map<String, Object>>) trace["events"])
+    }
+    return events
+  }
+
+  protected List<Map<String, Object>> waitForCoverages(int traceSize) {
+    def traceReceiveConditions = new PollingConditions(timeout: 15, initialDelay: 1, delay: 0.5, factor: 1)
+    traceReceiveConditions.eventually {
+      assert receivedCoverages.size() == traceSize
+    }
+
+    List<Map<String, Object>> coverages = new ArrayList<>()
+    while (!receivedCoverages.isEmpty()) {
+      def trace = receivedCoverages.poll()
+      coverages.addAll((List<Map<String, Object>>) trace["coverages"])
+    }
+    return coverages
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTest.groovy
deleted file mode 100644
index cd818861261..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTest.groovy
+++ /dev/null
@@ -1,480 +0,0 @@
-package datadog.trace.civisibility
-
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.api.Config
-import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.DDTags
-import datadog.trace.api.civisibility.InstrumentationBridge
-import datadog.trace.api.civisibility.config.ModuleExecutionSettings
-import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.api.config.CiVisibilityConfig
-import datadog.trace.api.config.GeneralConfig
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.codeowners.Codeowners
-import datadog.trace.civisibility.config.JvmInfoFactory
-import datadog.trace.civisibility.config.ModuleExecutionSettingsFactory
-import datadog.trace.civisibility.coverage.NoopCoverageProbeStore
-import datadog.trace.civisibility.decorator.TestDecorator
-import datadog.trace.civisibility.decorator.TestDecoratorImpl
-import datadog.trace.civisibility.events.BuildEventsHandlerImpl
-import datadog.trace.civisibility.events.TestEventsHandlerImpl
-import datadog.trace.civisibility.ipc.SignalServer
-import datadog.trace.civisibility.source.MethodLinesResolver
-import datadog.trace.civisibility.source.SourcePathResolver
-import datadog.trace.civisibility.source.index.RepoIndexBuilder
-import datadog.trace.core.DDSpan
-import datadog.trace.util.Strings
-import spock.lang.Unroll
-
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.util.regex.Pattern
-
-@Unroll
-abstract class CiVisibilityTest extends AgentTestRunner {
-
-  protected static final Comparator<List<DDSpan>> SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES = new SortTracesByDescSizeThenByNames()
-
-  static String dummyModule
-  static final String DUMMY_CI_TAG = "dummy_ci_tag"
-  static final String DUMMY_CI_TAG_VALUE = "dummy_ci_tag_value"
-  static final String DUMMY_SOURCE_PATH = "dummy_source_path"
-  static final int DUMMY_TEST_METHOD_START = 12
-  static final int DUMMY_TEST_METHOD_END = 18
-  static final Collection<String> DUMMY_CODE_OWNERS = ["owner1", "owner2"]
-  static final Pattern ANY_MESSAGE = Pattern.compile(".*")
-
-  private static Path agentKeyFile
-
-  private static final List<SkippableTest> skippableTests = new ArrayList<>()
-  private static volatile boolean itrEnabled = false
-
-  def setupSpec() {
-    def currentPath = Paths.get("").toAbsolutePath()
-    def rootPath = currentPath.parent
-    dummyModule = rootPath.relativize(currentPath)
-
-    def sourcePathResolver = Stub(SourcePathResolver)
-    sourcePathResolver.getSourcePath(_) >> DUMMY_SOURCE_PATH
-
-    def codeowners = Stub(Codeowners)
-    codeowners.getOwners(DUMMY_SOURCE_PATH) >> DUMMY_CODE_OWNERS
-
-    def methodLinesResolver = Stub(MethodLinesResolver)
-    methodLinesResolver.getLines(_) >> new MethodLinesResolver.MethodLines(DUMMY_TEST_METHOD_START, DUMMY_TEST_METHOD_END)
-
-    def moduleExecutionSettingsFactory = Stub(ModuleExecutionSettingsFactory)
-    moduleExecutionSettingsFactory.create(_, _) >> {
-      Map<String, String> properties = [
-        (CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED): String.valueOf(itrEnabled)
-      ]
-      return new ModuleExecutionSettings(false, itrEnabled, properties, Collections.singletonMap(dummyModule, skippableTests), Collections.emptyList())
-    }
-
-    def coverageProbeStoreFactory = new NoopCoverageProbeStore.NoopCoverageProbeStoreFactory()
-    DDTestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, Path projectRoot, String component, Long startTime) -> {
-      def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE]
-      TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags)
-      return new DDTestFrameworkSessionImpl(
-      projectName,
-      startTime,
-      Config.get(),
-      testDecorator,
-      sourcePathResolver,
-      codeowners,
-      methodLinesResolver,
-      coverageProbeStoreFactory,
-      moduleExecutionSettingsFactory,
-      )
-    }
-
-    InstrumentationBridge.registerTestEventsHandlerFactory {
-      component, path ->
-      DDTestFrameworkSession testSession = testFrameworkSessionFactory.startSession(dummyModule, path, component, null)
-      DDTestFrameworkModule testModule = testSession.testModuleStart(dummyModule, null)
-      new TestEventsHandlerImpl(testSession, testModule)
-    }
-
-    DDBuildSystemSession.Factory buildSystemSessionFactory = (String projectName, Path projectRoot, String startCommand, String component, Long startTime) -> {
-      def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE]
-      TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags)
-      TestModuleRegistry testModuleRegistry = new TestModuleRegistry()
-      SignalServer signalServer = new SignalServer()
-      RepoIndexBuilder repoIndexBuilder = Stub(RepoIndexBuilder)
-      return new DDBuildSystemSessionImpl(
-      projectName,
-      rootPath.toString(),
-      startCommand,
-      startTime,
-      Config.get(),
-      testModuleRegistry,
-      testDecorator,
-      sourcePathResolver,
-      codeowners,
-      methodLinesResolver,
-      moduleExecutionSettingsFactory,
-      coverageProbeStoreFactory,
-      signalServer,
-      repoIndexBuilder
-      )
-    }
-
-    InstrumentationBridge.registerBuildEventsHandlerFactory {
-      decorator -> new BuildEventsHandlerImpl<>(buildSystemSessionFactory, new JvmInfoFactory())
-    }
-
-    InstrumentationBridge.registerCoverageProbeStoreRegistry(coverageProbeStoreFactory)
-  }
-
-  @Override
-  void setup() {
-    skippableTests.clear()
-    itrEnabled = false
-  }
-
-  def givenSkippableTests(List<SkippableTest> tests) {
-    skippableTests.addAll(tests)
-    itrEnabled = true
-  }
-
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-
-    agentKeyFile = Files.createTempFile("TestFrameworkTest", "dummy_agent_key")
-    Files.write(agentKeyFile, "dummy".getBytes())
-
-    injectSysConfig(GeneralConfig.API_KEY_FILE, agentKeyFile.toString())
-    injectSysConfig(CiVisibilityConfig.CIVISIBILITY_ENABLED, "true")
-    injectSysConfig(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true")
-  }
-
-  def cleanupSpec() {
-    Files.deleteIfExists(agentKeyFile)
-  }
-
-  Long testSessionSpan(final TraceAssert trace,
-  final int index,
-  final String testStatus,
-  final Map<String, Object> testTags = null,
-  final String resource = null,
-  final String testCommand = null,
-  final String testToolchain = null,
-  final Throwable exception = null,
-  final boolean verifyExceptionMessage = true) {
-    def testFramework = expectedTestFramework()
-    def testFrameworkVersion = expectedTestFrameworkVersion()
-
-    def testSessionId
-    trace.span(index) {
-      testSessionId = span.getTag(Tags.TEST_SESSION_ID)
-
-      parent()
-      operationName expectedOperationPrefix() + ".test_session"
-      resourceName resource ? resource : dummyModule
-      spanType DDSpanTypes.TEST_SESSION_END
-      errored exception != null
-      duration({ it > 1L })
-      tags {
-        "$Tags.COMPONENT" component
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_TEST_SESSION
-        "$Tags.TEST_TYPE" TestDecorator.TEST_TYPE
-        if (testCommand) {
-          "$Tags.TEST_COMMAND" testCommand
-        } else {
-          // the default command for sessions that run without build system instrumentation
-          "$Tags.TEST_COMMAND" dummyModule
-        }
-        if (testToolchain) {
-          "$Tags.TEST_TOOLCHAIN" testToolchain
-        }
-        "$Tags.TEST_FRAMEWORK" testFramework
-        if (testFrameworkVersion) {
-          "$Tags.TEST_FRAMEWORK_VERSION" testFrameworkVersion
-        }
-        "$Tags.TEST_STATUS" testStatus
-        if (testTags) {
-          testTags.each { key, val -> tag(key, val) }
-        }
-
-        if (exception) {
-          if (verifyExceptionMessage) {
-            errorTags(exception.class, exception.message)
-          } else {
-            errorTags(exception.class, ANY_MESSAGE)
-          }
-        }
-
-        "$DUMMY_CI_TAG" DUMMY_CI_TAG_VALUE
-
-        "$Tags.ENV" String
-        "$Tags.OS_VERSION" String
-        "$Tags.OS_PLATFORM" String
-        "$Tags.OS_ARCHITECTURE" String
-        "$Tags.RUNTIME_VENDOR" String
-        "$Tags.RUNTIME_NAME" String
-        "$Tags.RUNTIME_VERSION" String
-        "$DDTags.LIBRARY_VERSION_TAG_KEY" String
-
-        "$Tags.TEST_SESSION_ID" Long
-
-        defaultTags()
-      }
-    }
-    return testSessionId
-  }
-
-  Long testModuleSpan(final TraceAssert trace,
-  final int index,
-  final Long testSessionId,
-  final String testStatus,
-  final Map<String, Object> testTags = null,
-  final Throwable exception = null,
-  final String resource = null,
-  final boolean verifyExceptionMessage = true) {
-    def testFramework = expectedTestFramework()
-    def testFrameworkVersion = expectedTestFrameworkVersion()
-
-    def testModuleId
-    trace.span(index) {
-      testModuleId = span.getTag(Tags.TEST_MODULE_ID)
-
-      parentSpanId(BigInteger.valueOf(testSessionId))
-      operationName expectedOperationPrefix() + ".test_module"
-      resourceName resource ? resource : dummyModule
-      spanType DDSpanTypes.TEST_MODULE_END
-      errored exception != null
-      duration({ it > 1L })
-      tags {
-        "$Tags.COMPONENT" component
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_TEST_MODULE
-        "$Tags.TEST_TYPE" TestDecorator.TEST_TYPE
-        "$Tags.TEST_MODULE" resource ? resource : dummyModule
-        "$Tags.TEST_FRAMEWORK" testFramework
-        if (testFrameworkVersion) {
-          "$Tags.TEST_FRAMEWORK_VERSION" testFrameworkVersion
-        }
-        "$Tags.TEST_STATUS" testStatus
-        if (testTags) {
-          testTags.each { key, val -> tag(key, val) }
-        }
-
-        if (exception) {
-          if (verifyExceptionMessage) {
-            errorTags(exception.class, exception.message)
-          } else {
-            errorTags(exception.class, ANY_MESSAGE)
-          }
-        }
-
-        "$DUMMY_CI_TAG" DUMMY_CI_TAG_VALUE
-
-        "$Tags.ENV" String
-        "$Tags.OS_VERSION" String
-        "$Tags.OS_PLATFORM" String
-        "$Tags.OS_ARCHITECTURE" String
-        "$Tags.RUNTIME_VENDOR" String
-        "$Tags.RUNTIME_NAME" String
-        "$Tags.RUNTIME_VERSION" String
-        "$DDTags.LIBRARY_VERSION_TAG_KEY" String
-
-        "$Tags.TEST_MODULE_ID" Long
-
-        if (testSessionId) {
-          "$Tags.TEST_SESSION_ID" testSessionId
-        }
-
-        defaultTags()
-      }
-    }
-    return testModuleId
-  }
-
-  Long testSuiteSpan(final TraceAssert trace,
-  final int index,
-  final Long testSessionId,
-  final Long testModuleId,
-  final String testSuite,
-  final String testStatus,
-  final Map<String, Object> testTags = null,
-  final Throwable exception = null,
-  final boolean emptyDuration = false,
-  final Collection<String> categories = null,
-  final boolean sourceFilePresent = true) {
-    def testFramework = expectedTestFramework()
-    def testFrameworkVersion = expectedTestFrameworkVersion()
-
-    def testSuiteId
-    trace.span(index) {
-      testSuiteId = span.getTag(Tags.TEST_SUITE_ID)
-
-      parentSpanId(BigInteger.valueOf(testModuleId))
-      operationName expectedOperationPrefix() + ".test_suite"
-      resourceName testSuite
-      spanType DDSpanTypes.TEST_SUITE_END
-      errored exception != null
-      if (emptyDuration) {
-        duration({ it == 1L })
-      } else {
-        duration({ it > 1L })
-      }
-      tags {
-        "$Tags.COMPONENT" component
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_TEST_SUITE
-        "$Tags.TEST_TYPE" TestDecorator.TEST_TYPE
-        "$Tags.TEST_SESSION_ID" testSessionId
-        "$Tags.TEST_MODULE_ID" testModuleId
-        "$Tags.TEST_MODULE" dummyModule
-        "$Tags.TEST_SUITE" testSuite
-        "$Tags.TEST_FRAMEWORK" testFramework
-        if (testFrameworkVersion) {
-          "$Tags.TEST_FRAMEWORK_VERSION" testFrameworkVersion
-        }
-        "$Tags.TEST_STATUS" testStatus
-        if (testTags) {
-          testTags.each { key, val -> tag(key, val) }
-        }
-        if (sourceFilePresent) {
-          "$Tags.TEST_SOURCE_FILE" DUMMY_SOURCE_PATH
-        }
-
-        if (exception) {
-          errorTags(exception.class, exception.message)
-        }
-
-        if (categories) {
-          "$Tags.TEST_TRAITS" Strings.toJson(["category": Strings.toJson(categories)], true)
-        }
-
-        "$DUMMY_CI_TAG" DUMMY_CI_TAG_VALUE
-
-        "$Tags.ENV" String
-        "$Tags.OS_VERSION" String
-        "$Tags.OS_PLATFORM" String
-        "$Tags.OS_ARCHITECTURE" String
-        "$Tags.RUNTIME_VENDOR" String
-        "$Tags.RUNTIME_NAME" String
-        "$Tags.RUNTIME_VERSION" String
-        "$DDTags.LIBRARY_VERSION_TAG_KEY" String
-
-        "$Tags.TEST_SUITE_ID" Long
-
-        defaultTags()
-      }
-    }
-    return testSuiteId
-  }
-
-  long testSpan(final TraceAssert trace,
-  final int index,
-  final Long testSessionId,
-  final Long testModuleId,
-  final Long testSuiteId,
-  final String testSuite,
-  final String testName,
-  final String testMethod,
-  final String testStatus,
-  final Map<String, Object> testTags = null,
-  final Throwable exception = null,
-  final boolean emptyDuration = false,
-  final Collection<String> categories = null,
-  final boolean sourceFilePresent = true,
-  final boolean sourceMethodPresent = true) {
-    def testFramework = expectedTestFramework()
-    def testFrameworkVersion = expectedTestFrameworkVersion()
-
-    def testId
-    trace.span(index) {
-      testId = span.getSpanId()
-
-      parent()
-      operationName expectedOperationPrefix() + ".test"
-      resourceName "$testSuite.$testName"
-      spanType DDSpanTypes.TEST
-      errored exception != null
-      if (emptyDuration) {
-        duration({ it == 1L })
-      } else {
-        duration({ it > 1L })
-      }
-      tags {
-        "$Tags.COMPONENT" component
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_TEST
-        "$Tags.TEST_TYPE" TestDecorator.TEST_TYPE
-        "$Tags.TEST_SESSION_ID" testSessionId
-        "$Tags.TEST_MODULE_ID" testModuleId
-        "$Tags.TEST_SUITE_ID" testSuiteId
-        "$Tags.TEST_MODULE" dummyModule
-        "$Tags.TEST_SUITE" testSuite
-        "$Tags.TEST_NAME" testName
-        "$Tags.TEST_FRAMEWORK" testFramework
-        "$Tags.TEST_FRAMEWORK_VERSION" testFrameworkVersion
-        "$Tags.TEST_STATUS" testStatus
-        if (testTags) {
-          testTags.each { key, val -> tag(key, val) }
-        }
-
-        if (sourceFilePresent) {
-          "$Tags.TEST_SOURCE_FILE" DUMMY_SOURCE_PATH
-          "$Tags.TEST_CODEOWNERS" Strings.toJson(DUMMY_CODE_OWNERS)
-        }
-
-        if (sourceMethodPresent) {
-          "$Tags.TEST_SOURCE_METHOD" testMethod
-          "$Tags.TEST_SOURCE_START" DUMMY_TEST_METHOD_START
-          "$Tags.TEST_SOURCE_END" DUMMY_TEST_METHOD_END
-        }
-
-        if (exception) {
-          errorTags(exception.class, exception.message)
-        }
-
-        if (categories) {
-          "$Tags.TEST_TRAITS" Strings.toJson(["category": Strings.toJson(categories)], true)
-        }
-
-        "$DUMMY_CI_TAG" DUMMY_CI_TAG_VALUE
-
-        "$Tags.ENV" String
-        "$Tags.OS_VERSION" String
-        "$Tags.OS_PLATFORM" String
-        "$Tags.OS_ARCHITECTURE" String
-        "$Tags.RUNTIME_VENDOR" String
-        "$Tags.RUNTIME_NAME" String
-        "$Tags.RUNTIME_VERSION" String
-        "$DDTags.LIBRARY_VERSION_TAG_KEY" String
-
-        defaultTags()
-      }
-    }
-    return testId
-  }
-
-  String component = component()
-
-  abstract String expectedOperationPrefix()
-
-  abstract String expectedTestFramework()
-
-  abstract String expectedTestFrameworkVersion()
-
-  abstract String component()
-
-  private static class SortTracesByDescSizeThenByNames implements Comparator<List<DDSpan>> {
-    @Override
-    int compare(List<DDSpan> o1, List<DDSpan> o2) {
-      if (o1.size() != o2.size()) {
-        return o2.size() - o1.size()
-      }
-      return rootSpanTrace(o1) <=> rootSpanTrace(o2)
-    }
-
-    String rootSpanTrace(List<DDSpan> trace) {
-      assert !trace.isEmpty()
-      def rootSpan = trace.get(0).localRootSpan
-      return "${rootSpan.serviceName}/${rootSpan.operationName}/${rootSpan.resourceName}"
-    }
-  }
-}
diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy
new file mode 100644
index 00000000000..05085095b2d
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy
@@ -0,0 +1,229 @@
+package datadog.trace.civisibility
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.jayway.jsonpath.Configuration
+import com.jayway.jsonpath.JsonPath
+import com.jayway.jsonpath.Option
+import com.jayway.jsonpath.ReadContext
+import com.jayway.jsonpath.WriteContext
+import freemarker.template.Template
+import freemarker.template.TemplateExceptionHandler
+import org.skyscreamer.jsonassert.JSONAssert
+import org.skyscreamer.jsonassert.JSONCompareMode
+
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.regex.Pattern
+
+abstract class CiVisibilityTestUtils {
+
+  static final List<DynamicPath> EVENT_DYNAMIC_PATHS = [
+    path("content.trace_id"),
+    path("content.span_id"),
+    path("content.parent_id"),
+    path("content.test_session_id"),
+    path("content.test_module_id"),
+    path("content.test_suite_id"),
+    path("content.metrics.process_id"),
+    path("content.meta.['os.architecture']"),
+    path("content.meta.['os.platform']"),
+    path("content.meta.['os.version']"),
+    path("content.meta.['runtime.name']"),
+    path("content.meta.['runtime.vendor']"),
+    path("content.meta.['runtime.version']"),
+    path("content.meta.['ci.workspace_path']"),
+    path("content.meta.['error.message']"),
+    path("content.meta.['error.stack']"),
+    path("content.meta.library_version"),
+    path("content.meta.runtime-id"),
+    // Different events might or might not have the same start or duration.
+    // Regardless, the values of these fields should be treated as different
+    path("content.start", false),
+    path("content.duration", false),
+    path("content.meta.['_dd.p.tid']", false),
+  ]
+
+  static final List<DynamicPath> COVERAGE_DYNAMIC_PATHS = [path("test_session_id"), path("test_suite_id"), path("span_id"),]
+
+  private static final Comparator<Map<?,?>> EVENT_RESOURCE_COMPARATOR = Comparator.comparing((Map m) -> {
+    def content = (Map) m.get("content")
+    return content.get("resource")
+  })
+
+  /**
+   * Use this method to generate expected data templates
+   */
+  static void generateTemplates(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Map<String, String> additionalReplacements) {
+    events.sort(EVENT_RESOURCE_COMPARATOR)
+
+    def templateGenerator = new TemplateGenerator(new LabelGenerator())
+    def compiledAdditionalReplacements = compile(additionalReplacements.keySet())
+
+    Files.createDirectories(Paths.get(baseTemplatesPath))
+    Files.write(Paths.get(baseTemplatesPath, "events.ftl"), templateGenerator.generateTemplate(events, EVENT_DYNAMIC_PATHS + compiledAdditionalReplacements).bytes)
+    Files.write(Paths.get(baseTemplatesPath, "coverages.ftl"), templateGenerator.generateTemplate(coverages, COVERAGE_DYNAMIC_PATHS + compiledAdditionalReplacements).bytes)
+  }
+
+  static void assertData(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Map<String, String> additionalReplacements) {
+    events.sort(EVENT_RESOURCE_COMPARATOR)
+
+    def labelGenerator = new LabelGenerator()
+    def templateGenerator = new TemplateGenerator(labelGenerator)
+
+    def replacementMap
+    replacementMap = templateGenerator.generateReplacementMap(events, EVENT_DYNAMIC_PATHS)
+    replacementMap = templateGenerator.generateReplacementMap(coverages, COVERAGE_DYNAMIC_PATHS)
+
+    for (Map.Entry<String, String> e : additionalReplacements.entrySet()) {
+      replacementMap.put(labelGenerator.forKey(e.key), "\"$e.value\"")
+    }
+
+    def expectedEvents = getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap)
+    def actualEvents = JSON_MAPPER.writeValueAsString(events)
+    try {
+      JSONAssert.assertEquals(expectedEvents, actualEvents, JSONCompareMode.LENIENT)
+    } catch (AssertionError e) {
+      throw new AssertionError("Error while comparing expected events $expectedEvents to actual events $actualEvents", e)
+    }
+
+    def expectedCoverages = getFreemarkerTemplate(baseTemplatesPath + "/coverages.ftl", replacementMap)
+    def actualCoverages = JSON_MAPPER.writeValueAsString(coverages)
+    try {
+      JSONAssert.assertEquals(expectedCoverages, actualCoverages, JSONCompareMode.LENIENT)
+    } catch (AssertionError e) {
+      throw new AssertionError("Error while comparing expected coverages $expectedCoverages to actual coverages $actualCoverages", e)
+    }
+  }
+
+  static final Configuration JSON_PATH_CONFIG = Configuration.builder()
+  .options(Option.SUPPRESS_EXCEPTIONS)
+  .build()
+
+  static final ObjectMapper JSON_MAPPER = new ObjectMapper() { {
+      enable(SerializationFeature.INDENT_OUTPUT)
+    }
+  }
+
+  static final freemarker.template.Configuration FREEMARKER = new freemarker.template.Configuration(freemarker.template.Configuration.VERSION_2_3_30) { {
+      setClassLoaderForTemplateLoading(CiVisibilityTestUtils.classLoader, "")
+      setDefaultEncoding("UTF-8")
+      setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER)
+      setLogTemplateExceptions(true)
+      setWrapUncheckedExceptions(true)
+      setFallbackOnNullLoopVariable(false)
+      setNumberFormat("0.######")
+    }
+  }
+
+  private static String getFreemarkerTemplate(String templatePath, Map<String, Object> replacements) {
+    Template coveragesTemplate = FREEMARKER.getTemplate(templatePath)
+    StringWriter coveragesOut = new StringWriter()
+    coveragesTemplate.process(replacements, coveragesOut)
+    return coveragesOut.toString()
+  }
+
+  private static final class TemplateGenerator {
+    private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\"(\\\$\\{.*?\\})\"")
+
+    private final Map<String, String> uniqueValues = new HashMap<>()
+    private final Map<String, String> nonUniqueValues = new HashMap<>()
+    private final LabelGenerator label
+
+    TemplateGenerator(LabelGenerator label) {
+      this.label = label
+    }
+
+    String generateTemplate(Collection<Map<?, ?>> objects, List<DynamicPath> dynamicPaths) {
+      for (Map<?, ?> object : objects) {
+        WriteContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG)
+        for (DynamicPath dynamicPath : dynamicPaths) {
+          ctx.map(dynamicPath.path, (currentValue, config) -> {
+            if (dynamicPath.unique) {
+              return uniqueValues.computeIfAbsent(currentValue, (k) -> label.forTemplateKey(dynamicPath.rawPath))
+            } else {
+              return label.forTemplateKey(dynamicPath.rawPath)
+            }
+          })
+        }
+
+      }
+      return JSON_MAPPER
+      .writeValueAsString(objects)
+      .replaceAll(PLACEHOLDER_PATTERN, "\$1") // remove quotes around placeholders
+    }
+
+    Map<String, String> generateReplacementMap(Collection<Map<?, ?>> objects, List<DynamicPath> dynamicPaths) {
+      for (Map<?, ?> object : objects) {
+        ReadContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG)
+        for (DynamicPath dynamicPath : dynamicPaths) {
+          def value = ctx.read(dynamicPath.path)
+          if (value != null) {
+            if (value instanceof String) {
+              value = '"' + // restore quotes around string values
+              value.replace('"', '\\"') + // escape quotes inside string values
+              '"' // restore quotes around string values
+            }
+            if (dynamicPath.unique) {
+              uniqueValues.computeIfAbsent(value, (k) -> label.forKey(dynamicPath.rawPath))
+            } else {
+              nonUniqueValues.put(label.forKey(dynamicPath.rawPath), value)
+            }
+          }
+        }
+      }
+      return invert(uniqueValues) + nonUniqueValues
+    }
+  }
+
+  private static final class LabelGenerator {
+    private static final Pattern ERASED_CHARS = Pattern.compile("[\\[\\]']")
+    private static final Pattern REPLACED_CHARS = Pattern.compile("[.-]")
+
+    private final Map<String, Integer> usageCounters = new HashMap<>()
+
+    String forTemplateKey(String key) {
+      return "\${" + forKey(key) + "}"
+    }
+
+    String forKey(String key) {
+      def usages = usageCounters.merge(key, 1, Integer::sum)
+      def sanitizedKey = key.replaceAll(ERASED_CHARS, "").replaceAll(REPLACED_CHARS, "_")
+      return sanitizedKey + (usages == 1 ? "" : "_${usages}")
+    }
+  }
+
+  private static <K, V> Map<V, K> invert(Map<K, V> map) {
+    Map<V, K> inverted = new HashMap(map.size())
+    for (Map.Entry<K, V> e : map.entrySet()) {
+      inverted.put(e.value, e.key)
+    }
+    return inverted
+  }
+
+  private static List<DynamicPath> compile(Iterable<String> rawPaths) {
+    def compiledPaths = []
+    for (String rawPath : rawPaths) {
+      compiledPaths += path(rawPath)
+    }
+    return compiledPaths
+  }
+
+  private static DynamicPath path(String rawPath, boolean unique = true) {
+    return new DynamicPath(rawPath, JsonPath.compile(rawPath), unique)
+  }
+
+  private static final class DynamicPath {
+    private final String rawPath
+    private final JsonPath path
+    // if true, same values are replaced with same placeholders;
+    // otherwise every path gets its own placeholder, even if its value is non-unique
+    private final boolean unique
+
+    DynamicPath(String rawPath, JsonPath path, boolean unique) {
+      this.rawPath = rawPath
+      this.path = path
+      this.unique = unique
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
index 707877540f9..2562372dee8 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
@@ -206,12 +206,13 @@ public void addReturn(CapturedValue retValue) {
     if (locals == null) {
       locals = new HashMap<>();
     }
-    locals.put("@return", retValue); // special local name for the return value
+    locals.put(ValueReferences.RETURN_REF, retValue); // special local name for the return value
     extensions.put(ValueReferences.RETURN_EXTENSION_NAME, retValue);
   }
 
   public void addThrowable(Throwable t) {
-    this.throwable = new CapturedThrowable(t);
+    addThrowable(new CapturedThrowable(t));
+    extensions.put(ValueReferences.EXCEPTION_EXTENSION_NAME, t);
   }
 
   public void addThrowable(CapturedThrowable capturedThrowable) {
@@ -327,26 +328,14 @@ public Status evaluate(
           ValueReferences.DURATION_EXTENSION_NAME, duration / 1_000_000.0); // convert to ms
     }
     this.thisClassName = thisClassName;
-    boolean shouldEvaluate = resolveEvaluateAt(probeImplementation, methodLocation);
+    boolean shouldEvaluate =
+        MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
     if (shouldEvaluate) {
-      probeImplementation.evaluate(this, status);
+      probeImplementation.evaluate(this, status, methodLocation);
     }
     return status;
   }
 
-  private static boolean resolveEvaluateAt(
-      ProbeImplementation probeImplementation, MethodLocation methodLocation) {
-    if (methodLocation == MethodLocation.DEFAULT) {
-      // line probe, no evaluation of probe's evaluateAt
-      return true;
-    }
-    MethodLocation localEvaluateAt = probeImplementation.getEvaluateAt();
-    if (methodLocation == MethodLocation.ENTRY) {
-      return localEvaluateAt == MethodLocation.DEFAULT || localEvaluateAt == MethodLocation.ENTRY;
-    }
-    return localEvaluateAt == methodLocation;
-  }
-
   public Status getStatus(String probeId) {
     Status result = statusByProbeId.get(probeId);
     if (result == null) {
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CorrelationAccess.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CorrelationAccess.java
index ed56d4ca89f..085f814ed31 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CorrelationAccess.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CorrelationAccess.java
@@ -30,7 +30,7 @@ private CorrelationAccess() {
     MethodHandle traceIdHandle = null;
     MethodHandle spanIdHandle = null;
     // ignore correlations if tracer is not enabled
-    if (ConfigProvider.getInstance().getBoolean(TraceInstrumentationConfig.TRACE_ENABLED, false)) {
+    if (ConfigProvider.getInstance().getBoolean(TraceInstrumentationConfig.TRACE_ENABLED, true)) {
       try {
         Class<?> clz =
             ClassLoader.getSystemClassLoader().loadClass(CORRELATION_IDENTIFIER_CLASSNAME);
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
index e2009f95e5f..2ec97949aad 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
@@ -191,19 +191,9 @@ public static DebuggerSpan createSpan(String operationName, String[] tags) {
    *
    * @return true if can proceed to capture data
    */
-  public static boolean isReadyToCapture(String... probeIds) {
-    // TODO provide overloaded version without string array
+  public static boolean isReadyToCapture(Class<?> callingClass, String... probeIds) {
     try {
-      if (probeIds == null || probeIds.length == 0) {
-        return false;
-      }
-      boolean result = false;
-      for (String probeId : probeIds) {
-        // if all probes are rate limited, we don't capture
-        result |= ProbeRateLimiter.tryProbe(probeId);
-      }
-      result = result && checkAndSetInProbe();
-      return result;
+      return checkAndSetInProbe();
     } catch (Exception ex) {
       LOGGER.debug("Error in isReadyToCapture: ", ex);
       return false;
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
index f07868286c4..7bceadf702d 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
@@ -3,5 +3,17 @@
 public enum MethodLocation {
   DEFAULT,
   ENTRY,
-  EXIT
+  EXIT;
+
+  public static boolean isSame(MethodLocation methodLocation, MethodLocation evaluateAt) {
+    if (methodLocation == MethodLocation.DEFAULT) {
+      // line probe, no evaluation of probe's evaluateAt
+      // MethodLocation.DEFAULT is used for line probe when evaluating the context
+      return true;
+    }
+    if (methodLocation == MethodLocation.ENTRY) {
+      return evaluateAt == MethodLocation.DEFAULT || evaluateAt == MethodLocation.ENTRY;
+    }
+    return methodLocation == evaluateAt;
+  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
index 80445b61fec..617b3aa6093 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
@@ -16,7 +16,8 @@ public interface ProbeImplementation {
 
   String getStrTags();
 
-  void evaluate(CapturedContext context, CapturedContext.Status status);
+  void evaluate(
+      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation);
 
   void commit(
       CapturedContext entryContext,
@@ -84,7 +85,8 @@ public String getStrTags() {
     }
 
     @Override
-    public void evaluate(CapturedContext context, CapturedContext.Status status) {}
+    public void evaluate(
+        CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {}
 
     @Override
     public void commit(
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
index 211a1ee34f1..e7c7aa22f8d 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
@@ -7,6 +7,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.DoubleFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,6 +24,7 @@ public class ProbeRateLimiter {
       new ConcurrentHashMap<>();
   private static Sampler GLOBAL_SNAPSHOT_SAMPLER = createSampler(DEFAULT_GLOBAL_SNAPSHOT_RATE);
   private static Sampler GLOBAL_LOG_SAMPLER = createSampler(DEFAULT_GLOBAL_LOG_RATE);
+  private static DoubleFunction<Sampler> samplerSupplier = ProbeRateLimiter::createSampler;
 
   public static boolean tryProbe(String probeId) {
     RateLimitInfo rateLimitInfo =
@@ -37,19 +39,19 @@ public static boolean tryProbe(String probeId) {
 
   private static RateLimitInfo getDefaultRateLimitInfo(String probeId) {
     LOGGER.debug("Setting sampling with default snapshot rate for probeId={}", probeId);
-    return new RateLimitInfo(createSampler(DEFAULT_SNAPSHOT_RATE), true);
+    return new RateLimitInfo(samplerSupplier.apply(DEFAULT_SNAPSHOT_RATE), true);
   }
 
   public static void setRate(String probeId, double rate, boolean isCaptureSnapshot) {
-    PROBE_SAMPLERS.put(probeId, new RateLimitInfo(createSampler(rate), isCaptureSnapshot));
+    PROBE_SAMPLERS.put(probeId, new RateLimitInfo(samplerSupplier.apply(rate), isCaptureSnapshot));
   }
 
   public static void setGlobalSnapshotRate(double rate) {
-    GLOBAL_SNAPSHOT_SAMPLER = createSampler(rate);
+    GLOBAL_SNAPSHOT_SAMPLER = samplerSupplier.apply(rate);
   }
 
   public static void setGlobalLogRate(double rate) {
-    GLOBAL_LOG_SAMPLER = createSampler(rate);
+    GLOBAL_LOG_SAMPLER = samplerSupplier.apply(rate);
   }
 
   public static void resetRate(String probeId) {
@@ -65,15 +67,20 @@ public static void resetAll() {
     resetGlobalRate();
   }
 
+  public static void setSamplerSupplier(DoubleFunction<Sampler> samplerSupplier) {
+    ProbeRateLimiter.samplerSupplier =
+        samplerSupplier != null ? samplerSupplier : ProbeRateLimiter::createSampler;
+  }
+
   private static Sampler createSampler(double rate) {
     if (rate < 0) {
       return new ConstantSampler(true);
     }
     if (rate < 1) {
       int intRate = (int) Math.round(rate * 10);
-      return new AdaptiveSampler(TEN_SECONDS_WINDOW, intRate, 180, 16);
+      return new AdaptiveSampler(TEN_SECONDS_WINDOW, intRate, 180, 16, true);
     }
-    return new AdaptiveSampler(ONE_SECOND_WINDOW, (int) Math.round(rate), 180, 16);
+    return new AdaptiveSampler(ONE_SECOND_WINDOW, (int) Math.round(rate), 180, 16, true);
   }
 
   private static class RateLimitInfo {
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
index 40ca3217251..2903bac33fc 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
@@ -13,9 +13,11 @@ public final class ValueReferences {
   public static String DURATION_EXTENSION_NAME = "duration";
   public static String RETURN_EXTENSION_NAME = "return";
   public static String ITERATOR_EXTENSION_NAME = "it";
+  public static String EXCEPTION_EXTENSION_NAME = "exception";
   public static String DURATION_REF = SYNTHETIC_PREFIX + DURATION_EXTENSION_NAME;
   public static String RETURN_REF = SYNTHETIC_PREFIX + RETURN_EXTENSION_NAME;
   public static String ITERATOR_REF = SYNTHETIC_PREFIX + ITERATOR_EXTENSION_NAME;
+  public static String EXCEPTION_REF = SYNTHETIC_PREFIX + EXCEPTION_EXTENSION_NAME;
 
   public static String synthetic(String name) {
     return SYNTHETIC_PREFIX + name;
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
index 2d746395f68..69b720c60a9 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
@@ -13,35 +13,92 @@
 public class Redaction {
   // Need to be a unique instance (new String) for reference equality (==) and
   // avoid internalization (intern) by the JVM because it's a string constant
-  public static final String REDACTED_VALUE = new String("REDACTED".toCharArray());
+  public static final String REDACTED_VALUE = new String("redacted".toCharArray());
 
   private static final Pattern COMMA_PATTERN = Pattern.compile(",");
   private static final List<String> PREDEFINED_KEYWORDS =
       Arrays.asList(
-          "password",
-          "passwd",
-          "secret",
+          "2fa",
+          "accesstoken",
+          "aiohttpsession",
+          "apisecret",
+          "apisignature",
           "apikey",
           "auth",
+          "authtoken",
+          "authorization",
+          "ccnumber",
+          "certificatepin",
+          "cipher",
+          "clientid",
+          "clientsecret",
+          "config",
+          "connect.sid",
+          "cookie",
           "credentials",
+          "creditcard",
+          "csrf",
+          "csrftoken",
+          "cvv",
+          "databaseurl",
+          "dburl",
+          "encryptionkey",
+          "encryptionkeyid",
+          "env",
+          "gpgkey",
+          "jti",
+          "jwt",
+          "licensekey",
+          "masterkey",
           "mysqlpwd",
+          "nonce",
+          "oauth",
+          "oauth_token",
+          "otp",
+          "passhash",
+          "passwd",
+          "password",
+          "passwordb",
+          "pemfile",
+          "pgpkey",
+          "phpsessid",
+          "pin",
+          "pincode",
+          "pkcs8",
           "privatekey",
-          "token",
-          "ipaddress",
+          "publickey",
+          "recaptchakey",
+          "refreshtoken",
+          "routingnumber",
+          "salt",
+          "secret",
+          "secrettoken",
+          "secretKey",
+          "securityanswer",
+          "securitycode",
+          "securityquestion",
+          "serviceaccountcredentials",
           "session",
-          // django
-          "csrftoken",
+          "sessionkey",
           "sessionid",
-          // wsgi
-          "remoteaddr",
-          "xcsrftoken",
-          "xforwardedfor",
           "setcookie",
-          "cookie",
-          "authorization",
+          "signature",
+          "signaturekey",
+          "sshkey",
+          "ssn",
+          "symfony",
+          "token",
+          "transactionid",
+          "twiliotoken",
+          "usersession",
+          "voterid",
           "xapikey",
+          "xcsrftoken",
           "xforwardedfor",
-          "xrealip");
+          "xrealip",
+          "xauthtoken",
+          "xsrftoken",
+          "pwd");
   private static final Set<String> KEYWORDS = ConcurrentHashMap.newKeySet();
   private static ClassNameTrie typeTrie = ClassNameTrie.Builder.EMPTY_TRIE;
   private static List<String> redactedClasses;
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
index b5aa5a0b5fa..5390ef5a6d5 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
@@ -43,6 +43,18 @@ public class WellKnownClasses {
             "java.util.concurrent.atomic.AtomicLong"));
   }
 
+  private static Set<String> stringPrimitives =
+      new HashSet<>(
+          Arrays.asList(
+              "java.lang.Class",
+              "java.lang.String",
+              "java.time.Duration",
+              "java.time.Instant",
+              "java.time.LocalTime",
+              "java.time.LocalDate",
+              "java.time.LocalDateTime",
+              "java.util.UUID"));
+
   /**
    * @return true if type is a final class and toString implementation is well known and side effect
    *     free
@@ -85,4 +97,8 @@ public static boolean isSizeSafe(Map<?, ?> map) {
     }
     return false;
   }
+
+  public static boolean isStringPrimitive(String type) {
+    return stringPrimitives.contains(type);
+  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
index c23704ec325..95efa57412d 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
@@ -15,6 +15,7 @@
 import com.datadog.debugger.el.expressions.IfExpression;
 import com.datadog.debugger.el.expressions.IndexExpression;
 import com.datadog.debugger.el.expressions.IsEmptyExpression;
+import com.datadog.debugger.el.expressions.IsUndefinedExpression;
 import com.datadog.debugger.el.expressions.LenExpression;
 import com.datadog.debugger.el.expressions.MatchesExpression;
 import com.datadog.debugger.el.expressions.NotExpression;
@@ -205,4 +206,8 @@ public static WhenExpression when(BooleanExpression expression) {
   public static BooleanValueExpressionAdapter bool(BooleanExpression expression) {
     return new BooleanValueExpressionAdapter(expression);
   }
+
+  public static IsUndefinedExpression isUndefined(ValueExpression<?> valueExpression) {
+    return new IsUndefinedExpression(valueExpression);
+  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
index 6f6eee3b1bb..0fec4f7cd05 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
@@ -214,6 +214,15 @@ private static BooleanExpression internalCreatePredicate(JsonReader reader, Stri
           }
           return DSL.isEmpty(asValueExpression(reader));
         }
+      case "isUndefined":
+        {
+          JsonReader.Token token = reader.peek();
+          if (token == BEGIN_ARRAY) {
+            throw new UnsupportedOperationException(
+                "Operation 'isUndefined' expects exactly one value argument");
+          }
+          return DSL.isUndefined(asValueExpression(reader));
+        }
       case "startsWith":
         {
           return createStringPredicateExpression(reader, DSL::startsWith);
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java
new file mode 100644
index 00000000000..a2ec6cdb02d
--- /dev/null
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java
@@ -0,0 +1,7 @@
+package com.datadog.debugger.el;
+
+public class RedactedException extends EvaluationException {
+  public RedactedException(String message, String expr) {
+    super(message, expr);
+  }
+}
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
index e77f17286dd..43d5930dcb6 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
@@ -1,13 +1,13 @@
 package com.datadog.debugger.el.expressions;
 
-import com.datadog.debugger.el.EvaluationException;
 import com.datadog.debugger.el.Expression;
 import com.datadog.debugger.el.PrettyPrintVisitor;
+import com.datadog.debugger.el.RedactedException;
 
 public class ExpressionHelper {
   public static void throwRedactedException(Expression<?> expr) {
     String strExpr = PrettyPrintVisitor.print(expr);
-    throw new EvaluationException(
+    throw new RedactedException(
         "Could not evaluate the expression because '" + strExpr + "' was redacted", strExpr);
   }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsUndefinedExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsUndefinedExpression.java
index 61581742fae..346c38bcca0 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsUndefinedExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsUndefinedExpression.java
@@ -1,5 +1,6 @@
 package com.datadog.debugger.el.expressions;
 
+import com.datadog.debugger.el.EvaluationException;
 import com.datadog.debugger.el.Value;
 import com.datadog.debugger.el.Visitor;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
@@ -21,8 +22,12 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
     if (valueExpression == null) {
       return Boolean.FALSE;
     }
-    Value<?> value = valueExpression.evaluate(valueRefResolver);
-    return value.isUndefined() ? Boolean.TRUE : Boolean.FALSE;
+    try {
+      Value<?> value = valueExpression.evaluate(valueRefResolver);
+      return value.isUndefined() ? Boolean.TRUE : Boolean.FALSE;
+    } catch (EvaluationException ex) {
+      return Boolean.TRUE;
+    }
   }
 
   @Override
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
index 75a82b54f48..87a3f747846 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
@@ -7,6 +7,7 @@
 import com.datadog.debugger.el.Visitor;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import datadog.trace.bootstrap.debugger.util.Redaction;
+import datadog.trace.bootstrap.debugger.util.WellKnownClasses;
 import java.util.Objects;
 
 /** An expression taking a reference path and resolving to {@linkplain Value} */
@@ -25,9 +26,14 @@ public Value<?> evaluate(ValueReferenceResolver valueRefResolver) {
     } catch (RuntimeException ex) {
       throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
     }
-    if (symbol == Redaction.REDACTED_VALUE
-        || (symbol != null && Redaction.isRedactedType(symbol.getClass().getTypeName()))) {
-      ExpressionHelper.throwRedactedException(this);
+    if (symbol != null) {
+      String typeName = symbol.getClass().getTypeName();
+      if (WellKnownClasses.isStringPrimitive(typeName)) {
+        symbol = symbol.toString();
+      }
+      if (symbol == Redaction.REDACTED_VALUE || (Redaction.isRedactedType(typeName))) {
+        ExpressionHelper.throwRedactedException(this);
+      }
     }
     return Value.of(symbol);
   }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
index c9dd388426e..71357d7bdf1 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
@@ -13,12 +13,14 @@
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import okio.Okio;
 import org.junit.jupiter.api.Test;
 
@@ -193,6 +195,30 @@ void redaction() throws IOException {
         evaluationException.getMessage());
   }
 
+  @Test
+  void stringPrimitives() throws IOException {
+    ProbeCondition probeCondition = load("/test_conditional_10.json");
+    Map<String, Object> args = new HashMap<>();
+    args.put("uuid", UUID.fromString("a3cbe9e7-edd3-4bef-8e5b-59bfcb04cf91"));
+    args.put("duration", Duration.ofSeconds(42));
+    args.put("clazz", "foo".getClass());
+    ValueReferenceResolver ctx = RefResolverHelper.createResolver(args, null, null);
+    assertTrue(probeCondition.execute(ctx));
+  }
+
+  @Test
+  void testBooleanOperation() throws Exception {
+    ProbeCondition probeCondition = load("/test_conditional_11.json");
+    Map<String, Object> fields = new HashMap<>();
+    fields.put("strField", "foobar");
+    fields.put("emptyStr", "");
+    fields.put("emptyList", new ArrayList<>());
+    fields.put("emptyMap", new HashMap<>());
+    fields.put("emptyArray", new Object[0]);
+    ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null, fields);
+    assertTrue(probeCondition.execute(ctx));
+  }
+
   private static ProbeCondition load(String resourcePath) throws IOException {
     InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath);
     Moshi moshi =
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsUndefinedExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsUndefinedExpressionTest.java
index 20ea0cade51..d3c592e8e66 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsUndefinedExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsUndefinedExpressionTest.java
@@ -41,6 +41,8 @@ void testUndefinedValue() {
         new IsUndefinedExpression(DSL.value(Values.UNDEFINED_OBJECT));
     assertTrue(expression.evaluate(resolver));
     assertEquals("isUndefined(UNDEFINED)", print(expression));
+    expression = new IsUndefinedExpression(DSL.ref("undefinedvar"));
+    assertTrue(expression.evaluate(resolver));
   }
 
   @Test
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
index be89476be39..eb966288523 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
@@ -72,9 +72,11 @@ void contextRef() {
 
     long duration = TimeUnit.NANOSECONDS.convert(680, TimeUnit.MILLISECONDS);
     boolean returnVal = true;
+    Throwable exception = new RuntimeException("oops");
     Map<String, Object> exts = new HashMap<>();
     exts.put(ValueReferences.RETURN_EXTENSION_NAME, returnVal);
     exts.put(ValueReferences.DURATION_EXTENSION_NAME, duration);
+    exts.put(ValueReferences.EXCEPTION_EXTENSION_NAME, exception);
     ValueReferenceResolver resolver =
         RefResolverHelper.createResolver(null, null, values).withExtensions(exts);
 
@@ -84,6 +86,9 @@ void contextRef() {
     expression = DSL.ref(ValueReferences.RETURN_REF);
     assertEquals(returnVal, expression.evaluate(resolver).getValue());
     assertEquals("@return", print(expression));
+    expression = DSL.ref(ValueReferences.EXCEPTION_REF);
+    assertEquals(exception, expression.evaluate(resolver).getValue());
+    assertEquals("@exception", print(expression));
     expression = DSL.ref(limitArg);
     assertEquals(limit, expression.evaluate(resolver).getValue());
     assertEquals("limit", print(expression));
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_10.json b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_10.json
new file mode 100644
index 00000000000..87b2f6e072a
--- /dev/null
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_10.json
@@ -0,0 +1,31 @@
+{
+  "dsl": "uuid == 'a3cbe9e7-edd3-4bef-8e5b-59bfcb04cf91' && duration == 'PT42S' && clazz == 'class java.lang.String'",
+  "json": {
+    "and": [{
+        "eq": [
+          {
+            "ref": "uuid"
+          },
+          "a3cbe9e7-edd3-4bef-8e5b-59bfcb04cf91"]
+      }, {
+        "eq": [
+          {"ref": "duration"},
+          "PT42S"]
+      }, {
+      "eq": [
+        {"ref": "clazz"},
+        "class java.lang.String"]
+    }
+    ]
+  }
+}
+
+  "dsl": "isEmpty(emptyStr) && isEmpty(emptyList) && isEmpty(emptyMap) && isEmpty(emptyArray) && isUndefined(@exception)",
+  "json": {
+    "and": [
+      {"isEmpty": {"ref": "emptyStr"}},
+      {"isEmpty": {"ref": "emptyList"}},
+      {"isEmpty": {"ref": "emptyMap"}},
+      {"isEmpty": {"ref": "emptyArray"}},
+      {"isUndefined":  {"ref": "@exception"}}
+
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_11.json b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_11.json
new file mode 100644
index 00000000000..fe276464c3d
--- /dev/null
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_11.json
@@ -0,0 +1,14 @@
+{
+  "dsl": "isEmpty(emptyStr) && isEmpty(emptyList) && isEmpty(emptyMap) && isEmpty(emptyArray) && isUndefined(@exception)",
+  "json": {
+    "and": [
+      {"isEmpty": {"ref": "emptyStr"}},
+      {"isEmpty": {"ref": "emptyList"}},
+      {"isEmpty": {"ref": "emptyMap"}},
+      {"isEmpty": {"ref": "emptyArray"}},
+      {"isUndefined":  {"ref": "@exception"}}
+    ]
+  }
+}
+
+
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
index f45c17584b4..533d78e2a83 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
@@ -258,11 +258,6 @@ private void applyRateLimiter(ConfigurationComparer changes) {
                 : getDefaultRateLimitPerProbe(probe),
             probe.isCaptureSnapshot());
       }
-      if (addedDefinitions instanceof SpanDecorationProbe) {
-        // Span decoration probes use the same instrumentation as log probes, but we don't want
-        // to sample here.
-        ProbeRateLimiter.setRate(addedDefinitions.getId(), -1, false);
-      }
     }
     // remove rate for all removed probes
     for (ProbeDefinition removedDefinition : changes.getRemovedDefinitions()) {
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
index 5c864cbf33d..7c3b60d1c6f 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
@@ -3,7 +3,8 @@
 import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
 
 import com.datadog.debugger.sink.DebuggerSink;
-import com.datadog.debugger.sink.Sink;
+import com.datadog.debugger.symbol.SymDBEnablement;
+import com.datadog.debugger.symbol.SymbolAggregator;
 import com.datadog.debugger.uploader.BatchUploader;
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
@@ -27,20 +28,21 @@
 
 /** Debugger agent implementation */
 public class DebuggerAgent {
-  private static final Logger log = LoggerFactory.getLogger(DebuggerAgent.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerAgent.class);
   private static ConfigurationPoller configurationPoller;
-  private static Sink sink;
+  private static DebuggerSink sink;
   private static String agentVersion;
   private static JsonSnapshotSerializer snapshotSerializer;
+  private static SymDBEnablement symDBEnablement;
 
   public static synchronized void run(
       Instrumentation instrumentation, SharedCommunicationObjects sco) {
     Config config = Config.get();
     if (!config.isDebuggerEnabled()) {
-      log.info("Debugger agent disabled");
+      LOGGER.info("Debugger agent disabled");
       return;
     }
-    log.info("Starting Dynamic Instrumentation");
+    LOGGER.info("Starting Dynamic Instrumentation");
     ClassesToRetransformFinder classesToRetransformFinder = new ClassesToRetransformFinder();
     setupSourceFileTracking(instrumentation, classesToRetransformFinder);
     Redaction.addUserDefinedKeywords(config);
@@ -76,7 +78,18 @@ public static synchronized void run(
     }
     configurationPoller = sco.configurationPoller(config);
     if (configurationPoller != null) {
-      subscribeConfigurationPoller(config, configurationUpdater);
+      if (config.isDebuggerSymbolEnabled()) {
+        symDBEnablement =
+            new SymDBEnablement(
+                instrumentation,
+                config,
+                new SymbolAggregator(
+                    debuggerSink.getSymbolSink(), config.getDebuggerSymbolFlushThreshold()));
+        if (config.isDebuggerSymbolForceUpload()) {
+          symDBEnablement.startSymbolExtraction();
+        }
+      }
+      subscribeConfigurationPoller(config, configurationUpdater, symDBEnablement);
       try {
         /*
         Note: shutdown hooks are tricky because JVM holds reference for them forever preventing
@@ -89,7 +102,7 @@ public static synchronized void run(
         // The JVM is already shutting down.
       }
     } else {
-      log.debug("No configuration poller available from SharedCommunicationObjects");
+      LOGGER.debug("No configuration poller available from SharedCommunicationObjects");
     }
   }
 
@@ -100,7 +113,7 @@ private static void setupSourceFileTracking(
 
   private static void loadFromFile(
       Path probeFilePath, ConfigurationUpdater configurationUpdater, long maxPayloadSize) {
-    log.debug("try to load from file...");
+    LOGGER.debug("try to load from file...");
     try (InputStream inputStream =
         new SizeCheckedInputStream(new FileInputStream(probeFilePath.toFile()), maxPayloadSize)) {
       byte[] buffer = new byte[4096];
@@ -115,17 +128,22 @@ private static void loadFromFile(
       Configuration configuration =
           DebuggerProductChangesListener.Adapter.deserializeConfiguration(
               outputStream.toByteArray());
-      log.debug("Probe definitions loaded from file {}", probeFilePath);
+      LOGGER.debug("Probe definitions loaded from file {}", probeFilePath);
       configurationUpdater.accept(configuration);
     } catch (IOException ex) {
-      log.error("Unable to load config file {}: {}", probeFilePath, ex);
+      LOGGER.error("Unable to load config file {}: {}", probeFilePath, ex);
     }
   }
 
   private static void subscribeConfigurationPoller(
-      Config config, ConfigurationUpdater configurationUpdater) {
+      Config config, ConfigurationUpdater configurationUpdater, SymDBEnablement symDBEnablement) {
+    LOGGER.debug("Subscribing to Live Debugging...");
     configurationPoller.addListener(
         Product.LIVE_DEBUGGING, new DebuggerProductChangesListener(config, configurationUpdater));
+    if (symDBEnablement != null && !config.isDebuggerSymbolForceUpload()) {
+      LOGGER.debug("Subscribing to Symbol DB...");
+      configurationPoller.addListener(Product.LIVE_DEBUGGING_SYMBOL_DB, symDBEnablement);
+    }
   }
 
   static ClassFileTransformer setupInstrumentTheWorldTransformer(
@@ -133,7 +151,7 @@ static ClassFileTransformer setupInstrumentTheWorldTransformer(
       Instrumentation instrumentation,
       DebuggerSink debuggerSink,
       StatsdMetricForwarder statsdMetricForwarder) {
-    log.info("install Instrument-The-World transformer");
+    LOGGER.info("install Instrument-The-World transformer");
     DebuggerTransformer transformer =
         createTransformer(config, Configuration.builder().build(), null, debuggerSink);
     DebuggerContext.init(transformer::instrumentTheWorldResolver, statsdMetricForwarder);
@@ -145,7 +163,7 @@ public static String getAgentVersion() {
     return agentVersion;
   }
 
-  public static Sink getSink() {
+  public static DebuggerSink getSink() {
     return sink;
   }
 
@@ -161,13 +179,13 @@ static void stop() {
     if (configurationPoller != null) {
       configurationPoller.stop();
     }
-    if (sink != null && sink instanceof DebuggerSink) {
-      ((DebuggerSink) sink).stop();
+    if (sink != null) {
+      sink.stop();
     }
   }
 
   // Used only for tests
-  static void initSink(Sink sink) {
+  static void initSink(DebuggerSink sink) {
     DebuggerAgent.sink = sink;
   }
 
@@ -198,7 +216,7 @@ public void run() {
         try {
           poller.stop();
         } catch (Exception ex) {
-          log.warn("failed to shutdown ProbesPoller: ", ex);
+          LOGGER.warn("failed to shutdown ProbesPoller: ", ex);
         }
       }
 
@@ -207,7 +225,7 @@ public void run() {
         try {
           uploader.shutdown();
         } catch (Exception ex) {
-          log.warn("Failed to shutdown SnapshotUploader", ex);
+          LOGGER.warn("Failed to shutdown SnapshotUploader", ex);
         }
       }
     }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
index b6ae16553d3..438d7a4061e 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
@@ -44,28 +44,27 @@ static class Adapter {
         MoshiHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
 
     static Configuration deserializeConfiguration(byte[] content) throws IOException {
-      return CONFIGURATION_JSON_ADAPTER.fromJson(
-          Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      return deserialize(CONFIGURATION_JSON_ADAPTER, content);
     }
 
     static MetricProbe deserializeMetricProbe(byte[] content) throws IOException {
-      return METRIC_PROBE_JSON_ADAPTER.fromJson(
-          Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      return deserialize(METRIC_PROBE_JSON_ADAPTER, content);
     }
 
     static LogProbe deserializeLogProbe(byte[] content) throws IOException {
-      return LOG_PROBE_JSON_ADAPTER.fromJson(
-          Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      return deserialize(LOG_PROBE_JSON_ADAPTER, content);
     }
 
     static SpanProbe deserializeSpanProbe(byte[] content) throws IOException {
-      return SPAN_PROBE_JSON_ADAPTER.fromJson(
-          Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      return deserialize(SPAN_PROBE_JSON_ADAPTER, content);
     }
 
     static SpanDecorationProbe deserializeSpanDecorationProbe(byte[] content) throws IOException {
-      return SPAN_DECORATION_PROBE_JSON_ADAPTER.fromJson(
-          Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      return deserialize(SPAN_DECORATION_PROBE_JSON_ADAPTER, content);
+    }
+
+    private static <T> T deserialize(JsonAdapter<T> adapter, byte[] content) throws IOException {
+      return adapter.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
     }
   }
 
@@ -89,9 +88,7 @@ public void accept(
       byte[] content,
       datadog.remoteconfig.ConfigurationChangesListener.PollingRateHinter pollingRateHinter)
       throws IOException {
-
     String configId = configKey.getConfigId();
-
     if (configId.startsWith("metricProbe_")) {
       MetricProbe metricProbe = Adapter.deserializeMetricProbe(content);
       configChunks.put(configId, (builder) -> builder.add(metricProbe));
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/LogMessageTemplateBuilder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
similarity index 71%
rename from dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/LogMessageTemplateBuilder.java
rename to dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
index 4554630e8eb..3f19bf2d2b2 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/LogMessageTemplateBuilder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
@@ -3,17 +3,20 @@
 import static com.datadog.debugger.util.ValueScriptHelper.serializeValue;
 
 import com.datadog.debugger.el.EvaluationException;
+import com.datadog.debugger.el.RedactedException;
 import com.datadog.debugger.el.Value;
 import com.datadog.debugger.el.ValueScript;
 import com.datadog.debugger.probe.LogProbe;
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.EvaluationError;
+import datadog.trace.bootstrap.debugger.Limits;
+import datadog.trace.bootstrap.debugger.util.Redaction;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LogMessageTemplateBuilder {
-  private static final Logger LOGGER = LoggerFactory.getLogger(LogMessageTemplateBuilder.class);
+public class StringTemplateBuilder {
+  private static final Logger LOGGER = LoggerFactory.getLogger(StringTemplateBuilder.class);
   /**
    * Serialization limits for log messages. Most values are lower than snapshot because you can
    * directly reference values that are in your interest with Expression Language:
@@ -21,8 +24,11 @@ public class LogMessageTemplateBuilder {
    */
   private final List<LogProbe.Segment> segments;
 
-  public LogMessageTemplateBuilder(List<LogProbe.Segment> segments) {
+  private final Limits limits;
+
+  public StringTemplateBuilder(List<LogProbe.Segment> segments, Limits limits) {
     this.segments = segments;
+    this.limits = limits;
   }
 
   public String evaluate(CapturedContext context, LogProbe.LogStatus status) {
@@ -43,13 +49,16 @@ public String evaluate(CapturedContext context, LogProbe.LogStatus status) {
             } else if (result.isNull()) {
               sb.append("null");
             } else {
-              serializeValue(sb, segment.getParsedExpr().getDsl(), result.getValue(), status);
+              serializeValue(
+                  sb, segment.getParsedExpr().getDsl(), result.getValue(), status, limits);
             }
           } catch (EvaluationException ex) {
             LOGGER.debug("Evaluation error: ", ex);
             status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
             status.setLogTemplateErrors(true);
-            sb.append("{").append(ex.getMessage()).append("}");
+            String msg =
+                ex instanceof RedactedException ? Redaction.REDACTED_VALUE : ex.getMessage();
+            sb.append("{").append(msg).append("}");
           }
         }
       }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
index 3edb9a464f0..5c4da11bd66 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
@@ -9,6 +9,7 @@
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.objectweb.asm.Opcodes;
@@ -20,6 +21,7 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.LocalVariableNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.TypeInsnNode;
 
@@ -164,7 +166,9 @@ public static void emitReflectiveCall(
     String methodName = getReflectiveMethodName(sort);
     // stack: [target_object, string]
     org.objectweb.asm.Type returnType =
-        sort == org.objectweb.asm.Type.OBJECT ? Types.OBJECT_TYPE : fieldType.getMainType();
+        sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY
+            ? Types.OBJECT_TYPE
+            : fieldType.getMainType();
     invokeStatic(
         insnList,
         REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE,
@@ -172,7 +176,7 @@ public static void emitReflectiveCall(
         returnType,
         targetType,
         Types.STRING_TYPE);
-    if (sort == org.objectweb.asm.Type.OBJECT) {
+    if (sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY) {
       insnList.add(new TypeInsnNode(Opcodes.CHECKCAST, fieldType.getMainType().getInternalName()));
     }
     // stack: [field_value]
@@ -197,12 +201,50 @@ private static String getReflectiveMethodName(int sort) {
       case org.objectweb.asm.Type.BOOLEAN:
         return "getFieldValueAsBoolean";
       case org.objectweb.asm.Type.OBJECT:
+      case org.objectweb.asm.Type.ARRAY:
         return "getFieldValue";
       default:
         throw new IllegalArgumentException("Unsupported type sort:" + sort);
     }
   }
 
+  public static List<LocalVariableNode> sortLocalVariables(List<LocalVariableNode> localVariables) {
+    List<LocalVariableNode> sortedLocalVars = new ArrayList<>(localVariables);
+    sortedLocalVars.sort(Comparator.comparingInt(o -> o.index));
+    return sortedLocalVars;
+  }
+
+  public static LocalVariableNode[] createLocalVarNodes(List<LocalVariableNode> sortedLocalVars) {
+    int maxIndex = sortedLocalVars.get(sortedLocalVars.size() - 1).index;
+    LocalVariableNode[] localVars = new LocalVariableNode[maxIndex + 1];
+    for (LocalVariableNode localVariableNode : sortedLocalVars) {
+      localVars[localVariableNode.index] = localVariableNode;
+    }
+    return localVars;
+  }
+
+  public static void adjustLocalVarsBasedOnArgs(
+      boolean isStatic,
+      LocalVariableNode[] localVars,
+      org.objectweb.asm.Type[] argTypes,
+      List<LocalVariableNode> sortedLocalVars) {
+    // assume that first local variables matches method arguments
+    // as stated into the JVM spec:
+    // https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.6.1
+    // so we reassigned local var in arg slots if they are empty
+    if (argTypes.length < localVars.length) {
+      int slot = isStatic ? 0 : 1;
+      int localVarTableIdx = slot;
+      for (org.objectweb.asm.Type t : argTypes) {
+        if (localVars[slot] == null && localVarTableIdx < sortedLocalVars.size()) {
+          localVars[slot] = sortedLocalVars.get(localVarTableIdx);
+        }
+        slot += t.getSize();
+        localVarTableIdx++;
+      }
+    }
+  }
+
   /** Wraps ASM's {@link org.objectweb.asm.Type} with associated generic types */
   public static class Type {
     private final org.objectweb.asm.Type mainType;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumentor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumentor.java
index 73ef9efb8fa..f728e14eb30 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumentor.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumentor.java
@@ -127,6 +127,8 @@ private boolean addLineCaptures(LineMap lineMap) {
       }
       if (beforeLabel != null) {
         InsnList insnList = new InsnList();
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [class, array]
         pushProbesIds(insnList);
         // stack [array]
         invokeStatic(
@@ -134,6 +136,7 @@ private boolean addLineCaptures(LineMap lineMap) {
             DEBUGGER_CONTEXT_TYPE,
             "isReadyToCapture",
             Type.BOOLEAN_TYPE,
+            CLASS_TYPE,
             STRING_ARRAY_TYPE);
         // stack [boolean]
         LabelNode targetNode = new LabelNode();
@@ -314,10 +317,17 @@ private void instrumentMethodEnter() {
       methodNode.instructions.insert(methodEnterLabel, insnList);
       return;
     }
+    ldc(insnList, Type.getObjectType(classNode.name));
+    // stack [class]
     pushProbesIds(insnList);
-    // stack [array]
+    // stack [class, array]
     invokeStatic(
-        insnList, DEBUGGER_CONTEXT_TYPE, "isReadyToCapture", Type.BOOLEAN_TYPE, STRING_ARRAY_TYPE);
+        insnList,
+        DEBUGGER_CONTEXT_TYPE,
+        "isReadyToCapture",
+        Type.BOOLEAN_TYPE,
+        CLASS_TYPE,
+        STRING_ARRAY_TYPE);
     // stack [boolean]
     LabelNode targetNode = new LabelNode();
     LabelNode gotoNode = new LabelNode();
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumentor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumentor.java
index 91799dfeff5..cda1012b299 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumentor.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumentor.java
@@ -1,14 +1,15 @@
 package com.datadog.debugger.instrumentation;
 
+import static com.datadog.debugger.instrumentation.ASMHelper.adjustLocalVarsBasedOnArgs;
+import static com.datadog.debugger.instrumentation.ASMHelper.createLocalVarNodes;
 import static com.datadog.debugger.instrumentation.ASMHelper.ldc;
+import static com.datadog.debugger.instrumentation.ASMHelper.sortLocalVariables;
 import static com.datadog.debugger.instrumentation.Types.STRING_TYPE;
 
 import com.datadog.debugger.instrumentation.DiagnosticMessage.Kind;
 import com.datadog.debugger.probe.ProbeDefinition;
 import com.datadog.debugger.probe.Where;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -75,29 +76,10 @@ private LocalVariableNode[] extractLocalVariables(Type[] argTypes) {
     if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
       return new LocalVariableNode[0];
     }
-    List<LocalVariableNode> sortedLocalVars = new ArrayList<>(methodNode.localVariables);
-    sortedLocalVars.sort(Comparator.comparingInt(o -> o.index));
-    int maxIndex = sortedLocalVars.get(sortedLocalVars.size() - 1).index;
-    LocalVariableNode[] localVars = new LocalVariableNode[maxIndex + 1];
+    List<LocalVariableNode> sortedLocalVars = sortLocalVariables(methodNode.localVariables);
+    LocalVariableNode[] localVars = createLocalVarNodes(sortedLocalVars);
+    adjustLocalVarsBasedOnArgs(isStatic, localVars, argTypes, sortedLocalVars);
     localVarBaseOffset = sortedLocalVars.get(0).index;
-    for (LocalVariableNode localVariableNode : sortedLocalVars) {
-      localVars[localVariableNode.index] = localVariableNode;
-    }
-    // assume that first local variables matches method arguments
-    // as stated into the JVM spec:
-    // https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.6.1
-    // so we reassigned local var in arg slots if they are empty
-    if (argTypes.length < localVars.length) {
-      int slot = isStatic ? 0 : 1;
-      int localVarTableIdx = slot;
-      for (Type t : argTypes) {
-        if (localVars[slot] == null && localVarTableIdx < sortedLocalVars.size()) {
-          localVars[slot] = sortedLocalVars.get(localVarTableIdx);
-        }
-        slot += t.getSize();
-        localVarTableIdx++;
-      }
-    }
     return localVars;
   }
 
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumentor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumentor.java
index 38642365cc4..6d361e5c1a9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumentor.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumentor.java
@@ -11,6 +11,8 @@
 import static com.datadog.debugger.instrumentation.ASMHelper.ldc;
 import static com.datadog.debugger.instrumentation.Types.*;
 import static datadog.trace.util.Strings.getClassName;
+import static org.objectweb.asm.Type.DOUBLE_TYPE;
+import static org.objectweb.asm.Type.LONG_TYPE;
 
 import com.datadog.debugger.el.InvalidValueException;
 import com.datadog.debugger.el.Visitor;
@@ -46,6 +48,7 @@
 import com.datadog.debugger.el.values.StringValue;
 import com.datadog.debugger.probe.MetricProbe;
 import com.datadog.debugger.probe.Where;
+import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.el.ValueReferences;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -141,6 +144,7 @@ protected InsnList getBeforeReturnInsnList(AbstractInsnNode node) {
     int size = 1;
     int storeOpCode = 0;
     int loadOpCode = 0;
+    Type returnType = null;
     switch (node.getOpcode()) {
       case Opcodes.RET:
       case Opcodes.RETURN:
@@ -149,29 +153,35 @@ protected InsnList getBeforeReturnInsnList(AbstractInsnNode node) {
         storeOpCode = Opcodes.LSTORE;
         loadOpCode = Opcodes.LLOAD;
         size = 2;
+        returnType = Type.LONG_TYPE;
         break;
       case Opcodes.DRETURN:
         storeOpCode = Opcodes.DSTORE;
         loadOpCode = Opcodes.DLOAD;
         size = 2;
+        returnType = Type.DOUBLE_TYPE;
         break;
       case Opcodes.IRETURN:
         storeOpCode = Opcodes.ISTORE;
         loadOpCode = Opcodes.ILOAD;
+        returnType = Type.INT_TYPE;
         break;
       case Opcodes.FRETURN:
         storeOpCode = Opcodes.FSTORE;
         loadOpCode = Opcodes.FLOAD;
+        returnType = Type.FLOAT_TYPE;
         break;
       case Opcodes.ARETURN:
         storeOpCode = Opcodes.ASTORE;
         loadOpCode = Opcodes.ALOAD;
+        returnType = OBJECT_TYPE;
         break;
       default:
         throw new UnsupportedOperationException("Unsupported opcode: " + node.getOpcode());
     }
-    InsnList insnList = wrapTryCatch(callMetric(metricProbe));
     int tmpIdx = newVar(size);
+    InsnList insnList =
+        wrapTryCatch(callMetric(metricProbe, new ReturnContext(tmpIdx, loadOpCode, returnType)));
     // store return value from the stack to local before wrapped call
     insnList.insert(new VarInsnNode(storeOpCode, tmpIdx));
     // restore return value to the stack after wrapped call
@@ -179,7 +189,7 @@ protected InsnList getBeforeReturnInsnList(AbstractInsnNode node) {
     return insnList;
   }
 
-  private InsnList callCount(MetricProbe metricProbe) {
+  private InsnList callCount(MetricProbe metricProbe, ReturnContext returnContext) {
     if (metricProbe.getValue() == null) {
       InsnList insnList = new InsnList();
       // consider the metric as an increment counter one
@@ -203,16 +213,20 @@ private InsnList callCount(MetricProbe metricProbe) {
       // stack []
       return insnList;
     }
-    return internalCallMetric(metricProbe);
+    return internalCallMetric(metricProbe, returnContext);
   }
 
-  private InsnList internalCallMetric(MetricProbe metricProbe) {
+  private InsnList internalCallMetric(MetricProbe metricProbe, ReturnContext returnContext) {
     InsnList insnList = new InsnList();
     InsnList nullBranch = new InsnList();
     VisitorResult result;
     Type resultType;
     try {
-      result = metricProbe.getValue().getExpr().accept(new MetricValueVisitor(this, nullBranch));
+      result =
+          metricProbe
+              .getValue()
+              .getExpr()
+              .accept(new MetricValueVisitor(this, nullBranch, returnContext));
     } catch (InvalidValueException | UnsupportedOperationException ex) {
       reportError(ex.getMessage());
       return EMPTY_INSN_LIST;
@@ -271,16 +285,20 @@ private Type convertIfRequired(Type currentType, InsnList insnList) {
   }
 
   private InsnList callMetric(MetricProbe metricProbe) {
+    return callMetric(metricProbe, null);
+  }
+
+  private InsnList callMetric(MetricProbe metricProbe, ReturnContext returnContext) {
     switch (metricProbe.getKind()) {
       case COUNT:
-        return callCount(metricProbe);
+        return callCount(metricProbe, returnContext);
       case GAUGE:
       case HISTOGRAM:
       case DISTRIBUTION:
         if (metricProbe.getValue() == null) {
           return EMPTY_INSN_LIST;
         }
-        return internalCallMetric(metricProbe);
+        return internalCallMetric(metricProbe, returnContext);
       default:
         reportError(String.format("Unknown metric kind: %s", metricProbe.getKind()));
     }
@@ -332,10 +350,13 @@ public VisitorResult(ASMHelper.Type type, InsnList insnList) {
   private static class MetricValueVisitor implements Visitor<VisitorResult> {
     private final MetricInstrumentor instrumentor;
     private final InsnList nullBranch;
+    private final ReturnContext returnContext;
 
-    public MetricValueVisitor(MetricInstrumentor instrumentor, InsnList nullBranch) {
+    public MetricValueVisitor(
+        MetricInstrumentor instrumentor, InsnList nullBranch, ReturnContext returnContext) {
       this.instrumentor = instrumentor;
       this.nullBranch = nullBranch;
+      this.returnContext = returnContext;
     }
 
     @Override
@@ -463,7 +484,11 @@ public VisitorResult visit(ValueRefExpression valueRefExpression) {
         insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
         // stack [this]
       } else {
-        currentType = tryRetrieve(name, insnList);
+        if (name.startsWith(ValueReferences.SYNTHETIC_PREFIX)) {
+          currentType = tryRetrieveSynthetic(name, insnList);
+        } else {
+          currentType = tryRetrieve(name, insnList);
+        }
         if (currentType == null) {
           throw new InvalidValueException("Cannot resolve symbol " + name);
         }
@@ -727,5 +752,58 @@ private ASMHelper.Type tryRetrieveField(
       }
       return returnType;
     }
+
+    private ASMHelper.Type tryRetrieveSynthetic(String name, InsnList insnList) {
+      if (name.equals(ValueReferences.RETURN_REF)) {
+        if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
+          return null;
+        }
+        if (returnContext == null) {
+          return null;
+        }
+        VarInsnNode varInsnNode =
+            new VarInsnNode(returnContext.opLoad, returnContext.returnLocalVarIdx);
+        insnList.add(varInsnNode);
+        // stack [return_value]
+        return new ASMHelper.Type(returnContext.type);
+      }
+      if (name.equals(ValueReferences.DURATION_REF)) {
+        if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
+          return null;
+        }
+        // call System.nanoTime at the beginning of the method
+        int var = instrumentor.newVar(LONG_TYPE);
+        InsnList nanoTimeList = new InsnList();
+        invokeStatic(nanoTimeList, Type.getType(System.class), "nanoTime", LONG_TYPE);
+        nanoTimeList.add(new VarInsnNode(Opcodes.LSTORE, var));
+        instrumentor.methodNode.instructions.insert(instrumentor.methodEnterLabel, nanoTimeList);
+        // diff nanoTime before calling metric
+        invokeStatic(insnList, Type.getType(System.class), "nanoTime", LONG_TYPE);
+        // stack [long]
+        insnList.add(new VarInsnNode(Opcodes.LLOAD, var));
+        // stack [long, long]
+        insnList.add(new InsnNode(Opcodes.LSUB));
+        // stack [long]
+        insnList.add(new InsnNode(Opcodes.L2D));
+        insnList.add(new LdcInsnNode(1_000_000D));
+        // stack [long, double]
+        insnList.add(new InsnNode(Opcodes.DDIV));
+        // stack [double]
+        return new ASMHelper.Type(DOUBLE_TYPE);
+      }
+      return null;
+    }
+  }
+
+  private static class ReturnContext {
+    private final int returnLocalVarIdx;
+    private final int opLoad;
+    private final Type type;
+
+    public ReturnContext(int returnLocalVarIdx, int opLoad, Type type) {
+      this.returnLocalVarIdx = returnLocalVarIdx;
+      this.opLoad = opLoad;
+      this.type = type;
+    }
   }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
index 48628f10550..0f112938335 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
@@ -4,14 +4,14 @@
 
 import com.datadog.debugger.agent.DebuggerAgent;
 import com.datadog.debugger.agent.Generated;
-import com.datadog.debugger.agent.LogMessageTemplateBuilder;
+import com.datadog.debugger.agent.StringTemplateBuilder;
 import com.datadog.debugger.el.EvaluationException;
 import com.datadog.debugger.el.ProbeCondition;
 import com.datadog.debugger.el.ValueScript;
 import com.datadog.debugger.instrumentation.CapturedContextInstrumentor;
 import com.datadog.debugger.instrumentation.DiagnosticMessage;
 import com.datadog.debugger.instrumentation.InstrumentationResult;
-import com.datadog.debugger.sink.Sink;
+import com.datadog.debugger.sink.DebuggerSink;
 import com.datadog.debugger.sink.Snapshot;
 import com.squareup.moshi.Json;
 import com.squareup.moshi.JsonAdapter;
@@ -41,6 +41,8 @@
 /** Stores definition of a log probe */
 public class LogProbe extends ProbeDefinition {
   private static final Logger LOGGER = LoggerFactory.getLogger(LogProbe.class);
+  private static final Limits LIMITS = new Limits(1, 3, 8192, 5);
+  private static final int LOG_MSG_LIMIT = 8192;
 
   /** Stores part of a templated message either a str or an expression */
   public static class Segment {
@@ -363,11 +365,17 @@ public InstrumentationResult.Status instrument(
   }
 
   @Override
-  public void evaluate(CapturedContext context, CapturedContext.Status status) {
+  public void evaluate(
+      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {
     if (!(status instanceof LogStatus)) {
       throw new IllegalStateException("Invalid status: " + status.getClass());
     }
+
     LogStatus logStatus = (LogStatus) status;
+    if (!hasCondition()) {
+      // sample when no condition associated
+      sample(logStatus, methodLocation);
+    }
     logStatus.setCondition(evaluateCondition(context, logStatus));
     CapturedContext.CapturedThrowable throwable = context.getThrowable();
     if (logStatus.hasConditionErrors() && throwable != null) {
@@ -375,9 +383,33 @@ public void evaluate(CapturedContext context, CapturedContext.Status status) {
           new EvaluationError(
               "uncaught exception", throwable.getType() + ": " + throwable.getMessage()));
     }
-    if (logStatus.getCondition()) {
-      LogMessageTemplateBuilder logMessageBuilder = new LogMessageTemplateBuilder(segments);
-      logStatus.setMessage(logMessageBuilder.evaluate(context, logStatus));
+    if (hasCondition() && (logStatus.getCondition() || logStatus.hasConditionErrors())) {
+      // sample if probe has condition and condition is true or has error
+      sample(logStatus, methodLocation);
+    }
+    if (logStatus.isSampled() && logStatus.getCondition()) {
+      StringTemplateBuilder logMessageBuilder = new StringTemplateBuilder(segments, LIMITS);
+      String msg = logMessageBuilder.evaluate(context, logStatus);
+      if (msg != null && msg.length() > LOG_MSG_LIMIT) {
+        StringBuilder sb = new StringBuilder(LOG_MSG_LIMIT + 3);
+        sb.append(msg, 0, LOG_MSG_LIMIT);
+        sb.append("...");
+        msg = sb.toString();
+      }
+      logStatus.setMessage(msg);
+    }
+  }
+
+  private void sample(LogStatus logStatus, MethodLocation methodLocation) {
+    // sample only once and when we need to evaluate
+    if (!MethodLocation.isSame(methodLocation, evaluateAt)) {
+      return;
+    }
+    boolean sampled = ProbeRateLimiter.tryProbe(id);
+    logStatus.setSampled(sampled);
+    if (!sampled) {
+      LOGGER.debug("{} not sampled!", id);
+      DebuggerAgent.getSink().skipSnapshot(id, DebuggerContext.SkipCause.RATE);
     }
   }
 
@@ -425,18 +457,11 @@ public void commit(
         spanId = exitContext.getSpanId();
         break;
     }
-    Sink sink = DebuggerAgent.getSink();
+    DebuggerSink sink = DebuggerAgent.getSink();
     boolean shouldCommit = false;
     int maxDepth = capture != null ? capture.maxReferenceDepth : -1;
     Snapshot snapshot = new Snapshot(Thread.currentThread(), this, maxDepth);
     if (entryStatus.shouldSend() && exitStatus.shouldSend()) {
-      // only rate limit if a condition is defined
-      if (probeCondition != null) {
-        if (!ProbeRateLimiter.tryProbe(id)) {
-          sink.skipSnapshot(id, DebuggerContext.SkipCause.RATE);
-          return;
-        }
-      }
       snapshot.setTraceId(traceId);
       snapshot.setSpanId(spanId);
       if (isCaptureSnapshot()) {
@@ -481,7 +506,7 @@ private LogStatus convertStatus(CapturedContext.Status status) {
     return (LogStatus) status;
   }
 
-  private void commitSnapshot(Snapshot snapshot, Sink sink) {
+  private void commitSnapshot(Snapshot snapshot, DebuggerSink sink) {
     /*
      * Record stack trace having the caller of this method as 'top' frame.
      * For this it is necessary to discard:
@@ -501,18 +526,11 @@ public void commit(CapturedContext lineContext, int line) {
     if (status == null) {
       return;
     }
-    Sink sink = DebuggerAgent.getSink();
+    DebuggerSink sink = DebuggerAgent.getSink();
     int maxDepth = capture != null ? capture.maxReferenceDepth : -1;
     Snapshot snapshot = new Snapshot(Thread.currentThread(), this, maxDepth);
     boolean shouldCommit = false;
     if (status.shouldSend()) {
-      // only rate limit if a condition is defined
-      if (probeCondition != null) {
-        if (!ProbeRateLimiter.tryProbe(id)) {
-          sink.skipSnapshot(id, DebuggerContext.SkipCause.RATE);
-          return;
-        }
-      }
       snapshot.setTraceId(lineContext.getTraceId());
       snapshot.setSpanId(lineContext.getSpanId());
       if (isCaptureSnapshot()) {
@@ -554,6 +572,7 @@ public static class LogStatus extends CapturedContext.Status {
     private boolean condition = true;
     private boolean hasLogTemplateErrors;
     private boolean hasConditionErrors;
+    private boolean sampled = true;
     private String message;
 
     public LogStatus(ProbeImplementation probeImplementation) {
@@ -567,7 +586,7 @@ private LogStatus(ProbeImplementation probeImplementation, boolean condition) {
 
     @Override
     public boolean shouldFreezeContext() {
-      return probeImplementation.isCaptureSnapshot() && shouldSend();
+      return sampled && probeImplementation.isCaptureSnapshot() && shouldSend();
     }
 
     @Override
@@ -576,7 +595,7 @@ public boolean isCapturing() {
     }
 
     public boolean shouldSend() {
-      return condition && !hasConditionErrors;
+      return sampled && condition && !hasConditionErrors;
     }
 
     public boolean shouldReportError() {
@@ -614,6 +633,14 @@ public void setMessage(String message) {
     public String getMessage() {
       return message;
     }
+
+    public void setSampled(boolean sampled) {
+      this.sampled = sampled;
+    }
+
+    public boolean isSampled() {
+      return sampled;
+    }
   }
 
   @Generated
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
index a02b1e95646..4de096f0619 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
@@ -143,7 +143,8 @@ public ProbeLocation getLocation() {
   }
 
   @Override
-  public void evaluate(CapturedContext context, CapturedContext.Status status) {}
+  public void evaluate(
+      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {}
 
   @Override
   public void commit(
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
index 9bd2a410dfe..47b170f57b1 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
@@ -2,7 +2,7 @@
 
 import com.datadog.debugger.agent.DebuggerAgent;
 import com.datadog.debugger.agent.Generated;
-import com.datadog.debugger.agent.LogMessageTemplateBuilder;
+import com.datadog.debugger.agent.StringTemplateBuilder;
 import com.datadog.debugger.el.EvaluationException;
 import com.datadog.debugger.el.ProbeCondition;
 import com.datadog.debugger.instrumentation.CapturedContextInstrumentor;
@@ -33,6 +33,7 @@ public class SpanDecorationProbe extends ProbeDefinition {
   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);
 
   public enum TargetSpan {
     ACTIVE,
@@ -145,7 +146,8 @@ public InstrumentationResult.Status instrument(
   }
 
   @Override
-  public void evaluate(CapturedContext context, CapturedContext.Status status) {
+  public void evaluate(
+      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {
     for (Decoration decoration : decorations) {
       if (decoration.when != null) {
         try {
@@ -165,7 +167,7 @@ public void evaluate(CapturedContext context, CapturedContext.Status status) {
       SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
       for (Tag tag : decoration.tags) {
         String tagName = sanitize(tag.name);
-        LogMessageTemplateBuilder builder = new LogMessageTemplateBuilder(tag.value.getSegments());
+        StringTemplateBuilder builder = new StringTemplateBuilder(tag.value.getSegments(), LIMITS);
         LogProbe.LogStatus logStatus = new LogProbe.LogStatus(this);
         String tagValue = builder.evaluate(context, logStatus);
         if (logStatus.hasLogTemplateErrors()) {
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
index f6c245e5000..eeffaa3031a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
@@ -164,12 +164,19 @@ private static String removeFQN(String targetSignature) {
     }
     String result = targetSignature;
     for (String className : classes) {
-      Pattern classNamePattern = Pattern.compile("L" + className + ";");
-      result = classNamePattern.matcher(result).replaceAll("L" + simplify(className) + ";");
+      Pattern classNamePattern = Pattern.compile("L" + escapeClassName(className) + ";");
+      result =
+          classNamePattern
+              .matcher(result)
+              .replaceAll("L" + escapeClassName(simplify(className)) + ";");
     }
     return result;
   }
 
+  private static String escapeClassName(String className) {
+    return className.replace("$", "\\$");
+  }
+
   private static String simplify(String fqnClass) {
     if (fqnClass == null) {
       return null;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
index 8203869d9a0..fe16b42f6df 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
@@ -17,7 +17,7 @@
 import org.slf4j.LoggerFactory;
 
 /** Collects data that needs to be sent to the backend: Snapshots, metrics and statuses */
-public class DebuggerSink implements Sink {
+public class DebuggerSink {
   private static final Logger log = LoggerFactory.getLogger(DebuggerSink.class);
   private static final double FREE_CAPACITY_LOWER_THRESHOLD = 0.25;
   private static final double FREE_CAPACITY_UPPER_THRESHOLD = 0.75;
@@ -30,6 +30,7 @@ public class DebuggerSink implements Sink {
 
   private final ProbeStatusSink probeStatusSink;
   private final SnapshotSink snapshotSink;
+  private final SymbolSink symbolSink;
   private final DebuggerMetrics debuggerMetrics;
   private final BatchUploader batchUploader;
   private final String tags;
@@ -42,10 +43,11 @@ public class DebuggerSink implements Sink {
   public DebuggerSink(Config config) {
     this(
         config,
-        new BatchUploader(config),
+        new BatchUploader(config, config.getFinalDebuggerSnapshotUrl()),
         DebuggerMetrics.getInstance(config),
         new ProbeStatusSink(config),
-        new SnapshotSink(config));
+        new SnapshotSink(config),
+        new SymbolSink(config));
   }
 
   DebuggerSink(Config config, BatchUploader batchUploader) {
@@ -54,16 +56,18 @@ public DebuggerSink(Config config) {
         batchUploader,
         DebuggerMetrics.getInstance(config),
         new ProbeStatusSink(config),
-        new SnapshotSink(config));
+        new SnapshotSink(config),
+        new SymbolSink(config));
   }
 
   public DebuggerSink(Config config, ProbeStatusSink probeStatusSink) {
     this(
         config,
-        new BatchUploader(config),
+        new BatchUploader(config, config.getFinalDebuggerSnapshotUrl()),
         DebuggerMetrics.getInstance(config),
         probeStatusSink,
-        new SnapshotSink(config));
+        new SnapshotSink(config),
+        new SymbolSink(config));
   }
 
   DebuggerSink(Config config, BatchUploader batchUploader, DebuggerMetrics debuggerMetrics) {
@@ -72,7 +76,8 @@ public DebuggerSink(Config config, ProbeStatusSink probeStatusSink) {
         batchUploader,
         debuggerMetrics,
         new ProbeStatusSink(config),
-        new SnapshotSink(config));
+        new SnapshotSink(config),
+        new SymbolSink(config));
   }
 
   public DebuggerSink(
@@ -80,12 +85,14 @@ public DebuggerSink(
       BatchUploader batchUploader,
       DebuggerMetrics debuggerMetrics,
       ProbeStatusSink probeStatusSink,
-      SnapshotSink snapshotSink) {
+      SnapshotSink snapshotSink,
+      SymbolSink symbolSink) {
     this.batchUploader = batchUploader;
     tags = getDefaultTagsMergedWithGlobalTags(config);
     this.debuggerMetrics = debuggerMetrics;
     this.probeStatusSink = probeStatusSink;
     this.snapshotSink = snapshotSink;
+    this.symbolSink = symbolSink;
     this.uploadFlushInterval = config.getDebuggerUploadFlushInterval();
   }
 
@@ -136,7 +143,10 @@ public BatchUploader getSnapshotUploader() {
     return batchUploader;
   }
 
-  @Override
+  public SymbolSink getSymbolSink() {
+    return symbolSink;
+  }
+
   public void addSnapshot(Snapshot snapshot) {
     boolean added = snapshotSink.offer(snapshot);
     if (!added) {
@@ -160,15 +170,16 @@ private void reschedule() {
 
   // visible for testing
   void flush(DebuggerSink ignored) {
+    symbolSink.flush();
     List<String> diagnostics = probeStatusSink.getSerializedDiagnostics();
     List<String> snapshots = snapshotSink.getSerializedSnapshots();
     if (snapshots.size() + diagnostics.size() == 0) {
       return;
     }
-    if (snapshots.size() >= 1) {
+    if (snapshots.size() > 0) {
       uploadPayloads(snapshots);
     }
-    if (diagnostics.size() >= 1) {
+    if (diagnostics.size() > 0) {
       uploadPayloads(diagnostics);
     }
   }
@@ -248,7 +259,6 @@ private void reportError(ProbeId probeId, DiagnosticMessage msg) {
   }
 
   /** Notifies the snapshot was skipped for one of the SkipCause reason */
-  @Override
   public void skipSnapshot(String probeId, DebuggerContext.SkipCause cause) {
     String causeTag;
     switch (cause) {
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Sink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Sink.java
deleted file mode 100644
index 687c83ef747..00000000000
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Sink.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.datadog.debugger.sink;
-
-import datadog.trace.bootstrap.debugger.DebuggerContext;
-
-public interface Sink {
-  void addSnapshot(Snapshot snapshot);
-
-  void skipSnapshot(String probeId, DebuggerContext.SkipCause cause);
-}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
index 559bd259424..4ceca7b547e 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
@@ -2,7 +2,7 @@
 
 import com.datadog.debugger.agent.DebuggerAgent;
 import com.datadog.debugger.util.ExceptionHelper;
-import com.datadog.debugger.util.SnapshotSlicer;
+import com.datadog.debugger.util.SnapshotPruner;
 import datadog.trace.api.Config;
 import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.TagsHelper;
@@ -64,20 +64,13 @@ public boolean offer(Snapshot snapshot) {
 
   String serializeSnapshot(String serviceName, Snapshot snapshot) {
     String str = DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot);
-    int currentMaxDepth = snapshot.getMaxDepth();
-    while (str.length() > MAX_SNAPSHOT_SIZE && currentMaxDepth >= 0) {
+    String prunedStr = SnapshotPruner.prune(str, MAX_SNAPSHOT_SIZE, 4);
+    if (prunedStr.length() != str.length()) {
       LOGGER.debug(
-          "serializing snapshot breached 1MB limit: {}, reducing depth level {} -> {}",
+          "serializing snapshot breached 1MB limit, reducing size from {} -> {}",
           str.length(),
-          currentMaxDepth,
-          currentMaxDepth - 1);
-      currentMaxDepth -= 1;
-      str = SnapshotSlicer.slice(currentMaxDepth, str);
+          prunedStr.length());
     }
-    if (str.length() > MAX_SNAPSHOT_SIZE) {
-      ratelimitedLogger.warn(
-          "Snapshot is too large even after reducing depth to 0: {}", str.length());
-    }
-    return str;
+    return prunedStr;
   }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
new file mode 100644
index 00000000000..1ff688a35ad
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
@@ -0,0 +1,85 @@
+package com.datadog.debugger.sink;
+
+import com.datadog.debugger.symbol.Scope;
+import com.datadog.debugger.symbol.ServiceVersion;
+import com.datadog.debugger.uploader.BatchUploader;
+import com.datadog.debugger.util.ExceptionHelper;
+import com.datadog.debugger.util.MoshiHelper;
+import com.squareup.moshi.JsonAdapter;
+import datadog.trace.api.Config;
+import datadog.trace.util.TagsHelper;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SymbolSink {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolSink.class);
+  private static final int CAPACITY = 1024;
+  private static final JsonAdapter<ServiceVersion> SERVICE_VERSION_ADAPTER =
+      MoshiHelper.createMoshiSymbol().adapter(ServiceVersion.class);
+  private static final String EVENT_FORMAT =
+      "{%n"
+          + "\"ddsource\": \"dd_debugger\",%n"
+          + "\"service\": \"%s\",%n"
+          + "\"runtimeId\": \"%s\"%n"
+          + "}";
+
+  private final String serviceName;
+  private final String env;
+  private final String version;
+  private final BatchUploader symbolUploader;
+  private final BlockingQueue<ServiceVersion> scopes = new ArrayBlockingQueue<>(CAPACITY);
+  private final BatchUploader.MultiPartContent event;
+
+  public SymbolSink(Config config) {
+    this(config, new BatchUploader(config, config.getFinalDebuggerSymDBUrl()));
+  }
+
+  SymbolSink(Config config, BatchUploader symbolUploader) {
+    this.serviceName = TagsHelper.sanitize(config.getServiceName());
+    this.env = config.getEnv();
+    this.version = config.getVersion();
+    this.symbolUploader = symbolUploader;
+    byte[] eventContent =
+        String.format(EVENT_FORMAT, serviceName, config.getRuntimeId())
+            .getBytes(StandardCharsets.UTF_8);
+    this.event = new BatchUploader.MultiPartContent(eventContent, "event", "event.json");
+  }
+
+  public boolean addScope(Scope jarScope) {
+    ServiceVersion serviceVersion =
+        new ServiceVersion(serviceName, env, version, "JAVA", Collections.singletonList(jarScope));
+    return scopes.offer(serviceVersion);
+  }
+
+  public void flush() {
+    if (scopes.isEmpty()) {
+      return;
+    }
+    List<ServiceVersion> scopesToSerialize = new ArrayList<>();
+    scopes.drainTo(scopesToSerialize);
+    LOGGER.debug("Sending {} scopes", scopesToSerialize.size());
+    for (ServiceVersion serviceVersion : scopesToSerialize) {
+      try {
+        String json = SERVICE_VERSION_ADAPTER.toJson(serviceVersion);
+        LOGGER.debug(
+            "Sending scope: {}, size={}",
+            serviceVersion.getScopes().get(0).getName(),
+            json.length());
+        symbolUploader.uploadAsMultipart(
+            "",
+            event,
+            new BatchUploader.MultiPartContent(
+                json.getBytes(StandardCharsets.UTF_8), "file", "file.json"));
+      } catch (Exception e) {
+        ExceptionHelper.logException(LOGGER, e, "Error during scope serialization:");
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java
new file mode 100644
index 00000000000..028335685b5
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java
@@ -0,0 +1,62 @@
+package com.datadog.debugger.symbol;
+
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JarScanner {
+  private static final Logger LOGGER = LoggerFactory.getLogger(JarScanner.class);
+  private static final String JAR_FILE_PREFIX = "jar:file:";
+  private static final String FILE_PREFIX = "file:";
+  // Spring prefixes:
+  // https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html
+  private static final String SPRING_CLASSES_PREFIX = "BOOT-INF/classes/";
+  private static final String SPRING_DEPS_PREFIX = "BOOT-INF/lib/";
+
+  public static Path extractJarPath(Class<?> clazz) throws URISyntaxException {
+    return extractJarPath(clazz.getProtectionDomain());
+  }
+
+  public static Path extractJarPath(ProtectionDomain protectionDomain) throws URISyntaxException {
+    if (protectionDomain == null) {
+      return null;
+    }
+    CodeSource codeSource = protectionDomain.getCodeSource();
+    if (codeSource == null) {
+      return null;
+    }
+    URL location = codeSource.getLocation();
+    if (location == null) {
+      return null;
+    }
+    String locationStr = location.toString();
+    LOGGER.debug("CodeSource Location={}", locationStr);
+    if (locationStr.startsWith(JAR_FILE_PREFIX)) {
+      int idx = locationStr.indexOf("!/");
+      if (idx != -1) {
+        return getPathFromPrefixedFileName(locationStr, JAR_FILE_PREFIX, idx);
+      }
+    } else if (locationStr.startsWith(FILE_PREFIX)) {
+      return getPathFromPrefixedFileName(locationStr, FILE_PREFIX, locationStr.length());
+    }
+    return null;
+  }
+
+  public static String trimPrefixes(String classFilePath) {
+    if (classFilePath.startsWith(SPRING_CLASSES_PREFIX)) {
+      return classFilePath.substring(SPRING_CLASSES_PREFIX.length());
+    }
+    return classFilePath;
+  }
+
+  private static Path getPathFromPrefixedFileName(String locationStr, String prefix, int endIdx) {
+    String fileName = locationStr.substring(prefix.length(), endIdx);
+    LOGGER.debug("jar filename={}", fileName);
+    return Paths.get(fileName);
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java
new file mode 100644
index 00000000000..78599d993d1
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java
@@ -0,0 +1,144 @@
+package com.datadog.debugger.symbol;
+
+import com.datadog.debugger.agent.Generated;
+import com.squareup.moshi.Json;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+public class LanguageSpecifics {
+  @Json(name = "access_modifiers")
+  private final List<String> accessModifiers;
+
+  private final List<String> annotations;
+
+  @Json(name = "super_class")
+  private final String superClass;
+
+  private final List<String> interfaces;
+
+  @Json(name = "return_type")
+  private final String returnType;
+
+  public LanguageSpecifics(
+      List<String> accessModifiers,
+      List<String> annotations,
+      String superClass,
+      List<String> interfaces,
+      String returnType) {
+    this.accessModifiers = accessModifiers;
+    this.annotations = annotations;
+    this.superClass = superClass;
+    this.interfaces = interfaces;
+    this.returnType = returnType;
+  }
+
+  public List<String> getAccessModifiers() {
+    return accessModifiers;
+  }
+
+  public List<String> getAnnotations() {
+    return annotations;
+  }
+
+  public String getSuperClass() {
+    return superClass;
+  }
+
+  public List<String> getInterfaces() {
+    return interfaces;
+  }
+
+  public String getReturnType() {
+    return returnType;
+  }
+
+  @Generated
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    LanguageSpecifics that = (LanguageSpecifics) o;
+    return Objects.equals(accessModifiers, that.accessModifiers)
+        && Objects.equals(annotations, that.annotations)
+        && Objects.equals(superClass, that.superClass)
+        && Objects.equals(interfaces, that.interfaces)
+        && Objects.equals(returnType, that.returnType);
+  }
+
+  @Generated
+  @Override
+  public int hashCode() {
+    return Objects.hash(accessModifiers, annotations, superClass, interfaces, returnType);
+  }
+
+  @Generated
+  @Override
+  public String toString() {
+    return "LanguageSpecifics{"
+        + "accessModifiers="
+        + accessModifiers
+        + ", annotations="
+        + annotations
+        + ", superClass='"
+        + superClass
+        + '\''
+        + ", interfaces="
+        + interfaces
+        + ", returnType='"
+        + returnType
+        + '\''
+        + '}';
+  }
+
+  public static class Builder {
+    private List<String> accessModifiers;
+    private List<String> annotations;
+    private String superClass;
+    private List<String> interfaces;
+    private String returnType;
+
+    public Builder addModifiers(Collection<String> modifiers) {
+      if (modifiers == null || modifiers.isEmpty()) {
+        this.accessModifiers = null;
+        return this;
+      }
+      accessModifiers = new ArrayList<>(modifiers);
+      return this;
+    }
+
+    public Builder addAnnotations(Collection<String> annotations) {
+      if (annotations == null || annotations.isEmpty()) {
+        this.annotations = null;
+        return this;
+      }
+      this.annotations = new ArrayList<>(annotations);
+      return this;
+    }
+
+    public Builder superClass(String superClass) {
+      this.superClass = superClass;
+      return this;
+    }
+
+    public Builder addInterfaces(Collection<String> interfaces) {
+      if (interfaces == null || interfaces.isEmpty()) {
+        this.interfaces = null;
+        return this;
+      }
+      this.interfaces = new ArrayList<>(interfaces);
+      return this;
+    }
+
+    public Builder returnType(String returnType) {
+      this.returnType = returnType;
+      return this;
+    }
+
+    public LanguageSpecifics build() {
+      return new LanguageSpecifics(
+          accessModifiers, annotations, superClass, interfaces, returnType);
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java
new file mode 100644
index 00000000000..bd0012bfb03
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java
@@ -0,0 +1,149 @@
+package com.datadog.debugger.symbol;
+
+import com.squareup.moshi.Json;
+import java.util.List;
+
+public class Scope {
+  @Json(name = "scope_type")
+  private final ScopeType scopeType;
+
+  @Json(name = "source_file")
+  private final String sourceFile;
+
+  @Json(name = "start_line")
+  private final int startLine;
+
+  @Json(name = "end_line")
+  private final int endLine;
+
+  private final String name;
+
+  @Json(name = "language_specifics")
+  private final LanguageSpecifics languageSpecifics;
+
+  private final List<Symbol> symbols;
+  private final List<Scope> scopes;
+
+  public Scope(
+      ScopeType scopeType,
+      String sourceFile,
+      int startLine,
+      int endLine,
+      String name,
+      LanguageSpecifics languageSpecifics,
+      List<Symbol> symbols,
+      List<Scope> scopes) {
+    this.scopeType = scopeType;
+    this.sourceFile = sourceFile;
+    this.startLine = startLine;
+    this.endLine = endLine;
+    this.name = name;
+    this.languageSpecifics = languageSpecifics;
+    this.symbols = symbols;
+    this.scopes = scopes;
+  }
+
+  public ScopeType getScopeType() {
+    return scopeType;
+  }
+
+  public String getSourceFile() {
+    return sourceFile;
+  }
+
+  public int getStartLine() {
+    return startLine;
+  }
+
+  public int getEndLine() {
+    return endLine;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public LanguageSpecifics getLanguageSpecifics() {
+    return languageSpecifics;
+  }
+
+  public List<Symbol> getSymbols() {
+    return symbols;
+  }
+
+  public List<Scope> getScopes() {
+    return scopes;
+  }
+
+  @Override
+  public String toString() {
+    return "Scope{"
+        + "scopeType="
+        + scopeType
+        + ", sourceFile='"
+        + sourceFile
+        + '\''
+        + ", startLine="
+        + startLine
+        + ", endLine="
+        + endLine
+        + ", name='"
+        + name
+        + '\''
+        + ", languageSpecifics="
+        + languageSpecifics
+        + ", symbols="
+        + symbols
+        + ", scopes="
+        + scopes
+        + '}';
+  }
+
+  public static Builder builder(
+      ScopeType scopeType, String sourceFile, int startLine, int endLine) {
+    return new Builder(scopeType, sourceFile, startLine, endLine);
+  }
+
+  public static class Builder {
+    private final ScopeType scopeType;
+    private final String sourceFile;
+    private final int startLine;
+    private final int endLine;
+    private String name;
+    private LanguageSpecifics languageSpecifics;
+    private List<Symbol> symbols;
+    private List<Scope> scopes;
+
+    public Builder(ScopeType scopeType, String sourceFile, int startLine, int endLine) {
+      this.scopeType = scopeType;
+      this.sourceFile = sourceFile;
+      this.startLine = startLine;
+      this.endLine = endLine;
+    }
+
+    public Builder name(String name) {
+      this.name = name;
+      return this;
+    }
+
+    public Builder languageSpecifics(LanguageSpecifics languageSpecifics) {
+      this.languageSpecifics = languageSpecifics;
+      return this;
+    }
+
+    public Builder symbols(List<Symbol> symbols) {
+      this.symbols = symbols;
+      return this;
+    }
+
+    public Builder scopes(List<Scope> scopes) {
+      this.scopes = scopes;
+      return this;
+    }
+
+    public Scope build() {
+      return new Scope(
+          scopeType, sourceFile, startLine, endLine, name, languageSpecifics, symbols, scopes);
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java
new file mode 100644
index 00000000000..99d8c004a55
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java
@@ -0,0 +1,9 @@
+package com.datadog.debugger.symbol;
+
+public enum ScopeType {
+  JAR,
+  CLASS,
+  METHOD,
+  LOCAL,
+  CLOSURE
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java
new file mode 100644
index 00000000000..a88fc25da63
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java
@@ -0,0 +1,25 @@
+package com.datadog.debugger.symbol;
+
+import java.util.List;
+
+public class ServiceVersion {
+  private final String service;
+
+  private final String env;
+  private final String version;
+  private final String language;
+  private final List<Scope> scopes;
+
+  public ServiceVersion(
+      String service, String env, String version, String language, List<Scope> scopes) {
+    this.service = service;
+    this.env = env;
+    this.version = version;
+    this.language = language;
+    this.scopes = scopes;
+  }
+
+  public List<Scope> getScopes() {
+    return scopes;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
new file mode 100644
index 00000000000..16184bce602
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
@@ -0,0 +1,207 @@
+package com.datadog.debugger.symbol;
+
+import static com.datadog.debugger.symbol.JarScanner.trimPrefixes;
+
+import com.datadog.debugger.agent.AllowListHelper;
+import com.datadog.debugger.agent.Configuration;
+import com.datadog.debugger.util.MoshiHelper;
+import com.squareup.moshi.JsonAdapter;
+import datadog.remoteconfig.ConfigurationChangesListener;
+import datadog.remoteconfig.state.ParsedConfigKey;
+import datadog.remoteconfig.state.ProductListener;
+import datadog.trace.api.Config;
+import datadog.trace.util.AgentTaskScheduler;
+import datadog.trace.util.Strings;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.instrument.Instrumentation;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.regex.Pattern;
+import okio.Okio;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SymDBEnablement implements ProductListener {
+  private static final Logger LOGGER = LoggerFactory.getLogger(SymDBEnablement.class);
+  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+  private static final JsonAdapter<SymDbRemoteConfigRecord> SYM_DB_JSON_ADAPTER =
+      MoshiHelper.createMoshiConfig().adapter(SymDbRemoteConfigRecord.class);
+  private static final String SYM_DB_RC_KEY = "symDb";
+  private static final int READ_BUFFER_SIZE = 4096;
+  private static final int CLASSFILE_BUFFER_SIZE = 8192;
+
+  private final Instrumentation instrumentation;
+  private final Config config;
+  private final SymbolAggregator symbolAggregator;
+  private SymbolExtractionTransformer symbolExtractionTransformer;
+  private volatile long lastUploadTimestamp;
+  private AtomicBoolean starting = new AtomicBoolean();
+
+  public SymDBEnablement(
+      Instrumentation instrumentation, Config config, SymbolAggregator symbolAggregator) {
+    this.instrumentation = instrumentation;
+    this.config = config;
+    this.symbolAggregator = symbolAggregator;
+  }
+
+  @Override
+  public void accept(
+      ParsedConfigKey configKey,
+      byte[] content,
+      ConfigurationChangesListener.PollingRateHinter pollingRateHinter)
+      throws IOException {
+    if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
+      SymDbRemoteConfigRecord symDb = deserializeSymDb(content);
+      if (symDb.isUploadSymbols()) {
+        // can be long, make it async
+        AgentTaskScheduler.INSTANCE.execute(this::startSymbolExtraction);
+      } else {
+        stopSymbolExtraction();
+      }
+    } else {
+      LOGGER.debug("unsupported configuration id {}", configKey.getConfigId());
+    }
+  }
+
+  @Override
+  public void remove(
+      ParsedConfigKey configKey, ConfigurationChangesListener.PollingRateHinter pollingRateHinter)
+      throws IOException {
+    if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
+      stopSymbolExtraction();
+    }
+  }
+
+  @Override
+  public void commit(ConfigurationChangesListener.PollingRateHinter pollingRateHinter) {}
+
+  private static SymDbRemoteConfigRecord deserializeSymDb(byte[] content) throws IOException {
+    return SYM_DB_JSON_ADAPTER.fromJson(
+        Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+  }
+
+  public void stopSymbolExtraction() {
+    LOGGER.debug("Stopping symbol extraction.");
+    instrumentation.removeTransformer(symbolExtractionTransformer);
+  }
+
+  long getLastUploadTimestamp() {
+    return lastUploadTimestamp;
+  }
+
+  public void startSymbolExtraction() {
+    if (!starting.compareAndSet(false, true)) {
+      return;
+    }
+    try {
+      LOGGER.debug("Starting symbol extraction...");
+      if (lastUploadTimestamp > 0) {
+        LOGGER.debug(
+            "Last upload was on {}",
+            LocalDateTime.ofInstant(
+                Instant.ofEpochMilli(lastUploadTimestamp), ZoneId.systemDefault()));
+        return;
+      }
+      String includes = config.getDebuggerSymbolIncludes();
+      AllowListHelper allowListHelper = new AllowListHelper(buildFilterList(includes));
+      symbolAggregator.loadedClassesProcessStarted();
+      try {
+        symbolExtractionTransformer =
+            new SymbolExtractionTransformer(allowListHelper, symbolAggregator);
+        instrumentation.addTransformer(symbolExtractionTransformer);
+        extractSymbolForLoadedClasses(allowListHelper);
+        lastUploadTimestamp = System.currentTimeMillis();
+      } finally {
+        symbolAggregator.loadedClassesProcessEnded();
+      }
+    } finally {
+      starting.set(false);
+    }
+  }
+
+  private void extractSymbolForLoadedClasses(AllowListHelper allowListHelper) {
+    Class<?>[] classesToExtract;
+    try {
+      classesToExtract =
+          Arrays.stream(instrumentation.getAllLoadedClasses())
+              .filter(clazz -> allowListHelper.isAllowed(clazz.getTypeName()))
+              .filter(instrumentation::isModifiableClass)
+              .toArray(Class<?>[]::new);
+    } catch (Throwable ex) {
+      LOGGER.debug("Failed to get all loaded classes", ex);
+      return;
+    }
+    Set<String> alreadyScannedJars = new HashSet<>();
+    byte[] buffer = new byte[READ_BUFFER_SIZE];
+    ByteArrayOutputStream baos = new ByteArrayOutputStream(CLASSFILE_BUFFER_SIZE);
+    for (Class<?> clazz : classesToExtract) {
+      Path jarPath;
+      try {
+        jarPath = JarScanner.extractJarPath(clazz);
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+      if (jarPath == null) {
+        continue;
+      }
+      if (!Files.exists(jarPath)) {
+        continue;
+      }
+      if (alreadyScannedJars.contains(jarPath.toString())) {
+        continue;
+      }
+      try {
+        try (JarFile jarFile = new JarFile(jarPath.toFile())) {
+          jarFile.stream()
+              .filter(jarEntry -> jarEntry.getName().endsWith(".class"))
+              .filter(
+                  jarEntry ->
+                      allowListHelper.isAllowed(
+                          Strings.getClassName(trimPrefixes(jarEntry.getName()))))
+              .forEach(jarEntry -> parseJarEntry(jarEntry, jarFile, jarPath, baos, buffer));
+        }
+        alreadyScannedJars.add(jarPath.toString());
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  private void parseJarEntry(
+      JarEntry jarEntry, JarFile jarFile, Path jarPath, ByteArrayOutputStream baos, byte[] buffer) {
+    LOGGER.debug("parsing jarEntry class: {}", jarEntry.getName());
+    try {
+      InputStream inputStream = jarFile.getInputStream(jarEntry);
+      int readBytes;
+      baos.reset();
+      while ((readBytes = inputStream.read(buffer)) != -1) {
+        baos.write(buffer, 0, readBytes);
+      }
+      symbolAggregator.parseClass(jarEntry.getName(), baos.toByteArray(), jarPath.toString());
+    } catch (IOException ex) {
+      LOGGER.debug("Exception during parsing jarEntry class: {}", jarEntry.getName(), ex);
+    }
+  }
+
+  private Configuration.FilterList buildFilterList(String includes) {
+    if (includes == null || includes.isEmpty()) {
+      return null;
+    }
+    String[] includeParts = COMMA_PATTERN.split(includes);
+    return new Configuration.FilterList(Arrays.asList(includeParts), Collections.emptyList());
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java
new file mode 100644
index 00000000000..85cc2159ae9
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java
@@ -0,0 +1,16 @@
+package com.datadog.debugger.symbol;
+
+import com.squareup.moshi.Json;
+
+public class SymDbRemoteConfigRecord {
+  @Json(name = "upload_symbols")
+  private final boolean uploadSymbols;
+
+  public SymDbRemoteConfigRecord(boolean uploadSymbols) {
+    this.uploadSymbols = uploadSymbols;
+  }
+
+  public boolean isUploadSymbols() {
+    return uploadSymbols;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java
new file mode 100644
index 00000000000..66deef6ee9f
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java
@@ -0,0 +1,66 @@
+package com.datadog.debugger.symbol;
+
+import com.squareup.moshi.Json;
+
+public class Symbol {
+  @Json(name = "symbol_type")
+  private final SymbolType symbolType;
+
+  private final String name;
+  private final int line;
+  private final String type;
+
+  @Json(name = "language_specifics")
+  private final LanguageSpecifics languageSpecifics;
+
+  public Symbol(
+      SymbolType symbolType,
+      String name,
+      int line,
+      String type,
+      LanguageSpecifics languageSpecifics) {
+    this.symbolType = symbolType;
+    this.name = name;
+    this.line = line;
+    this.type = type;
+    this.languageSpecifics = languageSpecifics;
+  }
+
+  public SymbolType getSymbolType() {
+    return symbolType;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public int getLine() {
+    return line;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public LanguageSpecifics getLanguageSpecifics() {
+    return languageSpecifics;
+  }
+
+  @Override
+  public String toString() {
+    return "Symbol{"
+        + "symbolType="
+        + symbolType
+        + ", name='"
+        + name
+        + '\''
+        + ", line="
+        + line
+        + ", type='"
+        + type
+        + '\''
+        + ", languageSpecifics="
+        + languageSpecifics
+        + '}';
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
new file mode 100644
index 00000000000..a10fccfb986
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
@@ -0,0 +1,123 @@
+package com.datadog.debugger.symbol;
+
+import static com.datadog.debugger.symbol.JarScanner.trimPrefixes;
+
+import com.datadog.debugger.sink.SymbolSink;
+import datadog.trace.util.AgentTaskScheduler;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SymbolAggregator {
+  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolAggregator.class);
+  private static final String CLASS_SUFFIX = ".class";
+
+  private final SymbolSink sink;
+  private final int symbolFlushThreshold;
+  private final Map<String, Scope> jarScopesByName = new HashMap<>();
+  private final AgentTaskScheduler.Scheduled<SymbolAggregator> scheduled;
+  private final Object jarScopeLock = new Object();
+  private int totalClasses;
+  private volatile Set<String> loadedClasses;
+
+  public SymbolAggregator(SymbolSink sink, int symbolFlushThreshold) {
+    this.sink = sink;
+    this.symbolFlushThreshold = symbolFlushThreshold;
+    scheduled =
+        AgentTaskScheduler.INSTANCE.scheduleAtFixedRate(
+            this::flushRemainingScopes, this, 0, 1, TimeUnit.SECONDS);
+  }
+
+  public void parseClass(
+      String className, byte[] classfileBuffer, ProtectionDomain protectionDomain) {
+    try {
+      String jarName = "DEFAULT";
+      Path jarPath = JarScanner.extractJarPath(protectionDomain);
+      if (jarPath != null && Files.exists(jarPath)) {
+        LOGGER.debug("jarpath: {}", jarPath);
+        jarName = jarPath.toString();
+      }
+      parseClass(className, classfileBuffer, jarName);
+    } catch (Exception ex) {
+      LOGGER.debug("Error parsing class: {}", className, ex);
+    }
+  }
+
+  public void parseClass(String className, byte[] classfileBuffer, String jarName) {
+    if (className == null) {
+      return;
+    }
+    className = trimPrefixes(className);
+    if (className.endsWith(CLASS_SUFFIX)) {
+      className = className.substring(0, className.length() - CLASS_SUFFIX.length());
+    }
+    Set<String> localLoadedClasses = loadedClasses;
+    if (localLoadedClasses != null && !localLoadedClasses.add(className)) {
+      // class already loaded and symbol extracted
+      return;
+    }
+    LOGGER.debug("Extracting Symbols from: {}, located in: {}", className, jarName);
+    Scope jarScope = SymbolExtractor.extract(classfileBuffer, jarName);
+    addJarScope(jarScope, false);
+  }
+
+  private void flushRemainingScopes(SymbolAggregator symbolAggregator) {
+    synchronized (jarScopeLock) {
+      if (jarScopesByName.isEmpty()) {
+        return;
+      }
+      LOGGER.debug("Flush remaining scopes");
+      addJarScope(null, true); // force flush remaining scopes
+    }
+  }
+
+  private void addJarScope(Scope jarScope, boolean forceFlush) {
+    List<Scope> scopes = Collections.emptyList();
+    synchronized (jarScopeLock) {
+      if (jarScope != null) {
+        Scope scope = jarScopesByName.get(jarScope.getName());
+        if (scope != null) {
+          scope.getScopes().addAll(jarScope.getScopes());
+        } else {
+          jarScopesByName.put(jarScope.getName(), jarScope);
+        }
+        totalClasses++;
+      }
+      if (totalClasses >= symbolFlushThreshold || forceFlush) {
+        scopes = new ArrayList<>(jarScopesByName.values());
+        jarScopesByName.clear();
+        totalClasses = 0;
+      }
+    }
+    if (!scopes.isEmpty()) {
+      LOGGER.debug("dumping {} jar scopes to sink", scopes.size());
+      for (Scope scope : scopes) {
+        LOGGER.debug(
+            "dumping {} class scopes to sink from scope: {}",
+            scope.getScopes().size(),
+            scope.getName());
+        sink.addScope(scope);
+      }
+    }
+  }
+
+  void loadedClassesProcessStarted() {
+    // to avoid duplicate symbol extraction we keep track of loaded classes
+    // during the loaded class extraction phase
+    loadedClasses = ConcurrentHashMap.newKeySet();
+  }
+
+  void loadedClassesProcessEnded() {
+    loadedClasses = null;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java
new file mode 100644
index 00000000000..fc18ce17fcd
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java
@@ -0,0 +1,67 @@
+package com.datadog.debugger.symbol;
+
+import com.datadog.debugger.agent.AllowListHelper;
+import com.datadog.debugger.sink.SymbolSink;
+import datadog.trace.api.Config;
+import datadog.trace.util.Strings;
+import java.lang.instrument.ClassFileTransformer;
+import java.security.ProtectionDomain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SymbolExtractionTransformer implements ClassFileTransformer {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolExtractionTransformer.class);
+
+  private final AllowListHelper allowListHelper;
+  private final SymbolAggregator symbolAggregator;
+
+  public SymbolExtractionTransformer() {
+    this(
+        new AllowListHelper(null),
+        new SymbolAggregator(
+            new SymbolSink(Config.get()), Config.get().getDebuggerSymbolFlushThreshold()));
+  }
+
+  public SymbolExtractionTransformer(
+      AllowListHelper allowListHelper, SymbolAggregator symbolAggregator) {
+    this.allowListHelper = allowListHelper;
+    this.symbolAggregator = symbolAggregator;
+  }
+
+  @Override
+  public byte[] transform(
+      ClassLoader loader,
+      String className,
+      Class<?> classBeingRedefined,
+      ProtectionDomain protectionDomain,
+      byte[] classfileBuffer) {
+    if (className == null) {
+      return null;
+    }
+    try {
+      if (allowListHelper.isAllowAll()) {
+        if (className.startsWith("java/")
+            || className.startsWith("javax/")
+            || className.startsWith("jdk/")
+            || className.startsWith("sun/")
+            || className.startsWith("com/sun/")
+            || className.startsWith("datadog/")
+            || className.startsWith("com/datadog/")) {
+          return null;
+        }
+      } else if (!allowListHelper.isAllowed(Strings.getClassName(className))) {
+        return null;
+      }
+      symbolAggregator.parseClass(className, classfileBuffer, protectionDomain);
+      return null;
+    } catch (Exception ex) {
+      LOGGER.debug("Error during extraction: ", ex);
+      return null;
+    }
+  }
+
+  AllowListHelper getAllowListHelper() {
+    return allowListHelper;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
new file mode 100644
index 00000000000..84d0ff4ffab
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
@@ -0,0 +1,469 @@
+package com.datadog.debugger.symbol;
+
+import static com.datadog.debugger.instrumentation.ASMHelper.adjustLocalVarsBasedOnArgs;
+import static com.datadog.debugger.instrumentation.ASMHelper.createLocalVarNodes;
+import static com.datadog.debugger.instrumentation.ASMHelper.sortLocalVariables;
+
+import com.datadog.debugger.instrumentation.ASMHelper;
+import datadog.trace.util.Strings;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.AnnotationNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LineNumberNode;
+import org.objectweb.asm.tree.LocalVariableNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.slf4j.LoggerFactory;
+
+public class SymbolExtractor {
+
+  public static Scope extract(byte[] classFileBuffer, String jarName) {
+    ClassNode classNode = parseClassFile(classFileBuffer);
+    return extractScopes(classNode, jarName);
+  }
+
+  private static Scope extractScopes(ClassNode classNode, String jarName) {
+    try {
+      String sourceFile = extractSourceFile(classNode);
+      List<Scope> methodScopes = extractMethods(classNode, sourceFile);
+      int classStartLine = Integer.MAX_VALUE;
+      int classEndLine = 0;
+      for (Scope scope : methodScopes) {
+        classStartLine = Math.min(classStartLine, scope.getStartLine());
+        classEndLine = Math.max(classEndLine, scope.getEndLine());
+      }
+      List<Symbol> fields = extractFields(classNode);
+      LanguageSpecifics classSpecifics =
+          new LanguageSpecifics.Builder()
+              .addModifiers(extractClassModifiers(classNode.access))
+              .addInterfaces(extractInterfaces(classNode))
+              .addAnnotations(extractAnnotations(classNode.visibleAnnotations))
+              .superClass(Strings.getClassName(classNode.superName))
+              .build();
+      Scope classScope =
+          Scope.builder(ScopeType.CLASS, sourceFile, classStartLine, classEndLine)
+              .name(Strings.getClassName(classNode.name))
+              .scopes(methodScopes)
+              .symbols(fields)
+              .languageSpecifics(classSpecifics)
+              .build();
+      return Scope.builder(ScopeType.JAR, jarName, 0, 0)
+          .name(jarName)
+          .scopes(new ArrayList<>(Collections.singletonList(classScope)))
+          .build();
+    } catch (Exception ex) {
+      LoggerFactory.getLogger(SymbolExtractor.class).info("", ex);
+      return null;
+    }
+  }
+
+  private static Collection<String> extractInterfaces(ClassNode classNode) {
+    if (classNode.interfaces.isEmpty()) {
+      return Collections.emptyList();
+    }
+    return classNode.interfaces.stream().map(Strings::getClassName).collect(Collectors.toList());
+  }
+
+  private static List<Symbol> extractFields(ClassNode classNode) {
+    List<Symbol> fields = new ArrayList<>();
+    for (FieldNode fieldNode : classNode.fields) {
+      SymbolType symbolType =
+          ASMHelper.isStaticField(fieldNode) ? SymbolType.STATIC_FIELD : SymbolType.FIELD;
+      LanguageSpecifics fieldSpecifics =
+          new LanguageSpecifics.Builder()
+              .addModifiers(extractFieldModifiers(fieldNode.access))
+              .addAnnotations(extractAnnotations(fieldNode.visibleAnnotations))
+              .build();
+      fields.add(
+          new Symbol(
+              symbolType,
+              fieldNode.name,
+              0,
+              Type.getType(fieldNode.desc).getClassName(),
+              fieldSpecifics));
+    }
+    return fields;
+  }
+
+  private static List<Scope> extractMethods(ClassNode classNode, String sourceFile) {
+    List<Scope> methodScopes = new ArrayList<>();
+    for (MethodNode method : classNode.methods) {
+      MethodLineInfo methodLineInfo = extractMethodLineInfo(method);
+      List<Scope> varScopes = new ArrayList<>();
+      List<Symbol> methodSymbols = new ArrayList<>();
+      int localVarBaseSlot = extractArgs(method, methodSymbols, methodLineInfo.start);
+      extractScopesFromVariables(
+          sourceFile, method, methodLineInfo.lineMap, varScopes, localVarBaseSlot);
+      ScopeType methodScopeType = ScopeType.METHOD;
+      if (method.name.startsWith("lambda$")) {
+        methodScopeType = ScopeType.CLOSURE;
+      }
+      LanguageSpecifics methodSpecifics =
+          new LanguageSpecifics.Builder()
+              .addModifiers(extractMethodModifiers(classNode, method, method.access))
+              .addAnnotations(extractAnnotations(method.visibleAnnotations))
+              .returnType(Type.getType(method.desc).getReturnType().getClassName())
+              .build();
+      Scope methodScope =
+          Scope.builder(methodScopeType, sourceFile, methodLineInfo.start, methodLineInfo.end)
+              .name(method.name)
+              .scopes(varScopes)
+              .symbols(methodSymbols)
+              .languageSpecifics(methodSpecifics)
+              .build();
+      methodScopes.add(methodScope);
+    }
+    return methodScopes;
+  }
+
+  private static Collection<String> extractClassModifiers(int access) {
+    List<String> results = new ArrayList<>();
+    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+      bit = Integer.lowestOneBit(remaining);
+      switch (bit) {
+        case Opcodes.ACC_PUBLIC:
+          results.add("public");
+          break;
+        case Opcodes.ACC_PRIVATE:
+          results.add("private");
+          break;
+        case Opcodes.ACC_PROTECTED:
+          results.add("protected");
+          break;
+        case Opcodes.ACC_STATIC:
+          results.add("static");
+          break;
+        case Opcodes.ACC_FINAL:
+          results.add("final");
+          break;
+        case Opcodes.ACC_SUPER:
+          break; // not interesting
+        case Opcodes.ACC_INTERFACE:
+          results.add("interface");
+          break;
+        case Opcodes.ACC_ABSTRACT:
+          results.add("abstract");
+          break;
+        case Opcodes.ACC_SYNTHETIC:
+          results.add("synthetic");
+          break;
+        case Opcodes.ACC_ANNOTATION:
+          results.add("annotation");
+          break;
+        case Opcodes.ACC_ENUM:
+          results.add("enum");
+          break;
+        case Opcodes.ACC_DEPRECATED:
+          results.add("deprecated");
+          break;
+        default:
+          throw new IllegalArgumentException("Invalid access modifiers: " + bit);
+      }
+    }
+    return results;
+  }
+
+  private static Collection<String> extractMethodModifiers(
+      ClassNode classNode, MethodNode methodNode, int access) {
+    List<String> results = new ArrayList<>();
+    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+      bit = Integer.lowestOneBit(remaining);
+      switch (bit) {
+        case Opcodes.ACC_PUBLIC:
+          results.add("public");
+          break;
+        case Opcodes.ACC_PRIVATE:
+          results.add("private");
+          break;
+        case Opcodes.ACC_PROTECTED:
+          results.add("protected");
+          break;
+        case Opcodes.ACC_STATIC:
+          results.add("static");
+          break;
+        case Opcodes.ACC_FINAL:
+          results.add("final");
+          break;
+        case Opcodes.ACC_SYNCHRONIZED:
+          results.add("synchronized");
+          break;
+        case Opcodes.ACC_BRIDGE:
+          results.add("(bridge)");
+          break;
+        case Opcodes.ACC_VARARGS:
+          results.add("(varargs)");
+          break;
+        case Opcodes.ACC_NATIVE:
+          results.add("native");
+          break;
+        case Opcodes.ACC_ABSTRACT:
+          results.add("abstract");
+          break;
+        case Opcodes.ACC_STRICT:
+          results.add("strictfp");
+          break;
+        case Opcodes.ACC_SYNTHETIC:
+          results.add("synthetic");
+          break;
+        case Opcodes.ACC_DEPRECATED:
+          results.add("deprecated");
+          break;
+        default:
+          throw new IllegalArgumentException(
+              "Invalid access modifiers method[" + methodNode.name + methodNode.desc + "]: " + bit);
+      }
+    }
+    // if class is an interface && method as code this is a default method
+    if ((classNode.access & Opcodes.ACC_INTERFACE) > 0 && methodNode.instructions.size() > 0) {
+      results.add("default");
+    }
+    return results;
+  }
+
+  private static Collection<String> extractFieldModifiers(int access) {
+    List<String> results = new ArrayList<>();
+    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+      bit = Integer.lowestOneBit(remaining);
+      switch (bit) {
+        case Opcodes.ACC_PUBLIC:
+          results.add("public");
+          break;
+        case Opcodes.ACC_PRIVATE:
+          results.add("private");
+          break;
+        case Opcodes.ACC_PROTECTED:
+          results.add("protected");
+          break;
+        case Opcodes.ACC_STATIC:
+          results.add("static");
+          break;
+        case Opcodes.ACC_FINAL:
+          results.add("final");
+          break;
+        case Opcodes.ACC_VOLATILE:
+          results.add("volatile");
+          break;
+        case Opcodes.ACC_TRANSIENT:
+          results.add("transient");
+          break;
+        case Opcodes.ACC_SYNTHETIC:
+          results.add("synthetic");
+          break;
+        case Opcodes.ACC_ENUM:
+          results.add("enum");
+          break;
+        case Opcodes.ACC_DEPRECATED:
+          results.add("deprecated");
+          break;
+        default:
+          throw new IllegalArgumentException("Invalid access modifiers: " + bit);
+      }
+    }
+    return results;
+  }
+
+  private static Collection<String> extractAnnotations(List<AnnotationNode> annotationNodes) {
+    if (annotationNodes == null || annotationNodes.isEmpty()) {
+      return Collections.emptyList();
+    }
+    List<String> results = new ArrayList<>();
+    for (AnnotationNode annotationNode : annotationNodes) {
+      StringBuilder sb = new StringBuilder("@");
+      sb.append(Type.getType(annotationNode.desc).getClassName());
+      results.add(sb.toString());
+    }
+    return results;
+  }
+
+  private static String extractSourceFile(ClassNode classNode) {
+    String packageName = classNode.name;
+    int idx = packageName.lastIndexOf('/');
+    packageName = idx >= 0 ? packageName.substring(0, idx + 1) : "";
+    return packageName + classNode.sourceFile;
+  }
+
+  private static int extractArgs(
+      MethodNode method, List<Symbol> methodSymbols, int methodStartLine) {
+    boolean isStatic = (method.access & Opcodes.ACC_STATIC) != 0;
+    int slot = isStatic ? 0 : 1;
+    if (method.localVariables == null || method.localVariables.size() == 0) {
+      return slot;
+    }
+    Type[] argTypes = Type.getArgumentTypes(method.desc);
+    if (argTypes.length == 0) {
+      return slot;
+    }
+    List<LocalVariableNode> sortedLocalVars = sortLocalVariables(method.localVariables);
+    LocalVariableNode[] localVarsBySlot = createLocalVarNodes(sortedLocalVars);
+    adjustLocalVarsBasedOnArgs(isStatic, localVarsBySlot, argTypes, sortedLocalVars);
+    for (Type argType : argTypes) {
+      if (slot >= localVarsBySlot.length) {
+        break;
+      }
+      String argName = localVarsBySlot[slot] != null ? localVarsBySlot[slot].name : "p" + slot;
+      methodSymbols.add(
+          new Symbol(SymbolType.ARG, argName, methodStartLine, argType.getClassName(), null));
+      slot += argType.getSize();
+    }
+    return slot;
+  }
+
+  private static void extractScopesFromVariables(
+      String sourceFile,
+      MethodNode methodNode,
+      Map<Label, Integer> monotonicLineMap,
+      List<Scope> varScopes,
+      int localVarBaseSlot) {
+    if (methodNode.localVariables == null) {
+      return;
+    }
+    // using a LinkedHashMap only for having a stable order of local scopes (tests)
+    Map<LabelNode, List<LocalVariableNode>> varsByEndLabel = new LinkedHashMap<>();
+    for (int i = 0; i < methodNode.localVariables.size(); i++) {
+      LocalVariableNode localVariable = methodNode.localVariables.get(i);
+      if (localVariable.index < localVarBaseSlot) {
+        continue;
+      }
+      varsByEndLabel.merge(
+          localVariable.end,
+          new ArrayList<>(Collections.singletonList(localVariable)),
+          (curr, next) -> {
+            curr.addAll(next);
+            return curr;
+          });
+    }
+    List<Scope> tmpScopes = new ArrayList<>();
+    for (Map.Entry<LabelNode, List<LocalVariableNode>> entry : varsByEndLabel.entrySet()) {
+      List<Symbol> varSymbols = new ArrayList<>();
+      int minLine = Integer.MAX_VALUE;
+      for (LocalVariableNode var : entry.getValue()) {
+        int line = monotonicLineMap.get(var.start.getLabel());
+        minLine = Math.min(line, minLine);
+        varSymbols.add(
+            new Symbol(
+                SymbolType.LOCAL, var.name, line, Type.getType(var.desc).getClassName(), null));
+      }
+      int endLine = monotonicLineMap.get(entry.getKey().getLabel());
+      Scope varScope =
+          Scope.builder(ScopeType.LOCAL, sourceFile, minLine, endLine)
+              .symbols(varSymbols)
+              .scopes(new ArrayList<>())
+              .build();
+      tmpScopes.add(varScope);
+    }
+    nestScopes(varScopes, tmpScopes);
+  }
+
+  private static Scope removeWidestScope(List<Scope> scopes) {
+    Scope widestScope = null;
+    for (Scope scope : scopes) {
+      widestScope = widestScope != null ? maxScope(widestScope, scope) : scope;
+    }
+    // Remove the actual widest instance from the list, based on reference equality
+    scopes.remove(widestScope);
+    return widestScope;
+  }
+
+  private static void nestScopes(List<Scope> outerScopes, List<Scope> scopes) {
+    Scope widestScope = removeWidestScope(scopes);
+    if (widestScope == null) {
+      return;
+    }
+    outerScopes.add(widestScope);
+    for (Scope scope : scopes) {
+      boolean added = false;
+      for (Scope outerScope : outerScopes) {
+        if (isInnerScope(outerScope, scope)) {
+          outerScope.getScopes().add(scope);
+          added = true;
+          break;
+        }
+      }
+      if (!added) {
+        outerScopes.add(scope);
+      }
+    }
+    for (Scope outerScope : outerScopes) {
+      List<Scope> tmpScopes = new ArrayList<>(outerScope.getScopes());
+      outerScope.getScopes().clear();
+      nestScopes(outerScope.getScopes(), tmpScopes);
+    }
+  }
+
+  private static boolean isInnerScope(Scope enclosingScope, Scope scope) {
+    return scope.getStartLine() >= enclosingScope.getStartLine()
+        && scope.getEndLine() <= enclosingScope.getEndLine();
+  }
+
+  private static Scope maxScope(Scope scope1, Scope scope2) {
+    return scope1.getStartLine() > scope2.getStartLine()
+            || scope1.getEndLine() < scope2.getEndLine()
+        ? scope2
+        : scope1;
+  }
+
+  private static int getFirstLine(MethodNode methodNode) {
+    AbstractInsnNode node = methodNode.instructions.getFirst();
+    while (node != null) {
+      if (node.getType() == AbstractInsnNode.LINE) {
+        LineNumberNode lineNumberNode = (LineNumberNode) node;
+        return lineNumberNode.line;
+      }
+      node = node.getNext();
+    }
+    return 0;
+  }
+
+  private static MethodLineInfo extractMethodLineInfo(MethodNode methodNode) {
+    Map<Label, Integer> map = new HashMap<>();
+    int startLine = getFirstLine(methodNode);
+    int maxLine = startLine;
+    AbstractInsnNode node = methodNode.instructions.getFirst();
+    while (node != null) {
+      if (node.getType() == AbstractInsnNode.LINE) {
+        LineNumberNode lineNumberNode = (LineNumberNode) node;
+        maxLine = Math.max(lineNumberNode.line, maxLine);
+      }
+      if (node.getType() == AbstractInsnNode.LABEL) {
+        if (node instanceof LabelNode) {
+          LabelNode labelNode = (LabelNode) node;
+          map.put(labelNode.getLabel(), maxLine);
+        }
+      }
+      node = node.getNext();
+    }
+    return new MethodLineInfo(startLine, maxLine, map);
+  }
+
+  private static ClassNode parseClassFile(byte[] classfileBuffer) {
+    ClassReader reader = new ClassReader(classfileBuffer);
+    ClassNode classNode = new ClassNode();
+    reader.accept(classNode, ClassReader.SKIP_FRAMES);
+    return classNode;
+  }
+
+  public static class MethodLineInfo {
+    final int start;
+    final int end;
+    final Map<Label, Integer> lineMap;
+
+    public MethodLineInfo(int start, int end, Map<Label, Integer> lineMap) {
+      this.start = start;
+      this.end = end;
+      this.lineMap = lineMap;
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java
new file mode 100644
index 00000000000..94b5b889c74
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java
@@ -0,0 +1,8 @@
+package com.datadog.debugger.symbol;
+
+public enum SymbolType {
+  FIELD,
+  STATIC_FIELD,
+  ARG,
+  LOCAL
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
index 3f7a9fe813e..15dbaaf604d 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
@@ -18,10 +18,10 @@
 import java.util.concurrent.TimeoutException;
 import okhttp3.Call;
 import okhttp3.Callback;
-import okhttp3.ConnectionPool;
 import okhttp3.Dispatcher;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
+import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -32,6 +32,30 @@
 
 /** Handles batching logic of upload requests sent to the intake */
 public class BatchUploader {
+  public static class MultiPartContent {
+    private final byte[] content;
+    private final String partName;
+    private final String fileName;
+
+    public MultiPartContent(byte[] content, String partName, String fileName) {
+      this.content = content;
+      this.partName = partName;
+      this.fileName = fileName;
+    }
+
+    public byte[] getContent() {
+      return content;
+    }
+
+    public String getPartName() {
+      return partName;
+    }
+
+    public String getFileName() {
+      return fileName;
+    }
+  }
+
   private static final Logger log = LoggerFactory.getLogger(BatchUploader.class);
   private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
   private static final MediaType APPLICATION_JSON = MediaType.parse("application/json");
@@ -54,23 +78,23 @@ public class BatchUploader {
 
   private final Phaser inflightRequests = new Phaser(1);
 
-  public BatchUploader(Config config) {
-    this(config, new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES));
+  public BatchUploader(Config config, String endpoint) {
+    this(config, endpoint, new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES));
   }
 
-  BatchUploader(Config config, RatelimitedLogger ratelimitedLogger) {
-    this(config, ratelimitedLogger, ContainerInfo.get().containerId);
+  BatchUploader(Config config, String endpoint, RatelimitedLogger ratelimitedLogger) {
+    this(config, endpoint, ratelimitedLogger, ContainerInfo.get().containerId);
   }
 
   // Visible for testing
-  BatchUploader(Config config, RatelimitedLogger ratelimitedLogger, String containerId) {
+  BatchUploader(
+      Config config, String endpoint, RatelimitedLogger ratelimitedLogger, String containerId) {
     instrumentTheWorld = config.isDebuggerInstrumentTheWorld();
-    String url = config.getFinalDebuggerSnapshotUrl();
-    if (url == null || url.length() == 0) {
-      throw new IllegalArgumentException("Snapshot url is empty");
+    if (endpoint == null || endpoint.length() == 0) {
+      throw new IllegalArgumentException("Endpoint url is empty");
     }
-    urlBase = HttpUrl.get(url);
-    log.debug("Started SnapshotUploader with target url {}", urlBase);
+    urlBase = HttpUrl.get(endpoint);
+    log.debug("Started BatchUploader with target url {}", urlBase);
     apiKey = config.getApiKey();
     this.ratelimitedLogger = ratelimitedLogger;
     responseCallback = new ResponseCallback(ratelimitedLogger, inflightRequests);
@@ -84,10 +108,6 @@ public BatchUploader(Config config) {
             new SynchronousQueue<>(),
             new AgentThreadFactory(DEBUGGER_HTTP_DISPATCHER));
     this.containerId = containerId;
-    // Reusing connections causes non daemon threads to be created which causes agent to prevent app
-    // from exiting. See https://github.com/square/okhttp/issues/4029 for some details.
-    ConnectionPool connectionPool = new ConnectionPool(MAX_RUNNING_REQUESTS, 1, TimeUnit.SECONDS);
-
     Duration requestTimeout = Duration.ofSeconds(config.getDebuggerUploadTimeout());
     client =
         OkHttpUtils.buildHttpClient(
@@ -110,21 +130,41 @@ public void upload(byte[] batch) {
   }
 
   public void upload(byte[] batch, String tags) {
+    doUpload(() -> makeUploadRequest(batch, tags));
+  }
+
+  public void uploadAsMultipart(String tags, MultiPartContent... parts) {
+    doUpload(() -> makeMultipartUploadRequest(tags, parts));
+  }
+
+  private void makeMultipartUploadRequest(String tags, MultiPartContent[] parts) {
+    int contentLength = 0;
+    MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+    for (MultiPartContent part : parts) {
+      RequestBody fileBody = RequestBody.create(APPLICATION_JSON, part.content);
+      contentLength += part.content.length;
+      builder.addFormDataPart(part.partName, part.fileName, fileBody);
+    }
+    MultipartBody body = builder.build();
+    buildAndSendRequest(body, contentLength, tags);
+  }
+
+  private void doUpload(Runnable makeRequest) {
     if (instrumentTheWorld) {
       // no upload in Instrument-The-World mode
       return;
     }
     try {
       if (canEnqueueMoreRequests()) {
-        makeUploadRequest(batch, tags);
+        makeRequest.run();
         debuggerMetrics.count("batch.uploaded", 1);
       } else {
         debuggerMetrics.count("request.queue.full", 1);
         ratelimitedLogger.warn("Cannot upload batch data: too many enqueued requests!");
       }
-    } catch (final IllegalStateException | IOException e) {
+    } catch (Exception ex) {
       debuggerMetrics.count("batch.upload.error", 1);
-      ratelimitedLogger.warn("Problem uploading batch!", e);
+      ratelimitedLogger.warn("Problem uploading batch!", ex);
     }
   }
 
@@ -136,11 +176,15 @@ OkHttpClient getClient() {
     return client;
   }
 
-  private void makeUploadRequest(byte[] json, String tags) throws IOException {
+  private void makeUploadRequest(byte[] json, String tags) {
+    int contentLength = json.length;
     // use RequestBody.create(MediaType, byte[]) to avoid changing Content-Type to
     // "Content-Type: application/json; charset=UTF-8" which is not recognized
-    int contentLength = json.length;
     RequestBody body = RequestBody.create(APPLICATION_JSON, json);
+    buildAndSendRequest(body, contentLength, tags);
+  }
+
+  private void buildAndSendRequest(RequestBody body, int contentLength, String tags) {
     debuggerMetrics.histogram("batch.uploader.request.size", contentLength);
     if (log.isDebugEnabled()) {
       log.debug("Uploading batch data size={} bytes", contentLength);
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
index 47f1828e773..31e132639a6 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
@@ -46,4 +46,8 @@ public static JsonAdapter<Map<String, Object>> createGenericAdapter() {
     ParameterizedType type = Types.newParameterizedType(Map.class, String.class, Object.class);
     return new Moshi.Builder().build().adapter(type);
   }
+
+  public static Moshi createMoshiSymbol() {
+    return new Moshi.Builder().build();
+  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
index 7cec03f035c..5f5a9e63ee4 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
@@ -44,7 +44,8 @@ public class MoshiSnapshotHelper {
   public static final String COLLECTION_SIZE_REASON = "collectionSize";
   public static final String TIMEOUT_REASON = "timeout";
   public static final String DEPTH_REASON = "depth";
-  public static final String REDACTED_REASON = "redacted";
+  public static final String REDACTED_IDENT_REASON = "redactedIdent";
+  public static final String REDACTED_TYPE_REASON = "redactedType";
   public static final String TYPE = "type";
   public static final String VALUE = "value";
   public static final String FIELDS = "fields";
@@ -462,10 +463,16 @@ public void notCaptured(SerializerWithLimits.NotCapturedReason reason) throws Ex
               jsonWriter.value(TIMEOUT_REASON);
               break;
             }
-          case REDACTED:
+          case REDACTED_IDENT:
             {
               jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(REDACTED_REASON);
+              jsonWriter.value(REDACTED_IDENT_REASON);
+              break;
+            }
+          case REDACTED_TYPE:
+            {
+              jsonWriter.name(NOT_CAPTURED_REASON);
+              jsonWriter.value(REDACTED_TYPE_REASON);
               break;
             }
           default:
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
index 68a7530a238..5d2da23f805 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
@@ -50,7 +50,8 @@ enum NotCapturedReason {
     MAX_DEPTH,
     FIELD_COUNT,
     TIMEOUT,
-    REDACTED
+    REDACTED_IDENT,
+    REDACTED_TYPE
   }
 
   public interface TokenWriter {
@@ -120,8 +121,14 @@ public void serialize(Object value, String type, Limits limits) throws Exception
       throw new IllegalArgumentException("Type is required for serialization");
     }
     tokenWriter.prologue(value, type);
-    if (value == REDACTED_VALUE || Redaction.isRedactedType(type)) {
-      tokenWriter.notCaptured(NotCapturedReason.REDACTED);
+    NotCapturedReason reason = null;
+    if (value == REDACTED_VALUE) {
+      reason = NotCapturedReason.REDACTED_IDENT;
+    } else if (Redaction.isRedactedType(type)) {
+      reason = NotCapturedReason.REDACTED_TYPE;
+    }
+    if (reason != null) {
+      tokenWriter.notCaptured(reason);
       tokenWriter.epilogue(value);
       return;
     }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java
new file mode 100644
index 00000000000..216441237b0
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java
@@ -0,0 +1,240 @@
+package com.datadog.debugger.util;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.function.Supplier;
+
+public class SnapshotPruner {
+  private static final String NOT_CAPTURED_REASON = "notCapturedReason";
+  private static final String DEPTH = "depth";
+  private static final String PRUNED = "{\"pruned\":true}";
+
+  private State state = State.OBJECT;
+  private final Deque<Node> stack = new ArrayDeque<>(32);
+  private int currentLevel;
+  private int strMatchIdx;
+  private Supplier<State> onStringMatches;
+  private String matchingString;
+  private Node root;
+
+  public static String prune(String snapshot, int maxTargetedSize, int minLevel) {
+    int delta = snapshot.length() - maxTargetedSize;
+    if (delta <= 0) {
+      return snapshot;
+    }
+    SnapshotPruner snapshotPruner = new SnapshotPruner(snapshot);
+    Collection<Node> leaves = snapshotPruner.getLeaves(minLevel);
+    PriorityQueue<Node> sortedLeaves =
+        new PriorityQueue<>(
+            Comparator.comparing((Node n) -> n.notCapturedDepth)
+                .thenComparingInt((Node n) -> n.level)
+                .thenComparing((Node n) -> n.notCaptured)
+                .thenComparingInt(Node::size)
+                .reversed());
+    sortedLeaves.addAll(leaves);
+    int total = 0;
+    Map<Integer, Node> nodes = new HashMap<>();
+    while (!sortedLeaves.isEmpty()) {
+      Node leaf = sortedLeaves.poll();
+      nodes.put(leaf.start, leaf);
+      total += leaf.size() - PRUNED.length();
+      if (total > delta) break;
+      Node parent = leaf.parent;
+      if (parent == null) {
+        break;
+      }
+      parent.pruned++;
+      if (parent.pruned >= parent.children.size() && parent.level >= minLevel) {
+        // We have pruned all the children of this parent node, so we can
+        // treat it as a leaf now.
+        parent.notCaptured = true;
+        parent.notCapturedDepth = true;
+        sortedLeaves.offer(parent);
+        for (Node child : parent.children) {
+          nodes.remove(child.start);
+          total -= child.size() - PRUNED.length();
+        }
+      }
+    }
+    List<Node> prunedNodes = new ArrayList<>(nodes.values());
+    prunedNodes.sort(Comparator.comparing((Node n) -> n.start));
+    StringBuilder sb = new StringBuilder();
+    sb.append(snapshot, 0, prunedNodes.get(0).start);
+    for (int i = 1; i < prunedNodes.size(); i++) {
+      sb.append(PRUNED);
+      sb.append(snapshot, prunedNodes.get(i - 1).end + 1, prunedNodes.get(i).start);
+    }
+    sb.append(PRUNED);
+    sb.append(snapshot, prunedNodes.get(prunedNodes.size() - 1).end + 1, snapshot.length());
+    return sb.toString();
+  }
+
+  private Collection<Node> getLeaves(int minLevel) {
+    if (root == null) {
+      return Collections.emptyList();
+    }
+    return root.getLeaves(minLevel);
+  }
+
+  private SnapshotPruner(String snapshot) {
+    for (int i = 0; i < snapshot.length(); i++) {
+      state = state.parse(this, snapshot.charAt(i), i);
+      if (state == null) {
+        break;
+      }
+    }
+  }
+
+  enum State {
+    OBJECT {
+      @Override
+      public State parse(SnapshotPruner pruner, char c, int index) {
+        switch (c) {
+          case '{':
+            {
+              Node n = new Node(index, pruner.currentLevel);
+              pruner.currentLevel++;
+              if (!pruner.stack.isEmpty()) {
+                n.parent = pruner.stack.peekLast();
+                n.parent.children.add(n);
+              }
+              pruner.stack.addLast(n);
+              return this;
+            }
+          case '}':
+            {
+              Node n = pruner.stack.removeLast();
+              n.end = index;
+              pruner.currentLevel--;
+              if (pruner.stack.isEmpty()) {
+                pruner.root = n;
+                return null;
+              }
+              return this;
+            }
+          case '"':
+            {
+              pruner.strMatchIdx = 0;
+              pruner.matchingString = NOT_CAPTURED_REASON;
+              pruner.onStringMatches =
+                  () -> {
+                    Node n = pruner.stack.peekLast();
+                    if (n == null) {
+                      throw new IllegalStateException("empty stack");
+                    }
+                    n.notCaptured = true;
+                    return NOT_CAPTURED;
+                  };
+              return STRING;
+            }
+          default:
+            return this;
+        }
+      }
+    },
+    STRING {
+      @Override
+      public State parse(SnapshotPruner pruner, char c, int index) {
+        switch (c) {
+          case '"':
+            {
+              if (pruner.strMatchIdx == pruner.matchingString.length()) {
+                return pruner.onStringMatches.get();
+              }
+              return OBJECT;
+            }
+          case '\\':
+            {
+              pruner.strMatchIdx = -1;
+              return ESCAPE;
+            }
+          default:
+            if (pruner.strMatchIdx > -1) {
+              char current = pruner.matchingString.charAt(pruner.strMatchIdx++);
+              if (c != current) {
+                pruner.strMatchIdx = -1;
+              }
+            }
+            return this;
+        }
+      }
+    },
+    NOT_CAPTURED {
+      @Override
+      public State parse(SnapshotPruner pruner, char c, int index) {
+        switch (c) {
+          case '"':
+            {
+              pruner.strMatchIdx = 0;
+              pruner.matchingString = DEPTH;
+              pruner.onStringMatches =
+                  () -> {
+                    Node n = pruner.stack.peekLast();
+                    if (n == null) {
+                      throw new IllegalStateException("empty stack");
+                    }
+                    n.notCapturedDepth = true;
+                    return OBJECT;
+                  };
+              return STRING;
+            }
+          case ' ':
+          case ':':
+          case '\n':
+          case '\t':
+          case '\r':
+            return this;
+          default:
+            return OBJECT;
+        }
+      }
+    },
+    ESCAPE {
+      @Override
+      public State parse(SnapshotPruner pruner, char c, int index) {
+        return STRING;
+      }
+    };
+
+    public abstract State parse(SnapshotPruner pruner, char c, int index);
+  }
+
+  private static class Node {
+    int pruned;
+    Node parent;
+    List<Node> children = new ArrayList<>();
+    final int start;
+    int end;
+    final int level;
+    boolean notCaptured;
+    boolean notCapturedDepth;
+
+    public Node(int start, int level) {
+      this.start = start;
+      this.level = level;
+    }
+
+    public Collection<Node> getLeaves(int minLevel) {
+      if (children.isEmpty() && level >= minLevel) {
+        return Collections.singleton(this);
+      }
+      Collection<Node> results = new ArrayList<>();
+      for (int i = children.size() - 1; i >= 0; i--) {
+        results.addAll(children.get(i).getLeaves(minLevel));
+      }
+      return results;
+    }
+
+    public int size() {
+      return end - start + 1;
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotSlicer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotSlicer.java
deleted file mode 100644
index 43232c0647d..00000000000
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotSlicer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.datadog.debugger.util;
-
-import static com.datadog.debugger.util.MoshiSnapshotHelper.DEPTH_REASON;
-import static com.datadog.debugger.util.MoshiSnapshotHelper.ELEMENTS;
-import static com.datadog.debugger.util.MoshiSnapshotHelper.ENTRIES;
-import static com.datadog.debugger.util.MoshiSnapshotHelper.FIELDS;
-import static com.datadog.debugger.util.MoshiSnapshotHelper.NOT_CAPTURED_REASON;
-
-import com.squareup.moshi.JsonReader;
-import com.squareup.moshi.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import okio.Buffer;
-
-/** Reduces the serialized snapshot by removing last depth level (fields or collections) */
-public class SnapshotSlicer {
-
-  private final Deque<JsonReader.Token> tokenLevels = new ArrayDeque<>(32);
-  private final Deque<Integer> fieldsLevels = new ArrayDeque<>(32);
-  private final int maxDepth;
-  private boolean copy = true;
-  private int skipTokenLevel = -1;
-  private JsonReader jsonReader;
-  private JsonWriter jsonWriter;
-
-  public static String slice(int maxDepth, String snapshot) {
-    return new SnapshotSlicer(maxDepth).internalSlice(snapshot);
-  }
-
-  private SnapshotSlicer(int maxDepth) {
-    this.maxDepth = maxDepth;
-  }
-
-  private String internalSlice(String snapshot) {
-    try {
-      Buffer writeBuffer = new Buffer();
-      jsonWriter = JsonWriter.of(writeBuffer);
-      jsonReader = JsonReader.of(new Buffer().writeUtf8(snapshot));
-      while (jsonReader.hasNext()) {
-        JsonReader.Token token = jsonReader.peek();
-        processToken(token);
-        handleLevelEnd();
-      }
-      return writeBuffer.readUtf8();
-    } catch (IOException ex) {
-      throw new RuntimeException(ex);
-    }
-  }
-
-  private void processToken(JsonReader.Token token) throws IOException {
-    switch (token) {
-      case BEGIN_ARRAY:
-        tokenLevels.addLast(token);
-        jsonReader.beginArray();
-        if (copy) {
-          jsonWriter.beginArray();
-        }
-        break;
-      case BEGIN_OBJECT:
-        tokenLevels.addLast(token);
-        jsonReader.beginObject();
-        if (copy) {
-          jsonWriter.beginObject();
-        }
-        break;
-      case NAME:
-        String name = jsonReader.nextName();
-        if (FIELDS.equals(name)) {
-          fieldsLevels.addLast(tokenLevels.size());
-          if (copy && fieldsLevels.size() > maxDepth) {
-            jsonWriter.name(NOT_CAPTURED_REASON);
-            jsonWriter.value(DEPTH_REASON);
-            copy = false;
-            skipTokenLevel = tokenLevels.size();
-          }
-        }
-        if (ELEMENTS.equals(name) || ENTRIES.equals(name)) {
-          fieldsLevels.addLast(tokenLevels.size());
-        }
-        if (copy) {
-          jsonWriter.name(name);
-        }
-        break;
-      case BOOLEAN:
-        boolean b = jsonReader.nextBoolean();
-        if (copy) {
-          jsonWriter.value(b);
-        }
-        break;
-      case NULL:
-        jsonReader.nextNull();
-        if (copy) {
-          jsonWriter.nullValue();
-        }
-        break;
-      case NUMBER:
-        // Moshi always consider numbers as decimal.
-        // need to parse it as string and detect if dot is present
-        // or not to determine ints/longs vs doubles
-        String numberStrValue = jsonReader.nextString();
-        if (copy) {
-          if (numberStrValue.indexOf('.') > 0) {
-            jsonWriter.value(Double.parseDouble(numberStrValue));
-          } else {
-            jsonWriter.value(Long.parseLong(numberStrValue));
-          }
-        }
-        break;
-      case STRING:
-        String s = jsonReader.nextString();
-        if (copy) {
-          jsonWriter.value(s);
-        }
-        break;
-      default:
-        throw new UnsupportedOperationException("Unsupported token: " + token);
-    }
-  }
-
-  private void handleLevelEnd() throws IOException {
-    while (!jsonReader.hasNext() && !tokenLevels.isEmpty()) {
-      JsonReader.Token lastToken = tokenLevels.removeLast();
-      switch (lastToken) {
-        case BEGIN_ARRAY:
-          jsonReader.endArray();
-          if (copy) {
-            jsonWriter.endArray();
-          }
-          break;
-        case BEGIN_OBJECT:
-          jsonReader.endObject();
-          if (copy) {
-            jsonWriter.endObject();
-          }
-          if (!fieldsLevels.isEmpty() && tokenLevels.size() == fieldsLevels.peekLast().intValue()) {
-            fieldsLevels.removeLast();
-          }
-          if (!copy && skipTokenLevel == tokenLevels.size()) {
-            copy = true;
-            skipTokenLevel = -1;
-          }
-          break;
-        default:
-          throw new UnsupportedOperationException("Unsupported last token: " + lastToken);
-      }
-    }
-  }
-}
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
index 838f1c45491..0a553863521 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
@@ -1,5 +1,9 @@
 package com.datadog.debugger.util;
 
+import static com.datadog.debugger.util.MoshiSnapshotHelper.REDACTED_IDENT_REASON;
+import static com.datadog.debugger.util.MoshiSnapshotHelper.REDACTED_TYPE_REASON;
+import static com.datadog.debugger.util.MoshiSnapshotHelper.TIMEOUT_REASON;
+
 import com.datadog.debugger.el.Value;
 import datadog.trace.bootstrap.debugger.EvaluationError;
 import java.lang.reflect.Field;
@@ -149,14 +153,19 @@ public void handleFieldException(Exception ex, Field field) {
   public void notCaptured(SerializerWithLimits.NotCapturedReason reason) {
     switch (reason) {
       case MAX_DEPTH:
-      case TIMEOUT:
         sb.append("...");
         break;
+      case TIMEOUT:
+        sb.append("{").append(TIMEOUT_REASON).append("}");
+        break;
       case FIELD_COUNT:
         sb.append(", ...");
         break;
-      case REDACTED:
-        sb.append("{redacted}");
+      case REDACTED_IDENT:
+        sb.append("{").append(REDACTED_IDENT_REASON).append("}");
+        break;
+      case REDACTED_TYPE:
+        sb.append("{").append(REDACTED_TYPE_REASON).append("}");
         break;
       default:
         throw new RuntimeException("Unsupported NotCapturedReason: " + reason);
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
index fb4ee1cfccf..60e25f8254c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
@@ -9,10 +9,8 @@
 import java.time.temporal.ChronoUnit;
 
 public class ValueScriptHelper {
-  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
-
   public static void serializeValue(
-      StringBuilder sb, String expr, Object value, CapturedContext.Status status) {
+      StringBuilder sb, String expr, Object value, CapturedContext.Status status, Limits limits) {
     Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
     TimeoutChecker timeoutChecker = new TimeoutChecker(timeout);
     SerializerWithLimits serializer =
@@ -21,7 +19,7 @@ public static void serializeValue(
       serializer.serialize(
           value,
           value != null ? value.getClass().getTypeName() : Object.class.getTypeName(),
-          LIMITS);
+          limits);
     } catch (Exception ex) {
       status.addError(new EvaluationError(expr, ex.getMessage()));
     }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
index e54c151dfb1..5c5a7cea0df 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
@@ -4,7 +4,10 @@
 import static com.datadog.debugger.util.MoshiSnapshotHelper.DEPTH_REASON;
 import static com.datadog.debugger.util.MoshiSnapshotHelper.FIELD_COUNT_REASON;
 import static com.datadog.debugger.util.MoshiSnapshotHelper.NOT_CAPTURED_REASON;
+import static com.datadog.debugger.util.MoshiSnapshotHelper.REDACTED_IDENT_REASON;
+import static com.datadog.debugger.util.MoshiSnapshotHelper.REDACTED_TYPE_REASON;
 import static com.datadog.debugger.util.TestHelper.setFieldInConfig;
+import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -27,7 +30,6 @@
 import com.datadog.debugger.instrumentation.InstrumentationResult;
 import com.datadog.debugger.probe.LogProbe;
 import com.datadog.debugger.probe.ProbeDefinition;
-import com.datadog.debugger.sink.DebuggerSink;
 import com.datadog.debugger.sink.ProbeStatusSink;
 import com.datadog.debugger.sink.Snapshot;
 import com.datadog.debugger.util.MoshiHelper;
@@ -35,6 +37,7 @@
 import com.datadog.debugger.util.SerializerWithLimits;
 import com.squareup.moshi.JsonAdapter;
 import datadog.trace.api.Config;
+import datadog.trace.api.sampling.Sampler;
 import datadog.trace.bootstrap.debugger.*;
 import datadog.trace.bootstrap.debugger.el.ValueReferences;
 import datadog.trace.bootstrap.debugger.util.Redaction;
@@ -117,7 +120,7 @@ public void methodNotFound() throws IOException, URISyntaxException {
         installSingleProbe(CLASS_NAME, "foobar", null);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     verify(probeStatusSink)
         .addError(eq(PROBE_ID), eq("Cannot find method CapturedSnapshot01::foobar"));
   }
@@ -129,25 +132,25 @@ public void methodProbe() throws IOException, URISyntaxException {
         installSingleProbe(CLASS_NAME, "main", "int (java.lang.String)");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
+    assertEquals(3, result);
     Snapshot snapshot = assertOneSnapshot(listener);
-    Assertions.assertNotNull(snapshot.getCaptures().getEntry());
-    Assertions.assertNotNull(snapshot.getCaptures().getReturn());
+    assertNotNull(snapshot.getCaptures().getEntry());
+    assertNotNull(snapshot.getCaptures().getReturn());
     assertCaptureArgs(snapshot.getCaptures().getEntry(), "arg", "java.lang.String", "1");
     assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
     assertTrue(snapshot.getDuration() > 0);
     assertTrue(snapshot.getStack().size() > 0);
-    Assertions.assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
+    assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
   }
 
   @Test
   public void singleLineProbe() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot01";
     DebuggerTransformerTest.TestSnapshotListener listener =
-        installSingleProbe(CLASS_NAME, "main", "int (java.lang.String)", "8");
+        installSingleProbeAtExit(CLASS_NAME, "main", "int (java.lang.String)", "8");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
+    assertEquals(3, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -155,7 +158,7 @@ public void singleLineProbe() throws IOException, URISyntaxException {
     assertCaptureArgs(snapshot.getCaptures().getLines().get(8), "arg", "java.lang.String", "1");
     assertCaptureLocals(snapshot.getCaptures().getLines().get(8), "var1", "int", "1");
     assertTrue(snapshot.getStack().size() > 0);
-    Assertions.assertEquals("CapturedSnapshot01.java", snapshot.getStack().get(0).getFileName());
+    assertEquals("CapturedSnapshot01.java", snapshot.getStack().get(0).getFileName());
   }
 
   @Test
@@ -167,8 +170,8 @@ public void resolutionFails() throws IOException, URISyntaxException {
     DebuggerContext.init((id, clazz) -> null, null);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(0, listener.snapshots.size());
+    assertEquals(3, result);
+    assertEquals(0, listener.snapshots.size());
   }
 
   @Test
@@ -186,8 +189,8 @@ public void resolutionThrows() throws IOException, URISyntaxException {
         null);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(0, listener.snapshots.size());
+    assertEquals(3, result);
+    assertEquals(0, listener.snapshots.size());
   }
 
   @Test
@@ -197,7 +200,7 @@ public void constructor() throws IOException, URISyntaxException {
         installSingleProbe(CLASS_NAME, "<init>", "(String, Object)");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     assertOneSnapshot(listener);
   }
 
@@ -208,7 +211,7 @@ public void overloadedConstructor() throws IOException, URISyntaxException {
         installSingleProbe(CLASS_NAME, "<init>", "()");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     assertOneSnapshot(listener);
   }
 
@@ -218,7 +221,7 @@ public void veryOldClassFile() throws Exception {
     DebuggerTransformerTest.TestSnapshotListener listener =
         installSingleProbe(CLASS_NAME, "<init>", "()");
     Class<?> testClass = Class.forName(CLASS_NAME);
-    Assertions.assertNotNull(testClass);
+    assertNotNull(testClass);
     testClass.newInstance();
     assertOneSnapshot(listener);
   }
@@ -229,7 +232,7 @@ public void oldJavacBug() throws Exception {
     DebuggerTransformerTest.TestSnapshotListener listener =
         installSingleProbe(CLASS_NAME, "main", null);
     Class<?> testClass = Class.forName(CLASS_NAME);
-    Assertions.assertNotNull(testClass);
+    assertNotNull(testClass);
     int result = Reflect.on(testClass).call("main", "").get();
     assertEquals(45, result);
     assertEquals(0, listener.snapshots.size());
@@ -242,7 +245,7 @@ public void nestedConstructor() throws Exception {
         installSingleProbe(CLASS_NAME, "<init>", "(Throwable)");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "init").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     assertOneSnapshot(listener);
   }
 
@@ -253,7 +256,7 @@ public void nestedConstructor2() throws Exception {
         installSingleProbe(CLASS_NAME, "<init>", "(int)");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
   }
 
@@ -264,7 +267,7 @@ public void nestedConstructor3() throws Exception {
         installSingleProbe(CLASS_NAME, "<init>", "(int, int, int)");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
   }
 
@@ -275,14 +278,14 @@ public void inheritedConstructor() throws Exception {
         installSingleProbe(CLASS_NAME + "$Inherited", "<init>", null);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureFields(
         snapshot.getCaptures().getEntry(), "obj2", "java.lang.Object", (String) null);
     CapturedContext.CapturedValue obj2 = snapshot.getCaptures().getReturn().getFields().get("obj2");
     Map<String, CapturedContext.CapturedValue> fields = getFields(obj2);
-    Assertions.assertEquals(24, fields.get("intValue").getValue());
-    Assertions.assertEquals(3.14, fields.get("doubleValue").getValue());
+    assertEquals(24, fields.get("intValue").getValue());
+    assertEquals(3.14, fields.get("doubleValue").getValue());
   }
 
   @Test
@@ -295,7 +298,7 @@ public void largeStackInheritedConstructor() throws Exception {
             createProbe(PROBE_ID2, CLASS_NAME, "<init>", "(String, long, String)"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     long result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(4_000_000_001L, result);
+    assertEquals(4_000_000_001L, result);
     assertSnapshots(listener, 2, PROBE_ID2, PROBE_ID1);
   }
 
@@ -309,7 +312,7 @@ public void multiMethods() throws IOException, URISyntaxException {
             createProbe(PROBE_ID2, CLASS_NAME, "f2", "(int)"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
     Snapshot snapshot0 = snapshots.get(0);
     assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
@@ -328,7 +331,7 @@ public void multiProbeSameMethod() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, probe, probe2);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
     Snapshot snapshot0 = snapshots.get(0);
     assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
@@ -342,9 +345,9 @@ private List<Snapshot> assertSnapshots(
       DebuggerTransformerTest.TestSnapshotListener listener,
       int expectedCount,
       ProbeId... probeIds) {
-    Assertions.assertEquals(expectedCount, listener.snapshots.size());
+    assertEquals(expectedCount, listener.snapshots.size());
     for (int i = 0; i < probeIds.length; i++) {
-      Assertions.assertEquals(probeIds[i].getId(), listener.snapshots.get(i).getProbe().getId());
+      assertEquals(probeIds[i].getId(), listener.snapshots.get(i).getProbe().getId());
     }
     return listener.snapshots;
   }
@@ -356,7 +359,7 @@ public void catchBlock() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "f", "()"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     assertOneSnapshot(listener);
   }
 
@@ -373,7 +376,7 @@ public void insideSynchronizedBlock() throws IOException, URISyntaxException {
                 PROBE_ID, CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "synchronizedBlock").get();
-    Assertions.assertEquals(76, result);
+    assertEquals(76, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 10);
     int count = 31;
     for (int i = 0; i < 10; i++) {
@@ -401,7 +404,7 @@ public void outsideSynchronizedBlock() throws IOException, URISyntaxException {
                 PROBE_ID, CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "synchronizedBlock").get();
-    Assertions.assertEquals(76, result);
+    assertEquals(76, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -417,7 +420,7 @@ public void sourceFileProbe() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createSourceFileProbe(PROBE_ID, CLASS_NAME + ".java", 4));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -434,7 +437,7 @@ public void simpleSourceFileProbe() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createSourceFileProbe(PROBE_ID, "CapturedSnapshot10.java", 11));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -454,7 +457,7 @@ public void sourceFileProbeFullPath() throws IOException, URISyntaxException {
             createSourceFileProbe(PROBE_ID, "src/main/java/" + DIR_CLASS_NAME + ".java", 11));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -474,7 +477,7 @@ public void sourceFileProbeFullPathTopLevelClass() throws IOException, URISyntax
             createSourceFileProbe(PROBE_ID, "src/main/java/" + DIR_CLASS_NAME + ".java", 21));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(42 * 42, result);
+    assertEquals(42 * 42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -496,7 +499,7 @@ public void methodProbeLineProbeMix() throws IOException, URISyntaxException {
             createProbe(PROBE_ID2, CLASS_NAME, "main", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
     Snapshot snapshot0 = snapshots.get(0);
     assertNull(snapshot0.getCaptures().getEntry());
@@ -504,13 +507,13 @@ public void methodProbeLineProbeMix() throws IOException, URISyntaxException {
     Assertions.assertEquals(1, snapshot0.getCaptures().getLines().size());
     Assertions.assertEquals(
         "com.datadog.debugger.CapturedSnapshot11", snapshot0.getProbe().getLocation().getType());
-    Assertions.assertEquals("main", snapshot0.getProbe().getLocation().getMethod());
+    assertEquals("main", snapshot0.getProbe().getLocation().getMethod());
     assertCaptureArgs(snapshot0.getCaptures().getLines().get(10), "arg", "java.lang.String", "2");
     assertCaptureLocals(snapshot0.getCaptures().getLines().get(10), "var1", "int", "1");
     Snapshot snapshot1 = snapshots.get(1);
-    Assertions.assertEquals(
+    assertEquals(
         "com.datadog.debugger.CapturedSnapshot11", snapshot1.getProbe().getLocation().getType());
-    Assertions.assertEquals("main", snapshot1.getProbe().getLocation().getMethod());
+    assertEquals("main", snapshot1.getProbe().getLocation().getMethod());
     assertCaptureArgs(snapshot1.getCaptures().getEntry(), "arg", "java.lang.String", "2");
     assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "2");
   }
@@ -524,7 +527,7 @@ public void sourceFileProbeScala() throws IOException, URISyntaxException {
     String source = getFixtureContent("/" + FILE_NAME);
     Class<?> testClass = ScalaHelper.compileAndLoad(source, CLASS_NAME, FILE_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -543,7 +546,7 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
     GroovyClassLoader groovyClassLoader = new GroovyClassLoader();
     Class<?> testClass = groovyClassLoader.parseClass(source);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertNull(snapshot.getCaptures().getEntry());
     assertNull(snapshot.getCaptures().getReturn());
@@ -559,13 +562,13 @@ public void sourceFileProbeKotlin() {
     DebuggerTransformerTest.TestSnapshotListener listener =
         installProbes(CLASS_NAME, createSourceFileProbe(PROBE_ID, CLASS_NAME + ".kt", 4));
     URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
-    Assertions.assertNotNull(resource);
+    assertNotNull(resource);
     List<File> filesToDelete = new ArrayList<>();
     Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
     try {
       Object companion = Reflect.on(testClass).get("Companion");
       int result = Reflect.on(companion).call("main", "").get();
-      Assertions.assertEquals(48, result);
+      assertEquals(48, result);
       Snapshot snapshot = assertOneSnapshot(listener);
       assertNull(snapshot.getCaptures().getEntry());
       assertNull(snapshot.getCaptures().getReturn());
@@ -589,7 +592,7 @@ public void fieldExtractor() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, simpleDataProbe, compositeDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
     Snapshot simpleSnapshot = snapshots.get(0);
     Map<String, String> expectedSimpleFields = new HashMap<>();
@@ -621,7 +624,7 @@ public void fieldExtractorDeep2() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, compositeDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext.CapturedValue returnValue =
         snapshot.getCaptures().getReturn().getLocals().get("@return");
@@ -631,11 +634,10 @@ public void fieldExtractorDeep2() throws IOException, URISyntaxException {
     CapturedContext.CapturedValue s1 = fields.get("s1");
     Map<String, CapturedContext.CapturedValue> s1Fields =
         (Map<String, CapturedContext.CapturedValue>) s1.getValue();
-    Assertions.assertEquals("101", String.valueOf(s1Fields.get("intValue").getValue()));
-    Assertions.assertEquals("foo1", s1Fields.get("strValue").getValue());
-    Assertions.assertEquals("null", String.valueOf(s1Fields.get("listValue").getValue()));
-    Assertions.assertEquals(
-        DEPTH_REASON, String.valueOf(s1Fields.get("listValue").getNotCapturedReason()));
+    assertEquals("101", String.valueOf(s1Fields.get("intValue").getValue()));
+    assertEquals("foo1", s1Fields.get("strValue").getValue());
+    assertEquals("null", String.valueOf(s1Fields.get("listValue").getValue()));
+    assertEquals(DEPTH_REASON, String.valueOf(s1Fields.get("listValue").getNotCapturedReason()));
   }
 
   @Test
@@ -647,7 +649,7 @@ public void fieldExtractorLength() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, simpleDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     Map<String, String> expectedFields = new HashMap<>();
     expectedFields.put("intValue", "42");
@@ -666,14 +668,13 @@ public void fieldExtractorDisabled() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, simpleDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext.CapturedValue simpleData =
         snapshot.getCaptures().getReturn().getLocals().get("simpleData");
     Map<String, CapturedContext.CapturedValue> fields = getFields(simpleData);
-    Assertions.assertEquals(1, fields.size());
-    Assertions.assertEquals(
-        DEPTH_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+    assertEquals(1, fields.size());
+    assertEquals(DEPTH_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
   }
 
   @Test
@@ -685,13 +686,13 @@ public void fieldExtractorDepth0() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, simpleDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext.CapturedValue simpleData =
         snapshot.getCaptures().getReturn().getLocals().get("simpleData");
     Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
-    Assertions.assertEquals(1, simpleDataFields.size());
-    Assertions.assertEquals(
+    assertEquals(1, simpleDataFields.size());
+    assertEquals(
         DEPTH_REASON, simpleDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
   }
 
@@ -704,15 +705,15 @@ public void fieldExtractorDepth1() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, simpleDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext.CapturedValue simpleData =
         snapshot.getCaptures().getReturn().getLocals().get("simpleData");
     Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
-    Assertions.assertEquals(4, simpleDataFields.size());
-    Assertions.assertEquals("foo", simpleDataFields.get("strValue").getValue());
-    Assertions.assertEquals(42, simpleDataFields.get("intValue").getValue());
-    Assertions.assertEquals(DEPTH_REASON, simpleDataFields.get("listValue").getNotCapturedReason());
+    assertEquals(4, simpleDataFields.size());
+    assertEquals("foo", simpleDataFields.get("strValue").getValue());
+    assertEquals(42, simpleDataFields.get("intValue").getValue());
+    assertEquals(DEPTH_REASON, simpleDataFields.get("listValue").getNotCapturedReason());
   }
 
   @Test
@@ -725,29 +726,28 @@ public void fieldExtractorCount2() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, compositeDataProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
+    assertEquals(143, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext.CapturedValue returnValue =
         snapshot.getCaptures().getReturn().getLocals().get("@return");
-    Assertions.assertEquals("CapturedSnapshot04$CompositeData", returnValue.getType());
+    assertEquals("CapturedSnapshot04$CompositeData", returnValue.getType());
     Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
-    Assertions.assertEquals(3, fields.size());
-    Assertions.assertEquals(
-        FIELD_COUNT_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+    assertEquals(3, fields.size());
+    assertEquals(FIELD_COUNT_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
     Map<String, CapturedContext.CapturedValue> s1Fields =
         (Map<String, CapturedContext.CapturedValue>) fields.get("s1").getValue();
-    Assertions.assertEquals("foo1", s1Fields.get("strValue").getValue());
-    Assertions.assertEquals(101, s1Fields.get("intValue").getValue());
+    assertEquals("foo1", s1Fields.get("strValue").getValue());
+    assertEquals(101, s1Fields.get("intValue").getValue());
     Map<String, CapturedContext.CapturedValue> s2Fields =
         (Map<String, CapturedContext.CapturedValue>) fields.get("s2").getValue();
-    Assertions.assertEquals("foo2", s2Fields.get("strValue").getValue());
-    Assertions.assertEquals(202, s2Fields.get("intValue").getValue());
+    assertEquals("foo2", s2Fields.get("strValue").getValue());
+    assertEquals(202, s2Fields.get("intValue").getValue());
 
     CapturedContext.CapturedValue compositeData =
         snapshot.getCaptures().getReturn().getLocals().get("compositeData");
     Map<String, CapturedContext.CapturedValue> compositeDataFields = getFields(compositeData);
-    Assertions.assertEquals(3, compositeDataFields.size());
-    Assertions.assertEquals(
+    assertEquals(3, compositeDataFields.size());
+    assertEquals(
         FIELD_COUNT_REASON,
         compositeDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
     assertTrue(compositeDataFields.containsKey("s1"));
@@ -765,7 +765,7 @@ public void uncaughtException() throws IOException, URISyntaxException {
       Reflect.on(testClass).call("main", "triggerUncaughtException").get();
       Assertions.fail("should not reach this code");
     } catch (ReflectException ex) {
-      Assertions.assertEquals("oops", ex.getCause().getCause().getMessage());
+      assertEquals("oops", ex.getCause().getCause().getMessage());
     }
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureThrowable(
@@ -776,6 +776,40 @@ public void uncaughtException() throws IOException, URISyntaxException {
         7);
   }
 
+  @Test
+  public void uncaughtExceptionCondition() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot05";
+    final String LOG_TEMPLATE = "exception msg={@exception.detailMessage}";
+    LogProbe probe =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "triggerUncaughtException", "()")
+            .evaluateAt(MethodLocation.EXIT)
+            .when(
+                new ProbeCondition(
+                    DSL.when(
+                        DSL.eq(
+                            DSL.getMember(DSL.ref("@exception"), "detailMessage"),
+                            DSL.value("oops"))),
+                    "@exception.detailMessage == 'oops'"))
+            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+            .build();
+    DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, probe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    try {
+      Reflect.on(testClass).call("main", "triggerUncaughtException").get();
+      Assertions.fail("should not reach this code");
+    } catch (ReflectException ex) {
+      assertEquals("oops", ex.getCause().getCause().getMessage());
+    }
+    Snapshot snapshot = assertOneSnapshot(listener);
+    assertEquals("exception msg=oops", snapshot.getMessage());
+    assertCaptureThrowable(
+        snapshot.getCaptures().getReturn(),
+        "java.lang.IllegalStateException",
+        "oops",
+        "CapturedSnapshot05.triggerUncaughtException",
+        7);
+  }
+
   @Test
   public void caughtException() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot05";
@@ -784,7 +818,7 @@ public void caughtException() throws IOException, URISyntaxException {
             CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "triggerCaughtException", "()"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "triggerCaughtException").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureThrowable(
         snapshot.getCaptures().getCaughtExceptions().get(0),
@@ -794,6 +828,25 @@ public void caughtException() throws IOException, URISyntaxException {
         12);
   }
 
+  @Test
+  public void noUncaughtExceptionCondition() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot01";
+    final String LOG_TEMPLATE = "exception?: {isUndefined(@exception)}";
+    LogProbe probe =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (String)")
+            .evaluateAt(MethodLocation.EXIT)
+            .when(
+                new ProbeCondition(
+                    DSL.when(DSL.isUndefined(DSL.ref("@exception"))), "isUndefined(@exception)"))
+            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+            .build();
+    DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, probe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "2").get();
+    assertEquals(2, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+  }
+
   @Test
   public void rateLimitSnapshot() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot01";
@@ -808,7 +861,7 @@ public void rateLimitSnapshot() throws IOException, URISyntaxException {
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     for (int i = 0; i < 100; i++) {
       int result = Reflect.on(testClass).call("main", "1").get();
-      Assertions.assertEquals(3, result);
+      assertEquals(3, result);
     }
     assertTrue(listener.snapshots.size() < 20);
   }
@@ -828,7 +881,7 @@ public void globalRateLimitSnapshot() throws IOException, URISyntaxException {
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     for (int i = 0; i < 100; i++) {
       int result = Reflect.on(testClass).call("main", "").get();
-      Assertions.assertEquals(48, result);
+      assertEquals(48, result);
     }
     assertTrue(listener.snapshots.size() < 20, "actual snapshots: " + listener.snapshots.size());
   }
@@ -865,11 +918,45 @@ public void simpleConditionTest() throws IOException, URISyntaxException {
       int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
       assertTrue((i == 2 && result == 2) || result == 3);
     }
-    Assertions.assertEquals(1, listener.snapshots.size());
+    assertEquals(1, listener.snapshots.size());
     assertCaptureArgs(
         listener.snapshots.get(0).getCaptures().getReturn(), "arg", "java.lang.String", "5");
   }
 
+  @Test
+  public void lineProbeCondition() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot08";
+    LogProbe logProbe =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)", "34")
+            .when(
+                new ProbeCondition(
+                    DSL.when(
+                        DSL.and(
+                            // this is always true
+                            DSL.and(
+                                // this reference is resolved directly from the snapshot
+                                DSL.eq(DSL.ref("fld"), DSL.value(11)),
+                                // this reference chain needs to use reflection
+                                DSL.eq(
+                                    DSL.getMember(
+                                        DSL.getMember(
+                                            DSL.getMember(DSL.ref("typed"), "fld"), "fld"),
+                                        "msg"),
+                                    DSL.value("hello"))),
+                            DSL.eq(DSL.ref("arg"), DSL.value("5")))),
+                    "(fld == 11 && typed.fld.fld.msg == \"hello\") && arg == '5'"))
+            .build();
+    DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    for (int i = 0; i < 100; i++) {
+      int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
+      assertTrue((i == 2 && result == 2) || result == 3);
+    }
+    assertEquals(1, listener.snapshots.size());
+    assertCaptureArgs(
+        listener.snapshots.get(0).getCaptures().getLines().get(34), "arg", "java.lang.String", "5");
+  }
+
   @Test
   public void staticFieldCondition() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot19";
@@ -883,7 +970,7 @@ public void staticFieldCondition() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "0").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     Map<String, CapturedContext.CapturedValue> staticFields =
         snapshot.getCaptures().getReturn().getStaticFields();
@@ -906,8 +993,8 @@ public void simpleFalseConditionTest() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "0").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(0, listener.snapshots.size());
+    assertEquals(3, result);
+    assertEquals(0, listener.snapshots.size());
   }
 
   @Test
@@ -928,7 +1015,7 @@ public void nullCondition() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbes);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(1, listener.snapshots.size());
+    assertEquals(1, listener.snapshots.size());
     List<EvaluationError> evaluationErrors = listener.snapshots.get(0).getEvaluationErrors();
     Assertions.assertEquals(1, evaluationErrors.size());
     Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
@@ -990,8 +1077,8 @@ private List<Snapshot> doMergedProbeConditions(
         installProbes(CLASS_NAME, probe1, probe2);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(expectedSnapshots, listener.snapshots.size());
+    assertEquals(3, result);
+    assertEquals(expectedSnapshots, listener.snapshots.size());
     return listener.snapshots;
   }
 
@@ -1109,9 +1196,9 @@ public void fields() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "f", "()"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
+    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 7); // +2 for correlation ids
     assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
     assertCaptureFields(snapshot.getCaptures().getEntry(), "doubleValue", "double", "3.14");
     assertCaptureFields(
@@ -1123,7 +1210,7 @@ public void fields() throws IOException, URISyntaxException {
         Arrays.asList("foo", "bar"));
     assertCaptureFields(
         snapshot.getCaptures().getEntry(), "strMap", "java.util.HashMap", Collections.emptyMap());
-    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
+    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 7); // +2 for correlation ids
     assertCaptureFields(snapshot.getCaptures().getReturn(), "intValue", "int", "48");
     assertCaptureFields(snapshot.getCaptures().getReturn(), "doubleValue", "double", "3.14");
     assertCaptureFields(snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "done");
@@ -1150,14 +1237,14 @@ public void inheritedFields() throws IOException, URISyntaxException {
         installProbes(INHERITED_CLASS_NAME, probe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "inherited").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     // Only Declared fields in the current class are captured, not inherited fields
-    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
+    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 7); // +2 for correlation ids
     assertCaptureFields(
         snapshot.getCaptures().getEntry(), "strValue", "java.lang.String", "foobar");
     assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
-    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
+    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 7); // +2 for correlation ids
     assertCaptureFields(
         snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "barfoo");
     assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
@@ -1170,7 +1257,7 @@ public void staticFields() throws IOException, URISyntaxException {
         installSingleProbe(CLASS_NAME, "<init>", "()");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     long result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(4_000_000_001L, result);
+    assertEquals(4_000_000_001L, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     Map<String, CapturedContext.CapturedValue> staticFields =
         snapshot.getCaptures().getEntry().getStaticFields();
@@ -1195,14 +1282,16 @@ public void staticInheritedFields() throws IOException, URISyntaxException {
         installProbes(INHERITED_CLASS_NAME, logProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "inherited").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     Map<String, CapturedContext.CapturedValue> staticFields =
         snapshot.getCaptures().getReturn().getStaticFields();
-    assertEquals(5, staticFields.size());
+    assertEquals(7, staticFields.size());
     assertEquals("barfoo", getValue(staticFields.get("strValue")));
     assertEquals("48", getValue(staticFields.get("intValue")));
     assertEquals("6.28", getValue(staticFields.get("doubleValue")));
+    assertEquals("[1, 2, 3, 4]", getValue(staticFields.get("longValues")));
+    assertEquals("[foo, bar]", getValue(staticFields.get("strValues")));
   }
 
   @Test
@@ -1215,10 +1304,10 @@ public void staticLambda() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, null, null, "33"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "static", "email@address").get();
-    Assertions.assertEquals(8, result);
+    assertEquals(8, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext context = snapshot.getCaptures().getLines().get(33);
-    Assertions.assertNotNull(context);
+    assertNotNull(context);
     assertCaptureLocals(context, "idx", "int", "5");
   }
 
@@ -1232,10 +1321,10 @@ public void capturingLambda() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, null, null, "44"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "capturing", "email@address").get();
-    Assertions.assertEquals(8, result);
+    assertEquals(8, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     CapturedContext context = snapshot.getCaptures().getLines().get(44);
-    Assertions.assertNotNull(context);
+    assertNotNull(context);
     assertCaptureLocals(context, "idx", "int", "5");
     assertCaptureFields(context, "strValue", "java.lang.String", "email@address");
   }
@@ -1260,7 +1349,7 @@ public void tracerInstrumentedClass() throws Exception {
     // it's important there is no null key in this map, as Jackson is not happy about it
     // it's means here that argument names are not resolved correctly
     Assertions.assertFalse(arguments.containsKey(null));
-    Assertions.assertEquals(4, arguments.size());
+    assertEquals(4, arguments.size());
     assertTrue(arguments.containsKey("this"));
     assertTrue(arguments.containsKey("apiKey"));
     assertTrue(arguments.containsKey("uriInfo"));
@@ -1276,16 +1365,14 @@ public void noCodeMethods() throws Exception {
         installProbes(CLASS_NAME, nativeMethodProbe, abstractMethodProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(1, result);
+    assertEquals(1, result);
     ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
     ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
     verify(probeStatusSink, times(2)).addError(probeIdCaptor.capture(), strCaptor.capture());
-    Assertions.assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
-    Assertions.assertEquals(
-        "Cannot instrument an abstract or native method", strCaptor.getAllValues().get(0));
-    Assertions.assertEquals(PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(1).getId());
-    Assertions.assertEquals(
-        "Cannot instrument an abstract or native method", strCaptor.getAllValues().get(1));
+    assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
+    assertEquals("Cannot instrument an abstract or native method", strCaptor.getAllValues().get(0));
+    assertEquals(PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(1).getId());
+    assertEquals("Cannot instrument an abstract or native method", strCaptor.getAllValues().get(1));
   }
 
   @Test
@@ -1300,7 +1387,7 @@ public void duplicateClassDefinition() throws Exception {
     DebuggerTransformerTest.TestSnapshotListener listener =
         installProbes(CLASS_NAME, abstractMethodProbe);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Assertions.assertNotNull(testClass);
+    assertNotNull(testClass);
   }
 
   @Test
@@ -1310,7 +1397,7 @@ public void overloadedMethods() throws Exception {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "overload", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(63, result);
+    assertEquals(63, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 4, PROBE_ID, PROBE_ID, PROBE_ID, PROBE_ID);
     assertCaptureReturnValue(snapshots.get(0).getCaptures().getReturn(), "int", "42");
     assertCaptureArgs(snapshots.get(1).getCaptures().getEntry(), "s", "java.lang.String", "1");
@@ -1326,7 +1413,7 @@ public void noDebugInfoEmptyMethod() throws Exception {
     Map<String, byte[]> classFileBuffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.NONE);
     Class<?> testClass = loadClass(CLASS_NAME, classFileBuffers);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(48, result);
+    assertEquals(48, result);
     assertOneSnapshot(listener);
   }
 
@@ -1343,8 +1430,8 @@ public void instrumentTheWorld() throws Exception {
       instr.removeTransformer(currentTransformer);
     }
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
-    Assertions.assertEquals(1, listener.snapshots.size());
+    assertEquals(2, result);
+    assertEquals(1, listener.snapshots.size());
     ProbeImplementation probeImplementation = listener.snapshots.get(0).getProbe();
     assertTrue(probeImplementation.isCaptureSnapshot());
     assertEquals("main", probeImplementation.getLocation().getMethod());
@@ -1365,8 +1452,8 @@ public void instrumentTheWorld_excludeClass(String excludeFileName) throws Excep
       instr.removeTransformer(currentTransformer);
     }
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
-    Assertions.assertEquals(0, listener.snapshots.size());
+    assertEquals(2, result);
+    assertEquals(0, listener.snapshots.size());
   }
 
   @Test
@@ -1376,7 +1463,7 @@ public void objectDynamicType() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "processWithArg", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(50, result);
+    assertEquals(50, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureArgs(snapshot.getCaptures().getEntry(), "obj", "java.lang.Integer", "42");
     assertCaptureFields(
@@ -1392,7 +1479,7 @@ public void exceptionAsLocalVariable() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, null, null, "14"));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(42, result);
+    assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     Map<String, String> expectedFields = new HashMap<>();
     expectedFields.put("detailMessage", "For input string: \"a\"");
@@ -1415,7 +1502,7 @@ public void evaluateAtEntry() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbes);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
+    assertEquals(3, result);
     assertOneSnapshot(listener);
   }
 
@@ -1432,7 +1519,7 @@ public void evaluateAtExit() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbes);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
+    assertEquals(3, result);
     assertOneSnapshot(listener);
   }
 
@@ -1449,10 +1536,10 @@ public void evaluateAtExitFalse() throws IOException, URISyntaxException {
     DebuggerTransformerTest.TestSnapshotListener listener = installProbes(CLASS_NAME, logProbes);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(0, listener.snapshots.size());
+    assertEquals(3, result);
+    assertEquals(0, listener.snapshots.size());
     assertTrue(listener.skipped);
-    Assertions.assertEquals(DebuggerContext.SkipCause.CONDITION, listener.cause);
+    assertEquals(DebuggerContext.SkipCause.CONDITION, listener.cause);
   }
 
   @Test
@@ -1469,7 +1556,7 @@ public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxEx
       Reflect.on(testClass).call("main", "triggerUncaughtException").get();
       Assertions.fail("should not reach this code");
     } catch (ReflectException ex) {
-      Assertions.assertEquals("oops", ex.getCause().getCause().getMessage());
+      assertEquals("oops", ex.getCause().getCause().getMessage());
     }
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureThrowable(
@@ -1478,10 +1565,9 @@ public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxEx
         "oops",
         "CapturedSnapshot05.triggerUncaughtException",
         7);
-    Assertions.assertEquals(2, snapshot.getEvaluationErrors().size());
-    Assertions.assertEquals(
-        "Cannot find symbol: after", snapshot.getEvaluationErrors().get(0).getMessage());
-    Assertions.assertEquals(
+    assertEquals(2, snapshot.getEvaluationErrors().size());
+    assertEquals("Cannot find symbol: after", snapshot.getEvaluationErrors().get(0).getMessage());
+    assertEquals(
         "java.lang.IllegalStateException: oops",
         snapshot.getEvaluationErrors().get(1).getMessage());
   }
@@ -1494,7 +1580,7 @@ public void enumConstructorArgs() throws IOException, URISyntaxException {
         installProbes(ENUM_CLASS, createProbe(PROBE_ID, ENUM_CLASS, "<init>", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     assertSnapshots(listener, 3, PROBE_ID);
     Map<String, CapturedContext.CapturedValue> arguments =
         listener.snapshots.get(0).getCaptures().getEntry().getArguments();
@@ -1511,7 +1597,7 @@ public void enumValues() throws IOException, URISyntaxException {
         installProbes(CLASS_NAME, createProbe(PROBE_ID, CLASS_NAME, "convert", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "2").get();
-    Assertions.assertEquals(2, result);
+    assertEquals(2, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureReturnValue(
         snapshot.getCaptures().getReturn(),
@@ -1527,7 +1613,7 @@ public void recursiveCapture() throws IOException, URISyntaxException {
         installProbes(INNER_CLASS, createProbe(PROBE_ID, INNER_CLASS, "size", null));
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(1, result);
+    assertEquals(1, result);
   }
 
   @Test
@@ -1541,7 +1627,7 @@ public void recursiveCaptureException() throws IOException, URISyntaxException {
       Reflect.on(testClass).call("main", "exception").get();
       Assertions.fail("should not reach this code");
     } catch (ReflectException ex) {
-      Assertions.assertEquals("not supported", ex.getCause().getCause().getMessage());
+      assertEquals("not supported", ex.getCause().getCause().getMessage());
     }
   }
 
@@ -1584,10 +1670,10 @@ private Snapshot doUnknownCount(String CLASS_NAME) throws IOException, URISyntax
   public void beforeForLoopLineProbe() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot02";
     DebuggerTransformerTest.TestSnapshotListener listener =
-        installSingleProbe(CLASS_NAME, null, null, "46");
+        installSingleProbeAtExit(CLASS_NAME, null, null, "46");
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "synchronizedBlock").get();
-    Assertions.assertEquals(76, result);
+    assertEquals(76, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertCaptureLocals(snapshot.getCaptures().getLines().get(46), "count", "int", "31");
   }
@@ -1599,16 +1685,18 @@ public void dupLineProbeSameTemplate() throws IOException, URISyntaxException {
     LogProbe probe1 =
         createProbeBuilder(PROBE_ID1, CLASS_NAME, null, null, "39")
             .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+            .evaluateAt(MethodLocation.EXIT)
             .build();
     LogProbe probe2 =
         createProbeBuilder(PROBE_ID2, CLASS_NAME, null, null, "39")
             .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+            .evaluateAt(MethodLocation.EXIT)
             .build();
     DebuggerTransformerTest.TestSnapshotListener listener =
         installProbes(CLASS_NAME, probe1, probe2);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
+    assertEquals(3, result);
     List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
     for (Snapshot snapshot : snapshots) {
       assertEquals("msg1=hello", snapshot.getMessage());
@@ -1632,17 +1720,23 @@ public void keywordRedaction() throws IOException, URISyntaxException {
     Assertions.assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertEquals(
-        "arg=secret123 secret={Could not evaluate the expression because 'secret' was redacted} password={Could not evaluate the expression because 'this.password' was redacted} fromMap={Could not evaluate the expression because 'strMap[\"password\"]' was redacted}",
+        "arg=secret123 secret={"
+            + REDACTED_VALUE
+            + "} password={"
+            + REDACTED_VALUE
+            + "} fromMap={"
+            + REDACTED_VALUE
+            + "}",
         snapshot.getMessage());
     CapturedContext.CapturedValue secretLocalVar =
         snapshot.getCaptures().getReturn().getLocals().get("secret");
     CapturedContext.CapturedValue secretValued =
         VALUE_ADAPTER.fromJson(secretLocalVar.getStrValue());
-    assertEquals("redacted", secretValued.getNotCapturedReason());
+    assertEquals(REDACTED_IDENT_REASON, secretValued.getNotCapturedReason());
     Map<String, CapturedContext.CapturedValue> thisFields =
         getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
     CapturedContext.CapturedValue passwordField = thisFields.get("password");
-    assertEquals("redacted", passwordField.getNotCapturedReason());
+    assertEquals(REDACTED_IDENT_REASON, passwordField.getNotCapturedReason());
     Map<String, String> strMap = (Map<String, String>) thisFields.get("strMap").getValue();
     assertNull(strMap.get("password"));
   }
@@ -1742,12 +1836,20 @@ public void typeRedactionSnapshot() throws IOException, URISyntaxException {
     Assertions.assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertEquals(
-        "arg=secret123 credentials={Could not evaluate the expression because 'creds' was redacted} user={Could not evaluate the expression because 'this.creds' was redacted} code={Could not evaluate the expression because 'creds' was redacted} dave={Could not evaluate the expression because 'credMap[\"dave\"]' was redacted}",
+        "arg=secret123 credentials={"
+            + REDACTED_VALUE
+            + "} user={"
+            + REDACTED_VALUE
+            + "} code={"
+            + REDACTED_VALUE
+            + "} dave={"
+            + REDACTED_VALUE
+            + "}",
         snapshot.getMessage());
     Map<String, CapturedContext.CapturedValue> thisFields =
         getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
     CapturedContext.CapturedValue credsField = thisFields.get("creds");
-    assertEquals("redacted", credsField.getNotCapturedReason());
+    assertEquals(REDACTED_TYPE_REASON, credsField.getNotCapturedReason());
     Map<String, String> credMap = (Map<String, String>) thisFields.get("credMap").getValue();
     assertNull(credMap.get("dave"));
   }
@@ -1811,6 +1913,56 @@ public void typeRedactionCondition() throws IOException, URISyntaxException {
         snapshots.get(2).getEvaluationErrors().get(0).getMessage());
   }
 
+  @Test
+  public void ensureCallingSamplingMethodProbe() throws IOException, URISyntaxException {
+    doSamplingTest(this::methodProbe, 1, 1);
+  }
+
+  @Test
+  public void ensureCallingSamplingProbeCondition() throws IOException, URISyntaxException {
+    doSamplingTest(this::simpleConditionTest, 1, 1);
+  }
+
+  @Test
+  public void ensureCallingSamplingProbeConditionError() throws IOException, URISyntaxException {
+    doSamplingTest(this::nullCondition, 1, 1);
+  }
+
+  @Test
+  public void ensureCallingSamplingDupMethodProbeCondition()
+      throws IOException, URISyntaxException {
+    doSamplingTest(this::mergedProbesWithAdditionalProbeConditionTest, 2, 2);
+  }
+
+  @Test
+  public void ensureCallingSamplingLineProbe() throws IOException, URISyntaxException {
+    doSamplingTest(this::singleLineProbe, 1, 1);
+  }
+
+  @Test
+  public void ensureCallingSamplingLineProbeCondition() throws IOException, URISyntaxException {
+    doSamplingTest(this::lineProbeCondition, 1, 1);
+  }
+
+  interface TestMethod {
+    void run() throws IOException, URISyntaxException;
+  }
+
+  private void doSamplingTest(TestMethod testRun, int expectedGlobalCount, int expectedProbeCount)
+      throws IOException, URISyntaxException {
+    MockSampler probeSampler = new MockSampler();
+    MockSampler globalSampler = new MockSampler();
+    ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
+    ProbeRateLimiter.setGlobalSnapshotRate(1000);
+    try {
+      testRun.run();
+    } finally {
+      ProbeRateLimiter.setSamplerSupplier(null);
+    }
+    assertEquals(expectedGlobalCount, globalSampler.callCount);
+    assertEquals(expectedProbeCount, probeSampler.callCount);
+  }
+
   private DebuggerTransformerTest.TestSnapshotListener setupInstrumentTheWorldTransformer(
       String excludeFileName) {
     Config config = mock(Config.class);
@@ -1820,13 +1972,13 @@ private DebuggerTransformerTest.TestSnapshotListener setupInstrumentTheWorldTran
     when(config.getDebuggerExcludeFiles()).thenReturn(excludeFileName);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     when(config.getDebuggerUploadBatchSize()).thenReturn(100);
     DebuggerTransformerTest.TestSnapshotListener listener =
-        new DebuggerTransformerTest.TestSnapshotListener();
+        new DebuggerTransformerTest.TestSnapshotListener(config, mock(ProbeStatusSink.class));
     DebuggerAgentHelper.injectSink(listener);
     currentTransformer =
-        DebuggerAgent.setupInstrumentTheWorldTransformer(
-            config, instr, new DebuggerSink(config), null);
+        DebuggerAgent.setupInstrumentTheWorldTransformer(config, instr, listener, null);
     DebuggerContext.initClassFilter(new DenyListHelper(null));
     return listener;
   }
@@ -1846,9 +1998,9 @@ private void setCorrelationSingleton(Object instance) {
   }
 
   private Snapshot assertOneSnapshot(DebuggerTransformerTest.TestSnapshotListener listener) {
-    Assertions.assertEquals(1, listener.snapshots.size());
+    assertEquals(1, listener.snapshots.size());
     Snapshot snapshot = listener.snapshots.get(0);
-    Assertions.assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     return snapshot;
   }
 
@@ -1858,6 +2010,12 @@ private DebuggerTransformerTest.TestSnapshotListener installSingleProbe(
     return installProbes(typeName, logProbes);
   }
 
+  private DebuggerTransformerTest.TestSnapshotListener installSingleProbeAtExit(
+      String typeName, String methodName, String signature, String... lines) {
+    LogProbe logProbes = createProbeAtExit(PROBE_ID, typeName, methodName, signature, lines);
+    return installProbes(typeName, logProbes);
+  }
+
   private DebuggerTransformerTest.TestSnapshotListener installProbes(
       String expectedClassName, Configuration configuration) {
     Config config = mock(Config.class);
@@ -1866,18 +2024,15 @@ private DebuggerTransformerTest.TestSnapshotListener installProbes(
     when(config.isDebuggerVerifyByteCode()).thenReturn(true);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     Collection<LogProbe> logProbes = configuration.getLogProbes();
     instrumentationListener = new MockInstrumentationListener();
     probeStatusSink = mock(ProbeStatusSink.class);
+    DebuggerTransformerTest.TestSnapshotListener listener =
+        new DebuggerTransformerTest.TestSnapshotListener(config, probeStatusSink);
     currentTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            instrumentationListener,
-            new DebuggerSink(config, probeStatusSink));
+        new DebuggerTransformer(config, configuration, instrumentationListener, listener);
     instr.addTransformer(currentTransformer);
-    DebuggerTransformerTest.TestSnapshotListener listener =
-        new DebuggerTransformerTest.TestSnapshotListener();
     DebuggerAgentHelper.injectSink(listener);
     DebuggerContext.init(
         (id, callingClass) -> resolver(id, callingClass, expectedClassName, logProbes), null);
@@ -1897,7 +2052,7 @@ private DebuggerTransformerTest.TestSnapshotListener installProbes(
 
   private ProbeImplementation resolver(
       String id, Class<?> callingClass, String expectedClassName, Collection<LogProbe> logProbes) {
-    Assertions.assertEquals(expectedClassName, callingClass.getName());
+    assertEquals(expectedClassName, callingClass.getName());
     for (LogProbe probe : logProbes) {
       if (probe.getId().equals(id)) {
         return probe;
@@ -1919,30 +2074,29 @@ private DebuggerTransformerTest.TestSnapshotListener installProbes(
   private void assertCaptureArgs(
       CapturedContext context, String name, String typeName, String value) {
     CapturedContext.CapturedValue capturedValue = context.getArguments().get(name);
-    Assertions.assertEquals(typeName, capturedValue.getType());
-    Assertions.assertEquals(value, getValue(capturedValue));
+    assertEquals(typeName, capturedValue.getType());
+    assertEquals(value, getValue(capturedValue));
   }
 
   private void assertCaptureLocals(
       CapturedContext context, String name, String typeName, String value) {
     CapturedContext.CapturedValue localVar = context.getLocals().get(name);
-    Assertions.assertEquals(typeName, localVar.getType());
-    Assertions.assertEquals(value, getValue(localVar));
+    assertEquals(typeName, localVar.getType());
+    assertEquals(value, getValue(localVar));
   }
 
   private void assertCaptureLocals(
       CapturedContext context, String name, String typeName, Map<String, String> expectedFields) {
     CapturedContext.CapturedValue localVar = context.getLocals().get(name);
-    Assertions.assertEquals(typeName, localVar.getType());
+    assertEquals(typeName, localVar.getType());
     Map<String, CapturedContext.CapturedValue> fields = getFields(localVar);
     for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
       assertTrue(fields.containsKey(entry.getKey()));
       CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
       if (fieldCapturedValue.getNotCapturedReason() != null) {
-        Assertions.assertEquals(
-            entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
+        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
       } else {
-        Assertions.assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
+        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
       }
     }
   }
@@ -1950,18 +2104,18 @@ private void assertCaptureLocals(
   private void assertCaptureFields(
       CapturedContext context, String name, String typeName, String value) {
     CapturedContext.CapturedValue field = context.getFields().get(name);
-    Assertions.assertEquals(typeName, field.getType());
-    Assertions.assertEquals(value, getValue(field));
+    assertEquals(typeName, field.getType());
+    assertEquals(value, getValue(field));
   }
 
   private void assertCaptureFields(
       CapturedContext context, String name, String typeName, Collection<?> collection) {
     CapturedContext.CapturedValue field = context.getFields().get(name);
-    Assertions.assertEquals(typeName, field.getType());
+    assertEquals(typeName, field.getType());
     Iterator<?> iterator = collection.iterator();
     for (Object obj : getCollection(field)) {
       if (iterator.hasNext()) {
-        Assertions.assertEquals(iterator.next(), obj);
+        assertEquals(iterator.next(), obj);
       } else {
         Assertions.fail("not same number of elements");
       }
@@ -1971,38 +2125,37 @@ private void assertCaptureFields(
   private void assertCaptureFields(
       CapturedContext context, String name, String typeName, Map<Object, Object> expectedMap) {
     CapturedContext.CapturedValue field = context.getFields().get(name);
-    Assertions.assertEquals(typeName, field.getType());
+    assertEquals(typeName, field.getType());
     Map<Object, Object> map = getMap(field);
-    Assertions.assertEquals(expectedMap.size(), map.size());
+    assertEquals(expectedMap.size(), map.size());
     for (Map.Entry<Object, Object> entry : map.entrySet()) {
       assertTrue(expectedMap.containsKey(entry.getKey()));
-      Assertions.assertEquals(expectedMap.get(entry.getKey()), entry.getValue());
+      assertEquals(expectedMap.get(entry.getKey()), entry.getValue());
     }
   }
 
   private void assertCaptureFieldCount(CapturedContext context, int expectedFieldCount) {
-    Assertions.assertEquals(expectedFieldCount, context.getFields().size());
+    assertEquals(expectedFieldCount, context.getFields().size());
   }
 
   private void assertCaptureReturnValue(CapturedContext context, String typeName, String value) {
     CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
-    Assertions.assertEquals(typeName, returnValue.getType());
-    Assertions.assertEquals(value, getValue(returnValue));
+    assertEquals(typeName, returnValue.getType());
+    assertEquals(value, getValue(returnValue));
   }
 
   private void assertCaptureReturnValue(
       CapturedContext context, String typeName, Map<String, String> expectedFields) {
     CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
-    Assertions.assertEquals(typeName, returnValue.getType());
+    assertEquals(typeName, returnValue.getType());
     Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
     for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
       assertTrue(fields.containsKey(entry.getKey()));
       CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
       if (fieldCapturedValue.getNotCapturedReason() != null) {
-        Assertions.assertEquals(
-            entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
+        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
       } else {
-        Assertions.assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
+        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
       }
     }
   }
@@ -2019,13 +2172,13 @@ private void assertCaptureThrowable(
       String message,
       String methodName,
       int lineNumber) {
-    Assertions.assertNotNull(throwable);
-    Assertions.assertEquals(typeName, throwable.getType());
-    Assertions.assertEquals(message, throwable.getMessage());
-    Assertions.assertNotNull(throwable.getStacktrace());
+    assertNotNull(throwable);
+    assertEquals(typeName, throwable.getType());
+    assertEquals(message, throwable.getMessage());
+    assertNotNull(throwable.getStacktrace());
     Assertions.assertFalse(throwable.getStacktrace().isEmpty());
-    Assertions.assertEquals(methodName, throwable.getStacktrace().get(0).getFunction());
-    Assertions.assertEquals(lineNumber, throwable.getStacktrace().get(0).getLineNumber());
+    assertEquals(methodName, throwable.getStacktrace().get(0).getFunction());
+    assertEquals(lineNumber, throwable.getStacktrace().get(0).getLineNumber());
   }
 
   private static String getValue(CapturedContext.CapturedValue capturedValue) {
@@ -2036,6 +2189,12 @@ private static String getValue(CapturedContext.CapturedValue capturedValue) {
         Assertions.fail("NotCapturedReason: " + valued.getNotCapturedReason());
       }
       Object obj = valued.getValue();
+      if (obj != null && obj.getClass().isArray()) {
+        if (obj.getClass().getComponentType().isPrimitive()) {
+          return primitiveArrayToString(obj);
+        }
+        return Arrays.toString((Object[]) obj);
+      }
       return obj != null ? String.valueOf(obj) : null;
     } catch (IOException e) {
       e.printStackTrace();
@@ -2043,6 +2202,35 @@ private static String getValue(CapturedContext.CapturedValue capturedValue) {
     }
   }
 
+  private static String primitiveArrayToString(Object obj) {
+    Class<?> componentType = obj.getClass().getComponentType();
+    if (componentType == long.class) {
+      return Arrays.toString((long[]) obj);
+    }
+    if (componentType == int.class) {
+      return Arrays.toString((int[]) obj);
+    }
+    if (componentType == short.class) {
+      return Arrays.toString((short[]) obj);
+    }
+    if (componentType == char.class) {
+      return Arrays.toString((char[]) obj);
+    }
+    if (componentType == byte.class) {
+      return Arrays.toString((byte[]) obj);
+    }
+    if (componentType == boolean.class) {
+      return Arrays.toString((boolean[]) obj);
+    }
+    if (componentType == float.class) {
+      return Arrays.toString((float[]) obj);
+    }
+    if (componentType == double.class) {
+      return Arrays.toString((double[]) obj);
+    }
+    return null;
+  }
+
   public static Map<String, CapturedContext.CapturedValue> getFields(
       CapturedContext.CapturedValue capturedValue) {
     try {
@@ -2118,6 +2306,13 @@ private static LogProbe createProbe(
     return createProbeBuilder(id, typeName, methodName, signature, lines).build();
   }
 
+  private static LogProbe createProbeAtExit(
+      ProbeId id, String typeName, String methodName, String signature, String... lines) {
+    return createProbeBuilder(id, typeName, methodName, signature, lines)
+        .evaluateAt(MethodLocation.EXIT)
+        .build();
+  }
+
   private static LogProbe.Builder createProbeBuilder(
       ProbeId id, String typeName, String methodName, String signature, String... lines) {
     return LogProbe.builder()
@@ -2135,6 +2330,7 @@ private static LogProbe createSourceFileProbe(ProbeId id, String sourceFile, int
         .probeId(id)
         .captureSnapshot(true)
         .where(null, null, null, line, sourceFile)
+        .evaluateAt(MethodLocation.EXIT)
         .build();
   }
 
@@ -2147,6 +2343,27 @@ public void instrumentationResult(ProbeDefinition definition, InstrumentationRes
     }
   }
 
+  static class MockSampler implements Sampler {
+
+    int callCount;
+
+    @Override
+    public boolean sample() {
+      callCount++;
+      return true;
+    }
+
+    @Override
+    public boolean keep() {
+      return false;
+    }
+
+    @Override
+    public boolean drop() {
+      return false;
+    }
+  }
+
   static class KotlinHelper {
     public static Class<?> compileAndLoad(
         String className, String sourceFileName, List<File> outputFilesToDelete) {
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
index 30749fdf549..5261dfb892f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
@@ -60,6 +60,7 @@ public class ConfigurationUpdaterTest {
   void setUp() {
     lenient().when(tracerConfig.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost");
     lenient().when(tracerConfig.getDebuggerUploadBatchSize()).thenReturn(100);
+    lenient().when(tracerConfig.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost");
 
     debuggerSinkWithMockStatusSink = new DebuggerSink(tracerConfig, probeStatusSink);
   }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
index c584a569689..121b6bf6e98 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
@@ -1,9 +1,9 @@
 package com.datadog.debugger.agent;
 
-import com.datadog.debugger.sink.Sink;
+import com.datadog.debugger.sink.DebuggerSink;
 
 public class DebuggerAgentHelper {
-  public static void injectSink(Sink sink) {
+  public static void injectSink(DebuggerSink sink) {
     DebuggerAgent.initSink(sink);
   }
 
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
index e4be8e3bb89..8097de84ce2 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
@@ -14,7 +14,6 @@
 import com.datadog.debugger.probe.Where;
 import com.datadog.debugger.sink.DebuggerSink;
 import com.datadog.debugger.sink.ProbeStatusSink;
-import com.datadog.debugger.sink.Sink;
 import com.datadog.debugger.sink.Snapshot;
 import datadog.trace.api.Config;
 import datadog.trace.api.GlobalTracer;
@@ -66,11 +65,15 @@ enum ExceptionKind {
     HANDLED
   }
 
-  static class TestSnapshotListener implements Sink {
+  static class TestSnapshotListener extends DebuggerSink {
     boolean skipped;
     DebuggerContext.SkipCause cause;
     List<Snapshot> snapshots = new ArrayList<>();
 
+    public TestSnapshotListener(Config config, ProbeStatusSink probeStatusSink) {
+      super(config, probeStatusSink);
+    }
+
     @Override
     public void skipSnapshot(String probeId, DebuggerContext.SkipCause cause) {
       skipped = true;
@@ -304,8 +307,6 @@ public void classBeingRedefinedNull() {
   @Test
   public void classGenerationFailed() {
     Config config = createConfig();
-    TestSnapshotListener listener = new TestSnapshotListener();
-    DebuggerAgentHelper.injectSink(listener);
     final String CLASS_NAME = DebuggerAgent.class.getTypeName();
     final String METHOD_NAME = "run";
     MockProbe mockProbe = MockProbe.builder(PROBE_ID).where(CLASS_NAME, METHOD_NAME).build();
@@ -321,12 +322,11 @@ public void classGenerationFailed() {
             .build();
     AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
     ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+    TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
     DebuggerTransformer debuggerTransformer =
         new DebuggerTransformer(
-            config,
-            configuration,
-            ((definition, result) -> lastResult.set(result)),
-            new DebuggerSink(config, probeStatusSink));
+            config, configuration, ((definition, result) -> lastResult.set(result)), listener);
+    DebuggerAgentHelper.injectSink(listener);
     byte[] newClassBuffer =
         debuggerTransformer.transform(
             ClassLoader.getSystemClassLoader(),
@@ -353,6 +353,7 @@ private Config createConfig() {
     Config config = mock(Config.class);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     when(config.getDebuggerUploadBatchSize()).thenReturn(100);
     return config;
   }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
index 8b5172d6579..1a512da61d3 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
@@ -11,6 +11,7 @@
 import com.datadog.debugger.el.DSL;
 import com.datadog.debugger.el.ProbeCondition;
 import com.datadog.debugger.probe.LogProbe;
+import com.datadog.debugger.sink.ProbeStatusSink;
 import com.datadog.debugger.sink.Snapshot;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
@@ -37,6 +38,8 @@ public class LogProbesInstrumentationTest {
   private static final ProbeId LOG_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
   private static final ProbeId LOG_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
   private static final String SERVICE_NAME = "service-name";
+  private static final String STR_8K =
+      "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 
   private Instrumentation instr = ByteBuddyAgent.install();
   private ClassFileTransformer currentTransformer;
@@ -62,6 +65,19 @@ public void methodPlainLog() throws IOException, URISyntaxException {
     assertEquals("this is log line", snapshot.getMessage());
   }
 
+  @Test
+  public void methodLargePlainLog() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot01";
+    DebuggerTransformerTest.TestSnapshotListener listener =
+        installSingleProbe(STR_8K + "123", CLASS_NAME, "main", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "1").get();
+    Assertions.assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    assertCapturesNull(snapshot);
+    assertEquals(STR_8K + "...", snapshot.getMessage());
+  }
+
   @Test
   public void methodTemplateArgLog() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot01";
@@ -76,6 +92,49 @@ public void methodTemplateArgLog() throws IOException, URISyntaxException {
     assertEquals("this is log line with arg=1", snapshot.getMessage());
   }
 
+  @Test
+  public void methodTemplateArgLogLarge() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot01";
+    DebuggerTransformerTest.TestSnapshotListener listener =
+        installSingleProbe(STR_8K + "{arg}", CLASS_NAME, "main", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "1").get();
+    Assertions.assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    assertCapturesNull(snapshot);
+    assertEquals(STR_8K + "...", snapshot.getMessage());
+  }
+
+  @Test
+  public void methodTemplateLargeArgLog() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot01";
+    DebuggerTransformerTest.TestSnapshotListener listener =
+        installSingleProbe(
+            "this is log line with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", STR_8K).get();
+    Assertions.assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    assertCapturesNull(snapshot);
+    final String expectedStr = "this is log line with arg=";
+    assertEquals(
+        expectedStr + STR_8K.substring(0, STR_8K.length() - expectedStr.length()) + "...",
+        snapshot.getMessage());
+  }
+
+  @Test
+  public void methodTemplateTooLargeArgLog() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot01";
+    DebuggerTransformerTest.TestSnapshotListener listener =
+        installSingleProbe("{arg}", CLASS_NAME, "main", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", STR_8K + "123").get();
+    Assertions.assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    assertCapturesNull(snapshot);
+    assertEquals(STR_8K + "...", snapshot.getMessage());
+  }
+
   @Test
   public void methodTemplateArgLogEvaluateAtExit() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot01";
@@ -488,11 +547,12 @@ private DebuggerTransformerTest.TestSnapshotListener installProbes(
     when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     when(config.getDebuggerUploadBatchSize()).thenReturn(100);
     currentTransformer = new DebuggerTransformer(config, configuration);
     instr.addTransformer(currentTransformer);
     DebuggerTransformerTest.TestSnapshotListener listener =
-        new DebuggerTransformerTest.TestSnapshotListener();
+        new DebuggerTransformerTest.TestSnapshotListener(config, mock(ProbeStatusSink.class));
     DebuggerAgentHelper.injectSink(listener);
     DebuggerContext.init(
         (id, callingClass) ->
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
index 8a29495bfe1..0fbb89f2a2e 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
@@ -366,6 +366,63 @@ public void methodFieldRefValueDistributionDoubleMetric() throws IOException, UR
     Assertions.assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
   }
 
+  @Test
+  public void methodSyntheticReturnGaugeMetric() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot06";
+    String METRIC_NAME = "syn_gauge";
+    MetricProbe metricProbe =
+        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+            .where(CLASS_NAME, "f", "()")
+            .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
+            .evaluateAt(MethodLocation.EXIT)
+            .build();
+    MetricForwarderListener listener = installMetricProbes(metricProbe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "f").get();
+    Assertions.assertEquals(42, result);
+    Assertions.assertTrue(listener.gauges.containsKey(METRIC_NAME));
+    Assertions.assertEquals(42, listener.gauges.get(METRIC_NAME).longValue());
+    Assertions.assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+  }
+
+  @Test
+  public void methodSyntheticReturnInvalidType() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot06";
+    final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
+    String METRIC_NAME = "syn_gauge";
+    MetricProbe metricProbe =
+        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+            .where(INHERITED_CLASS_NAME, "<init>", "()")
+            .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
+            .evaluateAt(MethodLocation.EXIT)
+            .build();
+    MetricForwarderListener listener = installMetricProbes(metricProbe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "").get();
+    Assertions.assertEquals(42, result);
+    Assertions.assertFalse(listener.gauges.containsKey(METRIC_NAME));
+    verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol @return"));
+  }
+
+  @Test
+  public void methodSyntheticDurationGaugeMetric() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot06";
+    String METRIC_NAME = "syn_gauge";
+    MetricProbe metricProbe =
+        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+            .where(CLASS_NAME, "f", "()")
+            .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
+            .evaluateAt(MethodLocation.EXIT)
+            .build();
+    MetricForwarderListener listener = installMetricProbes(metricProbe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "f").get();
+    Assertions.assertEquals(42, result);
+    Assertions.assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
+    Assertions.assertTrue(listener.doubleGauges.get(METRIC_NAME).doubleValue() > 0);
+    Assertions.assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+  }
+
   @Test
   public void lineArgumentRefValueCountMetric() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot03";
@@ -1179,6 +1236,7 @@ private MetricForwarderListener installMetricProbes(Configuration configuration)
     when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     probeStatusSink = mock(ProbeStatusSink.class);
     currentTransformer =
         new DebuggerTransformer(
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
index fa6ff412955..2f4b879924e 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
@@ -1,8 +1,9 @@
 package com.datadog.debugger.agent;
 
+import com.datadog.debugger.sink.DebuggerSink;
 import com.datadog.debugger.sink.ProbeStatusSink;
-import com.datadog.debugger.sink.Sink;
 import com.datadog.debugger.sink.Snapshot;
+import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
@@ -26,10 +27,14 @@ public void after() {
     }
   }
 
-  protected static class MockSink implements Sink {
+  protected static class MockSink extends DebuggerSink {
 
     private final List<Snapshot> snapshots = new ArrayList<>();
 
+    public MockSink(Config config, ProbeStatusSink probeStatusSink) {
+      super(config, probeStatusSink);
+    }
+
     @Override
     public void addSnapshot(Snapshot snapshot) {
       snapshots.add(snapshot);
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
index 2eb09c842c0..2049abe0e8b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
@@ -1,6 +1,8 @@
 package com.datadog.debugger.agent;
 
 import static com.datadog.debugger.el.DSL.eq;
+import static com.datadog.debugger.el.DSL.getMember;
+import static com.datadog.debugger.el.DSL.gt;
 import static com.datadog.debugger.el.DSL.ref;
 import static com.datadog.debugger.el.DSL.value;
 import static com.datadog.debugger.probe.SpanDecorationProbe.TargetSpan.ACTIVE;
@@ -11,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static utils.InstrumentationTestHelper.compileAndLoadClass;
@@ -180,11 +183,61 @@ public void methodActiveSpanInvalidCondition() throws IOException, URISyntaxExce
     assertEquals("Cannot find symbol: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
   }
 
+  @Test
+  public void methodActiveSpanSynthReturn() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+    SpanDecorationProbe.Decoration decoration =
+        createDecoration(gt(ref("@return"), value(0)), "@return > '0", "tag1", "{@return}");
+    installSingleSpanDecoration(
+        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "5").get();
+    assertEquals(84, result);
+    MutableSpan span = traceInterceptor.getFirstSpan();
+    assertEquals("84", span.getTags().get("tag1"));
+  }
+
+  @Test
+  public void methodActiveSpanSynthDuration() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+    SpanDecorationProbe.Decoration decoration =
+        createDecoration(gt(ref("@duration"), value(0)), "@return > 0", "tag1", "{@duration}");
+    installSingleSpanDecoration(
+        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.on(testClass).call("main", "5").get();
+    assertEquals(84, result);
+    MutableSpan span = traceInterceptor.getFirstSpan();
+    assertTrue(Double.parseDouble((String) span.getTags().get("tag1")) > 0);
+  }
+
+  @Test
+  public void methodActiveSpanSynthException() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+    SpanDecorationProbe.Decoration decoration =
+        createDecoration(
+            eq(getMember(ref("@exception"), "detailMessage"), value("oops")),
+            "@exception.detailMessage == 'oops'",
+            "tag1",
+            "{@exception.detailMessage}");
+    installSingleSpanDecoration(
+        CLASS_NAME, ACTIVE, decoration, "processWithException", "int (java.lang.String)");
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    try {
+      Reflect.on(testClass).call("main", "exception").get();
+      Assertions.fail("should not reach this code");
+    } catch (RuntimeException ex) {
+      assertEquals("oops", ex.getCause().getCause().getMessage());
+    }
+    MutableSpan span = traceInterceptor.getFirstSpan();
+    assertEquals("oops", span.getTags().get("tag1"));
+  }
+
   @Test
   public void lineActiveSpanSimpleTag() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
     SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
-    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 38);
+    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 41);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "1").get();
     assertEquals(84, result);
@@ -216,7 +269,7 @@ public void lineActiveSpanCondition() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
     SpanDecorationProbe.Decoration decoration =
         createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 38);
+    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 41);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     for (int i = 0; i < 10; i++) {
       int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
@@ -232,7 +285,7 @@ public void lineActiveSpanInvalidCondition() throws IOException, URISyntaxExcept
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
     SpanDecorationProbe.Decoration decoration =
         createDecoration(eq(ref("noarg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 38);
+    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", 41);
     Class<?> testClass = compileAndLoadClass(CLASS_NAME);
     int result = Reflect.on(testClass).call("main", "5").get();
     assertEquals(84, result);
@@ -584,12 +637,13 @@ private void installSpanDecorationProbes(String expectedClassName, Configuration
     when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     probeStatusSink = mock(ProbeStatusSink.class);
     currentTransformer =
         new DebuggerTransformer(
             config, configuration, null, new DebuggerSink(config, probeStatusSink));
     instr.addTransformer(currentTransformer);
-    mockSink = new MockSink();
+    mockSink = new MockSink(config, probeStatusSink);
     DebuggerAgentHelper.injectSink(mockSink);
     DebuggerContext.init(
         (id, callingClass) -> resolver(id, callingClass, expectedClassName, configuration), null);
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
index 4823ff4dec1..08c0de0d287 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
@@ -145,12 +145,13 @@ private MockTracer installSpanProbes(Configuration configuration) {
     when(config.isDebuggerVerifyByteCode()).thenReturn(true);
     when(config.getFinalDebuggerSnapshotUrl())
         .thenReturn("http://localhost:8126/debugger/v1/input");
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
     probeStatusSink = mock(ProbeStatusSink.class);
     currentTransformer =
         new DebuggerTransformer(
             config, configuration, null, new DebuggerSink(config, probeStatusSink));
     instr.addTransformer(currentTransformer);
-    mockSink = new MockSink();
+    mockSink = new MockSink(config, probeStatusSink);
     DebuggerAgentHelper.injectSink(mockSink);
     DebuggerContext.init(null, null);
     DebuggerContext.initClassFilter(new DenyListHelper(null));
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogMessageTemplateBuilderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
similarity index 85%
rename from dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogMessageTemplateBuilderTest.java
rename to dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
index 0089376522b..83df1db244a 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogMessageTemplateBuilderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
@@ -11,6 +11,7 @@
 import com.datadog.debugger.probe.LogProbe;
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.EvaluationError;
+import datadog.trace.bootstrap.debugger.Limits;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,12 +24,13 @@
 import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
 
-class LogMessageTemplateBuilderTest {
+class StringTemplateBuilderTest {
+  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
 
   @Test
   public void emptyProbe() {
     LogProbe probe = LogProbe.builder().build();
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
     assertNull(message);
   }
@@ -36,7 +38,7 @@ public void emptyProbe() {
   @Test
   public void emptyTemplate() {
     LogProbe probe = createLogProbe("");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
     assertEquals("", message);
   }
@@ -44,7 +46,7 @@ public void emptyTemplate() {
   @Test
   public void onlyStringTemplate() {
     LogProbe probe = createLogProbe("this is a simple string");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
     assertEquals("this is a simple string", message);
   }
@@ -52,7 +54,7 @@ public void onlyStringTemplate() {
   @Test
   public void undefinedArgTemplate() {
     LogProbe probe = createLogProbe("{arg}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
     assertEquals("{Cannot find symbol: arg}", message);
   }
@@ -60,7 +62,7 @@ public void undefinedArgTemplate() {
   @Test
   public void argTemplate() {
     LogProbe probe = createLogProbe("{arg}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -78,7 +80,7 @@ public void booleanArgTemplate() {
             new ValueScript(
                 DSL.bool(DSL.contains(DSL.ref("arg"), new StringValue("o"))), "{arg}")));
     LogProbe probe = LogProbe.builder().template("{contains(arg, 'o')}", segments).build();
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -91,14 +93,14 @@ public void booleanArgTemplate() {
   @Test
   public void argMultipleInFlightTemplate() {
     LogProbe probe = createLogProbe("{arg}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
           CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
         });
     String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    LogMessageTemplateBuilder summaryBuilder2 = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder2 = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext2 = new CapturedContext();
     capturedContext2.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -112,7 +114,7 @@ public void argMultipleInFlightTemplate() {
   @Test
   public void argNullTemplate() {
     LogProbe probe = createLogProbe("{nullObject}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -125,7 +127,7 @@ public void argNullTemplate() {
   @Test
   public void argArrayTemplate() {
     LogProbe probe = createLogProbe("{primArray} {strArray}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -145,7 +147,7 @@ public void argArrayTemplate() {
   @Test
   public void argCollectionTemplate() {
     LogProbe probe = createLogProbe("{strList} {strSet}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -171,7 +173,7 @@ public void argCollectionTemplate() {
   @Test
   public void argMapTemplate() {
     LogProbe probe = createLogProbe("{strMap}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     Map<String, String> map = new LinkedHashMap<>();
     for (int i = 0; i < 10; i++) {
@@ -199,7 +201,7 @@ static class Level1 {
   @Test
   public void argComplexObjectTemplate() {
     LogProbe probe = createLogProbe("{obj}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -212,7 +214,7 @@ public void argComplexObjectTemplate() {
   @Test
   public void argComplexObjectArrayTemplate() {
     LogProbe probe = createLogProbe("{array}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
@@ -228,7 +230,7 @@ public void argComplexObjectArrayTemplate() {
   @DisabledIf("datadog.trace.api.Platform#isJ9")
   public void argInaccessibleFieldTemplate() {
     LogProbe probe = createLogProbe("{obj}");
-    LogMessageTemplateBuilder summaryBuilder = new LogMessageTemplateBuilder(probe.getSegments());
+    StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addArguments(
         new CapturedContext.CapturedValue[] {
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
index 0469c8137be..ff5338af532 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
@@ -71,6 +71,14 @@ void testDescriptorFromSignatureNoArgsVoid() {
     assertEquals(expectedDesc, desc);
   }
 
+  @Test
+  void testDescriptorFromSignatureInnerClassArgs() {
+    String expectedDesc = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;)V";
+    String signature = "void(java.util.Map$Entry, java.util.Map$Entry)";
+    String desc = Types.descriptorFromSignature(signature);
+    assertEquals(expectedDesc, desc);
+  }
+
   @Test
   void testDescriptorFromSignatureInvalid() {
     assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("()"));
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
index 8c88b6b9f57..9d9fdd98e4a 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
@@ -1,5 +1,7 @@
 package com.datadog.debugger.probe;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.datadog.debugger.util.MoshiHelper;
 import com.squareup.moshi.JsonAdapter;
 import java.io.IOException;
@@ -12,7 +14,7 @@ public void simpleLineRange() {
     Where where =
         new Where(
             "java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"}, null);
-    Assertions.assertTrue(where.isSignatureMatching("java.lang.String ()"));
+    assertTrue(where.isSignatureMatching("java.lang.String ()"));
     String[] lines = where.getLines();
     Assertions.assertNotNull(lines);
     Assertions.assertEquals(1, lines.length);
@@ -28,7 +30,7 @@ public void multiLines() {
             "java.lang.String ()",
             new String[] {"12-25", "42-45"},
             null);
-    Assertions.assertTrue(where.isSignatureMatching("java.lang.String ()"));
+    assertTrue(where.isSignatureMatching("java.lang.String ()"));
     String[] lines = where.getLines();
     Assertions.assertNotNull(lines);
     Assertions.assertEquals(2, lines.length);
@@ -41,7 +43,7 @@ public void singleLine() {
     Where where =
         new Where(
             "java.lang.Object", "toString()", "java.lang.String ()", new String[] {"12"}, null);
-    Assertions.assertTrue(where.isSignatureMatching("java.lang.String ()"));
+    assertTrue(where.isSignatureMatching("java.lang.String ()"));
     String[] lines = where.getLines();
     Assertions.assertNotNull(lines);
     Assertions.assertEquals(1, lines.length);
@@ -57,7 +59,7 @@ public void noLines() {
             "java.lang.String ()",
             (Where.SourceLine[]) null,
             null);
-    Assertions.assertTrue(where.isSignatureMatching("java.lang.String ()"));
+    assertTrue(where.isSignatureMatching("java.lang.String ()"));
     String[] lines = where.getLines();
     Assertions.assertNull(lines);
   }
@@ -78,18 +80,30 @@ public void linesRoundTrip() throws IOException {
   @Test
   public void methodMatching() {
     Where where = new Where("String", "substring", "(int,int)", new String[0], null);
-    Assertions.assertTrue(where.isMethodMatching("substring", "(II)Ljava/lang/String;"));
+    assertTrue(where.isMethodMatching("substring", "(II)Ljava/lang/String;"));
     where = new Where("String", "replaceAll", "(String,String)", new String[0], null);
-    Assertions.assertTrue(
+    assertTrue(
         where.isMethodMatching(
             "replaceAll", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"));
     where = new Where("HashMap", "<init>", "(Map)", new String[0], null);
-    Assertions.assertTrue(where.isMethodMatching("<init>", "(Ljava/util/Map;)V"));
+    assertTrue(where.isMethodMatching("<init>", "(Ljava/util/Map;)V"));
     where = new Where("ArrayList", "removeIf", "(Predicate)", new String[0], null);
-    Assertions.assertTrue(where.isMethodMatching("removeIf", "(Ljava/util/function/Predicate;)Z"));
+    assertTrue(where.isMethodMatching("removeIf", "(Ljava/util/function/Predicate;)Z"));
     where = new Where("String", "concat", "", new String[0], null);
-    Assertions.assertTrue(where.isMethodMatching("concat", "String (String)"));
+    assertTrue(where.isMethodMatching("concat", "String (String)"));
     where = new Where("String", "concat", " \t", new String[0], null);
-    Assertions.assertTrue(where.isMethodMatching("concat", "String (String)"));
+    assertTrue(where.isMethodMatching("concat", "String (String)"));
+    where =
+        new Where(
+            "Inner",
+            "innerMethod",
+            "(com.datadog.debugger.probe.Outer$Inner)",
+            new String[0],
+            null);
+    assertTrue(
+        where.isMethodMatching("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"));
+    where = new Where("Inner", "innerMethod", "(Outer$Inner)", new String[0], null);
+    assertTrue(
+        where.isMethodMatching("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"));
   }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
index a0df890b0c9..61a40fa136f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
@@ -71,6 +71,7 @@ void setUp() {
     when(config.getEnv()).thenReturn("test");
     when(config.getVersion()).thenReturn("foo");
     when(config.getDebuggerUploadBatchSize()).thenReturn(1);
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
 
     EXPECTED_SNAPSHOT_TAGS =
         "^env:test,version:foo,debugger_version:\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?~[0-9a-f]+,agent_version:null,host_name:"
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java
new file mode 100644
index 00000000000..d158780d92e
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java
@@ -0,0 +1,53 @@
+package com.datadog.debugger.sink;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.datadog.debugger.symbol.Scope;
+import com.datadog.debugger.symbol.ScopeType;
+import com.datadog.debugger.uploader.BatchUploader;
+import datadog.trace.api.Config;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class SymbolSinkTest {
+
+  @Test
+  public void testFlush() {
+    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+    Config config = mock(Config.class);
+    when(config.getServiceName()).thenReturn("service1");
+    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock);
+    symbolSink.addScope(Scope.builder(ScopeType.JAR, null, 0, 0).build());
+    symbolSink.flush();
+    assertEquals(2, symbolUploaderMock.multiPartContents.size());
+    BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(0);
+    assertEquals("event", eventContent.getPartName());
+    assertEquals("event.json", eventContent.getFileName());
+    String strEventContent = new String(eventContent.getContent());
+    assertTrue(strEventContent.contains("\"ddsource\": \"dd_debugger\""));
+    assertTrue(strEventContent.contains("\"service\": \"service1\""));
+    BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(1);
+    assertEquals("file", symbolContent.getPartName());
+    assertEquals("file.json", symbolContent.getFileName());
+    assertEquals(
+        "{\"language\":\"JAVA\",\"scopes\":[{\"end_line\":0,\"scope_type\":\"JAR\",\"start_line\":0}],\"service\":\"service1\"}",
+        new String(symbolContent.getContent()));
+  }
+
+  static class SymbolUploaderMock extends BatchUploader {
+    final List<MultiPartContent> multiPartContents = new ArrayList<>();
+
+    public SymbolUploaderMock() {
+      super(Config.get(), "http://localhost");
+    }
+
+    @Override
+    public void uploadAsMultipart(String tags, MultiPartContent... parts) {
+      multiPartContents.addAll(Arrays.asList(parts));
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java
new file mode 100644
index 00000000000..2e31dbfca76
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java
@@ -0,0 +1,34 @@
+package com.datadog.debugger.symbol;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import org.junit.jupiter.api.Test;
+
+class JarScannerTest {
+  @Test
+  public void extractJarPathFromJar()
+      throws ClassNotFoundException, URISyntaxException, MalformedURLException {
+    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+    URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+    assertEquals(jarFileUrl.getFile(), JarScanner.extractJarPath(testClass).toString());
+    assertEquals(
+        jarFileUrl.getFile(),
+        JarScanner.extractJarPath(testClass.getProtectionDomain()).toString());
+  }
+
+  @Test
+  public void extractJarPathFromFile() throws ClassNotFoundException, URISyntaxException {
+    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarFileUrl}, null);
+    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+    assertEquals(jarFileUrl.getFile(), JarScanner.extractJarPath(testClass).toString());
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java
new file mode 100644
index 00000000000..a298a3774c7
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java
@@ -0,0 +1,160 @@
+package com.datadog.debugger.symbol;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.datadog.debugger.agent.AllowListHelper;
+import com.datadog.debugger.sink.SymbolSink;
+import datadog.remoteconfig.state.ParsedConfigKey;
+import datadog.trace.api.Config;
+import datadog.trace.util.Strings;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.instrument.Instrumentation;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+class SymDBEnablementTest {
+  private static final String CONFIG_KEY =
+      "datadog/2/LIVE_DEBUGGING_SYMBOL_DB/symDb/d5df9e11566aee56b2c9f8a557680ac53fd3a021141a71275345a90e77f2f2ed";
+  private static final byte[] UPlOAD_SYMBOL_TRUE = "{\"upload_symbols\": true}".getBytes();
+  private static final byte[] UPlOAD_SYMBOL_FALSE = "{\"upload_symbols\": false}".getBytes();
+  private Instrumentation instr = mock(Instrumentation.class);
+  private Config config;
+  private SymbolSink symbolSink;
+
+  @BeforeEach
+  public void before() {
+    when(instr.getAllLoadedClasses()).thenReturn(new Class[0]);
+    when(instr.isModifiableClass(any())).thenReturn(true);
+    config = mock(Config.class);
+    when(config.getDebuggerSymbolIncludes()).thenReturn("com.datadog.debugger");
+    when(config.isDebuggerSymbolEnabled()).thenReturn(true);
+    symbolSink = mock(SymbolSink.class);
+  }
+
+  @Test
+  public void enableDisableSymDBThroughRC() throws Exception {
+    SymDBEnablement symDBEnablement =
+        new SymDBEnablement(instr, config, new SymbolAggregator(symbolSink, 1));
+    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
+    waitForUpload(symDBEnablement);
+    verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
+    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_FALSE, null);
+    verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
+  }
+
+  @Test
+  public void removeSymDBConfig() throws Exception {
+    SymDBEnablement symDBEnablement =
+        new SymDBEnablement(instr, config, new SymbolAggregator(symbolSink, 1));
+    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
+    waitForUpload(symDBEnablement);
+    symDBEnablement.remove(ParsedConfigKey.parse(CONFIG_KEY), null);
+    verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
+  }
+
+  @Test
+  public void noIncludesFilterOutDatadogClass() {
+    when(config.getDebuggerSymbolIncludes()).thenReturn("com.datadog.debugger.");
+    SymDBEnablement symDBEnablement =
+        new SymDBEnablement(instr, config, new SymbolAggregator(symbolSink, 1));
+    symDBEnablement.startSymbolExtraction();
+    ArgumentCaptor<SymbolExtractionTransformer> captor =
+        ArgumentCaptor.forClass(SymbolExtractionTransformer.class);
+    verify(instr).addTransformer(captor.capture());
+    SymbolExtractionTransformer transformer = captor.getValue();
+    AllowListHelper allowListHelper = transformer.getAllowListHelper();
+    assertTrue(allowListHelper.isAllowed("com.datadog.debugger.test.TestClass"));
+    assertFalse(allowListHelper.isAllowed("org.springframework.test.TestClass"));
+    assertFalse(allowListHelper.isAllowed("com.datadog.test.TestClass"));
+  }
+
+  @Test
+  public void parseLoadedClass() throws ClassNotFoundException, IOException, URISyntaxException {
+    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+    URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+    when(instr.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
+    when(config.getDebuggerSymbolIncludes())
+        .thenReturn("com.datadog.debugger.,org.springframework.samples.");
+    SymbolAggregator symbolAggregator = mock(SymbolAggregator.class);
+    SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregator);
+    symDBEnablement.startSymbolExtraction();
+    verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
+    ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+    verify(symbolAggregator, times(2))
+        .parseClass(captor.capture(), any(), eq(jarFileUrl.getFile()));
+    assertEquals(
+        "com/datadog/debugger/symbol/SymbolExtraction01.class", captor.getAllValues().get(0));
+    assertEquals(
+        "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
+        captor.getAllValues().get(1));
+  }
+
+  @Test
+  public void noDuplicateSymbolExtraction() {
+    final String CLASS_NAME_PATH = "com/datadog/debugger/symbol/SymbolExtraction01";
+    SymbolSink mockSymbolSink = mock(SymbolSink.class);
+    SymbolAggregator symbolAggregator = new SymbolAggregator(mockSymbolSink, 1);
+    SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregator);
+    doAnswer(
+            invocation -> {
+              SymbolExtractionTransformer transformer = invocation.getArgument(0);
+              JarFile jarFile =
+                  new JarFile(getClass().getResource("/debugger-symbol.jar").getFile());
+              JarEntry jarEntry = jarFile.getJarEntry(CLASS_NAME_PATH + ".class");
+              InputStream inputStream = jarFile.getInputStream(jarEntry);
+              byte[] buffer = new byte[4096];
+              ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
+              int readBytes;
+              baos.reset();
+              while ((readBytes = inputStream.read(buffer)) != -1) {
+                baos.write(buffer, 0, readBytes);
+              }
+              transformer.transform(
+                  getClass().getClassLoader(), CLASS_NAME_PATH, null, null, baos.toByteArray());
+              return null;
+            })
+        .when(instr)
+        .addTransformer(any(SymbolExtractionTransformer.class), eq(true));
+    when(instr.getAllLoadedClasses())
+        .thenAnswer(
+            invocation -> {
+              URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+              URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+              URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+              Class<?> testClass = urlClassLoader.loadClass(Strings.getClassName(CLASS_NAME_PATH));
+              return new Class[] {testClass};
+            });
+    symDBEnablement.startSymbolExtraction();
+    verify(mockSymbolSink, times(1)).addScope(any());
+  }
+
+  private void waitForUpload(SymDBEnablement symDBEnablement) throws InterruptedException {
+    int count = 0;
+    while (symDBEnablement.getLastUploadTimestamp() == 0) {
+      Thread.sleep(1);
+      if (count++ > 30 * 1000) {
+        throw new RuntimeException("Timeout waiting for symDBEnablement.getLastUploadTimestamp()");
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
new file mode 100644
index 00000000000..23eb98dccb7
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
@@ -0,0 +1,914 @@
+package com.datadog.debugger.symbol;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+import static utils.InstrumentationTestHelper.compileAndLoadClass;
+
+import com.datadog.debugger.agent.AllowListHelper;
+import com.datadog.debugger.agent.Configuration;
+import com.datadog.debugger.sink.SymbolSink;
+import datadog.trace.api.Config;
+import java.io.IOException;
+import java.lang.instrument.Instrumentation;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import net.bytebuddy.agent.ByteBuddyAgent;
+import org.joor.Reflect;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.mockito.Mockito;
+
+class SymbolExtractionTransformerTest {
+  private static final String SYMBOL_PACKAGE = "com.datadog.debugger.symbol.";
+  private static final String SYMBOL_PACKAGE_DIR = SYMBOL_PACKAGE.replace('.', '/');
+
+  private Instrumentation instr = ByteBuddyAgent.install();
+  private Config config;
+
+  @BeforeEach
+  public void setUp() {
+    config = Mockito.mock(Config.class);
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+  }
+
+  @Test
+  public void noIncludesFilterOutDatadogClass() throws IOException, URISyntaxException {
+    config = Mockito.mock(Config.class);
+    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer =
+        new SymbolExtractionTransformer(
+            new AllowListHelper(null), new SymbolAggregator(symbolSinkMock, 1));
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    assertFalse(
+        symbolSinkMock.jarScopes.stream()
+            .flatMap(scope -> scope.getScopes().stream())
+            .anyMatch(scope -> scope.getName().equals(CLASS_NAME)));
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction01() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction01.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 2, 20, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 2, 2, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 4, 20, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 4);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 4, 20, SOURCE_FILE, 1, 2);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        4);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "var3",
+        Integer.TYPE.getTypeName(),
+        19);
+    Scope ifLine5Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(ifLine5Scope, ScopeType.LOCAL, null, 6, 17, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        ifLine5Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 6);
+    Scope forLine7Scope = ifLine5Scope.getScopes().get(0);
+    assertScope(forLine7Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        forLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 7);
+    Scope forBodyLine7Scope = forLine7Scope.getScopes().get(0);
+    assertScope(forBodyLine7Scope, ScopeType.LOCAL, null, 8, 15, SOURCE_FILE, 1, 3);
+    assertSymbol(
+        forBodyLine7Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "foo",
+        Integer.TYPE.getTypeName(),
+        8);
+    assertSymbol(
+        forBodyLine7Scope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "bar",
+        Integer.TYPE.getTypeName(),
+        9);
+    assertSymbol(
+        forBodyLine7Scope.getSymbols().get(2),
+        SymbolType.LOCAL,
+        "j",
+        Integer.TYPE.getTypeName(),
+        11);
+    Scope whileLine12 = forBodyLine7Scope.getScopes().get(0);
+    assertScope(whileLine12, ScopeType.LOCAL, null, 13, 14, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        whileLine12.getSymbols().get(0), SymbolType.LOCAL, "var4", Integer.TYPE.getTypeName(), 13);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction02() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction02";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction02.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 6, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        String.class.getTypeName(),
+        5);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction03() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction03";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction03.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 4, 28, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 4, 4, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 28, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 6);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 28, SOURCE_FILE, 2, 2);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        String.class.getTypeName(),
+        6);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "var5",
+        String.class.getTypeName(),
+        27);
+    Scope elseLine10Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(elseLine10Scope, ScopeType.LOCAL, null, 12, 24, SOURCE_FILE, 1, 4);
+    assertSymbol(
+        elseLine10Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var31",
+        String.class.getTypeName(),
+        12);
+    assertSymbol(
+        elseLine10Scope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "var32",
+        String.class.getTypeName(),
+        13);
+    assertSymbol(
+        elseLine10Scope.getSymbols().get(2),
+        SymbolType.LOCAL,
+        "var30",
+        String.class.getTypeName(),
+        15);
+    assertSymbol(
+        elseLine10Scope.getSymbols().get(3),
+        SymbolType.LOCAL,
+        "var3",
+        String.class.getTypeName(),
+        17);
+    Scope ifLine19Scope = elseLine10Scope.getScopes().get(0);
+    assertScope(ifLine19Scope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        ifLine19Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var4",
+        String.class.getTypeName(),
+        20);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction04() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction04";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction04.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 18, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 18, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 18, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        String.class.getTypeName(),
+        5);
+    Scope forLine6Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(forLine6Scope, ScopeType.LOCAL, null, 6, 15, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        forLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 6);
+    Scope forBodyLine6Scope = forLine6Scope.getScopes().get(0);
+    assertScope(forBodyLine6Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 2);
+    assertSymbol(
+        forBodyLine6Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "j",
+        Integer.TYPE.getTypeName(),
+        8);
+    assertSymbol(
+        forBodyLine6Scope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "var2",
+        String.class.getTypeName(),
+        7);
+    Scope forBodyLine8Scope = forBodyLine6Scope.getScopes().get(0);
+    assertScope(forBodyLine8Scope, ScopeType.LOCAL, null, 9, 15, SOURCE_FILE, 1, 2);
+    assertSymbol(
+        forBodyLine8Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var3",
+        String.class.getTypeName(),
+        9);
+    assertSymbol(
+        forBodyLine8Scope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "var5",
+        String.class.getTypeName(),
+        14);
+    Scope forLine10Scope = forBodyLine8Scope.getScopes().get(0);
+    assertScope(forLine10Scope, ScopeType.LOCAL, null, 10, 12, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        forLine10Scope.getSymbols().get(0), SymbolType.LOCAL, "k", Integer.TYPE.getTypeName(), 10);
+    Scope forBodyLine10Scope = forLine10Scope.getScopes().get(0);
+    assertScope(forBodyLine10Scope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        forBodyLine10Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var4",
+        String.class.getTypeName(),
+        11);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction05() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction05";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction05.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 15, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 15, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 15, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "i",
+        Integer.TYPE.getTypeName(),
+        5);
+    Scope whileLine6Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(whileLine6Scope, ScopeType.LOCAL, null, 7, 13, SOURCE_FILE, 1, 2);
+    assertSymbol(
+        whileLine6Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        7);
+    assertSymbol(
+        whileLine6Scope.getSymbols().get(1), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 8);
+    Scope whileLine9Scope = whileLine6Scope.getScopes().get(0);
+    assertScope(whileLine9Scope, ScopeType.LOCAL, null, 10, 11, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        whileLine9Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var2",
+        Integer.TYPE.getTypeName(),
+        10);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction06() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction06";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction06.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 13, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 13, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 13, SOURCE_FILE, 2, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        5);
+    Scope catchLine9Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(catchLine9Scope, ScopeType.LOCAL, null, 9, 11, SOURCE_FILE, 0, 2);
+    assertSymbol(
+        catchLine9Scope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var3",
+        Integer.TYPE.getTypeName(),
+        10);
+    assertSymbol(
+        catchLine9Scope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "rte",
+        RuntimeException.class.getTypeName(),
+        9);
+    Scope tryLine6Scope = mainMethodLocalScope.getScopes().get(1);
+    assertScope(tryLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        tryLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction07() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction07";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction07.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 10, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 10, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 10, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "i",
+        Integer.TYPE.getTypeName(),
+        5);
+    Scope doLine6Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(doLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        doLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 7);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction08() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction08";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction08.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 11, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 11, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 11, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        5);
+    Scope line6Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(line6Scope, ScopeType.LOCAL, null, 7, 9, SOURCE_FILE, 0, 2);
+    assertSymbol(
+        line6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
+    assertSymbol(
+        line6Scope.getSymbols().get(1), SymbolType.LOCAL, "var3", Integer.TYPE.getTypeName(), 8);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction09() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction09";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction09.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 23, SOURCE_FILE, 6, 2);
+    assertSymbol(
+        classScope.getSymbols().get(0),
+        SymbolType.STATIC_FIELD,
+        "staticIntField",
+        Integer.TYPE.getTypeName(),
+        0);
+    assertSymbol(
+        classScope.getSymbols().get(1),
+        SymbolType.FIELD,
+        "intField",
+        Integer.TYPE.getTypeName(),
+        0);
+    assertScope(
+        classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 5, 17, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 14, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 8);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 14, SOURCE_FILE, 0, 3);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "outside",
+        Integer.TYPE.getTypeName(),
+        8);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "outside2",
+        Integer.TYPE.getTypeName(),
+        9);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(2),
+        SymbolType.LOCAL,
+        "lambda",
+        Supplier.class.getTypeName(),
+        10);
+    Scope processMethodScope = classScope.getScopes().get(2);
+    assertScope(processMethodScope, ScopeType.METHOD, "process", 19, 23, SOURCE_FILE, 1, 0);
+    Scope processMethodLocalScope = processMethodScope.getScopes().get(0);
+    assertScope(processMethodLocalScope, ScopeType.LOCAL, null, 19, 23, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        processMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "supplier",
+        Supplier.class.getTypeName(),
+        19);
+    Scope supplierClosureScope = classScope.getScopes().get(3);
+    assertScope(
+        supplierClosureScope, ScopeType.CLOSURE, "lambda$process$1", 20, 21, SOURCE_FILE, 1, 0);
+    Scope supplierClosureLocalScope = supplierClosureScope.getScopes().get(0);
+    assertScope(supplierClosureLocalScope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        supplierClosureLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        20);
+    Scope lambdaClosureScope = classScope.getScopes().get(4);
+    assertScope(lambdaClosureScope, ScopeType.CLOSURE, "lambda$main$0", 11, 12, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        lambdaClosureScope.getSymbols().get(0),
+        SymbolType.ARG,
+        "outside",
+        Integer.TYPE.getTypeName(),
+        11);
+    Scope lambdaMethodLocalScope = lambdaClosureScope.getScopes().get(0);
+    assertScope(lambdaMethodLocalScope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        lambdaMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        11);
+    Scope clinitMethodScope = classScope.getScopes().get(5);
+    assertScope(clinitMethodScope, ScopeType.METHOD, "<clinit>", 6, 6, SOURCE_FILE, 0, 0);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction10() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction10";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction10.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock, 2);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    assertEquals(2, symbolSinkMock.jarScopes.get(0).getScopes().size());
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 6, SOURCE_FILE, 2, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 3, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "winner",
+        "com.datadog.debugger.symbol.SymbolExtraction10$Inner",
+        5);
+    Scope innerClassScope = symbolSinkMock.jarScopes.get(0).getScopes().get(1);
+    assertScope(innerClassScope, ScopeType.CLASS, CLASS_NAME + "$Inner", 9, 13, SOURCE_FILE, 2, 1);
+    assertSymbol(
+        innerClassScope.getSymbols().get(0),
+        SymbolType.FIELD,
+        "field1",
+        Integer.TYPE.getTypeName(),
+        0);
+    assertScope(
+        innerClassScope.getScopes().get(0), ScopeType.METHOD, "<init>", 9, 10, SOURCE_FILE, 0, 0);
+    Scope addToMethod = innerClassScope.getScopes().get(1);
+    assertScope(addToMethod, ScopeType.METHOD, "addTo", 12, 13, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        addToMethod.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 12);
+    Scope addToMethodLocalScope = addToMethod.getScopes().get(0);
+    assertScope(addToMethodLocalScope, ScopeType.LOCAL, null, 12, 13, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        addToMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        12);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction11() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction11";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction11.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", 1).get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 3, 11, SOURCE_FILE, 2, 1);
+    assertSymbol(
+        classScope.getSymbols().get(0), SymbolType.FIELD, "field1", Integer.TYPE.getTypeName(), 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 3, 4, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 11, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 6);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 11, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "var1",
+        Integer.TYPE.getTypeName(),
+        6);
+    Scope ifLine7Scope = mainMethodLocalScope.getScopes().get(0);
+    assertScope(ifLine7Scope, ScopeType.LOCAL, null, 8, 9, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        ifLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 8);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction12() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction12";
+    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction12.java";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", 1).get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 20, SOURCE_FILE, 7, 0);
+    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 6, 6, SOURCE_FILE, 0, 0);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 13, SOURCE_FILE, 1, 1);
+    assertSymbol(
+        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 8);
+    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 13, SOURCE_FILE, 0, 2);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(0),
+        SymbolType.LOCAL,
+        "list",
+        List.class.getTypeName(),
+        8);
+    assertSymbol(
+        mainMethodLocalScope.getSymbols().get(1),
+        SymbolType.LOCAL,
+        "sum",
+        Integer.TYPE.getTypeName(),
+        12);
+    Scope fooMethodScope = classScope.getScopes().get(2);
+    assertScope(fooMethodScope, ScopeType.METHOD, "foo", 17, 20, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        fooMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 17);
+    Scope lambdaFoo3MethodScope = classScope.getScopes().get(3);
+    assertScope(
+        lambdaFoo3MethodScope, ScopeType.CLOSURE, "lambda$foo$3", 19, 19, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        lambdaFoo3MethodScope.getSymbols().get(0),
+        SymbolType.ARG,
+        "x",
+        Integer.TYPE.getTypeName(),
+        19);
+    Scope lambdaFoo2MethodScope = classScope.getScopes().get(4);
+    assertScope(
+        lambdaFoo2MethodScope, ScopeType.CLOSURE, "lambda$foo$2", 19, 19, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        lambdaFoo2MethodScope.getSymbols().get(0),
+        SymbolType.ARG,
+        "x",
+        Integer.class.getTypeName(),
+        19);
+    Scope lambdaMain1MethodScope = classScope.getScopes().get(5);
+    assertScope(
+        lambdaMain1MethodScope, ScopeType.CLOSURE, "lambda$main$1", 11, 11, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        lambdaMain1MethodScope.getSymbols().get(0),
+        SymbolType.ARG,
+        "x",
+        Integer.TYPE.getTypeName(),
+        11);
+    Scope lambdaMain0MethodScope = classScope.getScopes().get(6);
+    assertScope(
+        lambdaMain0MethodScope, ScopeType.CLOSURE, "lambda$main$0", 11, 11, SOURCE_FILE, 0, 1);
+    assertSymbol(
+        lambdaMain0MethodScope.getSymbols().get(0),
+        SymbolType.ARG,
+        "x",
+        Integer.class.getTypeName(),
+        11);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction13() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction13";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertLangSpecifics(
+        classScope.getLanguageSpecifics(),
+        asList("public"),
+        asList(
+            "@com.datadog.debugger.symbol.MyAnnotation", "@com.datadog.debugger.symbol.MyMarker"),
+        Object.class.getTypeName(),
+        null,
+        null);
+    Scope mainMethodScope = classScope.getScopes().get(1);
+    assertLangSpecifics(
+        mainMethodScope.getLanguageSpecifics(),
+        asList("public", "static"),
+        asList("@com.datadog.debugger.symbol.MyAnnotation"),
+        null,
+        null,
+        Integer.TYPE.getTypeName());
+    assertEquals(3, classScope.getSymbols().size());
+    Symbol intField = classScope.getSymbols().get(0);
+    assertLangSpecifics(
+        intField.getLanguageSpecifics(),
+        asList("private"),
+        asList("@com.datadog.debugger.symbol.MyAnnotation"),
+        null,
+        null,
+        null);
+    Scope myAnnotationClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
+    assertLangSpecifics(
+        myAnnotationClassScope.getLanguageSpecifics(),
+        asList("interface", "abstract", "annotation"),
+        asList("@java.lang.annotation.Target", "@java.lang.annotation.Retention"),
+        Object.class.getTypeName(),
+        asList("java.lang.annotation.Annotation"),
+        null);
+    Symbol strField = classScope.getSymbols().get(1);
+    assertLangSpecifics(
+        strField.getLanguageSpecifics(),
+        asList("public", "static", "volatile"),
+        null,
+        null,
+        null,
+        null);
+    Symbol doubleField = classScope.getSymbols().get(2);
+    assertLangSpecifics(
+        doubleField.getLanguageSpecifics(),
+        asList("protected", "final", "transient"),
+        null,
+        null,
+        null,
+        null);
+  }
+
+  @Test
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  public void symbolExtraction14() throws IOException, URISyntaxException {
+    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction14";
+    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+    SymbolExtractionTransformer transformer = createTransformer(symbolSinkMock);
+    instr.addTransformer(transformer);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    Reflect.on(testClass).call("main", "1").get();
+    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+    assertLangSpecifics(
+        classScope.getLanguageSpecifics(),
+        asList("public", "abstract"),
+        null,
+        Object.class.getTypeName(),
+        asList("com.datadog.debugger.symbol.I1", "com.datadog.debugger.symbol.I2"),
+        null);
+    assertEquals(4, classScope.getScopes().size());
+    Scope m1MethodScope = classScope.getScopes().get(2);
+    assertLangSpecifics(
+        m1MethodScope.getLanguageSpecifics(),
+        asList("protected", "abstract"),
+        null,
+        null,
+        null,
+        Void.TYPE.getTypeName());
+    Scope m2MethodScope = classScope.getScopes().get(3);
+    assertLangSpecifics(
+        m2MethodScope.getLanguageSpecifics(),
+        asList("private", "final", "synchronized", "(varargs)", "strictfp"),
+        null,
+        null,
+        null,
+        String.class.getTypeName());
+    Scope i1ClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
+    assertLangSpecifics(
+        i1ClassScope.getLanguageSpecifics(),
+        asList("interface", "abstract"),
+        null,
+        Object.class.getTypeName(),
+        null,
+        null);
+    Scope m3MethodScope = i1ClassScope.getScopes().get(0);
+    assertLangSpecifics(
+        m3MethodScope.getLanguageSpecifics(),
+        asList("public", "default"),
+        null,
+        null,
+        null,
+        Void.TYPE.getTypeName());
+    Scope myEnumClassScope = symbolSinkMock.jarScopes.get(3).getScopes().get(0);
+    assertLangSpecifics(
+        myEnumClassScope.getLanguageSpecifics(),
+        asList("final", "enum"),
+        null,
+        Enum.class.getTypeName(),
+        null,
+        null);
+    assertEquals(4, myEnumClassScope.getSymbols().size());
+    Symbol oneField = myEnumClassScope.getSymbols().get(0);
+    assertLangSpecifics(
+        oneField.getLanguageSpecifics(),
+        asList("public", "static", "final", "enum"),
+        null,
+        null,
+        null,
+        null);
+    Symbol valuesField = myEnumClassScope.getSymbols().get(3);
+    assertLangSpecifics(
+        valuesField.getLanguageSpecifics(),
+        asList("private", "static", "final", "synthetic"),
+        null,
+        null,
+        null,
+        null);
+  }
+
+  private void assertLangSpecifics(
+      LanguageSpecifics languageSpecifics,
+      List<String> expectedModifiers,
+      List<String> expectedAnnotations,
+      String expectedSuperClass,
+      List<String> expectedInterfaces,
+      String expectedReturnType) {
+    if (expectedModifiers == null) {
+      assertNull(languageSpecifics.getAccessModifiers());
+    } else {
+      assertEquals(expectedModifiers, languageSpecifics.getAccessModifiers());
+    }
+    if (expectedAnnotations == null) {
+      assertNull(languageSpecifics.getAnnotations());
+    } else {
+      assertEquals(expectedAnnotations, languageSpecifics.getAnnotations());
+    }
+    if (expectedSuperClass == null) {
+      assertNull(languageSpecifics.getSuperClass());
+    } else {
+      assertEquals(expectedSuperClass, languageSpecifics.getSuperClass());
+    }
+    if (expectedInterfaces == null) {
+      assertNull(languageSpecifics.getInterfaces());
+    } else {
+      assertEquals(expectedInterfaces, languageSpecifics.getInterfaces());
+    }
+    if (expectedReturnType == null) {
+      assertNull(languageSpecifics.getReturnType());
+    } else {
+      assertEquals(expectedReturnType, languageSpecifics.getReturnType());
+    }
+  }
+
+  private static void assertScope(
+      Scope scope,
+      ScopeType scopeType,
+      String name,
+      int startLine,
+      int endLine,
+      String sourceFile,
+      int nbScopes,
+      int nbSymbols) {
+    assertEquals(scopeType, scope.getScopeType());
+    assertEquals(name, scope.getName());
+    assertEquals(startLine, scope.getStartLine());
+    assertEquals(endLine, scope.getEndLine());
+    assertEquals(sourceFile, scope.getSourceFile());
+    assertEquals(nbScopes, scope.getScopes().size());
+    assertEquals(nbSymbols, scope.getSymbols().size());
+  }
+
+  private void assertSymbol(
+      Symbol symbol, SymbolType symbolType, String name, String type, int line) {
+    assertEquals(symbolType, symbol.getSymbolType());
+    assertEquals(name, symbol.getName());
+    assertEquals(type, symbol.getType());
+    assertEquals(line, symbol.getLine());
+  }
+
+  private SymbolExtractionTransformer createTransformer(SymbolSink symbolSink) {
+    return createTransformer(symbolSink, 1);
+  }
+
+  private SymbolExtractionTransformer createTransformer(
+      SymbolSink symbolSink, int symbolFlushThreshold) {
+    AllowListHelper allowListHelper =
+        new AllowListHelper(
+            new Configuration.FilterList(singletonList(SYMBOL_PACKAGE), emptyList()));
+    return new SymbolExtractionTransformer(
+        allowListHelper, new SymbolAggregator(symbolSink, symbolFlushThreshold));
+  }
+
+  static class SymbolSinkMock extends SymbolSink {
+    final List<Scope> jarScopes = new ArrayList<>();
+
+    public SymbolSinkMock(Config config) {
+      super(config);
+    }
+
+    @Override
+    public boolean addScope(Scope jarScope) {
+      return jarScopes.add(jarScope);
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
index e018598f313..99a9e7db46e 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
@@ -55,10 +55,9 @@ public void setup() throws IOException {
     server.start();
     url = server.url(URL_PATH);
 
-    when(config.getFinalDebuggerSnapshotUrl()).thenReturn(server.url(URL_PATH).toString());
     when(config.getDebuggerUploadTimeout()).thenReturn((int) REQUEST_TIMEOUT.getSeconds());
 
-    uploader = new BatchUploader(config, ratelimitedLogger);
+    uploader = new BatchUploader(config, url.toString(), ratelimitedLogger);
   }
 
   @AfterEach
@@ -73,9 +72,7 @@ public void tearDown() throws IOException {
 
   @Test
   void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
-    when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://example.com");
-
-    uploader = new BatchUploader(config);
+    uploader = new BatchUploader(config, "http://example.com");
 
     final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
     assertEquals(connectionSpecs.size(), 1);
@@ -84,9 +81,7 @@ void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
 
   @Test
   void testOkHttpClientUsesDefaultConnspecsOverTLS() {
-    when(config.getFinalDebuggerSnapshotUrl()).thenReturn("https://example.com");
-
-    uploader = new BatchUploader(config);
+    uploader = new BatchUploader(config, "https://example.com");
 
     final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
     assertEquals(connectionSpecs.size(), 2);
@@ -163,7 +158,7 @@ public void testTooManyRequests() throws IOException, InterruptedException {
     // We need to make sure that initial requests that fill up the queue hang to the duration of the
     // test. So we specify insanely large timeout here.
     when(config.getDebuggerUploadTimeout()).thenReturn((int) FOREVER_REQUEST_TIMEOUT.getSeconds());
-    uploader = new BatchUploader(config);
+    uploader = new BatchUploader(config, url.toString());
 
     // We have to block all parallel requests to make sure queue is kept full
     for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
@@ -203,15 +198,15 @@ public void testShutdown() throws IOException, InterruptedException {
 
   @Test
   public void testEmptyUrl() {
-    when(config.getFinalDebuggerSnapshotUrl()).thenReturn("");
-    Assertions.assertThrows(IllegalArgumentException.class, () -> new BatchUploader(config));
+    Assertions.assertThrows(IllegalArgumentException.class, () -> new BatchUploader(config, ""));
   }
 
   @Test
   public void testNoContainerId() throws InterruptedException {
     // we don't explicitly specify a container ID
     server.enqueue(new MockResponse().setResponseCode(200));
-    BatchUploader uploaderWithNoContainerId = new BatchUploader(config, ratelimitedLogger, null);
+    BatchUploader uploaderWithNoContainerId =
+        new BatchUploader(config, url.toString(), ratelimitedLogger, null);
 
     uploaderWithNoContainerId.upload(SNAPSHOT_BUFFER);
     uploaderWithNoContainerId.shutdown();
@@ -225,7 +220,7 @@ public void testContainerIdHeader() throws InterruptedException {
     server.enqueue(new MockResponse().setResponseCode(200));
 
     BatchUploader uploaderWithContainerId =
-        new BatchUploader(config, ratelimitedLogger, "testContainerId");
+        new BatchUploader(config, url.toString(), ratelimitedLogger, "testContainerId");
     uploaderWithContainerId.upload(SNAPSHOT_BUFFER);
     uploaderWithContainerId.shutdown();
 
@@ -238,7 +233,7 @@ public void testApiKey() throws InterruptedException {
     server.enqueue(new MockResponse().setResponseCode(200));
     when(config.getApiKey()).thenReturn(API_KEY_VALUE);
 
-    BatchUploader uploaderWithApiKey = new BatchUploader(config, ratelimitedLogger);
+    BatchUploader uploaderWithApiKey = new BatchUploader(config, url.toString(), ratelimitedLogger);
     uploaderWithApiKey.upload(SNAPSHOT_BUFFER);
     uploaderWithApiKey.shutdown();
 
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java
new file mode 100644
index 00000000000..038053dd524
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java
@@ -0,0 +1,232 @@
+package com.datadog.debugger.util;
+
+import static com.datadog.debugger.sink.SnapshotSink.MAX_SNAPSHOT_SIZE;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class SnapshotPrunerTest {
+  @Test
+  public void noPruning() {
+    assertEquals("[]", SnapshotPruner.prune("[]", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals("{}", SnapshotPruner.prune("{}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals("[{},{},{}]", SnapshotPruner.prune("[{},{},{}]", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals(
+        "{\"foo\":[[],[],[]]}", SnapshotPruner.prune("{\"foo\":[[],[],[]]}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals(
+        "{\"foo\":\"bar\"}", SnapshotPruner.prune("{\"foo\":\"bar\"}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals("{\"foo\":1001}", SnapshotPruner.prune("{\"foo\":1001}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals("{\"foo\":3.14}", SnapshotPruner.prune("{\"foo\":3.14}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals("{\"foo\":true}", SnapshotPruner.prune("{\"foo\":true}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals(
+        "{\"foo\":{\"name\":\"value\"}}",
+        SnapshotPruner.prune("{\"foo\":{\"name\":\"value\"}}", MAX_SNAPSHOT_SIZE, 0));
+    assertEquals(
+        "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}",
+        SnapshotPruner.prune(
+            "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}", MAX_SNAPSHOT_SIZE, 0));
+  }
+
+  @Test
+  public void basic() {
+    assertEquals("aaaa{\"pruned\":true}bbbb", SnapshotPruner.prune("aaaa{}bbbb", 8, 0));
+    assertEquals(
+        "aa{\"pruned\":true}bb",
+        SnapshotPruner.prune("aa{\"notCapturedReason\": \"depth\"}bb", 8, 0));
+    assertEquals(
+        "aa{\"pruned\":true}bb",
+        SnapshotPruner.prune("aa{\"notCapturedReason\": \"collectionSize\"}bb", 8, 0));
+  }
+
+  @Test
+  public void priorityPruning() {
+    final String INPUT =
+        "{\n"
+            + "  \"elements\":[\n"
+            + "    {\n"
+            + "      \"type\": \"list\",\n"
+            + "      \"notCapturedReason\": \"collectionSize\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"complex\",\n"
+            + "      \"notCapturedReason\": \"depth\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"deep\",\n"
+            + "      \"subobject\": {\n"
+            + "        \"type\": \"complex\",\n"
+            + "        \"value\": \"subobject\"\n"
+            + "      }\n"
+            + "    }\n"
+            + "    {\n"
+            + "      \"type\": \"complex\",\n"
+            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}";
+    assertEquals(
+        "{\n"
+            + "  \"elements\":[\n"
+            + "    {\n"
+            + "      \"type\": \"list\",\n"
+            + "      \"notCapturedReason\": \"collectionSize\"\n"
+            + "    },\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\n"
+            + "      \"type\": \"deep\",\n"
+            + "      \"subobject\": {\n"
+            + "        \"type\": \"complex\",\n"
+            + "        \"value\": \"subobject\"\n"
+            + "      }\n"
+            + "    }\n"
+            + "    {\n"
+            + "      \"type\": \"complex\",\n"
+            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}",
+        SnapshotPruner.prune(INPUT, 400, 0));
+    assertEquals(
+        "{\n"
+            + "  \"elements\":[\n"
+            + "    {\n"
+            + "      \"type\": \"list\",\n"
+            + "      \"notCapturedReason\": \"collectionSize\"\n"
+            + "    },\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\"pruned\":true}\n"
+            + "    {\n"
+            + "      \"type\": \"complex\",\n"
+            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}",
+        SnapshotPruner.prune(INPUT, 300, 0));
+    assertEquals(
+        "{\n"
+            + "  \"elements\":[\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\"pruned\":true}\n"
+            + "    {\n"
+            + "      \"type\": \"complex\",\n"
+            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}",
+        SnapshotPruner.prune(INPUT, 250, 0));
+    assertEquals(
+        "{\n"
+            + "  \"elements\":[\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\"pruned\":true},\n"
+            + "    {\"pruned\":true}\n"
+            + "    {\"pruned\":true}\n"
+            + "  ]\n"
+            + "}",
+        SnapshotPruner.prune(INPUT, 200, 0));
+  }
+
+  @Test
+  public void sizeReduction() {
+    final String INPUT =
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
+            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
+            + "                ]}\n"
+            + "            }";
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
+            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
+            + "                ]}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 800, 0));
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"pruned\":true},\n"
+            + "                    {\"pruned\":true}\n"
+            + "                ]}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 440, 0));
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"pruned\":true}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 350, 0));
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+            + "                    {\"pruned\":true}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"pruned\":true}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 270, 0));
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+            + "                    {\"pruned\":true},\n"
+            + "                    {\"pruned\":true}\n"
+            + "                ]},\n"
+            + "                \"prune\": {\"pruned\":true}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 240, 0));
+    assertEquals(
+        "{\n"
+            + "                \"keep\": {\"pruned\":true},\n"
+            + "                \"prune\": {\"pruned\":true}\n"
+            + "            }",
+        SnapshotPruner.prune(INPUT, 120, 0));
+    assertEquals("{\"pruned\":true}", SnapshotPruner.prune(INPUT, 20, 0));
+  }
+
+  @Test
+  public void sliceSmallSnapshot() throws Exception {
+    final int MIN_LEVEL = 6;
+    String inputSmallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot.json").trim();
+    assertEquals(
+        inputSmallSnapshot,
+        SnapshotPruner.prune(inputSmallSnapshot, inputSmallSnapshot.length(), MIN_LEVEL));
+    String smallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned0.json")
+            .trim();
+    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1500, MIN_LEVEL));
+    smallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned1.json")
+            .trim();
+    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1250, MIN_LEVEL));
+    smallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned2.json")
+            .trim();
+    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1100, MIN_LEVEL));
+    smallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned3.json")
+            .trim();
+    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1000, MIN_LEVEL));
+    smallSnapshot =
+        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned4.json")
+            .trim();
+    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 500, MIN_LEVEL));
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotSlicerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotSlicerTest.java
deleted file mode 100644
index f6148407097..00000000000
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotSlicerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.datadog.debugger.util;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import utils.TestHelper;
-
-class SnapshotSlicerTest {
-
-  @Test
-  public void noSlice() throws Exception {
-    Assertions.assertEquals("[]", SnapshotSlicer.slice(16, "[]"));
-    Assertions.assertEquals("{}", SnapshotSlicer.slice(16, "{}"));
-    Assertions.assertEquals("[{},{},{}]", SnapshotSlicer.slice(16, "[{},{},{}]"));
-    Assertions.assertEquals(
-        "{\"foo\":[[],[],[]]}", SnapshotSlicer.slice(16, "{\"foo\":[[],[],[]]}"));
-    Assertions.assertEquals("{\"foo\":\"bar\"}", SnapshotSlicer.slice(16, "{\"foo\":\"bar\"}"));
-    Assertions.assertEquals("{\"foo\":1001}", SnapshotSlicer.slice(16, "{\"foo\":1001}"));
-    Assertions.assertEquals("{\"foo\":3.14}", SnapshotSlicer.slice(16, "{\"foo\":3.14}"));
-    Assertions.assertEquals("{\"foo\":true}", SnapshotSlicer.slice(16, "{\"foo\":true}"));
-    Assertions.assertEquals(
-        "{\"foo\":{\"name\":\"value\"}}",
-        SnapshotSlicer.slice(16, "{\"foo\":{\"name\":\"value\"}}"));
-    Assertions.assertEquals(
-        "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}",
-        SnapshotSlicer.slice(16, "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}"));
-  }
-
-  @Test
-  public void sliceSmallSnapshot() throws Exception {
-    String inputSmallSnapshot =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot.json").trim();
-    Assertions.assertEquals(inputSmallSnapshot, SnapshotSlicer.slice(5, inputSmallSnapshot));
-    String smallSnapshot4 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_4.json").trim();
-    Assertions.assertEquals(smallSnapshot4, SnapshotSlicer.slice(4, inputSmallSnapshot));
-    String smallSnapshot3 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_3.json").trim();
-    Assertions.assertEquals(smallSnapshot3, SnapshotSlicer.slice(3, inputSmallSnapshot));
-    String smallSnapshot2 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_2.json").trim();
-    Assertions.assertEquals(smallSnapshot2, SnapshotSlicer.slice(2, inputSmallSnapshot));
-    String smallSnapshot1 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_1.json").trim();
-    Assertions.assertEquals(smallSnapshot1, SnapshotSlicer.slice(1, inputSmallSnapshot));
-    String smallSnapshot0 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_0.json").trim();
-    Assertions.assertEquals(smallSnapshot0, SnapshotSlicer.slice(0, inputSmallSnapshot));
-  }
-
-  @Test
-  public void sliceLargeSnapshot() throws Exception {
-    String inputLargeSnapshot =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/largeSnapshot.json").trim();
-    String largeSnapshot2 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/largeSnapshot_2.json").trim();
-    Assertions.assertEquals(largeSnapshot2, SnapshotSlicer.slice(2, inputLargeSnapshot));
-    String largeSnapshot1 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/largeSnapshot_1.json").trim();
-    Assertions.assertEquals(largeSnapshot1, SnapshotSlicer.slice(1, inputLargeSnapshot));
-    String largeSnapshot0 =
-        TestHelper.getFixtureContent("/com/datadog/debugger/util/largeSnapshot_0.json").trim();
-    Assertions.assertEquals(largeSnapshot0, SnapshotSlicer.slice(0, inputLargeSnapshot));
-  }
-}
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
index dd6ebad74c7..739e66b5cff 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import datadog.trace.bootstrap.debugger.CapturedContext;
+import datadog.trace.bootstrap.debugger.Limits;
 import datadog.trace.bootstrap.debugger.ProbeId;
 import datadog.trace.bootstrap.debugger.ProbeImplementation;
 import datadog.trace.bootstrap.debugger.ProbeLocation;
@@ -17,12 +18,13 @@ class ValueScriptHelperTest {
       new ProbeLocation("java.lang.String", "indexOf", "String.java", Arrays.asList("12-15", "23"));
   private static final ProbeImplementation DUMMY_PROBE =
       new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION);
+  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
 
   @Test
   public void nullValue() {
     CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
     StringBuilder sb = new StringBuilder();
-    ValueScriptHelper.serializeValue(sb, "", null, status);
+    ValueScriptHelper.serializeValue(sb, "", null, status, LIMITS);
     assertEquals("null", sb.toString());
   }
 
@@ -30,7 +32,7 @@ public void nullValue() {
   public void basicString() {
     CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
     StringBuilder sb = new StringBuilder();
-    ValueScriptHelper.serializeValue(sb, "", "foo", status);
+    ValueScriptHelper.serializeValue(sb, "", "foo", status, LIMITS);
     assertEquals("foo", sb.toString());
   }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot19.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot19.java
index 8b04dcffe2e..5909e5644f2 100644
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot19.java
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot19.java
@@ -17,6 +17,8 @@ static class Base {
     private static int intValue = 24;
     protected static double doubleValue = 3.14;
     private static Object obj1;
+    private static long[] longValues = new long[] {1, 2, 3, 4};
+    private static String[] strValues = new String[] {"foo", "bar"};
 
     public Base(Object obj1) {
       this.obj1 = obj1;
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java
index 07e5fa48828..8ccf68139d0 100644
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java
@@ -27,6 +27,9 @@ public static int main(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
     AgentSpan span = tracerAPI.buildSpan("process").start();
     try (AgentScope scope = tracerAPI.activateSpan(span, ScopeSource.MANUAL)) {
+      if (arg.equals("exception")) {
+        return new CapturedSnapshot20().processWithException(arg);
+      }
       return new CapturedSnapshot20().process(arg);
     } finally {
       span.finish();
@@ -37,4 +40,9 @@ private int process(String arg) {
     int intLocal = intField + 42;
     return intLocal;
   }
+
+  private int processWithException(String arg) {
+    int intLocal = intField + 42;
+    throw new RuntimeException("oops");
+  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction01.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction01.java
new file mode 100644
index 00000000000..aea27733512
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction01.java
@@ -0,0 +1,22 @@
+package com.datadog.debugger.symbol;
+public class SymbolExtraction01 {
+  public static int main(String arg) {
+    int var1 = 1;
+    if (Integer.parseInt(arg) == 2) {
+      int var2 = 2;
+      for (int i = 0; i <= 9; i++) {
+        int foo = 13;
+        int bar = 13;
+        System.out.println(i + foo + bar);
+        int j = 0;
+        while (j < 10) {
+          int var4 = 1;
+          j++;
+        }
+      }
+      return var2;
+    }
+    int var3 = 3;
+    return var1 + var3;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction02.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction02.java
new file mode 100644
index 00000000000..2b0396c23a5
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction02.java
@@ -0,0 +1,8 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction02 {
+  public static int main(String arg) {
+    String var1 = "var1";
+    return var1.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction03.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction03.java
new file mode 100644
index 00000000000..bc2be93c149
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction03.java
@@ -0,0 +1,30 @@
+
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction03 {
+  public static int main(String arg) {
+    String var1 = "var1";
+    if (arg.equals("foo")) {
+      String var2 = "var2";
+      System.out.println(var2);
+    } else {
+      System.out.println(var1);
+      String var31 = "var31";
+      String var32 = "var32";
+      System.out.println(var1);
+      String var30 = "var30";
+      System.out.println(var1);
+      String var3 = "var3";
+      System.out.println(var3);
+      if (arg.equals(var3)) {
+        String var4 = "var4";
+        System.out.println(var4);
+      }
+      if (arg.equals(var1)) {
+        return var3.length();
+      }
+    }
+    String var5 = "var5";
+    return var1.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction04.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction04.java
new file mode 100644
index 00000000000..f667317cb92
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction04.java
@@ -0,0 +1,20 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction04 {
+  public static int main(String arg) {
+    String var1 = "var1";
+    for (int i = 0; i < 10; i++) {
+      String var2 = "var2";
+      for (int j = 0; j < 10; j++) {
+        String var3 = "var3";
+        for (int k = 0; k < 10; k++) {
+          String var4 = "var4";
+          System.out.println("var4 = " + var4);
+        }
+        String var5 = "var5";
+        System.out.println("var5 = " + var5);
+      }
+    }
+    return var1.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction05.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction05.java
new file mode 100644
index 00000000000..327adb10431
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction05.java
@@ -0,0 +1,17 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction05 {
+  public static int main(String arg) {
+    int i = 0;
+    while (i < 10) {
+      int var1 = 10;
+      int j = 0;
+      while (j < 10) {
+        int var2 = 1;
+        j++;
+      }
+      i++;
+    }
+    return arg.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction06.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction06.java
new file mode 100644
index 00000000000..4eeb3173c81
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction06.java
@@ -0,0 +1,15 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction06 {
+  public static int main(String arg) {
+    int var1 = 1;
+    try {
+      int var2 = 2;
+      throw new RuntimeException("" + var1);
+    } catch (RuntimeException rte) {
+      int var3 = 3;
+      System.out.println("rte = " + rte.getMessage() + var3);
+    }
+    return arg.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction07.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction07.java
new file mode 100644
index 00000000000..6b3b6f04af1
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction07.java
@@ -0,0 +1,12 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction07 {
+  public static int main(String arg) {
+    int i = 10;
+    do {
+      int j = i + 12;
+      i--;
+    } while (i > 0);
+    return arg.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction08.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction08.java
new file mode 100644
index 00000000000..a06a4561a64
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction08.java
@@ -0,0 +1,13 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction08 {
+  public static int main(String arg) {
+    int var1 = 1;
+    {
+      int var2 = 2;
+      int var3 = 3;
+      int var4 = var2 + var3; // var4 is not in the LocalVariableTable because last statement of the scope
+    }
+    return arg.length();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction09.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction09.java
new file mode 100644
index 00000000000..fac032d858c
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction09.java
@@ -0,0 +1,25 @@
+package com.datadog.debugger.symbol;
+
+import java.util.function.Supplier;
+
+public class SymbolExtraction09 {
+  static int staticIntField = 42;
+  public static int main(String arg) {
+    int outside = 12;
+    int outside2 = 1337;
+    Supplier<Integer> lambda = () -> {
+      int var1 = 1;
+      return var1 + outside + staticIntField;
+    };
+    return lambda.get();
+  }
+
+  int intField = 42;
+  public int process() {
+    Supplier<Integer> supplier = () -> {
+      int var1 = 1;
+      return var1 + intField;
+    };
+    return supplier.get();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction10.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction10.java
new file mode 100644
index 00000000000..b1d6f28bea7
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction10.java
@@ -0,0 +1,16 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction10 {
+  public static int main(String arg) {
+    Inner winner = new Inner();
+    return winner.addTo(12);
+  }
+
+  static class Inner {
+    private final int field1 = 1;
+    public int addTo(int arg) {
+      int var1 = 2;
+      return var1 + arg;
+    }
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction11.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction11.java
new file mode 100644
index 00000000000..b4ba9ccd520
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction11.java
@@ -0,0 +1,13 @@
+package com.datadog.debugger.symbol;
+
+public class SymbolExtraction11 {
+  private final int field1 = 1;
+  public static int main(int arg) {
+    int var1 = 1;
+    if (arg == 42) {
+      int var2 = 2;
+      return var2;
+    }
+    return var1 + arg;
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction12.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction12.java
new file mode 100644
index 00000000000..330fbb1ae81
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction12.java
@@ -0,0 +1,22 @@
+package com.datadog.debugger.symbol;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SymbolExtraction12 {
+  public static int main(int arg) {
+    List<Integer> list = Arrays.asList(1, 2, 3);
+    int sum = list
+        .stream()
+        .mapToInt(x -> x + 1).map(x -> x - 12)
+        .sum();
+    return sum;
+  }
+
+  public static int foo(int arg) {
+    return Arrays.asList(1, 2, 3, 4)
+        .stream()
+        .mapToInt(x -> x + 1).map(x -> x - 12)
+        .sum();
+  }
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction13.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction13.java
new file mode 100644
index 00000000000..6cd268066ef
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction13.java
@@ -0,0 +1,39 @@
+package com.datadog.debugger.symbol;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@MyAnnotation("class")
+@MyMarker
+public class SymbolExtraction13 {
+
+  @MyAnnotation("field")
+  private int intField;
+  public static  volatile String strField;
+  protected final transient double doubleField = 3.14;
+
+  @MyAnnotation("method")
+  public static int main(String arg) {
+    System.out.println(MyAnnotation.class);
+    return 42;
+  }
+
+  private static class InnerClass {
+
+  }
+}
+
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@interface MyAnnotation {
+  String value() default "";
+}
+
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@interface MyMarker {
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction14.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction14.java
new file mode 100644
index 00000000000..417867c3659
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symbol/SymbolExtraction14.java
@@ -0,0 +1,36 @@
+package com.datadog.debugger.symbol;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+public abstract class SymbolExtraction14 extends Object implements I1, I2{
+
+  public static int main(String arg) {
+    System.out.println(MyEnum.ONE);
+    return 42;
+  }
+
+  protected abstract void m1();
+  private strictfp synchronized final String m2(String... strVarArgs) {
+    return null;
+  }
+
+}
+
+interface I1 {
+  default void m3(){}
+}
+
+interface I2 {
+
+}
+
+enum MyEnum {
+  ONE,
+  TWO,
+  THREE
+}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot.json
deleted file mode 100644
index f15769e4a1c..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke","lineNumber":62},{"fileName":"DelegatingMethodAccessorImpl.java","function":"sun.reflect.DelegatingMethodAccessorImpl.invoke","lineNumber":43},{"fileName":"Method.java","function":"java.lang.reflect.Method.invoke","lineNumber":498},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.doInvoke","lineNumber":197},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest","lineNumber":141},{"fileName":"ServletInvocableHandlerMethod.java","function":"org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle","lineNumber":106},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod","lineNumber":894},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal","lineNumber":808},{"fileName":"AbstractHandlerMethodAdapter.java","function":"org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle","lineNumber":87},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doDispatch","lineNumber":1060},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doService","lineNumber":962},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.processRequest","lineNumber":1006},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.doGet","lineNumber":898},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":626},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.service","lineNumber":883},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":733},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":227},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WsFilter.java","function":"org.apache.tomcat.websocket.server.WsFilter.doFilter","lineNumber":53},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ResourceUrlEncodingFilter.java","function":"org.springframework.web.servlet.resource.ResourceUrlEncodingFilter.doFilter","lineNumber":67},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"RequestContextFilter.java","function":"org.springframework.web.filter.RequestContextFilter.doFilterInternal","lineNumber":100},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"FormContentFilter.java","function":"org.springframework.web.filter.FormContentFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"HandlerMappingResourceNameFilter.java","function":"datadog.trace.instrumentation.springweb.HandlerMappingResourceNameFilter.doFilterInternal","lineNumber":50},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WebMvcMetricsFilter.java","function":"org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"CharacterEncodingFilter.java","function":"org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal","lineNumber":201},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ServletRequestPathFilter.java","function":"org.springframework.web.filter.ServletRequestPathFilter.doFilter","lineNumber":55},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate","lineNumber":358},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.doFilter","lineNumber":271},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"StandardWrapperValve.java","function":"org.apache.catalina.core.StandardWrapperValve.invoke","lineNumber":202},{"fileName":"StandardContextValve.java","function":"org.apache.catalina.core.StandardContextValve.invoke","lineNumber":97},{"fileName":"AuthenticatorBase.java","function":"org.apache.catalina.authenticator.AuthenticatorBase.invoke","lineNumber":542},{"fileName":"StandardHostValve.java","function":"org.apache.catalina.core.StandardHostValve.invoke","lineNumber":143},{"fileName":"ErrorReportValve.java","function":"org.apache.catalina.valves.ErrorReportValve.invoke","lineNumber":92},{"fileName":"StandardEngineValve.java","function":"org.apache.catalina.core.StandardEngineValve.invoke","lineNumber":78},{"fileName":"CoyoteAdapter.java","function":"org.apache.catalina.connector.CoyoteAdapter.service","lineNumber":357},{"fileName":"Http11Processor.java","function":"org.apache.coyote.http11.Http11Processor.service","lineNumber":374},{"fileName":"AbstractProcessorLight.java","function":"org.apache.coyote.AbstractProcessorLight.process","lineNumber":65},{"fileName":"AbstractProtocol.java","function":"org.apache.coyote.AbstractProtocol$ConnectionHandler.process","lineNumber":893},{"fileName":"NioEndpoint.java","function":"org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun","lineNumber":1707},{"fileName":"SocketProcessorBase.java","function":"org.apache.tomcat.util.net.SocketProcessorBase.run","lineNumber":49},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor.runWorker","lineNumber":1149},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor$Worker.run","lineNumber":624},{"fileName":"TaskThread.java","function":"org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run","lineNumber":61},{"fileName":"Thread.java","function":"java.lang.Thread.run","lineNumber":750}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","fields":{"e":{"type":"java.util.concurrent.ThreadPoolExecutor","fields":{"termination":{"notCapturedReason":"depth","type":"java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject"},"acc":{"isNull":true,"type":"java.security.AccessControlContext"},"handler":{"notCapturedReason":"depth","type":"java.util.concurrent.ThreadPoolExecutor$AbortPolicy"},"threadFactory":{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$$Lambda$1112/1706225206"},"keepAliveTime":{"type":"long","value":"0"},"largestPoolSize":{"type":"int","value":"1"},"__datadogContext$3":{"type":"java.lang.Boolean","value":"true"},"allowCoreThreadTimeOut":{"type":"boolean","value":"false"},"corePoolSize":{"type":"int","value":"1"},"ctl":{"type":"java.util.concurrent.atomic.AtomicInteger","value":"-536870911"},"completedTaskCount":{"type":"long","value":"0"},"workQueue":{"notCapturedReason":"depth","type":"java.util.concurrent.LinkedBlockingQueue"},"maximumPoolSize":{"type":"int","value":"1"},"workers":{"notCapturedReason":"depth","type":"java.util.HashSet"},"mainLock":{"notCapturedReason":"depth","type":"java.util.concurrent.locks.ReentrantLock"}}}}},"logger":{"type":"ch.qos.logback.classic.Logger","fields":{"parent":{"type":"ch.qos.logback.classic.Logger","fields":{"parent":{"notCapturedReason":"depth","type":"ch.qos.logback.classic.Logger"},"level":{"isNull":true,"type":"ch.qos.logback.classic.Level"},"name":{"type":"java.lang.String","value":"org.springframework.samples.petclinic.vet"},"aai":{"isNull":true,"type":"ch.qos.logback.core.spi.AppenderAttachableImpl"},"childrenList":{"notCapturedReason":"depth","type":"java.util.concurrent.CopyOnWriteArrayList"},"loggerContext":{"notCapturedReason":"depth","type":"ch.qos.logback.classic.LoggerContext"},"effectiveLevelInt":{"type":"int","value":"20000"},"additive":{"type":"boolean","value":"true"}}},"level":{"isNull":true,"type":"ch.qos.logback.classic.Level"},"name":{"type":"java.lang.String","value":"org.springframework.samples.petclinic.vet.VetController"},"aai":{"isNull":true,"type":"ch.qos.logback.core.spi.AppenderAttachableImpl"},"childrenList":{"isNull":true,"type":"java.util.List"},"loggerContext":{"notCapturedReason":"fieldCount","type":"ch.qos.logback.classic.LoggerContext","fields":{"loggerCache":{"notCapturedReason":"depth","type":"java.util.concurrent.ConcurrentHashMap"},"frameworkPackages":{"notCapturedReason":"depth","type":"java.util.ArrayList"},"resetCount":{"type":"int","value":"2"},"noAppenderWarning":{"type":"int","value":"0"},"configurationLock":{"notCapturedReason":"depth","type":"ch.qos.logback.core.spi.LogbackLock"},"birthTime":{"type":"long","value":"1686734324162"},"objectMap":{"notCapturedReason":"depth","type":"java.util.HashMap"},"propertyMap":{"notCapturedReason":"depth","type":"java.util.HashMap"},"lifeCycleManager":{"notCapturedReason":"depth","type":"ch.qos.logback.core.LifeCycleManager"},"loggerContextListenerList":{"notCapturedReason":"depth","type":"java.util.ArrayList"},"size":{"type":"int","value":"995"},"maxCallerDataDepth":{"type":"int","value":"8"},"packagingDataEnabled":{"type":"boolean","value":"true"},"root":{"notCapturedReason":"depth","type":"ch.qos.logback.classic.Logger"},"name":{"type":"java.lang.String","value":"default"},"sm":{"notCapturedReason":"depth","type":"ch.qos.logback.core.BasicStatusManager"},"scheduledExecutorService":{"isNull":true,"type":"java.util.concurrent.ScheduledExecutorService"},"loggerContextRemoteView":{"notCapturedReason":"depth","type":"ch.qos.logback.classic.spi.LoggerContextVO"},"turboFilterList":{"notCapturedReason":"depth","type":"ch.qos.logback.classic.spi.TurboFilterList"},"scheduledFutures":{"notCapturedReason":"depth","type":"java.util.ArrayList"}}},"effectiveLevelInt":{"type":"int","value":"20000"},"additive":{"type":"boolean","value":"true"}}},"vets":{"notCapturedReason":"fieldCount","type":"com.sun.proxy.$Proxy165","fields":{"m0":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"8"},"modifiers":{"type":"int","value":"257"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"hashCode"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"class java.lang.Object"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"int"}}},"m1":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"6"},"modifiers":{"type":"int","value":"1"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"equals"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"class java.lang.Object"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"boolean"}}},"m2":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"7"},"modifiers":{"type":"int","value":"1"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"toString"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"class java.lang.Object"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"class java.lang.String"}}},"m3":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"notCapturedReason":"depth","type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"notCapturedReason":"depth","type":"java.util.LinkedHashMap"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"type":"java.lang.String","value":"()Ljava/util/Collection<Lorg/springframework/samples/petclinic/vet/Vet;>;"},"annotations":{"notCapturedReason":"depth","type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"0"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"findAll"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.samples.petclinic.vet.VetRepository"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"interface java.util.Collection"}}},"m4":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"0"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"indexOf"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"int"}}},"m7":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"3"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"getTargetSource"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"interface org.springframework.aop.TargetSource"}}},"m8":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"type":"java.lang.String","value":"()[Ljava/lang/Class<*>;"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"5"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"getProxiedInterfaces"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"class [Ljava.lang.Class;"}}},"m9":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"type":"java.lang.String","value":"(Ljava/lang/Class<*>;)Z"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"6"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"isInterfaceProxied"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"boolean"}}},"m21":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"18"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"removeAdvisor"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m10":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"7"},"modifiers":{"type":"int","value":"1"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"getAdvisorCount"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"int"}}},"m24":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"21"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"addAdvice"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m13":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"10"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"setTargetSource"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m12":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"9"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"isProxyTargetClass"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"boolean"}}},"m23":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"20"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"addAdvice"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m15":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"12"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"isExposeProxy"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"boolean"}}},"m25":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"22"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"removeAdvice"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"boolean"}}},"m14":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"11"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"setExposeProxy"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m27":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"type":"java.lang.String","value":"()Ljava/lang/Class<*>;"},"annotations":{"notCapturedReason":"depth","type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"0"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"notCapturedReason":"depth","type":"sun.reflect.DelegatingMethodAccessorImpl"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"getTargetClass"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.TargetClassAware"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"class java.lang.Class"}}},"m19":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"16"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"isNull":true,"type":"sun.reflect.MethodAccessor"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"addAdvisor"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}},"m18":{"type":"java.lang.reflect.Method","fields":{"genericInfo":{"isNull":true,"type":"sun.reflect.generics.repository.MethodRepository"},"hasRealParameterData":{"type":"boolean","value":"false"},"declaredAnnotations":{"isNull":true,"type":"java.util.Map"},"parameterTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"signature":{"isNull":true,"type":"java.lang.String"},"annotations":{"isNull":true,"type":"byte[]"},"securityCheckCache":{"isNull":true,"type":"java.lang.Object"},"slot":{"type":"int","value":"15"},"modifiers":{"type":"int","value":"1025"},"methodAccessor":{"notCapturedReason":"depth","type":"sun.reflect.DelegatingMethodAccessorImpl"},"exceptionTypes":{"notCapturedReason":"depth","type":"java.lang.Class[]"},"annotationDefault":{"isNull":true,"type":"byte[]"},"root":{"notCapturedReason":"depth","type":"java.lang.reflect.Method"},"name":{"type":"java.lang.String","value":"addAdvisor"},"parameterAnnotations":{"isNull":true,"type":"byte[]"},"override":{"type":"boolean","value":"false"},"clazz":{"type":"java.lang.Class","value":"interface org.springframework.aop.framework.Advised"},"parameters":{"isNull":true,"type":"java.lang.reflect.Parameter[]"},"returnType":{"type":"java.lang.Class","value":"void"}}}}},"garbage":{"size":"10","elements":[{"size":"7515","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"4412","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"3665","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"635","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6794","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"7280","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6563","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"85","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"type":"java.lang.Object[]"},{"size":"4819","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"2521","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"}],"type":"java.util.ArrayList"},"counter":{"type":"int","value":"0"},"timeout":{"type":"java.time.Duration","value":"PT30S"},"syntheticLiveSet":{"type":"java.util.concurrent.atomic.AtomicReference","fields":{"value":{"isNull":true,"type":"java.lang.Object"}}}}},"model":{"entries":[[{"type":"java.lang.String","value":"vets"},{"type":"org.springframework.samples.petclinic.vet.Vets","fields":{"vets":{"size":"12000","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.Vet"}],"notCapturedReason":"collectionSize","type":"java.util.ArrayList"}}}]],"size":"1","type":"org.springframework.validation.support.BindingAwareModelMap"},"uuid":{"isNull":true,"type":"java.lang.String"}},"locals":{"@return":{"type":"java.lang.String","value":"vets/vetList"}}}},"language":"java","id":"75332018-9ffa-41f2-9aa1-5a3804fabe9c","probe":{"location":{"method":"showVetList","type":"org.springframework.samples.petclinic.vet.VetController"},"id":"2147bca7-2880-4ce5-a856-6b5f161b5f79","version":4},"timestamp":1686734349534}},"logger":{"thread_id":376,"method":"showVetList","thread_name":"http-nio-8080-exec-1","name":"org.springframework.samples.petclinic.vet.VetController","version":2},"timestamp":1686734349534}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_0.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_0.json
deleted file mode 100644
index 46b82a86e8f..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke","lineNumber":62},{"fileName":"DelegatingMethodAccessorImpl.java","function":"sun.reflect.DelegatingMethodAccessorImpl.invoke","lineNumber":43},{"fileName":"Method.java","function":"java.lang.reflect.Method.invoke","lineNumber":498},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.doInvoke","lineNumber":197},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest","lineNumber":141},{"fileName":"ServletInvocableHandlerMethod.java","function":"org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle","lineNumber":106},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod","lineNumber":894},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal","lineNumber":808},{"fileName":"AbstractHandlerMethodAdapter.java","function":"org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle","lineNumber":87},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doDispatch","lineNumber":1060},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doService","lineNumber":962},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.processRequest","lineNumber":1006},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.doGet","lineNumber":898},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":626},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.service","lineNumber":883},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":733},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":227},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WsFilter.java","function":"org.apache.tomcat.websocket.server.WsFilter.doFilter","lineNumber":53},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ResourceUrlEncodingFilter.java","function":"org.springframework.web.servlet.resource.ResourceUrlEncodingFilter.doFilter","lineNumber":67},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"RequestContextFilter.java","function":"org.springframework.web.filter.RequestContextFilter.doFilterInternal","lineNumber":100},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"FormContentFilter.java","function":"org.springframework.web.filter.FormContentFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"HandlerMappingResourceNameFilter.java","function":"datadog.trace.instrumentation.springweb.HandlerMappingResourceNameFilter.doFilterInternal","lineNumber":50},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WebMvcMetricsFilter.java","function":"org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"CharacterEncodingFilter.java","function":"org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal","lineNumber":201},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ServletRequestPathFilter.java","function":"org.springframework.web.filter.ServletRequestPathFilter.doFilter","lineNumber":55},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate","lineNumber":358},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.doFilter","lineNumber":271},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"StandardWrapperValve.java","function":"org.apache.catalina.core.StandardWrapperValve.invoke","lineNumber":202},{"fileName":"StandardContextValve.java","function":"org.apache.catalina.core.StandardContextValve.invoke","lineNumber":97},{"fileName":"AuthenticatorBase.java","function":"org.apache.catalina.authenticator.AuthenticatorBase.invoke","lineNumber":542},{"fileName":"StandardHostValve.java","function":"org.apache.catalina.core.StandardHostValve.invoke","lineNumber":143},{"fileName":"ErrorReportValve.java","function":"org.apache.catalina.valves.ErrorReportValve.invoke","lineNumber":92},{"fileName":"StandardEngineValve.java","function":"org.apache.catalina.core.StandardEngineValve.invoke","lineNumber":78},{"fileName":"CoyoteAdapter.java","function":"org.apache.catalina.connector.CoyoteAdapter.service","lineNumber":357},{"fileName":"Http11Processor.java","function":"org.apache.coyote.http11.Http11Processor.service","lineNumber":374},{"fileName":"AbstractProcessorLight.java","function":"org.apache.coyote.AbstractProcessorLight.process","lineNumber":65},{"fileName":"AbstractProtocol.java","function":"org.apache.coyote.AbstractProtocol$ConnectionHandler.process","lineNumber":893},{"fileName":"NioEndpoint.java","function":"org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun","lineNumber":1707},{"fileName":"SocketProcessorBase.java","function":"org.apache.tomcat.util.net.SocketProcessorBase.run","lineNumber":49},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor.runWorker","lineNumber":1149},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor$Worker.run","lineNumber":624},{"fileName":"TaskThread.java","function":"org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run","lineNumber":61},{"fileName":"Thread.java","function":"java.lang.Thread.run","lineNumber":750}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","notCapturedReason":"depth"},"model":{"entries":[[{"type":"java.lang.String","value":"vets"},{"type":"org.springframework.samples.petclinic.vet.Vets","notCapturedReason":"depth"}]],"size":"1","type":"org.springframework.validation.support.BindingAwareModelMap"},"uuid":{"isNull":true,"type":"java.lang.String"}},"locals":{"@return":{"type":"java.lang.String","value":"vets/vetList"}}}},"language":"java","id":"75332018-9ffa-41f2-9aa1-5a3804fabe9c","probe":{"location":{"method":"showVetList","type":"org.springframework.samples.petclinic.vet.VetController"},"id":"2147bca7-2880-4ce5-a856-6b5f161b5f79","version":4},"timestamp":1686734349534}},"logger":{"thread_id":376,"method":"showVetList","thread_name":"http-nio-8080-exec-1","name":"org.springframework.samples.petclinic.vet.VetController","version":2},"timestamp":1686734349534}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_1.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_1.json
deleted file mode 100644
index fb652cd0dc6..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke","lineNumber":62},{"fileName":"DelegatingMethodAccessorImpl.java","function":"sun.reflect.DelegatingMethodAccessorImpl.invoke","lineNumber":43},{"fileName":"Method.java","function":"java.lang.reflect.Method.invoke","lineNumber":498},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.doInvoke","lineNumber":197},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest","lineNumber":141},{"fileName":"ServletInvocableHandlerMethod.java","function":"org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle","lineNumber":106},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod","lineNumber":894},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal","lineNumber":808},{"fileName":"AbstractHandlerMethodAdapter.java","function":"org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle","lineNumber":87},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doDispatch","lineNumber":1060},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doService","lineNumber":962},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.processRequest","lineNumber":1006},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.doGet","lineNumber":898},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":626},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.service","lineNumber":883},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":733},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":227},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WsFilter.java","function":"org.apache.tomcat.websocket.server.WsFilter.doFilter","lineNumber":53},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ResourceUrlEncodingFilter.java","function":"org.springframework.web.servlet.resource.ResourceUrlEncodingFilter.doFilter","lineNumber":67},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"RequestContextFilter.java","function":"org.springframework.web.filter.RequestContextFilter.doFilterInternal","lineNumber":100},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"FormContentFilter.java","function":"org.springframework.web.filter.FormContentFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"HandlerMappingResourceNameFilter.java","function":"datadog.trace.instrumentation.springweb.HandlerMappingResourceNameFilter.doFilterInternal","lineNumber":50},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WebMvcMetricsFilter.java","function":"org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"CharacterEncodingFilter.java","function":"org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal","lineNumber":201},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ServletRequestPathFilter.java","function":"org.springframework.web.filter.ServletRequestPathFilter.doFilter","lineNumber":55},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate","lineNumber":358},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.doFilter","lineNumber":271},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"StandardWrapperValve.java","function":"org.apache.catalina.core.StandardWrapperValve.invoke","lineNumber":202},{"fileName":"StandardContextValve.java","function":"org.apache.catalina.core.StandardContextValve.invoke","lineNumber":97},{"fileName":"AuthenticatorBase.java","function":"org.apache.catalina.authenticator.AuthenticatorBase.invoke","lineNumber":542},{"fileName":"StandardHostValve.java","function":"org.apache.catalina.core.StandardHostValve.invoke","lineNumber":143},{"fileName":"ErrorReportValve.java","function":"org.apache.catalina.valves.ErrorReportValve.invoke","lineNumber":92},{"fileName":"StandardEngineValve.java","function":"org.apache.catalina.core.StandardEngineValve.invoke","lineNumber":78},{"fileName":"CoyoteAdapter.java","function":"org.apache.catalina.connector.CoyoteAdapter.service","lineNumber":357},{"fileName":"Http11Processor.java","function":"org.apache.coyote.http11.Http11Processor.service","lineNumber":374},{"fileName":"AbstractProcessorLight.java","function":"org.apache.coyote.AbstractProcessorLight.process","lineNumber":65},{"fileName":"AbstractProtocol.java","function":"org.apache.coyote.AbstractProtocol$ConnectionHandler.process","lineNumber":893},{"fileName":"NioEndpoint.java","function":"org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun","lineNumber":1707},{"fileName":"SocketProcessorBase.java","function":"org.apache.tomcat.util.net.SocketProcessorBase.run","lineNumber":49},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor.runWorker","lineNumber":1149},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor$Worker.run","lineNumber":624},{"fileName":"TaskThread.java","function":"org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run","lineNumber":61},{"fileName":"Thread.java","function":"java.lang.Thread.run","lineNumber":750}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","notCapturedReason":"depth"},"logger":{"type":"ch.qos.logback.classic.Logger","notCapturedReason":"depth"},"vets":{"notCapturedReason":"fieldCount","type":"com.sun.proxy.$Proxy165","notCapturedReason":"depth"},"garbage":{"size":"10","elements":[{"size":"7515","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"4412","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"3665","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"635","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6794","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"7280","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6563","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"85","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"type":"java.lang.Object[]"},{"size":"4819","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"2521","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"}],"type":"java.util.ArrayList"},"counter":{"type":"int","value":"0"},"timeout":{"type":"java.time.Duration","value":"PT30S"},"syntheticLiveSet":{"type":"java.util.concurrent.atomic.AtomicReference","notCapturedReason":"depth"}}},"model":{"entries":[[{"type":"java.lang.String","value":"vets"},{"type":"org.springframework.samples.petclinic.vet.Vets","notCapturedReason":"depth"}]],"size":"1","type":"org.springframework.validation.support.BindingAwareModelMap"},"uuid":{"isNull":true,"type":"java.lang.String"}},"locals":{"@return":{"type":"java.lang.String","value":"vets/vetList"}}}},"language":"java","id":"75332018-9ffa-41f2-9aa1-5a3804fabe9c","probe":{"location":{"method":"showVetList","type":"org.springframework.samples.petclinic.vet.VetController"},"id":"2147bca7-2880-4ce5-a856-6b5f161b5f79","version":4},"timestamp":1686734349534}},"logger":{"thread_id":376,"method":"showVetList","thread_name":"http-nio-8080-exec-1","name":"org.springframework.samples.petclinic.vet.VetController","version":2},"timestamp":1686734349534}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_2.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_2.json
deleted file mode 100644
index f18a6613a91..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/largeSnapshot_2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke","lineNumber":62},{"fileName":"DelegatingMethodAccessorImpl.java","function":"sun.reflect.DelegatingMethodAccessorImpl.invoke","lineNumber":43},{"fileName":"Method.java","function":"java.lang.reflect.Method.invoke","lineNumber":498},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.doInvoke","lineNumber":197},{"fileName":"InvocableHandlerMethod.java","function":"org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest","lineNumber":141},{"fileName":"ServletInvocableHandlerMethod.java","function":"org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle","lineNumber":106},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod","lineNumber":894},{"fileName":"RequestMappingHandlerAdapter.java","function":"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal","lineNumber":808},{"fileName":"AbstractHandlerMethodAdapter.java","function":"org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle","lineNumber":87},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doDispatch","lineNumber":1060},{"fileName":"DispatcherServlet.java","function":"org.springframework.web.servlet.DispatcherServlet.doService","lineNumber":962},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.processRequest","lineNumber":1006},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.doGet","lineNumber":898},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":626},{"fileName":"FrameworkServlet.java","function":"org.springframework.web.servlet.FrameworkServlet.service","lineNumber":883},{"fileName":"HttpServlet.java","function":"javax.servlet.http.HttpServlet.service","lineNumber":733},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":227},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WsFilter.java","function":"org.apache.tomcat.websocket.server.WsFilter.doFilter","lineNumber":53},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ResourceUrlEncodingFilter.java","function":"org.springframework.web.servlet.resource.ResourceUrlEncodingFilter.doFilter","lineNumber":67},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"RequestContextFilter.java","function":"org.springframework.web.filter.RequestContextFilter.doFilterInternal","lineNumber":100},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"FormContentFilter.java","function":"org.springframework.web.filter.FormContentFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"HandlerMappingResourceNameFilter.java","function":"datadog.trace.instrumentation.springweb.HandlerMappingResourceNameFilter.doFilterInternal","lineNumber":50},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"WebMvcMetricsFilter.java","function":"org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal","lineNumber":93},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"CharacterEncodingFilter.java","function":"org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal","lineNumber":201},{"fileName":"OncePerRequestFilter.java","function":"org.springframework.web.filter.OncePerRequestFilter.doFilter","lineNumber":119},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"ServletRequestPathFilter.java","function":"org.springframework.web.filter.ServletRequestPathFilter.doFilter","lineNumber":55},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate","lineNumber":358},{"fileName":"DelegatingFilterProxy.java","function":"org.springframework.web.filter.DelegatingFilterProxy.doFilter","lineNumber":271},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.internalDoFilter","lineNumber":189},{"fileName":"ApplicationFilterChain.java","function":"org.apache.catalina.core.ApplicationFilterChain.doFilter","lineNumber":162},{"fileName":"StandardWrapperValve.java","function":"org.apache.catalina.core.StandardWrapperValve.invoke","lineNumber":202},{"fileName":"StandardContextValve.java","function":"org.apache.catalina.core.StandardContextValve.invoke","lineNumber":97},{"fileName":"AuthenticatorBase.java","function":"org.apache.catalina.authenticator.AuthenticatorBase.invoke","lineNumber":542},{"fileName":"StandardHostValve.java","function":"org.apache.catalina.core.StandardHostValve.invoke","lineNumber":143},{"fileName":"ErrorReportValve.java","function":"org.apache.catalina.valves.ErrorReportValve.invoke","lineNumber":92},{"fileName":"StandardEngineValve.java","function":"org.apache.catalina.core.StandardEngineValve.invoke","lineNumber":78},{"fileName":"CoyoteAdapter.java","function":"org.apache.catalina.connector.CoyoteAdapter.service","lineNumber":357},{"fileName":"Http11Processor.java","function":"org.apache.coyote.http11.Http11Processor.service","lineNumber":374},{"fileName":"AbstractProcessorLight.java","function":"org.apache.coyote.AbstractProcessorLight.process","lineNumber":65},{"fileName":"AbstractProtocol.java","function":"org.apache.coyote.AbstractProtocol$ConnectionHandler.process","lineNumber":893},{"fileName":"NioEndpoint.java","function":"org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun","lineNumber":1707},{"fileName":"SocketProcessorBase.java","function":"org.apache.tomcat.util.net.SocketProcessorBase.run","lineNumber":49},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor.runWorker","lineNumber":1149},{"fileName":"ThreadPoolExecutor.java","function":"java.util.concurrent.ThreadPoolExecutor$Worker.run","lineNumber":624},{"fileName":"TaskThread.java","function":"org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run","lineNumber":61},{"fileName":"Thread.java","function":"java.lang.Thread.run","lineNumber":750}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","fields":{"e":{"type":"java.util.concurrent.ThreadPoolExecutor","notCapturedReason":"depth"}}},"logger":{"type":"ch.qos.logback.classic.Logger","fields":{"parent":{"type":"ch.qos.logback.classic.Logger","notCapturedReason":"depth"},"level":{"isNull":true,"type":"ch.qos.logback.classic.Level"},"name":{"type":"java.lang.String","value":"org.springframework.samples.petclinic.vet.VetController"},"aai":{"isNull":true,"type":"ch.qos.logback.core.spi.AppenderAttachableImpl"},"childrenList":{"isNull":true,"type":"java.util.List"},"loggerContext":{"notCapturedReason":"fieldCount","type":"ch.qos.logback.classic.LoggerContext","notCapturedReason":"depth"},"effectiveLevelInt":{"type":"int","value":"20000"},"additive":{"type":"boolean","value":"true"}}},"vets":{"notCapturedReason":"fieldCount","type":"com.sun.proxy.$Proxy165","fields":{"m0":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m1":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m2":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m3":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m4":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m7":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m8":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m9":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m21":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m10":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m24":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m13":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m12":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m23":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m15":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m25":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m14":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m27":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m19":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"},"m18":{"type":"java.lang.reflect.Method","notCapturedReason":"depth"}}},"garbage":{"size":"10","elements":[{"size":"7515","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"4412","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"3665","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"635","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6794","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"7280","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"6563","elements":[{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"85","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"type":"java.lang.Object[]"},{"size":"4819","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"},{"size":"2521","elements":[{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"java.lang.Object"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$MiddleObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"},{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$LargeObject"}],"notCapturedReason":"collectionSize","type":"java.lang.Object[]"}],"type":"java.util.ArrayList"},"counter":{"type":"int","value":"0"},"timeout":{"type":"java.time.Duration","value":"PT30S"},"syntheticLiveSet":{"type":"java.util.concurrent.atomic.AtomicReference","notCapturedReason":"depth"}}},"model":{"entries":[[{"type":"java.lang.String","value":"vets"},{"type":"org.springframework.samples.petclinic.vet.Vets","notCapturedReason":"depth"}]],"size":"1","type":"org.springframework.validation.support.BindingAwareModelMap"},"uuid":{"isNull":true,"type":"java.lang.String"}},"locals":{"@return":{"type":"java.lang.String","value":"vets/vetList"}}}},"language":"java","id":"75332018-9ffa-41f2-9aa1-5a3804fabe9c","probe":{"location":{"method":"showVetList","type":"org.springframework.samples.petclinic.vet.VetController"},"id":"2147bca7-2880-4ce5-a856-6b5f161b5f79","version":4},"timestamp":1686734349534}},"logger":{"thread_id":376,"method":"showVetList","thread_name":"http-nio-8080-exec-1","name":"org.springframework.samples.petclinic.vet.VetController","version":2},"timestamp":1686734349534}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot.json
index 560f0b48f7a..4c7303c2131 100644
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot.json
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot.json
@@ -1 +1 @@
-{"level":0,"this":{"fields":{"level":1,"field11":{"fields":{"level":2,"field21":{"fields":{"level":3,"field31":{"fields":{"level":4,"field41":{"fields":{"level":5,"field51":"foo51","field52":"foo52"}},"field42":"foo42"}},"field32":"foo32"}},"field22":"foo22"}},"field12":"foo12"}},"field02":"foo02"}
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","fields":{"e":{"type":"java.util.concurrent.ThreadPoolExecutor","fields":{"termination":{"notCapturedReason":"depth","type":"java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject"},"acc":{"isNull":true,"type":"java.security.AccessControlContext"},"handler":{"notCapturedReason":"depth","type":"java.util.concurrent.ThreadPoolExecutor$AbortPolicy"},"threadFactory":{"notCapturedReason":"depth","type":"org.springframework.samples.petclinic.vet.VetController$$Lambda$1112/1706225206"}}}}}}}}}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_0.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_0.json
deleted file mode 100644
index b14e715d2ed..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"level":0,"this":{"notCapturedReason":"depth"},"field02":"foo02"}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_1.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_1.json
deleted file mode 100644
index 20c31bf7885..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"level":0,"this":{"fields":{"level":1,"field11":{"notCapturedReason":"depth"},"field12":"foo12"}},"field02":"foo02"}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_2.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_2.json
deleted file mode 100644
index 023aca34040..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"level":0,"this":{"fields":{"level":1,"field11":{"fields":{"level":2,"field21":{"notCapturedReason":"depth"},"field22":"foo22"}},"field12":"foo12"}},"field02":"foo02"}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_3.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_3.json
deleted file mode 100644
index 716489fdef1..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_3.json
+++ /dev/null
@@ -1 +0,0 @@
-{"level":0,"this":{"fields":{"level":1,"field11":{"fields":{"level":2,"field21":{"fields":{"level":3,"field31":{"notCapturedReason":"depth"},"field32":"foo32"}},"field22":"foo22"}},"field12":"foo12"}},"field02":"foo02"}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_4.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_4.json
deleted file mode 100644
index f6f29a64bf5..00000000000
--- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_4.json
+++ /dev/null
@@ -1 +0,0 @@
-{"level":0,"this":{"fields":{"level":1,"field11":{"fields":{"level":2,"field21":{"fields":{"level":3,"field31":{"fields":{"level":4,"field41":{"notCapturedReason":"depth"},"field42":"foo42"}},"field32":"foo32"}},"field22":"foo22"}},"field12":"foo12"}},"field02":"foo02"}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned0.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned0.json
new file mode 100644
index 00000000000..f47e198fc02
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned0.json
@@ -0,0 +1 @@
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","fields":{"e":{"type":"java.util.concurrent.ThreadPoolExecutor","fields":{"termination":{"pruned":true},"acc":{"isNull":true,"type":"java.security.AccessControlContext"},"handler":{"notCapturedReason":"depth","type":"java.util.concurrent.ThreadPoolExecutor$AbortPolicy"},"threadFactory":{"pruned":true}}}}}}}}}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned1.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned1.json
new file mode 100644
index 00000000000..d4def329595
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned1.json
@@ -0,0 +1 @@
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"type":"long","value":"1686734349511"},"executor":{"type":"java.util.concurrent.Executors$FinalizableDelegatedExecutorService","fields":{"e":{"pruned":true}}}}}}}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned2.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned2.json
new file mode 100644
index 00000000000..5198d062c7d
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned2.json
@@ -0,0 +1 @@
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"result":{"type":"int","value":"0"},"garbageStart":{"pruned":true},"executor":{"pruned":true}}}}}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned3.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned3.json
new file mode 100644
index 00000000000..d8268f4591f
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned3.json
@@ -0,0 +1 @@
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"arguments":{"this":{"type":"org.springframework.samples.petclinic.vet.VetController","fields":{"pruned":true}}}}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned4.json b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned4.json
new file mode 100644
index 00000000000..495103ba4a6
--- /dev/null
+++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/util/smallSnapshot_pruned4.json
@@ -0,0 +1 @@
+{"id":"AgAAAYi5M6TejOuSNQAAAAAAAAAYAAAAAEFZaTVNNmtLQUFDRkJYcG5fLTNHaUFBQQAAACQAAAAAMDE4OGI5MzMtZTBkNC00MzdhLWEwNmEtZjk3ZGFhOWY5YWQ3","content":{"timestamp":"2023-06-14T09:19:09.534Z","tags":["agent_version:7.45.0","env:","host_name:comp-kv33mv2fv3","source:dd_debugger","debugger_version:1.16.0-snapshot_587bb56c3c","version:","host:comp-kv33mv2fv3","default_env:none","datadog.submission_auth:private_api_key"],"service":"petclinic-benchmark","message":"Executed VetController.showVetList, it took 465ms","attributes":{"duration":465830375,"service":"petclinic-benchmark","debugger":{"snapshot":{"stack":[{"fileName":"VetController.java","function":"org.springframework.samples.petclinic.vet.VetController.showVetList","lineNumber":174},{"fileName":"NativeMethodAccessorImpl.java","function":"sun.reflect.NativeMethodAccessorImpl.invoke0","lineNumber":-2}],"captures":{"return":{"pruned":true}}}}}}}
diff --git a/dd-java-agent/agent-debugger/src/test/resources/debugger-symbol.jar b/dd-java-agent/agent-debugger/src/test/resources/debugger-symbol.jar
new file mode 100644
index 00000000000..2113a1358ad
Binary files /dev/null and b/dd-java-agent/agent-debugger/src/test/resources/debugger-symbol.jar differ
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
index 3a42e0871f4..a6474456aa6 100644
--- a/dd-java-agent/agent-iast/build.gradle
+++ b/dd-java-agent/agent-iast/build.gradle
@@ -1,13 +1,29 @@
+import net.ltgt.gradle.errorprone.CheckSeverity
+
 plugins {
   id 'com.github.johnrengelman.shadow'
   id 'me.champeau.jmh'
   id 'java-test-fixtures'
   id 'com.google.protobuf' version '0.8.18'
+  id 'net.ltgt.errorprone' version '3.1.0'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
+}
+
+tasks.withType(AbstractCompile).configureEach {
+  // ensure no APIs beyond JDK8 are used
+  options.release = 8
+}
+
 // First version with Mac M1 support
 def grpcVersion = '1.42.2'
 protobuf {
@@ -49,6 +65,10 @@ dependencies {
   jmh project(':dd-java-agent:agent-builder')
   jmh project(':dd-java-agent:instrumentation:iast-instrumenter')
   jmh project(':dd-java-agent:instrumentation:java-lang')
+
+  compileOnly('org.jetbrains:annotations:24.0.0')
+  errorprone('com.uber.nullaway:nullaway:0.10.15')
+  errorprone('com.google.errorprone:error_prone_core:2.23.0')
 }
 
 shadowJar {
@@ -80,7 +100,6 @@ ext {
 tasks.withType(Test).configureEach {
   jvmArgs += ['-Ddd.iast.enabled=true']
 }
-def rootDir = project.rootDir
 spotless {
   java {
     target 'src/**/*.java'
@@ -104,3 +123,16 @@ sourceSets {
     }
   }
 }
+
+tasks.withType(JavaCompile).configureEach {
+  if (name == 'compileJava') {
+    options.errorprone {
+      check("NullAway", CheckSeverity.ERROR)
+      option("NullAway:AnnotatedPackages", "com.datadog.iast")
+      disableAllWarnings = true // only errors for now
+    }
+  } else {
+    // disable null away for test and jmh
+    options.errorprone.enabled = false
+  }
+}
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
index babe608c0f3..e4bb2ee9f46 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
@@ -1,6 +1,6 @@
 package com.datadog.iast.propagation;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
index 1d5f61a43bd..8bb5d4adb20 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 
 import com.datadog.iast.IastRequestContext;
@@ -34,8 +35,7 @@ protected StringBuilderBatchBenchmark.Context initializeContext() {
       final String value;
       if (current < limit) {
         value =
-            tainted(
-                context, UUID.randomUUID().toString(), new Range(3, 6, source(), Range.NOT_MARKED));
+            tainted(context, UUID.randomUUID().toString(), new Range(3, 6, source(), NOT_MARKED));
       } else {
         value = notTainted(UUID.randomUUID().toString());
       }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
index a3c832355dc..ec11b927ff2 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
 import datadog.trace.instrumentation.java.lang.StringBuilderCallSite;
@@ -14,7 +16,7 @@ protected Context initializeContext() {
     final IastRequestContext context = new IastRequestContext();
     final String notTainted = notTainted("I am not a tainted string");
     final String tainted =
-        tainted(context, "I am a tainted string", new Range(3, 6, source(), Range.NOT_MARKED));
+        tainted(context, "I am a tainted string", new Range(3, 6, source(), NOT_MARKED));
     return new Context(context, notTainted, tainted);
   }
 
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
index 707e9b04611..1a8468610a4 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
 import datadog.trace.instrumentation.java.lang.StringBuilderCallSite;
@@ -18,7 +20,7 @@ protected Context initializeContext() {
         tainted(
             context,
             new StringBuilder("I am a tainted string builder"),
-            new Range(5, 7, source(), Range.NOT_MARKED));
+            new Range(5, 7, source(), NOT_MARKED));
     return new Context(context, notTaintedBuilder, taintedBuilder);
   }
 
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
index 4dded1b999e..0858263ff00 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
 import datadog.trace.instrumentation.java.lang.StringCallSite;
@@ -13,7 +15,7 @@ protected StringConcatBenchmark.Context initializeContext() {
     final IastRequestContext context = new IastRequestContext();
     final String notTainted = notTainted("I am not a tainted string");
     final String tainted =
-        tainted(context, "I am a tainted string", new Range(3, 5, source(), Range.NOT_MARKED));
+        tainted(context, "I am a tainted string", new Range(3, 5, source(), NOT_MARKED));
     return new StringConcatBenchmark.Context(context, notTainted, tainted);
   }
 
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
index 42e1741f361..59f0353ec51 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 
 import com.datadog.iast.IastRequestContext;
@@ -54,7 +55,7 @@ protected StringConcatFactoryBatchBenchmark.Context initializeContext() {
       double current = i / (double) stringCount;
       final String value;
       if (current < limit) {
-        value = tainted(context, "Yep, tainted", new Range(3, 5, source(), Range.NOT_MARKED));
+        value = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
       } else {
         value = notTainted("Nop, tainted");
       }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
index 6f99576fa56..9008bea3ad4 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.propagation;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
 import datadog.trace.api.iast.InstrumentationBridge;
@@ -13,8 +15,7 @@ public class StringConcatFactoryBenchmark
   protected StringConcatFactoryBenchmark.Context initializeContext() {
     final IastRequestContext context = new IastRequestContext();
     final String notTainted = notTainted("Nop, tainted");
-    final String tainted =
-        tainted(context, "Yep, tainted", new Range(3, 5, source(), Range.NOT_MARKED));
+    final String tainted = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
     return new StringConcatFactoryBenchmark.Context(context, notTainted, tainted);
   }
 
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
index 5b7b4d87a69..3f8bb4b6cfd 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
@@ -1,6 +1,6 @@
 package com.datadog.iast.propagation;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
index 78e8f030be8..c8ba76a2add 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
@@ -1,6 +1,6 @@
 package com.datadog.iast.propagation;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java
new file mode 100644
index 00000000000..e4df7602205
--- /dev/null
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java
@@ -0,0 +1,41 @@
+package com.datadog.iast;
+
+import com.datadog.iast.overhead.OverheadController;
+import datadog.trace.api.Config;
+import datadog.trace.util.stacktrace.StackWalker;
+import javax.annotation.Nonnull;
+
+public class Dependencies {
+
+  private final Config config;
+  private final Reporter reporter;
+  private final OverheadController overheadController;
+  private final StackWalker stackWalker;
+
+  public Dependencies(
+      @Nonnull final Config config,
+      @Nonnull final Reporter reporter,
+      @Nonnull final OverheadController overheadController,
+      @Nonnull final StackWalker stackWalker) {
+    this.config = config;
+    this.reporter = reporter;
+    this.overheadController = overheadController;
+    this.stackWalker = stackWalker;
+  }
+
+  public Config getConfig() {
+    return config;
+  }
+
+  public Reporter getReporter() {
+    return reporter;
+  }
+
+  public OverheadController getOverheadController() {
+    return overheadController;
+  }
+
+  public StackWalker getStackWalker() {
+    return stackWalker;
+  }
+}
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
index 7091ffc23af..21df4f14862 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
@@ -2,10 +2,12 @@
 
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
-import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
+import datadog.trace.api.iast.telemetry.IastMetric;
+import datadog.trace.api.iast.telemetry.IastMetricCollector;
 import java.util.function.BiFunction;
 import javax.annotation.Nonnull;
 
@@ -29,9 +31,13 @@ public class GrpcRequestMessageHandler implements BiFunction<RequestContext, Obj
   public Flow<Void> apply(final RequestContext ctx, final Object o) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null && o != null) {
-      final IastRequestContext iastCtx = ctx.getData(RequestContextSlot.IAST);
-      module.taintDeeply(
-          iastCtx, SourceTypes.GRPC_BODY, o, GrpcRequestMessageHandler::isProtobufArtifact);
+      final IastContext iastCtx = IastContext.Provider.get(ctx);
+      final byte source = SourceTypes.GRPC_BODY;
+      final int tainted =
+          module.taintDeeply(iastCtx, o, source, GrpcRequestMessageHandler::isProtobufArtifact);
+      if (tainted > 0) {
+        IastMetricCollector.add(IastMetric.EXECUTED_SOURCE, source, tainted, iastCtx);
+      }
     }
     return Flow.ResultFlow.empty();
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HasDependencies.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HasDependencies.java
deleted file mode 100644
index 9e1d7cf758f..00000000000
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HasDependencies.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.datadog.iast;
-
-import com.datadog.iast.overhead.OverheadController;
-import datadog.trace.api.Config;
-import datadog.trace.util.stacktrace.StackWalker;
-import javax.annotation.Nonnull;
-
-public interface HasDependencies {
-
-  void registerDependencies(@Nonnull Dependencies dependencies);
-
-  class Dependencies {
-    private final Config config;
-    private final Reporter reporter;
-    private final OverheadController overheadController;
-    private final StackWalker stackWalker;
-
-    public Dependencies(
-        @Nonnull final Config config,
-        @Nonnull final Reporter reporter,
-        @Nonnull final OverheadController overheadController,
-        @Nonnull final StackWalker stackWalker) {
-      this.config = config;
-      this.reporter = reporter;
-      this.overheadController = overheadController;
-      this.stackWalker = stackWalker;
-    }
-
-    public Config getConfig() {
-      return config;
-    }
-
-    public Reporter getReporter() {
-      return reporter;
-    }
-
-    public OverheadController getOverheadController() {
-      return overheadController;
-    }
-
-    public StackWalker getStackWalker() {
-      return stackWalker;
-    }
-  }
-}
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
index a5472fb3b00..15817bde263 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
@@ -4,25 +4,25 @@
 import com.datadog.iast.overhead.OverheadContext;
 import com.datadog.iast.taint.TaintedObjects;
 import datadog.trace.api.gateway.RequestContext;
-import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.telemetry.IastMetricCollector;
 import datadog.trace.api.iast.telemetry.IastMetricCollector.HasMetricCollector;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class IastRequestContext implements HasMetricCollector {
+public class IastRequestContext implements IastContext, HasMetricCollector {
 
   private final VulnerabilityBatch vulnerabilityBatch;
   private final AtomicBoolean spanDataIsSet;
   private final TaintedObjects taintedObjects;
   private final OverheadContext overheadContext;
-  private final IastMetricCollector collector;
-  private volatile String strictTransportSecurity;
-  private volatile String xContentTypeOptions;
-  private volatile String xForwardedProto;
-  private volatile String contentType;
+  @Nullable private final IastMetricCollector collector;
+  @Nullable private volatile String strictTransportSecurity;
+  @Nullable private volatile String xContentTypeOptions;
+  @Nullable private volatile String xForwardedProto;
+  @Nullable private volatile String contentType;
 
   public IastRequestContext() {
     this(TaintedObjects.acquire(), null);
@@ -33,7 +33,7 @@ public IastRequestContext(final TaintedObjects taintedObjects) {
   }
 
   public IastRequestContext(
-      final TaintedObjects taintedObjects, final IastMetricCollector collector) {
+      final TaintedObjects taintedObjects, @Nullable final IastMetricCollector collector) {
     this.vulnerabilityBatch = new VulnerabilityBatch();
     this.spanDataIsSet = new AtomicBoolean(false);
     this.overheadContext = new OverheadContext();
@@ -45,6 +45,7 @@ public VulnerabilityBatch getVulnerabilityBatch() {
     return vulnerabilityBatch;
   }
 
+  @Nullable
   public String getStrictTransportSecurity() {
     return strictTransportSecurity;
   }
@@ -53,6 +54,7 @@ public void setStrictTransportSecurity(final String strictTransportSecurity) {
     this.strictTransportSecurity = strictTransportSecurity;
   }
 
+  @Nullable
   public String getxContentTypeOptions() {
     return xContentTypeOptions;
   }
@@ -61,6 +63,7 @@ public void setxContentTypeOptions(final String xContentTypeOptions) {
     this.xContentTypeOptions = xContentTypeOptions;
   }
 
+  @Nullable
   public String getxForwardedProto() {
     return xForwardedProto;
   }
@@ -69,6 +72,7 @@ public void setxForwardedProto(final String xForwardedProto) {
     this.xForwardedProto = xForwardedProto;
   }
 
+  @Nullable
   public String getContentType() {
     return contentType;
   }
@@ -85,6 +89,7 @@ public OverheadContext getOverheadContext() {
     return overheadContext;
   }
 
+  @Nonnull
   public TaintedObjects getTaintedObjects() {
     return taintedObjects;
   }
@@ -97,22 +102,21 @@ public IastMetricCollector getMetricCollector() {
 
   @Nullable
   public static IastRequestContext get() {
-    return get(AgentTracer.activeSpan());
+    return asRequestContext(IastContext.Provider.get());
   }
 
   @Nullable
   public static IastRequestContext get(final AgentSpan span) {
-    if (span == null) {
-      return null;
-    }
-    return get(span.getRequestContext());
+    return asRequestContext(IastContext.Provider.get(span));
   }
 
   @Nullable
   public static IastRequestContext get(final RequestContext reqCtx) {
-    if (reqCtx == null) {
-      return null;
-    }
-    return reqCtx.getData(RequestContextSlot.IAST);
+    return asRequestContext(IastContext.Provider.get(reqCtx));
+  }
+
+  @Nullable
+  private static IastRequestContext asRequestContext(final IastContext ctx) {
+    return ctx instanceof IastRequestContext ? (IastRequestContext) ctx : null;
   }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
index b5c3e7131f4..5da60ff4d30 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
@@ -1,6 +1,5 @@
 package com.datadog.iast;
 
-import com.datadog.iast.HasDependencies.Dependencies;
 import com.datadog.iast.overhead.OverheadController;
 import com.datadog.iast.propagation.FastCodecModule;
 import com.datadog.iast.propagation.PropagationModuleImpl;
@@ -15,6 +14,7 @@
 import com.datadog.iast.sink.PathTraversalModuleImpl;
 import com.datadog.iast.sink.SqlInjectionModuleImpl;
 import com.datadog.iast.sink.SsrfModuleImpl;
+import com.datadog.iast.sink.StacktraceLeakModuleImpl;
 import com.datadog.iast.sink.TrustBoundaryViolationModuleImpl;
 import com.datadog.iast.sink.UnvalidatedRedirectModuleImpl;
 import com.datadog.iast.sink.WeakCipherModuleImpl;
@@ -23,7 +23,6 @@
 import com.datadog.iast.sink.XContentTypeModuleImpl;
 import com.datadog.iast.sink.XPathInjectionModuleImpl;
 import com.datadog.iast.sink.XssModuleImpl;
-import com.datadog.iast.source.WebModuleImpl;
 import com.datadog.iast.telemetry.TelemetryRequestEndedHandler;
 import com.datadog.iast.telemetry.TelemetryRequestStartedHandler;
 import datadog.trace.api.Config;
@@ -41,9 +40,9 @@
 import datadog.trace.util.AgentTaskScheduler;
 import datadog.trace.util.stacktrace.StackWalkerFactory;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +55,8 @@ public static void start(final SubscriptionService ss) {
     start(ss, null);
   }
 
-  public static void start(final SubscriptionService ss, OverheadController overheadController) {
+  public static void start(
+      final SubscriptionService ss, @Nullable OverheadController overheadController) {
     final Config config = Config.get();
     if (config.getIastActivation() != ProductActivation.FULLY_ENABLED) {
       LOGGER.debug("IAST is disabled");
@@ -71,7 +71,7 @@ public static void start(final SubscriptionService ss, OverheadController overhe
     final Dependencies dependencies =
         new Dependencies(config, reporter, overheadController, StackWalkerFactory.INSTANCE);
     final boolean addTelemetry = config.getIastTelemetryVerbosity() != Verbosity.OFF;
-    iastModules().forEach(registerModule(dependencies));
+    iastModules(dependencies).forEach(InstrumentationBridge::registerIastModule);
     registerRequestStartedCallback(ss, addTelemetry, dependencies);
     registerRequestEndedCallback(ss, addTelemetry, dependencies);
     registerHeadersCallback(ss);
@@ -79,39 +79,30 @@ public static void start(final SubscriptionService ss, OverheadController overhe
     LOGGER.debug("IAST started");
   }
 
-  private static Consumer<IastModule> registerModule(final Dependencies dependencies) {
-    return module -> {
-      if (module instanceof HasDependencies) {
-        ((HasDependencies) module).registerDependencies(dependencies);
-      }
-      InstrumentationBridge.registerIastModule(module);
-    };
-  }
-
-  private static Stream<IastModule> iastModules() {
+  private static Stream<IastModule> iastModules(final Dependencies dependencies) {
     return Stream.of(
-        new WebModuleImpl(),
         new StringModuleImpl(),
         new FastCodecModule(),
-        new SqlInjectionModuleImpl(),
-        new PathTraversalModuleImpl(),
-        new CommandInjectionModuleImpl(),
-        new WeakCipherModuleImpl(),
-        new WeakHashModuleImpl(),
-        new LdapInjectionModuleImpl(),
+        new SqlInjectionModuleImpl(dependencies),
+        new PathTraversalModuleImpl(dependencies),
+        new CommandInjectionModuleImpl(dependencies),
+        new WeakCipherModuleImpl(dependencies),
+        new WeakHashModuleImpl(dependencies),
+        new LdapInjectionModuleImpl(dependencies),
         new PropagationModuleImpl(),
-        new HttpResponseHeaderModuleImpl(),
-        new HstsMissingHeaderModuleImpl(),
+        new HttpResponseHeaderModuleImpl(dependencies),
+        new HstsMissingHeaderModuleImpl(dependencies),
         new InsecureCookieModuleImpl(),
         new NoHttpOnlyCookieModuleImpl(),
-        new XContentTypeModuleImpl(),
+        new XContentTypeModuleImpl(dependencies),
         new NoSameSiteCookieModuleImpl(),
-        new SsrfModuleImpl(),
-        new UnvalidatedRedirectModuleImpl(),
-        new WeakRandomnessModuleImpl(),
-        new XPathInjectionModuleImpl(),
-        new TrustBoundaryViolationModuleImpl(),
-        new XssModuleImpl());
+        new SsrfModuleImpl(dependencies),
+        new UnvalidatedRedirectModuleImpl(dependencies),
+        new WeakRandomnessModuleImpl(dependencies),
+        new XPathInjectionModuleImpl(dependencies),
+        new TrustBoundaryViolationModuleImpl(dependencies),
+        new XssModuleImpl(dependencies),
+        new StacktraceLeakModuleImpl(dependencies));
   }
 
   private static void registerRequestStartedCallback(
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
index e51cf258b38..bb4f3436a27 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
@@ -30,7 +30,7 @@ public class Reporter {
     this(Config.get(), null);
   }
 
-  public Reporter(final Config config, final AgentTaskScheduler taskScheduler) {
+  public Reporter(final Config config, @Nullable final AgentTaskScheduler taskScheduler) {
     this(
         config.isIastDeduplicationEnabled()
             ? new HashBasedDeduplication(taskScheduler)
@@ -108,11 +108,11 @@ protected static class HashBasedDeduplication implements Predicate<Vulnerability
 
     private final Set<Long> hashes;
 
-    public HashBasedDeduplication(final AgentTaskScheduler taskScheduler) {
+    public HashBasedDeduplication(@Nullable final AgentTaskScheduler taskScheduler) {
       this(DEFAULT_MAX_SIZE, taskScheduler);
     }
 
-    HashBasedDeduplication(final int size, final AgentTaskScheduler taskScheduler) {
+    HashBasedDeduplication(final int size, @Nullable final AgentTaskScheduler taskScheduler) {
       maxSize = size;
       hashes = ConcurrentHashMap.newKeySet(size);
       if (taskScheduler != null) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
index 25611c79643..fc2c9a18975 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
@@ -3,7 +3,6 @@
 import static com.datadog.iast.IastTag.ANALYZED;
 import static com.datadog.iast.IastTag.SKIPPED;
 
-import com.datadog.iast.HasDependencies.Dependencies;
 import com.datadog.iast.overhead.OverheadController;
 import com.datadog.iast.taint.TaintedObjects;
 import datadog.trace.api.gateway.Flow;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
index 9c680717743..4d5c851f52c 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
@@ -1,6 +1,5 @@
 package com.datadog.iast;
 
-import com.datadog.iast.HasDependencies.Dependencies;
 import com.datadog.iast.overhead.OverheadController;
 import datadog.trace.api.gateway.Flow;
 import java.util.function.Supplier;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
index 65b2f78e374..c4dc17d27e5 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
@@ -17,6 +17,8 @@ public final class Evidence {
   private final transient @Nonnull Context context = new Evidence.Context(4);
 
   /** For deserialization in tests via moshi */
+  @Deprecated
+  @SuppressWarnings({"NullAway", "DataFlowIssue", "unused"})
   private Evidence() {
     this(null, null);
   }
@@ -25,15 +27,17 @@ public Evidence(final String value) {
     this(value, null);
   }
 
-  public Evidence(final String value, final Range[] ranges) {
+  public Evidence(@Nonnull final String value, @Nullable final Range[] ranges) {
     this.value = value;
     this.ranges = ranges;
   }
 
+  @Nonnull
   public String getValue() {
     return value;
   }
 
+  @Nullable
   public Range[] getRanges() {
     return ranges;
   }
@@ -76,6 +80,7 @@ public boolean put(final String key, final Object value) {
       return true;
     }
 
+    @Nullable
     @SuppressWarnings("unchecked")
     public <E> E get(@Nonnull final String key) {
       return (E) context.get(key);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
index 2522699121b..1dbe22b545d 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
@@ -1,25 +1,26 @@
 package com.datadog.iast.model;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import javax.annotation.Nullable;
 
 public final class Location {
 
-  private final String path;
+  @Nullable private final String path;
 
   private final int line;
 
-  private final String method;
+  @Nullable private final String method;
 
-  private Long spanId;
+  @Nullable private Long spanId;
 
-  private transient String serviceName;
+  @Nullable private transient String serviceName;
 
   private Location(
-      final Long spanId,
-      final String path,
+      @Nullable final Long spanId,
+      @Nullable final String path,
       final int line,
-      final String method,
-      final String serviceName) {
+      @Nullable final String method,
+      @Nullable final String serviceName) {
     this.spanId = spanId;
     this.path = path;
     this.line = line;
@@ -27,7 +28,8 @@ private Location(
     this.serviceName = serviceName;
   }
 
-  public static Location forSpanAndStack(final AgentSpan span, final StackTraceElement stack) {
+  public static Location forSpanAndStack(
+      @Nullable final AgentSpan span, final StackTraceElement stack) {
     return new Location(
         spanId(span),
         stack.getClassName(),
@@ -54,6 +56,7 @@ public long getSpanId() {
     return spanId == null ? 0 : spanId;
   }
 
+  @Nullable
   public String getPath() {
     return path;
   }
@@ -62,26 +65,30 @@ public int getLine() {
     return line;
   }
 
+  @Nullable
   public String getMethod() {
     return method;
   }
 
+  @Nullable
   public String getServiceName() {
     return serviceName;
   }
 
-  public void updateSpan(final AgentSpan span) {
+  public void updateSpan(@Nullable final AgentSpan span) {
     if (span != null) {
       this.spanId = span.getSpanId();
       this.serviceName = span.getServiceName();
     }
   }
 
-  private static Long spanId(AgentSpan span) {
+  @Nullable
+  private static Long spanId(@Nullable AgentSpan span) {
     return span != null ? span.getSpanId() : null;
   }
 
-  private static String serviceName(AgentSpan span) {
+  @Nullable
+  private static String serviceName(@Nullable AgentSpan span) {
     return span != null ? span.getServiceName() : null;
   }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
index 97caac40bd3..a8e1d43b28a 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.model;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import com.datadog.iast.model.json.SourceIndex;
 import com.datadog.iast.util.Ranged;
 import java.util.Objects;
@@ -9,8 +11,6 @@
 
 public final class Range implements Ranged {
 
-  public static final int NOT_MARKED = 0;
-
   private final @Nonnegative int start;
   private final @Nonnegative int length;
   private final @Nonnull @SourceIndex Source source;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
index 6dc5956adc7..31acd483a7a 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
@@ -5,13 +5,19 @@
 import datadog.trace.api.iast.Taintable;
 import java.util.Objects;
 import java.util.StringJoiner;
+import javax.annotation.Nullable;
 
 public final class Source implements Taintable.Source {
   private final @SourceTypeString byte origin;
-  private final String name;
-  private final String value;
+  @Nullable private final String name;
+  @Nullable private final String value;
 
-  public Source(final byte origin, final String name, final String value) {
+  public Source(
+      final byte origin, @Nullable final CharSequence name, @Nullable final CharSequence value) {
+    this(origin, name == null ? null : name.toString(), value == null ? null : value.toString());
+  }
+
+  public Source(final byte origin, @Nullable final String name, @Nullable final String value) {
     this.origin = origin;
     this.name = name;
     this.value = value;
@@ -23,11 +29,13 @@ public byte getOrigin() {
   }
 
   @Override
+  @Nullable
   public String getName() {
     return name;
   }
 
   @Override
+  @Nullable
   public String getValue() {
     return value;
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
index 1e119321ff1..97ecf815775 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
@@ -15,21 +15,26 @@ public final class Vulnerability {
   private long hash;
 
   public Vulnerability(
-      final VulnerabilityType type, final Location location, final Evidence evidence) {
+      @Nonnull final VulnerabilityType type,
+      @Nonnull final Location location,
+      @Nullable final Evidence evidence) {
     this.type = type;
     this.location = location;
     this.evidence = evidence;
     this.hash = type.calculateHash(this);
   }
 
+  @Nonnull
   public VulnerabilityType getType() {
     return type;
   }
 
+  @Nonnull
   public Location getLocation() {
     return location;
   }
 
+  @Nullable
   public Evidence getEvidence() {
     return evidence;
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
index 17f59fbdd7c..fa5193b0a00 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
@@ -3,12 +3,13 @@
 import com.datadog.iast.model.json.VulnerabilityEncoding;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /** Collects vulnerabilities and serializes to JSON lazily on {@link #toString()}. */
 public final class VulnerabilityBatch {
 
-  private List<Vulnerability> vulnerabilities;
-  private volatile String json;
+  @Nullable private List<Vulnerability> vulnerabilities;
+  @Nullable private volatile String json;
 
   public void add(final Vulnerability v) {
     synchronized (this) {
@@ -21,6 +22,7 @@ public void add(final Vulnerability v) {
   }
 
   /** Internal list of vulnerabilities. Not thread-safe. */
+  @Nullable
   public List<Vulnerability> getVulnerabilities() {
     return vulnerabilities;
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
index deb7888adaf..62fdc6db56e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
@@ -1,10 +1,11 @@
 package com.datadog.iast.model;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import datadog.trace.api.iast.VulnerabilityMarks;
 import datadog.trace.api.iast.VulnerabilityTypes;
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.CRC32;
 import javax.annotation.Nonnull;
 
@@ -64,6 +65,9 @@ public interface VulnerabilityType {
   InjectionType XSS =
       new InjectionTypeImpl(VulnerabilityTypes.XSS_STRING, VulnerabilityMarks.XSS_MARK, ' ');
 
+  VulnerabilityType STACKTRACE_LEAK =
+      new VulnerabilityTypeImpl(VulnerabilityTypes.STACKTRACE_LEAK_STRING, NOT_MARKED);
+
   String name();
 
   /** A bit flag to ignore tainted ranges for this vulnerability. Set to 0 if none. */
@@ -99,17 +103,24 @@ public int mark() {
     @Override
     public long calculateHash(@Nonnull final Vulnerability vulnerability) {
       CRC32 crc = new CRC32();
-      crc.update(name().getBytes());
+      update(crc, name());
       final Location location = vulnerability.getLocation();
       if (location != null) {
         crc.update(location.getLine());
-        crc.update(location.getPath().getBytes());
+        if (location.getPath() != null) {
+          update(crc, location.getPath());
+        }
         if (location.getLine() <= -1 && location.getMethod() != null) {
-          crc.update(location.getMethod().getBytes());
+          update(crc, location.getMethod());
         }
       }
       return crc.getValue();
     }
+
+    protected void update(final CRC32 crc, final String value) {
+      final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+      crc.update(bytes, 0, bytes.length);
+    }
   }
 
   class InjectionTypeImpl extends VulnerabilityTypeImpl implements InjectionType {
@@ -135,10 +146,10 @@ public HeaderVulnerabilityType(@Nonnull String name, int vulnerabilityMark) {
     @Override
     public long calculateHash(@Nonnull final Vulnerability vulnerability) {
       CRC32 crc = new CRC32();
-      crc.update(name().getBytes());
+      update(crc, name());
       String serviceName = vulnerability.getLocation().getServiceName();
       if (serviceName != null) {
-        crc.update(serviceName.getBytes());
+        update(crc, serviceName);
       }
       return crc.getValue();
     }
@@ -152,10 +163,10 @@ public CookieVulnerabilityType(@Nonnull String name, int vulnerabilityMark) {
     @Override
     public long calculateHash(@Nonnull final Vulnerability vulnerability) {
       CRC32 crc = new CRC32();
-      crc.update(name().getBytes());
+      update(crc, name());
       final Evidence evidence = vulnerability.getEvidence();
       if (evidence != null) {
-        crc.update(evidence.getValue().getBytes());
+        update(crc, evidence.getValue());
       }
       return crc.getValue();
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
index 469c3b9227d..b62e74388ae 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
@@ -37,7 +37,7 @@ static class Context {
     final List<Source> sources;
     final Map<Source, Integer> sourceIndexMap;
     final Map<Source, RedactionContext> sourceContext;
-    Vulnerability vulnerability;
+    @Nullable Vulnerability vulnerability;
 
     public Context() {
       sources = new ArrayList<>();
@@ -183,7 +183,7 @@ public static class RedactionContext {
     private final Source source;
     private final boolean sensitive;
     private boolean sensitiveRanges;
-    private String redactedValue;
+    @Nullable private String redactedValue;
 
     public RedactionContext(final Source source) {
       this.source = source;
@@ -206,6 +206,7 @@ public boolean shouldRedact() {
       return sensitive || sensitiveRanges;
     }
 
+    @Nullable
     public String getRedactedValue() {
       return redactedValue;
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
index f90f7d68a67..9c78f11ed81 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
@@ -74,8 +74,12 @@ private String substring(final String value, final Ranged range) {
   private class DefaultEvidenceAdapter extends FormattingAdapter<Evidence> {
 
     @Override
-    public void toJson(@Nonnull final JsonWriter writer, final @Nonnull Evidence evidence)
+    public void toJson(@Nonnull final JsonWriter writer, final @Nullable Evidence evidence)
         throws IOException {
+      if (evidence == null) {
+        writer.nullValue();
+        return;
+      }
       writer.beginObject();
       if (evidence.getRanges() == null || evidence.getRanges().length == 0) {
         writer.name("value");
@@ -132,8 +136,12 @@ private void writeValuePart(
   private class RedactedEvidenceAdapter extends FormattingAdapter<Evidence> {
 
     @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nonnull final Evidence evidence)
+    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Evidence evidence)
         throws IOException {
+      if (evidence == null) {
+        writer.nullValue();
+        return;
+      }
       final Context ctx = Context.get();
       final Vulnerability vulnerability = ctx.vulnerability;
       if (vulnerability == null) {
@@ -163,7 +171,10 @@ private void toRedactedJson(
       writer.beginArray();
       for (final Iterator<ValuePart> it = new ValuePartIterator(ctx, value, tainted, sensitive);
           it.hasNext(); ) {
-        it.next().write(ctx, writer);
+        final ValuePart next = it.next();
+        if (next != null) {
+          next.write(ctx, writer);
+        }
       }
       writer.endArray();
     }
@@ -205,6 +216,7 @@ public boolean hasNext() {
       return !next.isEmpty() || index < value.length();
     }
 
+    @Nullable
     @Override
     public ValuePart next() {
       if (!hasNext()) {
@@ -237,6 +249,7 @@ public ValuePart next() {
       return next.poll();
     }
 
+    @Nullable
     private Ranged handleTaintedValue(
         @Nonnull final Range nextTainted, @Nullable Ranged nextSensitive) {
       final RedactionContext redactionCtx = ctx.getRedaction(nextTainted.getSource());
@@ -290,6 +303,7 @@ private void handleSensitiveValue(@Nonnull Ranged nextSensitive) {
      * Removes the tainted range from the sensitive one and returns whatever is before and enqueues
      * the rest
      */
+    @Nullable
     private Ranged removeTaintedRange(final Ranged sensitive, final Range tainted) {
       final List<Ranged> disjointRanges = sensitive.remove(tainted);
       Ranged result = null;
@@ -303,6 +317,7 @@ private Ranged removeTaintedRange(final Ranged sensitive, final Range tainted) {
       return result;
     }
 
+    @Nullable
     private ValuePart nextStringValuePart(final int end) {
       if (index < end) {
         final String chunk = value.substring(index, end);
@@ -325,9 +340,10 @@ interface ValuePart {
   }
 
   static class StringValuePart implements ValuePart {
-    private final String value;
 
-    private StringValuePart(final String value) {
+    @Nullable private final String value;
+
+    private StringValuePart(@Nullable final String value) {
       this.value = value;
     }
 
@@ -443,11 +459,13 @@ private void addValuePart(
           valueParts.add(new TaintedValuePart(adapter, source, chunk, false));
         } else {
           final int length = chunk.length();
-          final int matching = source.getValue().indexOf(chunk);
+          final String sourceValue = source.getValue();
+          final String redactedValue = ctx.getRedactedValue();
+          final int matching = (sourceValue == null) ? -1 : sourceValue.indexOf(chunk);
           final String pattern;
-          if (matching >= 0) {
+          if (matching >= 0 && redactedValue != null) {
             // if matches append the matching part from the redacted value
-            pattern = ctx.getRedactedValue().substring(matching, matching + length);
+            pattern = redactedValue.substring(matching, matching + length);
           } else {
             // otherwise redact the string
             pattern = SensitiveHandler.get().redactString(chunk);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
index 9da5177c6ef..7f5ab7edc1f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
@@ -66,7 +66,8 @@ public void toJson(@Nonnull final JsonWriter writer, final @Nonnull Source sourc
       }
     }
 
-    private void toRedactedJson(final JsonWriter writer, final Source source, final String value)
+    private void toRedactedJson(
+        final JsonWriter writer, final Source source, @Nullable final String value)
         throws IOException {
       writer.beginObject();
       writer.name("origin");
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
index 2212f1b9963..fe767384ef2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
@@ -2,15 +2,17 @@
 
 import com.datadog.iast.model.Vulnerability;
 import java.util.List;
+import javax.annotation.Nullable;
 
 public class TruncatedVulnerabilities {
 
-  private final List<Vulnerability> vulnerabilities;
+  @Nullable private final List<Vulnerability> vulnerabilities;
 
-  public TruncatedVulnerabilities(final List<Vulnerability> vulnerabilities) {
+  public TruncatedVulnerabilities(@Nullable final List<Vulnerability> vulnerabilities) {
     this.vulnerabilities = vulnerabilities;
   }
 
+  @Nullable
   public List<Vulnerability> getVulnerabilities() {
     return vulnerabilities;
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
index 455e1334b70..59c6c1c5b62 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
@@ -3,9 +3,12 @@
 import com.datadog.iast.model.VulnerabilityBatch;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VulnerabilityEncoding {
 
+  private static final Logger log = LoggerFactory.getLogger(VulnerabilityEncoding.class);
   private static final int MAX_SPAN_TAG_SIZE = 25000;
 
   static final Moshi MOSHI =
@@ -18,10 +21,15 @@ public class VulnerabilityEncoding {
       MOSHI.adapter(TruncatedVulnerabilities.class);
 
   public static String toJson(final VulnerabilityBatch value) {
-    String json = BATCH_ADAPTER.toJson(value);
-    return json.getBytes().length > MAX_SPAN_TAG_SIZE
-        ? getExceededTagSizeJson(new TruncatedVulnerabilities(value.getVulnerabilities()))
-        : json;
+    try {
+      String json = BATCH_ADAPTER.toJson(value);
+      return json.getBytes().length > MAX_SPAN_TAG_SIZE
+          ? getExceededTagSizeJson(new TruncatedVulnerabilities(value.getVulnerabilities()))
+          : json;
+    } catch (Exception ex) {
+      log.debug("Vulnerability serialization error", ex);
+      return "{\"vulnerabilities\":[]}";
+    }
   }
 
   static String getExceededTagSizeJson(final TruncatedVulnerabilities truncatedVulnerabilities) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
index f0d75012887..c21cec9d9c7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
@@ -1,7 +1,9 @@
 package com.datadog.iast.overhead;
 
+import javax.annotation.Nullable;
+
 public interface Operation {
-  boolean hasQuota(final OverheadContext context);
+  boolean hasQuota(@Nullable final OverheadContext context);
 
-  boolean consumeQuota(final OverheadContext context);
+  boolean consumeQuota(@Nullable final OverheadContext context);
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
index c9eab7b7237..e7bb35f1550 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
@@ -1,5 +1,7 @@
 package com.datadog.iast.overhead;
 
+import javax.annotation.Nullable;
+
 public class Operations {
 
   private Operations() {}
@@ -7,7 +9,7 @@ private Operations() {}
   public static final Operation REPORT_VULNERABILITY =
       new Operation() {
         @Override
-        public boolean hasQuota(final OverheadContext context) {
+        public boolean hasQuota(@Nullable final OverheadContext context) {
           if (context == null) {
             return false;
           }
@@ -15,7 +17,7 @@ public boolean hasQuota(final OverheadContext context) {
         }
 
         @Override
-        public boolean consumeQuota(final OverheadContext context) {
+        public boolean consumeQuota(@Nullable final OverheadContext context) {
           if (context == null) {
             return false;
           }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
index ee03973a11e..44f62063030 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
@@ -13,6 +13,7 @@
 import datadog.trace.util.AgentTaskScheduler;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,9 +25,9 @@ public interface OverheadController {
 
   int releaseRequest();
 
-  boolean hasQuota(final Operation operation, final AgentSpan span);
+  boolean hasQuota(final Operation operation, @Nullable final AgentSpan span);
 
-  boolean consumeQuota(final Operation operation, final AgentSpan span);
+  boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span);
 
   static OverheadController build(final Config config, final AgentTaskScheduler scheduler) {
     final OverheadControllerImpl result = new OverheadControllerImpl(config, scheduler);
@@ -68,7 +69,7 @@ public int releaseRequest() {
     }
 
     @Override
-    public boolean hasQuota(final Operation operation, final AgentSpan span) {
+    public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
       final boolean result = delegate.hasQuota(operation, span);
       if (LOGGER.isDebugEnabled()) {
         LOGGER.debug(
@@ -82,7 +83,7 @@ public boolean hasQuota(final Operation operation, final AgentSpan span) {
     }
 
     @Override
-    public boolean consumeQuota(final Operation operation, final AgentSpan span) {
+    public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
       final boolean result = delegate.consumeQuota(operation, span);
       if (LOGGER.isDebugEnabled()) {
         LOGGER.debug(
@@ -103,7 +104,7 @@ public void reset() {
       }
     }
 
-    private int getAvailableQuote(final AgentSpan span) {
+    private int getAvailableQuote(@Nullable final AgentSpan span) {
       final OverheadContext context = delegate.getContext(span);
       return context == null ? -1 : context.getAvailableQuota();
     }
@@ -149,16 +150,17 @@ public int releaseRequest() {
     }
 
     @Override
-    public boolean hasQuota(final Operation operation, final AgentSpan span) {
+    public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
       return operation.hasQuota(getContext(span));
     }
 
     @Override
-    public boolean consumeQuota(final Operation operation, final AgentSpan span) {
+    public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
       return operation.consumeQuota(getContext(span));
     }
 
-    public OverheadContext getContext(final AgentSpan span) {
+    @Nullable
+    public OverheadContext getContext(@Nullable final AgentSpan span) {
       final RequestContext requestContext = span != null ? span.getRequestContext() : null;
       if (requestContext != null) {
         IastRequestContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
index cae08236901..dd5ec368a06 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
@@ -1,9 +1,8 @@
 package com.datadog.iast.propagation;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
 import static com.datadog.iast.taint.Ranges.highestPriorityRange;
-import static com.datadog.iast.taint.Tainteds.canBeTainted;
 import static com.datadog.iast.util.ObjectVisitor.State.CONTINUE;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
@@ -11,349 +10,505 @@
 import com.datadog.iast.taint.Ranges;
 import com.datadog.iast.taint.TaintedObject;
 import com.datadog.iast.taint.TaintedObjects;
+import com.datadog.iast.taint.Tainteds;
 import com.datadog.iast.util.ObjectVisitor;
-import com.datadog.iast.util.ObjectVisitor.State;
-import com.datadog.iast.util.ObjectVisitor.Visitor;
-import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.Config;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.Taintable;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import org.jetbrains.annotations.Contract;
 
 public class PropagationModuleImpl implements PropagationModule {
 
+  /** Prevent copy of values bigger than this threshold */
+  private static final int MAX_VALUE_LENGTH = Config.get().getIastTruncationMaxValueLength();
+
   @Override
-  public void taintIfInputIsTainted(@Nullable final Object toTaint, @Nullable final Object input) {
-    if (toTaint == null || input == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Source source = highestPriorityTaintedSource(taintedObjects, input);
-    if (source != null) {
-      taintObject(taintedObjects, toTaint, source);
-    }
+  public void taint(@Nullable final Object target, final byte origin) {
+    taint(target, origin, null);
   }
 
   @Override
-  public void taintIfInputIsTainted(@Nullable final String toTaint, @Nullable final Object input) {
-    if (!canBeTainted(toTaint) || input == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Source source = highestPriorityTaintedSource(taintedObjects, input);
-    if (source != null) {
-      taintString(taintedObjects, toTaint, source);
-    }
+  public void taint(
+      @Nullable final Object target, final byte origin, @Nullable final CharSequence name) {
+    taint(target, origin, name, sourceValue(target));
   }
 
   @Override
-  public void taintIfInputIsTainted(
+  public void taint(
+      @Nullable final Object target,
       final byte origin,
-      @Nullable final String name,
-      @Nullable final String toTaint,
-      @Nullable final Object input) {
-    if (!canBeTainted(toTaint) || input == null) {
+      @Nullable final CharSequence name,
+      @Nullable final CharSequence value) {
+    if (!canBeTainted(target)) {
       return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    if (isTainted(taintedObjects, input)) {
-      taintString(taintedObjects, toTaint, new Source(origin, name, toTaint));
-    }
+    taint(LazyContext.build(), target, origin, name, value);
   }
 
   @Override
-  public void taintIfInputIsTainted(
-      final byte origin,
-      @Nullable final String name,
-      @Nullable final Collection<String> toTaintCollection,
-      @Nullable final Object input) {
-    if (toTaintCollection == null || toTaintCollection.isEmpty() || input == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    if (isTainted(taintedObjects, input)) {
-      for (final String toTaint : toTaintCollection) {
-        if (canBeTainted(toTaint)) {
-          taintString(taintedObjects, toTaint, new Source(origin, name, toTaint));
-        }
-      }
-    }
+  public void taint(
+      @Nullable final IastContext ctx, @Nullable final Object target, final byte origin) {
+    taint(ctx, target, origin, null);
   }
 
   @Override
-  public void taintIfInputIsTainted(
+  public void taint(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
       final byte origin,
-      @Nullable final Collection<String> toTaintCollection,
-      @Nullable final Object input) {
-    if (toTaintCollection == null || toTaintCollection.isEmpty() || input == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    if (isTainted(taintedObjects, input)) {
-      for (final String toTaint : toTaintCollection) {
-        if (canBeTainted(toTaint)) {
-          taintString(taintedObjects, toTaint, new Source(origin, toTaint, toTaint));
-        }
-      }
-    }
+      @Nullable final CharSequence name) {
+    taint(ctx, target, origin, name, sourceValue(target));
   }
 
   @Override
-  public void taintIfInputIsTainted(
+  public void taint(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
       final byte origin,
-      @Nullable final List<Map.Entry<String, String>> toTaintCollection,
-      @Nullable final Object input) {
-    if (toTaintCollection == null || toTaintCollection.isEmpty() || input == null) {
+      @Nullable final CharSequence name,
+      @Nullable final CharSequence value) {
+    if (!canBeTainted(target)) {
       return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    if (isTainted(taintedObjects, input)) {
-      for (final Map.Entry<String, String> entry : toTaintCollection) {
-        final String name = entry.getKey();
-        if (canBeTainted(name)) {
-          taintString(
-              taintedObjects, name, new Source(SourceTypes.namedSource(origin), name, name));
-        }
-        final String toTaint = entry.getValue();
-        if (canBeTainted(toTaint)) {
-          taintString(taintedObjects, toTaint, new Source(origin, name, toTaint));
-        }
-      }
-    }
+    internalTaint(ctx, target, newSource(target, origin, name, value), NOT_MARKED);
   }
 
   @Override
-  public void taintIfAnyInputIsTainted(
-      @Nullable final Object toTaint, @Nullable final Object... inputs) {
-    if (toTaint == null || inputs == null || inputs.length == 0) {
+  public void taintIfTainted(@Nullable final Object target, @Nullable final Object input) {
+    taintIfTainted(target, input, false, NOT_MARKED);
+  }
+
+  @Override
+  public void taintIfTainted(
+      @Nullable final Object target, @Nullable final Object input, boolean keepRanges, int mark) {
+    if (!canBeTainted(target) || !canBeTainted(input)) {
       return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    for (final Object input : inputs) {
-      final Source source = highestPriorityTaintedSource(taintedObjects, input);
-      if (source != null) {
-        taintObject(taintedObjects, toTaint, source);
-        return;
-      }
-    }
+    taintIfTainted(LazyContext.build(), target, input, keepRanges, mark);
   }
 
   @Override
-  public void taint(final byte source, @Nullable final String name, @Nullable final String value) {
-    if (!canBeTainted(value)) {
+  public void taintIfTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object input) {
+    taintIfTainted(ctx, target, input, false, NOT_MARKED);
+  }
+
+  @Override
+  public void taintIfTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object input,
+      boolean keepRanges,
+      int mark) {
+    if (!canBeTainted(target) || !canBeTainted(input)) {
       return;
     }
-    final IastRequestContext ctx = IastRequestContext.get();
-    if (ctx == null) {
-      return;
+    if (keepRanges) {
+      internalTaint(ctx, target, getRanges(ctx, input), mark);
+    } else {
+      internalTaint(ctx, target, highestPrioritySource(ctx, input), mark);
     }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    taintedObjects.taintInputString(value, new Source(source, name, value));
   }
 
   @Override
-  public void taint(
-      @Nullable final Object ctx_,
-      final byte source,
-      @Nullable final String name,
-      @Nullable final String value) {
-    if (ctx_ == null || !canBeTainted(value)) {
-      return;
-    }
-    final IastRequestContext ctx = (IastRequestContext) ctx_;
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    taintedObjects.taintInputString(value, new Source(source, name, value));
+  public void taintIfTainted(
+      @Nullable final Object target, @Nullable final Object input, final byte origin) {
+    taintIfTainted(target, input, origin, null);
   }
 
   @Override
-  public void taintDeeply(@Nullable final Object ctx_, final byte source, @Nonnull final Object o) {
-    taintDeeply(ctx_, source, o, ObjectVisitor::inspectClass);
+  public void taintIfTainted(
+      @Nullable final Object target,
+      @Nullable final Object input,
+      final byte origin,
+      @Nullable final CharSequence name) {
+    taintIfTainted(target, input, origin, name, sourceValue(target));
   }
 
   @Override
-  public void taintDeeply(
-      @Nullable final Object ctx_,
-      final byte source,
-      @Nonnull final Object o,
-      @Nonnull final Predicate<Class<?>> classFilter) {
-    if (ctx_ == null) {
+  public void taintIfTainted(
+      @Nullable final Object target,
+      @Nullable final Object input,
+      final byte origin,
+      @Nullable final CharSequence name,
+      @Nullable final CharSequence value) {
+    if (!canBeTainted(target) || !canBeTainted(input)) {
       return;
     }
-    final IastRequestContext ctx = (IastRequestContext) ctx_;
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    ObjectVisitor.visit(o, new TaintingVisitor(taintedObjects, source), classFilter);
+    taintIfTainted(LazyContext.build(), target, input, origin, name, value);
   }
 
   @Override
-  public void taintObjectIfInputIsTaintedKeepingRanges(
-      @Nullable final Object toTaint, @Nullable Object input) {
-    if (toTaint == null || input == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Range[] ranges = getTaintedRanges(taintedObjects, input);
-    if (ranges != null && ranges.length > 0) {
-      taintedObjects.taint(toTaint, ranges);
-    }
+  public void taintIfTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object input,
+      final byte origin) {
+    taintIfTainted(ctx, target, input, origin, null);
   }
 
   @Override
-  public void taintObject(final byte origin, @Nullable final Object toTaint) {
-    if (toTaint == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(false);
-    if (taintedObjects == null) {
-      return;
-    }
-    final Source source = new Source(origin, null, null);
-    taintObject(taintedObjects, toTaint, source);
+  public void taintIfTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object input,
+      final byte origin,
+      @Nullable final CharSequence name) {
+    taintIfTainted(ctx, target, input, origin, name, sourceValue(target));
   }
 
   @Override
-  public void taintObjects(final byte origin, @Nullable final Object[] toTaintArray) {
-    if (toTaintArray == null || toTaintArray.length == 0) {
+  public void taintIfTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object input,
+      final byte origin,
+      @Nullable final CharSequence name,
+      @Nullable final CharSequence value) {
+    if (!canBeTainted(target) || !canBeTainted(input)) {
       return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Source source = new Source(origin, null, null);
-    for (final Object toTaint : toTaintArray) {
-      taintObject(taintedObjects, toTaint, source);
+    if (isTainted(ctx, input)) {
+      internalTaint(ctx, target, newSource(target, origin, name, value), NOT_MARKED);
     }
   }
 
   @Override
-  public boolean isTainted(@Nullable Object obj) {
-    if (obj instanceof Taintable) {
-      return ((Taintable) obj).$DD$isTainted();
-    }
+  public void taintIfAnyTainted(@Nullable final Object target, @Nullable final Object[] inputs) {
+    taintIfAnyTainted(target, inputs, false, NOT_MARKED);
+  }
 
-    if (obj == null) {
-      return false;
+  @Override
+  public void taintIfAnyTainted(
+      @Nullable final Object target,
+      @Nullable final Object[] inputs,
+      final boolean keepRanges,
+      final int mark) {
+    if (!canBeTainted(target) || !canBeTainted(inputs)) {
+      return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    return taintedObjects.get(obj) != null;
+    taintIfAnyTainted(LazyContext.build(), target, inputs, keepRanges, mark);
   }
 
   @Override
-  public void taintObjects(
-      final byte origin, @Nullable final Collection<Object> toTaintCollection) {
-    if (toTaintCollection == null || toTaintCollection.isEmpty()) {
+  public void taintIfAnyTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object[] inputs) {
+    taintIfAnyTainted(ctx, target, inputs, false, NOT_MARKED);
+  }
+
+  @Override
+  public void taintIfAnyTainted(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      @Nullable final Object[] inputs,
+      final boolean keepRanges,
+      final int mark) {
+    if (!canBeTainted(target) || !canBeTainted(inputs)) {
       return;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Source source = new Source(origin, null, null);
-    for (final Object toTaint : toTaintCollection) {
-      taintObject(taintedObjects, toTaint, source);
+    if (keepRanges) {
+      final Range[] ranges = getRangesInArray(ctx, inputs);
+      if (ranges != null) {
+        internalTaint(ctx, target, ranges, mark);
+      }
+    } else {
+      final Source source = highestPrioritySourceInArray(ctx, inputs);
+      if (source != null) {
+        internalTaint(ctx, target, source, mark);
+      }
     }
   }
 
   @Override
-  public void taintObject(
-      byte origin, @Nullable String name, @Nullable String value, @Nullable Object t) {
-    if (t == null) {
-      return;
+  public int taintDeeply(
+      @Nullable final Object target, final byte origin, final Predicate<Class<?>> classFilter) {
+    if (!canBeTainted(target)) {
+      return 0;
+    }
+    return taintDeeply(LazyContext.build(), target, origin, classFilter);
+  }
+
+  @Override
+  public int taintDeeply(
+      @Nullable final IastContext ctx,
+      @Nullable final Object target,
+      final byte origin,
+      final Predicate<Class<?>> classFilter) {
+    if (!canBeTainted(target)) {
+      return 0;
+    }
+    final TaintedObjects to = getTaintedObjects(ctx);
+    if (to == null) {
+      return 0;
     }
-    if (t instanceof Taintable) {
-      ((Taintable) t).$$DD$setSource(new Source(origin, name, value));
+    if (target instanceof CharSequence) {
+      internalTaint(ctx, target, newSource(target, origin, null, sourceValue(target)), NOT_MARKED);
+      return 1;
     } else {
-      final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects();
-      taintObject(taintedObjects, t, new Source(origin, name, value));
+      final TaintingVisitor visitor = new TaintingVisitor(to, origin);
+      ObjectVisitor.visit(target, visitor, classFilter);
+      return visitor.getCount();
     }
   }
 
+  @Nullable
   @Override
-  public Taintable.Source firstTaintedSource(@Nullable final Object input) {
-    if (input == null) {
+  public Taintable.Source findSource(@Nullable final Object target) {
+    return target == null ? null : findSource(LazyContext.build(), target);
+  }
+
+  @Nullable
+  @Override
+  public Taintable.Source findSource(
+      @Nullable final IastContext ctx, @Nullable final Object target) {
+    if (target == null) {
       return null;
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    return highestPriorityTaintedSource(taintedObjects, input);
+    return highestPrioritySource(ctx, target);
   }
 
   @Override
-  public void taintIfInputIsTaintedWithMarks(
-      @Nullable final String toTaint, @Nullable final Object input, final int mark) {
-    if (!canBeTainted(toTaint) || input == null) {
-      return;
+  public boolean isTainted(@Nullable final Object target) {
+    return target != null && isTainted(LazyContext.build(), target);
+  }
+
+  @Override
+  public boolean isTainted(@Nullable final IastContext ctx, @Nullable final Object target) {
+    return target != null && findSource(ctx, target) != null;
+  }
+
+  /** Ensures that the reference is not kept strongly via the name or value properties */
+  private static Source newSource(
+      @Nonnull final Object reference,
+      final byte origin,
+      @Nullable final CharSequence name,
+      @Nullable final CharSequence value) {
+    return new Source(
+        origin,
+        reference == name ? sourceValue(name) : name,
+        reference == value ? sourceValue(value) : value);
+  }
+
+  /**
+   * This method will prevent the code from creating a strong reference to what should remain weak
+   */
+  @Nullable
+  private static CharSequence sourceValue(@Nullable final Object target) {
+    if (target instanceof String) {
+      final String string = (String) target;
+      if (MAX_VALUE_LENGTH > string.length()) {
+        return String.copyValueOf(string.toCharArray());
+      } else {
+        final char[] chars = new char[MAX_VALUE_LENGTH];
+        string.getChars(0, MAX_VALUE_LENGTH, chars, 0);
+        return String.copyValueOf(chars);
+      }
+    } else if (target instanceof CharSequence) {
+      final CharSequence charSequence = (CharSequence) target;
+      if (MAX_VALUE_LENGTH > charSequence.length()) {
+        return charSequence.toString();
+      } else {
+        final CharSequence subSequence = charSequence.subSequence(0, MAX_VALUE_LENGTH);
+        return subSequence.toString();
+      }
     }
-    final TaintedObjects taintedObjects = TaintedObjects.activeTaintedObjects(true);
-    final Range[] ranges = getTaintedRanges(taintedObjects, input);
-    if (ranges != null && ranges.length > 0) {
-      Range priorityRange = highestPriorityRange(ranges);
-      taintedObjects.taintInputString(
-          toTaint, priorityRange.getSource(), priorityRange.getMarks() | mark);
+    return null;
+  }
+
+  @Contract("null -> false")
+  private static boolean canBeTainted(@Nullable final Object target) {
+    if (target == null) {
+      return false;
     }
+    if (target instanceof CharSequence) {
+      return Tainteds.canBeTainted((CharSequence) target);
+    }
+    return true;
   }
 
-  private static void taintString(
-      final TaintedObjects taintedObjects, final String toTaint, final Source source) {
-    taintedObjects.taintInputString(toTaint, source);
+  @Contract("null -> false")
+  private static boolean canBeTainted(@Nullable final Object[] target) {
+    if (target == null || target.length == 0) {
+      return false;
+    }
+    return true;
   }
 
-  private static void taintObject(
-      final TaintedObjects taintedObjects, final Object toTaint, final Source source) {
-    if (toTaint instanceof Taintable) {
-      ((Taintable) toTaint).$$DD$setSource(source);
-    } else {
-      taintedObjects.taintInputObject(toTaint, source);
+  @Nullable
+  private static TaintedObjects getTaintedObjects(final @Nullable IastContext ctx) {
+    IastRequestContext iastCtx = null;
+    if (ctx instanceof IastRequestContext) {
+      iastCtx = (IastRequestContext) ctx;
+    } else if (ctx instanceof LazyContext) {
+      iastCtx = ((LazyContext) ctx).getDelegate();
     }
+    return iastCtx == null ? null : iastCtx.getTaintedObjects();
   }
 
-  private static boolean isTainted(final TaintedObjects taintedObjects, final Object object) {
-    return highestPriorityTaintedSource(taintedObjects, object) != null;
+  @Nullable
+  private static Range[] getRangesInArray(
+      final @Nullable IastContext ctx, final @Nonnull Object[] objects) {
+    for (final Object object : objects) {
+      final Range[] ranges = getRanges(ctx, object);
+      if (ranges != null) {
+        return ranges;
+      }
+    }
+    return null;
   }
 
-  private static Source highestPriorityTaintedSource(
-      final TaintedObjects taintedObjects, final Object object) {
+  @Nullable
+  private static Range[] getRanges(final @Nullable IastContext ctx, final @Nonnull Object object) {
+    if (object instanceof Taintable) {
+      final Source source = highestPrioritySource(ctx, object);
+      if (source == null) {
+        return null;
+      } else {
+        return new Range[] {new Range(0, Integer.MAX_VALUE, source, NOT_MARKED)};
+      }
+    }
+    final TaintedObjects to = getTaintedObjects(ctx);
+    if (to == null) {
+      return null;
+    }
+    final TaintedObject tainted = to.get(object);
+    return tainted == null ? null : tainted.getRanges();
+  }
+
+  @Nullable
+  private static Source highestPrioritySourceInArray(
+      final @Nullable IastContext ctx, final @Nonnull Object[] objects) {
+    for (final Object object : objects) {
+      final Source source = highestPrioritySource(ctx, object);
+      if (source != null) {
+        return source;
+      }
+    }
+    return null;
+  }
+
+  @Nullable
+  private static Source highestPrioritySource(
+      final @Nullable IastContext ctx, final @Nonnull Object object) {
     if (object instanceof Taintable) {
       return (Source) ((Taintable) object).$$DD$getSource();
     } else {
-      final TaintedObject tainted = taintedObjects.get(object);
-      final Range[] ranges = tainted == null ? null : tainted.getRanges();
+      final Range[] ranges = getRanges(ctx, object);
       return ranges != null && ranges.length > 0 ? highestPriorityRange(ranges).getSource() : null;
     }
   }
 
-  private static Range[] getTaintedRanges(
-      final TaintedObjects taintedObjects, final Object object) {
-    if (object instanceof Taintable) {
-      Source source = (Source) ((Taintable) object).$$DD$getSource();
-      if (source == null) {
-        return null;
+  private static void internalTaint(
+      @Nullable final IastContext ctx,
+      @Nonnull final Object value,
+      @Nullable final Source source,
+      int mark) {
+    if (source == null) {
+      return;
+    }
+    if (value instanceof Taintable) {
+      ((Taintable) value).$$DD$setSource(source);
+    } else {
+      final TaintedObjects to = getTaintedObjects(ctx);
+      if (to == null) {
+        return;
+      }
+      if (value instanceof CharSequence) {
+        to.taint(value, Ranges.forCharSequence((CharSequence) value, source, mark));
       } else {
-        return Ranges.forObject(source, NOT_MARKED);
+        to.taint(value, Ranges.forObject(source, mark));
       }
+    }
+  }
+
+  private static void internalTaint(
+      @Nullable final IastContext ctx,
+      @Nonnull final Object value,
+      @Nullable final Range[] ranges,
+      final int mark) {
+    if (ranges == null || ranges.length == 0) {
+      return;
+    }
+    if (value instanceof Taintable) {
+      ((Taintable) value).$$DD$setSource(ranges[0].getSource());
     } else {
-      final TaintedObject tainted = taintedObjects.get(object);
-      return tainted == null ? null : tainted.getRanges();
+      final TaintedObjects to = getTaintedObjects(ctx);
+      if (to != null) {
+        final Range[] markedRanges = markRanges(ranges, mark);
+        to.taint(value, markedRanges);
+      }
+    }
+  }
+
+  @Nonnull
+  private static Range[] markRanges(@Nonnull final Range[] ranges, final int mark) {
+    if (mark == NOT_MARKED) {
+      return ranges;
+    }
+    final Range[] result = new Range[ranges.length];
+    for (int i = 0; i < ranges.length; i++) {
+      final Range range = ranges[i];
+      final int newMark = range.getMarks() | mark;
+      result[i] = new Range(range.getStart(), range.getLength(), range.getSource(), newMark);
+    }
+    return result;
+  }
+
+  private static class LazyContext implements IastContext {
+
+    private boolean fetched;
+    @Nullable private IastRequestContext delegate;
+
+    @Nullable
+    private IastRequestContext getDelegate() {
+      if (!fetched) {
+        fetched = true;
+        delegate = IastRequestContext.get();
+      }
+      return delegate;
+    }
+
+    public static IastContext build() {
+      return new LazyContext();
     }
   }
 
-  private static class TaintingVisitor implements Visitor {
+  private static class TaintingVisitor implements ObjectVisitor.Visitor {
 
     private final TaintedObjects taintedObjects;
-    private final byte source;
+    private final byte origin;
+    private int count;
 
-    private TaintingVisitor(final TaintedObjects taintedObjects, final byte source) {
+    private TaintingVisitor(@Nonnull final TaintedObjects taintedObjects, final byte origin) {
       this.taintedObjects = taintedObjects;
-      this.source = source;
+      this.origin = origin;
     }
 
     @Nonnull
     @Override
-    public State visit(@Nonnull final String path, @Nonnull final Object value) {
-      if (value instanceof String) {
-        final String stringValue = (String) value;
-        if (canBeTainted(stringValue)) {
-          taintedObjects.taintInputString(stringValue, new Source(source, path, stringValue));
+    public ObjectVisitor.State visit(@Nonnull final String path, @Nonnull final Object value) {
+      if (value instanceof CharSequence) {
+        final CharSequence charSequence = (CharSequence) value;
+        if (canBeTainted(charSequence)) {
+          final Source source = newSource(value, origin, path, charSequence);
+          count++;
+          taintedObjects.taint(
+              charSequence, Ranges.forCharSequence(charSequence, source, NOT_MARKED));
         }
       }
       return CONTINUE;
     }
+
+    public int getCount() {
+      return count;
+    }
   }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
index 7a3f7720112..a93d3c53e8e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
@@ -39,6 +39,7 @@ public class StringModuleImpl implements StringModule {
 
   private static final int NULL_STR_LENGTH = "null".length();
 
+  @SuppressWarnings("NullAway") // NullAway fails with taintedLeft and taintedRight checks
   @Override
   public void onStringConcat(
       @Nonnull final String left, @Nullable final String right, @Nonnull final String result) {
@@ -170,7 +171,7 @@ public void onStringConcatFactory(
     int offset = 0, rangeIndex = 0;
     for (int item : recipeOffsets) {
       if (item < 0) {
-        offset += (-item);
+        offset += -item;
       } else {
         final String argument = args[item];
         final Range[] ranges = sourceRanges.get(item);
@@ -214,7 +215,7 @@ public void onStringSubSequence(
 
   @Override
   public void onStringJoin(
-      @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence... elements) {
+      @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements) {
     if (!canBeTainted(result)) {
       return;
     }
@@ -262,7 +263,7 @@ public void onStringJoin(
 
   @Override
   @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onStringRepeat(String self, int count, String result) {
+  public void onStringRepeat(@Nonnull String self, int count, @Nonnull String result) {
     if (!canBeTainted(self) || !canBeTainted(result) || self == result) {
       return;
     }
@@ -368,7 +369,7 @@ private static int insertRange(
     return rangeIndex + count;
   }
 
-  private static Range[] getRanges(final TaintedObject taintedObject) {
+  private static Range[] getRanges(@Nullable final TaintedObject taintedObject) {
     return taintedObject == null ? EMPTY : taintedObject.getRanges();
   }
 
@@ -572,11 +573,11 @@ public void onSplit(@Nonnull String self, @Nonnull String[] result) {
    * @param finalRanges result with all ranges
    */
   private void addParameterTaintedRanges(
-      final Range placeholderRange,
+      @Nullable final Range placeholderRange,
       final Object param,
       final String formatted,
       final int offset,
-      final Range[] ranges,
+      @Nullable final Range[] ranges,
       /* out */ final RangeList finalRanges) {
     if (ranges != null && ranges.length > 0) {
       // only shift ranges if they are character sequences of the same length, otherwise taint the
@@ -602,6 +603,7 @@ private void addParameterTaintedRanges(
    * @param finalRanges result with all ranges
    * @return tainted range of the placeholder or {@code null} if not tainted
    */
+  @Nullable
   private Range addFormatTaintedRanges(
       final Ranged placeholderPos,
       final int offset,
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
index 58a1e8aaec3..54c73669be3 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
@@ -4,11 +4,12 @@
 import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 
 public abstract class AbstractRegexTokenizer implements SensitiveHandler.Tokenizer {
 
   protected final Matcher matcher;
-  private Ranged current;
+  @Nullable private Ranged current;
 
   protected AbstractRegexTokenizer(final Pattern pattern, final String evidence) {
     matcher = pattern.matcher(evidence);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
index ffa8dbe3346..d62fdf8c95c 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
@@ -76,7 +76,7 @@ public Tokenizer tokenizeEvidence(
     return supplier.tokenizerFor(evidence);
   }
 
-  private int computeLength(final String value) {
+  private int computeLength(@Nullable final String value) {
     if (value == null || value.isEmpty()) {
       return 0;
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
index 9082979e890..6c87aaf7a87 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
@@ -120,10 +120,6 @@ public static Dialect fromEvidence(final Evidence evidence) {
       return ANSI;
     }
 
-    public static Dialect current() {
-      return ANSI;
-    }
-
     public Pattern buildPattern() {
       return pattern.get();
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
index b0f08bb9afb..b2cff3356b4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
@@ -2,22 +2,24 @@
 
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.Range;
+import com.datadog.iast.taint.Ranges;
 import com.datadog.iast.util.Ranged;
 import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
 
 public class TaintedRangeBasedTokenizer implements SensitiveHandler.Tokenizer {
 
   private final String value;
   private final Range[] ranges;
 
-  private Ranged current;
+  @Nullable private Ranged current;
 
   private int rangesIndex;
 
   private int pos;
 
   public TaintedRangeBasedTokenizer(final Evidence evidence) {
-    this.ranges = evidence.getRanges();
+    this.ranges = evidence.getRanges() == null ? Ranges.EMPTY : evidence.getRanges();
     this.value = evidence.getValue();
     rangesIndex = 0;
     pos = 0; // current value position
@@ -37,6 +39,7 @@ public Ranged current() {
     return current;
   }
 
+  @Nullable
   private Ranged buildNext() {
     for (; rangesIndex < ranges.length; rangesIndex++) {
       Range range = ranges[rangesIndex];
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
index ea5fa289e6d..24fd88c99c4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
@@ -3,6 +3,7 @@
 import static com.datadog.iast.taint.Ranges.rangesProviderFor;
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.taint.TaintedObjects;
@@ -15,6 +16,10 @@
 
 public class CommandInjectionModuleImpl extends SinkModuleBase implements CommandInjectionModule {
 
+  public CommandInjectionModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onRuntimeExec(@Nullable final String... cmdArray) {
     if (!canBeTainted(cmdArray)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
index f096f5f46ce..801d7e51052 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Location;
 import com.datadog.iast.model.Vulnerability;
@@ -23,6 +24,10 @@ public class HstsMissingHeaderModuleImpl extends SinkModuleBase implements HstsM
 
   private static final Logger LOGGER = LoggerFactory.getLogger(HstsMissingHeaderModuleImpl.class);
 
+  public HstsMissingHeaderModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onRequestEnd(final Object iastRequestContextObject, final IGSpanInfo igSpanInfo) {
 
@@ -70,7 +75,7 @@ static boolean isHttps(@Nullable final String urlString, @Nullable final String
     if (urlString == null) {
       return false;
     }
-    if (urlString.toLowerCase().startsWith("https://")) {
+    if (urlString.toLowerCase(Locale.ROOT).startsWith("https://")) {
       return true;
     }
     if (forwardedFor == null) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
index 3216bff3d60..9eea7be16c5 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
@@ -3,6 +3,7 @@
 import static com.datadog.iast.util.HttpHeader.Values.SET_COOKIE;
 import static java.util.Collections.singletonList;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.Location;
@@ -27,6 +28,10 @@
 public class HttpResponseHeaderModuleImpl extends SinkModuleBase
     implements HttpResponseHeaderModule {
 
+  public HttpResponseHeaderModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onHeader(@Nonnull final String name, final String value) {
     final HttpHeader header = HttpHeader.from(name);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
index 1b0fc2a3cd9..aaa0f999bfb 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
@@ -3,6 +3,7 @@
 import static com.datadog.iast.taint.Ranges.rangesProviderFor;
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.taint.TaintedObjects;
@@ -14,6 +15,10 @@
 
 public class LdapInjectionModuleImpl extends SinkModuleBase implements LdapInjectionModule {
 
+  public LdapInjectionModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public void onDirContextSearch(
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
index 2cb6eb4d816..cd5a54862a7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
@@ -4,6 +4,7 @@
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 import static java.util.Arrays.asList;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.taint.TaintedObjects;
@@ -20,6 +21,10 @@
 
 public class PathTraversalModuleImpl extends SinkModuleBase implements PathTraversalModule {
 
+  public PathTraversalModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onPathTraversal(final @Nullable String path) {
     if (!canBeTainted(path)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
index 57a7de1b0dc..d1a24a5516f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
@@ -3,7 +3,7 @@
 import static com.datadog.iast.util.ObjectVisitor.State.CONTINUE;
 import static com.datadog.iast.util.ObjectVisitor.State.EXIT;
 
-import com.datadog.iast.HasDependencies;
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.Reporter;
 import com.datadog.iast.model.Evidence;
@@ -29,14 +29,13 @@
 
 /** Base class with utility methods for with sinks */
 @SuppressWarnings({"UnusedReturnValue", "SameParameterValue"})
-public abstract class SinkModuleBase implements HasDependencies {
+public abstract class SinkModuleBase {
 
-  protected OverheadController overheadController;
-  protected Reporter reporter;
-  protected StackWalker stackWalker;
+  protected final OverheadController overheadController;
+  protected final Reporter reporter;
+  protected final StackWalker stackWalker;
 
-  @Override
-  public void registerDependencies(@Nonnull final Dependencies dependencies) {
+  protected SinkModuleBase(@Nonnull final Dependencies dependencies) {
     overheadController = dependencies.getOverheadController();
     reporter = dependencies.getReporter();
     stackWalker = dependencies.getStackWalker();
@@ -89,6 +88,9 @@ public void registerDependencies(@Nonnull final Dependencies dependencies) {
     if (rangeProvider.size() == 1) {
       // only one item and has ranges
       final E item = rangeProvider.value(0);
+      if (item == null) {
+        return null; // should never happen
+      }
       evidence = item.toString();
       targetRanges = rangeProvider.ranges(item);
     } else {
@@ -177,10 +179,6 @@ protected StackTraceElement getCurrentStackTrace() {
     return stackWalker.walk(SinkModuleBase::findValidPackageForVulnerability);
   }
 
-  protected String getServiceName(final AgentSpan span) {
-    return span != null ? span.getServiceName() : null;
-  }
-
   static StackTraceElement findValidPackageForVulnerability(
       @Nonnull final Stream<StackTraceElement> stream) {
     final StackTraceElement[] first = new StackTraceElement[1];
@@ -198,13 +196,13 @@ static StackTraceElement findValidPackageForVulnerability(
 
   private class InjectionVisitor implements Visitor {
 
-    private final AgentSpan span;
+    @Nullable private final AgentSpan span;
     private final IastRequestContext ctx;
     private final InjectionType type;
-    private Evidence evidence;
+    @Nullable private Evidence evidence;
 
     private InjectionVisitor(
-        final AgentSpan span, final IastRequestContext ctx, final InjectionType type) {
+        @Nullable final AgentSpan span, final IastRequestContext ctx, final InjectionType type) {
       this.span = span;
       this.ctx = ctx;
       this.type = type;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
index 31d42394329..98ad3d757f4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.VulnerabilityType;
@@ -10,6 +11,10 @@
 
 public class SqlInjectionModuleImpl extends SinkModuleBase implements SqlInjectionModule {
 
+  public SqlInjectionModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onJdbcQuery(@Nullable final String queryString) {
     onJdbcQuery(queryString, null);
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
index b4df8302c94..e397e649c6e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import datadog.trace.api.iast.sink.SsrfModule;
@@ -9,6 +10,10 @@
 
 public class SsrfModuleImpl extends SinkModuleBase implements SsrfModule {
 
+  public SsrfModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onURLConnection(@Nullable final Object url) {
     if (url == null) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java
new file mode 100644
index 00000000000..2cfb07e5f49
--- /dev/null
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java
@@ -0,0 +1,37 @@
+package com.datadog.iast.sink;
+
+import com.datadog.iast.Dependencies;
+import com.datadog.iast.model.Evidence;
+import com.datadog.iast.model.Location;
+import com.datadog.iast.model.Vulnerability;
+import com.datadog.iast.model.VulnerabilityType;
+import datadog.trace.api.iast.sink.StacktraceLeakModule;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import org.jetbrains.annotations.NotNull;
+
+public class StacktraceLeakModuleImpl extends SinkModuleBase implements StacktraceLeakModule {
+
+  public StacktraceLeakModuleImpl(@NotNull Dependencies dependencies) {
+    super(dependencies);
+  }
+
+  @Override
+  public void onStacktraceLeak(
+      Throwable throwable, String moduleName, String className, String methodName) {
+    if (throwable != null) {
+      final AgentSpan span = AgentTracer.activeSpan();
+
+      Evidence evidence =
+          new Evidence(
+              "ExceptionHandler in "
+                  + moduleName
+                  + " \r\nthrown "
+                  + throwable.getClass().getName());
+      Location location = Location.forSpanAndClassAndMethod(span, className, methodName);
+
+      reporter.report(
+          span, new Vulnerability(VulnerabilityType.STACKTRACE_LEAK, location, evidence));
+    }
+  }
+}
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
index a584d078a0c..5f3ed0707b2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import datadog.trace.api.iast.sink.TrustBoundaryViolationModule;
@@ -9,6 +10,11 @@
 
 public class TrustBoundaryViolationModuleImpl extends SinkModuleBase
     implements TrustBoundaryViolationModule {
+
+  public TrustBoundaryViolationModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onSessionValue(@Nonnull String name, Object value) {
     final AgentSpan span = AgentTracer.activeSpan();
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
index 45bd6ed2e47..deaf1977898 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
@@ -2,6 +2,7 @@
 
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.Location;
@@ -25,6 +26,10 @@ public class UnvalidatedRedirectModuleImpl extends SinkModuleBase
   private static final String LOCATION_HEADER = "Location";
   private static final String REFERER = "Referer";
 
+  public UnvalidatedRedirectModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onRedirect(final @Nullable String value) {
     if (!canBeTainted(value)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
index f06a52c4f02..0c61867614d 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.overhead.Operations;
@@ -14,9 +15,8 @@ public class WeakCipherModuleImpl extends SinkModuleBase implements WeakCipherMo
 
   private Config config;
 
-  @Override
-  public void registerDependencies(@Nonnull Dependencies dependencies) {
-    super.registerDependencies(dependencies);
+  public WeakCipherModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
     config = dependencies.getConfig();
   }
 
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
index 3d91d1d371b..88b9cb8b0a4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.overhead.Operations;
@@ -14,9 +15,8 @@ public class WeakHashModuleImpl extends SinkModuleBase implements WeakHashModule
 
   private Config config;
 
-  @Override
-  public void registerDependencies(@Nonnull Dependencies dependencies) {
-    super.registerDependencies(dependencies);
+  public WeakHashModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
     config = dependencies.getConfig();
   }
 
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
index d374927173a..7c13313eb30 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.VulnerabilityType;
 import com.datadog.iast.overhead.Operations;
@@ -11,6 +12,10 @@
 
 public class WeakRandomnessModuleImpl extends SinkModuleBase implements WeakRandomnessModule {
 
+  public WeakRandomnessModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onWeakRandom(@Nonnull final Class<?> instance) {
     if (isSecuredInstance(instance)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
index 3d610e75792..8cb864e443e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
@@ -1,5 +1,6 @@
 package com.datadog.iast.sink;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Location;
 import com.datadog.iast.model.Vulnerability;
@@ -18,6 +19,10 @@
 public class XContentTypeModuleImpl extends SinkModuleBase implements XContentTypeModule {
   private static final Logger LOGGER = LoggerFactory.getLogger(XContentTypeModuleImpl.class);
 
+  public XContentTypeModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onRequestEnd(final Object iastRequestContextObject, final IGSpanInfo igSpanInfo) {
     try {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
index 7e501b969a6..31633777c5e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
@@ -2,6 +2,7 @@
 
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.VulnerabilityType;
 import datadog.trace.api.iast.sink.XPathInjectionModule;
@@ -10,6 +11,11 @@
 import javax.annotation.Nullable;
 
 public class XPathInjectionModuleImpl extends SinkModuleBase implements XPathInjectionModule {
+
+  public XPathInjectionModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onExpression(@Nullable String expression) {
     if (!canBeTainted(expression)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
index 0168b73924f..da3d1e18337 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
@@ -3,6 +3,7 @@
 import static com.datadog.iast.taint.Ranges.rangesProviderFor;
 import static com.datadog.iast.taint.Tainteds.canBeTainted;
 
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Evidence;
 import com.datadog.iast.model.Location;
@@ -21,6 +22,10 @@
 
 public class XssModuleImpl extends SinkModuleBase implements XssModule {
 
+  public XssModuleImpl(final Dependencies dependencies) {
+    super(dependencies);
+  }
+
   @Override
   public void onXss(@Nonnull String s) {
     if (!canBeTainted(s)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/source/WebModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/source/WebModuleImpl.java
deleted file mode 100644
index b036a740f06..00000000000
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/source/WebModuleImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.datadog.iast.source;
-
-import static com.datadog.iast.taint.Tainteds.canBeTainted;
-
-import com.datadog.iast.IastRequestContext;
-import com.datadog.iast.model.Source;
-import com.datadog.iast.taint.TaintedObjects;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import javax.annotation.Nullable;
-
-public class WebModuleImpl implements WebModule {
-
-  @Override
-  public void onParameterNames(@Nullable final Collection<String> paramNames) {
-    onNamed(paramNames, SourceTypes.REQUEST_PARAMETER_NAME);
-  }
-
-  @Override
-  public void onParameterValues(
-      @Nullable final String paramName, @Nullable final String[] paramValues) {
-    onNamed(paramName, paramValues, SourceTypes.REQUEST_PARAMETER_VALUE);
-  }
-
-  @Override
-  public void onParameterValues(
-      @Nullable final String paramName, @Nullable final Collection<String> paramValues) {
-    onNamed(paramName, paramValues, SourceTypes.REQUEST_PARAMETER_VALUE);
-  }
-
-  @Override
-  public void onParameterValues(@Nullable final Map<String, String[]> values) {
-    onNamed(values, SourceTypes.REQUEST_PARAMETER_VALUE);
-  }
-
-  @Override
-  public void onHeaderNames(@Nullable final Collection<String> headerNames) {
-    onNamed(headerNames, SourceTypes.REQUEST_HEADER_NAME);
-  }
-
-  @Override
-  public void onHeaderValues(
-      @Nullable final String headerName, @Nullable final Collection<String> headerValues) {
-    onNamed(headerName, headerValues, SourceTypes.REQUEST_HEADER_VALUE);
-  }
-
-  @Override
-  public void onMultipartNames(@Nullable final Collection<String> headerNames) {
-    onNamed(headerNames, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-  }
-
-  @Override
-  public void onMultipartValues(
-      @Nullable final String headerName, @Nullable final Collection<String> headerValues) {
-    onNamed(headerName, headerValues, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-  }
-
-  @Override
-  public void onCookieNames(@Nullable Iterable<String> cookieNames) {
-    onNamed(cookieNames, SourceTypes.REQUEST_COOKIE_NAME);
-  }
-
-  @Override
-  public void onGetPathInfo(@Nullable String s) {
-    onNamed(Collections.singleton(s), SourceTypes.REQUEST_PATH);
-  }
-
-  @Override
-  public void onGetRequestURI(@Nullable String s) {
-    onNamed(Collections.singleton(s), SourceTypes.REQUEST_URI);
-  }
-
-  private static void onNamed(@Nullable final Iterable<String> names, final byte source) {
-    if (names == null) {
-      return;
-    }
-    Iterator<String> iterator = names.iterator();
-    if (!iterator.hasNext()) {
-      return;
-    }
-
-    final IastRequestContext ctx = IastRequestContext.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    do {
-      String name = iterator.next();
-      if (canBeTainted(name)) {
-        taintedObjects.taintInputString(name, new Source(source, name, name));
-      }
-    } while (iterator.hasNext());
-  }
-
-  private static void onNamed(
-      @Nullable final String name, @Nullable final Iterable<String> values, final byte source) {
-    if (values == null) {
-      return;
-    }
-    Iterator<String> iterator = values.iterator();
-    if (!iterator.hasNext()) {
-      return;
-    }
-
-    final IastRequestContext ctx = IastRequestContext.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    do {
-      String value = iterator.next();
-      if (canBeTainted(value)) {
-        taintedObjects.taintInputString(value, new Source(source, name, value));
-      }
-    } while (iterator.hasNext());
-  }
-
-  private static void onNamed(
-      @Nullable final String name, @Nullable final String[] values, final byte source) {
-    if (values == null || values.length == 0) {
-      return;
-    }
-    final IastRequestContext ctx = IastRequestContext.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    for (final String value : values) {
-      if (canBeTainted(value)) {
-        taintedObjects.taintInputString(value, new Source(source, name, value));
-      }
-    }
-  }
-
-  private static void onNamed(@Nullable final Map<String, String[]> values, final byte source) {
-    if (values == null || values.isEmpty()) {
-      return;
-    }
-    final IastRequestContext ctx = IastRequestContext.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final byte nameSource = SourceTypes.namedSource(source);
-    for (final Map.Entry<String, String[]> entry : values.entrySet()) {
-      final String name = entry.getKey();
-      if (canBeTainted(name)) {
-        taintedObjects.taintInputString(name, new Source(nameSource, name, name));
-      }
-      for (final String value : entry.getValue()) {
-        if (canBeTainted(value)) {
-          taintedObjects.taintInputString(value, new Source(source, name, value));
-        }
-      }
-    }
-  }
-}
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
index aa6543d1b59..992655086c5 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
@@ -1,7 +1,7 @@
 package com.datadog.iast.taint;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
 import static com.datadog.iast.taint.TaintedObject.MAX_RANGE_COUNT;
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
 
 import com.datadog.iast.model.Range;
 import com.datadog.iast.model.Source;
@@ -41,11 +41,20 @@ public Range[] ranges(final Object value) {
 
   private Ranges() {}
 
+  public static Range[] forCharSequence(
+      final @Nonnull CharSequence obj, final @Nonnull Source source) {
+    return forCharSequence(obj, source, NOT_MARKED);
+  }
+
   public static Range[] forCharSequence(
       final @Nonnull CharSequence obj, final @Nonnull Source source, final int mark) {
     return new Range[] {new Range(0, obj.length(), source, mark)};
   }
 
+  public static Range[] forObject(final @Nonnull Source source) {
+    return forObject(source, NOT_MARKED);
+  }
+
   public static Range[] forObject(final @Nonnull Source source, final int mark) {
     return new Range[] {new Range(0, Integer.MAX_VALUE, source, mark)};
   }
@@ -76,7 +85,7 @@ public static void copyShift(
 
   public static Range[] mergeRanges(
       final int offset, @Nonnull final Range[] rangesLeft, @Nonnull final Range[] rangesRight) {
-    final long nRanges = rangesLeft.length + rangesRight.length;
+    final long nRanges = rangesLeft.length + (long) rangesRight.length;
     final Range[] ranges = newArray(nRanges);
     int remaining = ranges.length;
     if (rangesLeft.length > 0) {
@@ -114,6 +123,7 @@ public static <E> RangesProvider<E> rangesProviderFor(
     return new ListProvider<>(items, to);
   }
 
+  @Nullable
   public static Range[] forSubstring(int offset, int length, final @Nonnull Range[] ranges) {
 
     int[] includedRangesInterval = getIncludedRangesInterval(offset, length, ranges);
@@ -175,6 +185,7 @@ public static int[] getIncludedRangesInterval(
     return new int[] {start, end};
   }
 
+  @Nonnull
   public static Range highestPriorityRange(@Nonnull final Range[] ranges) {
     /*
      * This approach is better but not completely correct ideally the highest priority should use the following patterns:
@@ -204,14 +215,16 @@ public interface RangesProvider<E> {
 
     int size();
 
+    @Nullable
     E value(final int index);
 
+    @Nullable
     Range[] ranges(final E value);
   }
 
   private abstract static class IterableProvider<E, LIST> implements RangesProvider<E> {
     private final LIST items;
-    private final Map<E, Range[]> ranges;
+    @Nullable private final Map<E, Range[]> ranges;
     private final int rangeCount;
 
     private IterableProvider(@Nonnull final LIST items, @Nonnull final TaintedObjects to) {
@@ -242,11 +255,13 @@ public int rangeCount() {
       return rangeCount;
     }
 
+    @Nullable
     @Override
     public E value(final int index) {
       return item(items, index);
     }
 
+    @Nullable
     @Override
     public Range[] ranges(final E value) {
       return ranges == null ? null : ranges.get(value);
@@ -259,12 +274,13 @@ public int size() {
 
     protected abstract int size(@Nonnull final LIST items);
 
+    @Nullable
     protected abstract E item(@Nonnull final LIST items, final int index);
   }
 
   private static class SingleProvider<E> implements RangesProvider<E> {
     private final E value;
-    private final TaintedObject tainted;
+    @Nullable private final TaintedObject tainted;
 
     private SingleProvider(@Nonnull final E value, @Nonnull final TaintedObjects to) {
       this.value = value;
@@ -281,11 +297,13 @@ public int size() {
       return 1;
     }
 
+    @Nullable
     @Override
     public E value(int index) {
       return index == 0 ? value : null;
     }
 
+    @Nullable
     @Override
     public Range[] ranges(E value) {
       return value == this.value && tainted != null ? tainted.getRanges() : null;
@@ -303,6 +321,7 @@ protected int size(@Nonnull final E[] items) {
       return items.length;
     }
 
+    @Nullable
     @Override
     protected E item(@Nonnull final E[] items, final int index) {
       return items[index];
@@ -320,13 +339,15 @@ protected int size(@Nonnull final List<E> items) {
       return items.size();
     }
 
+    @Nullable
     @Override
     protected E item(@Nonnull final List<E> items, final int index) {
       return items.get(index);
     }
   }
 
-  public static Range[] getNotMarkedRanges(final Range[] ranges, final int mark) {
+  @Nullable
+  public static Range[] getNotMarkedRanges(@Nullable final Range[] ranges, final int mark) {
     if (ranges == null) {
       return null;
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
index fa690a22ded..79f91c18a6a 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
@@ -223,7 +223,7 @@ private int remove(final TaintedObject entry) {
     if (cur == null) {
       return 0;
     }
-    for (TaintedObject prev = cur.next; cur != null; prev = cur, cur = cur.next) {
+    for (TaintedObject prev = cur.next; cur != null && prev != null; prev = cur, cur = cur.next) {
       if (cur == entry) {
         prev.next = cur.next;
         return 1;
@@ -259,7 +259,7 @@ private int index(int h) {
   private Iterator<TaintedObject> iterator(final int start, final int stop) {
     return new Iterator<TaintedObject>() {
       int currentIndex = start;
-      TaintedObject currentSubPos;
+      @Nullable TaintedObject currentSubPos;
 
       @Override
       public boolean hasNext() {
@@ -294,6 +294,8 @@ public TaintedObject next() {
     };
   }
 
+  @Nonnull
+  @Override
   public Iterator<TaintedObject> iterator() {
     return iterator(0, table.length);
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
index d8b60f6b68e..84d3b9c6091 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
@@ -14,7 +14,7 @@ public class TaintedObject extends WeakReference<Object> {
   public static final int MAX_RANGE_COUNT = Config.get().getIastMaxRangeCount();
 
   final int positiveHashCode;
-  TaintedObject next;
+  @Nullable TaintedObject next;
   private Range[] ranges;
 
   public TaintedObject(
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
index a292802992a..ab3b20e0401 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
@@ -1,13 +1,10 @@
 package com.datadog.iast.taint;
 
-import static com.datadog.iast.model.Range.NOT_MARKED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_MAX_CONCURRENT_REQUESTS;
 import static java.util.Collections.emptyIterator;
 
-import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.IastSystem;
 import com.datadog.iast.model.Range;
-import com.datadog.iast.model.Source;
 import com.datadog.iast.model.json.TaintedObjectEncoding;
 import datadog.trace.api.Config;
 import java.util.ArrayList;
@@ -16,19 +13,17 @@
 import java.util.UUID;
 import java.util.concurrent.ArrayBlockingQueue;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("UnusedReturnValue")
 public interface TaintedObjects extends Iterable<TaintedObject> {
 
-  TaintedObject taintInputString(@Nonnull String obj, @Nonnull Source source, int mark);
-
-  TaintedObject taintInputCharSequence(@Nonnull CharSequence obj, @Nonnull Source source, int mark);
-
-  TaintedObject taintInputObject(@Nonnull Object obj, @Nonnull Source source, int mark);
-
+  @Nullable
   TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges);
 
+  @Nullable
   TaintedObject get(@Nonnull Object obj);
 
   void release();
@@ -39,18 +34,6 @@ public interface TaintedObjects extends Iterable<TaintedObject> {
 
   boolean isFlat();
 
-  default TaintedObject taintInputString(@Nonnull String obj, @Nonnull Source source) {
-    return taintInputString(obj, source, NOT_MARKED);
-  }
-
-  default TaintedObject taintInputCharSequence(@Nonnull CharSequence obj, @Nonnull Source source) {
-    return taintInputCharSequence(obj, source, NOT_MARKED);
-  }
-
-  default TaintedObject taintInputObject(@Nonnull Object obj, @Nonnull Source source) {
-    return taintInputObject(obj, source, NOT_MARKED);
-  }
-
   static TaintedObjects acquire() {
     TaintedObjectsImpl taintedObjects = TaintedObjectsImpl.pool.poll();
     if (taintedObjects == null) {
@@ -59,22 +42,6 @@ static TaintedObjects acquire() {
     return IastSystem.DEBUG ? new TaintedObjectsDebugAdapter(taintedObjects) : taintedObjects;
   }
 
-  static TaintedObjects activeTaintedObjects(boolean lazy) {
-    if (lazy) {
-      return new LazyTaintedObjects();
-    } else {
-      final IastRequestContext ctx = IastRequestContext.get();
-      if (ctx != null) {
-        return ctx.getTaintedObjects();
-      }
-      return null;
-    }
-  }
-
-  static TaintedObjects activeTaintedObjects() {
-    return activeTaintedObjects(false);
-  }
-
   class TaintedObjectsImpl implements TaintedObjects {
 
     private static final ArrayBlockingQueue<TaintedObjectsImpl> pool =
@@ -92,35 +59,6 @@ private TaintedObjectsImpl(final @Nonnull TaintedMap map) {
       this.map = map;
     }
 
-    @Override
-    public TaintedObject taintInputString(
-        final @Nonnull String obj, final @Nonnull Source source, final int mark) {
-      final TaintedObject tainted =
-          new TaintedObject(
-              obj, Ranges.forCharSequence(obj, source, mark), map.getReferenceQueue());
-      map.put(tainted);
-      return tainted;
-    }
-
-    @Override
-    public TaintedObject taintInputCharSequence(
-        final @Nonnull CharSequence obj, final @Nonnull Source source, final int mark) {
-      final TaintedObject tainted =
-          new TaintedObject(
-              obj, Ranges.forCharSequence(obj, source, mark), map.getReferenceQueue());
-      map.put(tainted);
-      return tainted;
-    }
-
-    @Override
-    public TaintedObject taintInputObject(
-        @Nonnull Object obj, @Nonnull Source source, final int mark) {
-      final TaintedObject tainted =
-          new TaintedObject(obj, Ranges.forObject(source, mark), map.getReferenceQueue());
-      map.put(tainted);
-      return tainted;
-    }
-
     @Override
     public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
       final TaintedObject tainted = new TaintedObject(obj, ranges, map.getReferenceQueue());
@@ -128,6 +66,7 @@ public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ran
       return tainted;
     }
 
+    @Nullable
     @Override
     public TaintedObject get(final @Nonnull Object obj) {
       return map.get(obj);
@@ -154,13 +93,14 @@ public boolean isFlat() {
       return map.isFlat();
     }
 
+    @Nonnull
     @Override
     public Iterator<TaintedObject> iterator() {
       return map.iterator();
     }
   }
 
-  class TaintedObjectsDebugAdapter implements TaintedObjects {
+  final class TaintedObjectsDebugAdapter implements TaintedObjects {
     static final Logger LOGGER = LoggerFactory.getLogger(TaintedObjects.class);
 
     private final TaintedObjectsImpl delegated;
@@ -172,30 +112,7 @@ public TaintedObjectsDebugAdapter(final TaintedObjectsImpl delegated) {
       LOGGER.debug("new: id={}", id);
     }
 
-    @Override
-    public TaintedObject taintInputString(
-        final @Nonnull String obj, final @Nonnull Source source, final int mark) {
-      final TaintedObject tainted = delegated.taintInputString(obj, source, mark);
-      logTainted(tainted);
-      return tainted;
-    }
-
-    @Override
-    public TaintedObject taintInputCharSequence(
-        @Nonnull CharSequence obj, @Nonnull Source source, int mark) {
-      final TaintedObject tainted = delegated.taintInputCharSequence(obj, source, mark);
-      logTainted(tainted);
-      return tainted;
-    }
-
-    @Override
-    public TaintedObject taintInputObject(
-        @Nonnull Object obj, @Nonnull Source source, final int mark) {
-      final TaintedObject tainted = delegated.taintInputObject(obj, source, mark);
-      logTainted(tainted);
-      return tainted;
-    }
-
+    @Nullable
     @Override
     public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
       final TaintedObject tainted = delegated.taint(obj, ranges);
@@ -203,6 +120,7 @@ public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ran
       return tainted;
     }
 
+    @Nullable
     @Override
     public TaintedObject get(final @Nonnull Object obj) {
       return delegated.get(obj);
@@ -239,6 +157,7 @@ public boolean isFlat() {
       return delegated.isFlat();
     }
 
+    @Nonnull
     @Override
     public Iterator<TaintedObject> iterator() {
       return delegated.iterator();
@@ -255,110 +174,17 @@ private void logTainted(final TaintedObject tainted) {
     }
   }
 
-  class LazyTaintedObjects implements TaintedObjects {
-    private boolean fetched = false;
-    private TaintedObjects taintedObjects;
-
-    @Override
-    public TaintedObject taintInputString(
-        @Nonnull final String obj, @Nonnull final Source source, final int mark) {
-      final TaintedObjects to = getTaintedObjects();
-      return to == null ? null : to.taintInputString(obj, source, mark);
-    }
-
-    @Override
-    public TaintedObject taintInputCharSequence(
-        @Nonnull CharSequence obj, @Nonnull Source source, int mark) {
-      final TaintedObjects to = getTaintedObjects();
-      return to == null ? null : to.taintInputCharSequence(obj, source, mark);
-    }
-
-    @Override
-    public TaintedObject taintInputObject(
-        @Nonnull final Object obj, @Nonnull final Source source, final int mark) {
-      final TaintedObjects to = getTaintedObjects();
-      return to == null ? null : to.taintInputObject(obj, source, mark);
-    }
-
-    @Override
-    public TaintedObject taint(@Nonnull final Object obj, @Nonnull final Range[] ranges) {
-      final TaintedObjects to = getTaintedObjects();
-      return to == null ? null : to.taint(obj, ranges);
-    }
-
-    @Override
-    public TaintedObject get(@Nonnull final Object obj) {
-      final TaintedObjects to = getTaintedObjects();
-      return to == null ? null : to.get(obj);
-    }
-
-    @Override
-    public void release() {
-      final TaintedObjects to = getTaintedObjects();
-      if (to != null) {
-        to.release();
-      }
-    }
-
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      final TaintedObjects to = getTaintedObjects();
-      return to != null ? to.iterator() : emptyIterator();
-    }
-
-    @Override
-    public int getEstimatedSize() {
-      final TaintedObjects to = getTaintedObjects();
-      return to != null ? to.getEstimatedSize() : 0;
-    }
-
-    @Override
-    public boolean isFlat() {
-      final TaintedObjects to = getTaintedObjects();
-      return to != null && to.isFlat();
-    }
-
-    @Override
-    public int count() {
-      final TaintedObjects to = getTaintedObjects();
-      return to != null ? to.count() : 0;
-    }
-
-    private TaintedObjects getTaintedObjects() {
-      if (!fetched) {
-        fetched = true;
-        taintedObjects = activeTaintedObjects();
-      }
-      return taintedObjects;
-    }
-  }
-
-  enum NoOp implements TaintedObjects {
-    INSTANCE;
-
-    @Override
-    public TaintedObject taintInputString(
-        @Nonnull final String obj, @Nonnull final Source source, final int mark) {
-      return null;
-    }
-
-    @Override
-    public TaintedObject taintInputCharSequence(
-        @Nonnull CharSequence obj, @Nonnull Source source, int mark) {
-      return null;
-    }
+  final class NoOp implements TaintedObjects {
 
-    @Override
-    public TaintedObject taintInputObject(
-        @Nonnull final Object obj, @Nonnull final Source source, final int mark) {
-      return null;
-    }
+    public static final TaintedObjects INSTANCE = new NoOp();
 
+    @Nullable
     @Override
     public TaintedObject taint(@Nonnull final Object obj, @Nonnull final Range[] ranges) {
       return null;
     }
 
+    @Nullable
     @Override
     public TaintedObject get(@Nonnull final Object obj) {
       return null;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
index 142249ec1fe..422f677d553 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
@@ -1,17 +1,21 @@
 package com.datadog.iast.taint;
 
 import java.util.Collection;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import org.jetbrains.annotations.Contract;
 
 /** Utilitiles to work with {@link TaintedObject} */
 public final class Tainteds {
 
   private Tainteds() {}
 
+  @Contract("null -> false")
   public static boolean canBeTainted(@Nullable final CharSequence s) {
     return s != null && s.length() > 0;
   }
 
+  @Contract("null -> false")
   public static <E extends CharSequence> boolean canBeTainted(@Nullable final E[] e) {
     if (e == null || e.length == 0) {
       return false;
@@ -24,6 +28,7 @@ public static <E extends CharSequence> boolean canBeTainted(@Nullable final E[]
     return false;
   }
 
+  @Contract("null -> false")
   public static <E extends CharSequence> boolean canBeTainted(@Nullable final Collection<E> e) {
     if (e == null || e.isEmpty()) {
       return false;
@@ -36,7 +41,9 @@ public static <E extends CharSequence> boolean canBeTainted(@Nullable final Coll
     return false;
   }
 
-  public static TaintedObject getTainted(final TaintedObjects to, final Object value) {
+  @Nullable
+  public static TaintedObject getTainted(
+      @Nonnull final TaintedObjects to, @Nullable final Object value) {
     return value == null ? null : to.get(value);
   }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
index 1bf6033ca8a..5e647355b09 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
@@ -1,6 +1,6 @@
 package com.datadog.iast.telemetry;
 
-import com.datadog.iast.HasDependencies.Dependencies;
+import com.datadog.iast.Dependencies;
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.RequestStartedHandler;
 import com.datadog.iast.taint.TaintedObjects;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
index 951bd9ec15f..1ac059b0b54 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
@@ -6,13 +6,13 @@
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.model.Range;
-import com.datadog.iast.model.Source;
 import com.datadog.iast.taint.TaintedObject;
 import com.datadog.iast.taint.TaintedObjects;
 import datadog.trace.api.iast.telemetry.IastMetricCollector;
 import datadog.trace.api.iast.telemetry.Verbosity;
 import java.util.Iterator;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class TaintedObjectsWithTelemetry implements TaintedObjects {
 
@@ -31,7 +31,7 @@ public static TaintedObjects build(
 
   private final TaintedObjects delegate;
   private final boolean debug;
-  private IastRequestContext ctx;
+  @Nullable private IastRequestContext ctx;
 
   protected TaintedObjectsWithTelemetry(final boolean debug, final TaintedObjects delegate) {
     this.delegate = delegate;
@@ -46,26 +46,7 @@ public void initContext(final IastRequestContext ctx) {
     this.ctx = ctx;
   }
 
-  @Override
-  public TaintedObject taintInputString(
-      @Nonnull String obj, @Nonnull Source source, final int mark) {
-    final TaintedObject result = delegate.taintInputString(obj, source, mark);
-    if (debug) {
-      IastMetricCollector.add(EXECUTED_TAINTED, 1, ctx);
-    }
-    return result;
-  }
-
-  @Override
-  public TaintedObject taintInputCharSequence(
-      @Nonnull CharSequence obj, @Nonnull Source source, int mark) {
-    final TaintedObject result = delegate.taintInputCharSequence(obj, source, mark);
-    if (debug) {
-      IastMetricCollector.add(EXECUTED_TAINTED, 1, ctx);
-    }
-    return result;
-  }
-
+  @Nullable
   @Override
   public TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges) {
     final TaintedObject result = delegate.taint(obj, ranges);
@@ -75,16 +56,7 @@ public TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges) {
     return result;
   }
 
-  @Override
-  public TaintedObject taintInputObject(
-      @Nonnull Object obj, @Nonnull Source source, final int mark) {
-    final TaintedObject result = delegate.taintInputObject(obj, source, mark);
-    if (debug) {
-      IastMetricCollector.add(EXECUTED_TAINTED, 1, ctx);
-    }
-    return result;
-  }
-
+  @Nullable
   @Override
   public TaintedObject get(@Nonnull Object obj) {
     return delegate.get(obj);
@@ -102,6 +74,7 @@ public void release() {
     }
   }
 
+  @Nonnull
   @Override
   public Iterator<TaintedObject> iterator() {
     return delegate.iterator();
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
index 54dec1ec58a..bc238eac288 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
@@ -5,8 +5,10 @@
 import datadog.trace.api.iast.util.Cookie;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +46,7 @@ public static List<Cookie> parse(final String cookieString) {
     }
   }
 
+  @Nullable
   private static Cookie parseInternal(final String header) {
     String cookieName;
     boolean httpOnly = false;
@@ -111,7 +114,7 @@ private static List<String> splitMultiCookies(final String header) {
   }
 
   private static int guessCookieVersion(String header) {
-    header = header.toLowerCase();
+    header = header.toLowerCase(Locale.ROOT);
     if (header.contains("expires=")) {
       // only netscape cookie using 'expires'
       return 0;
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
index 36ee2b86501..5d58ea8a617 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
@@ -6,6 +6,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 
 public class HttpHeader {
 
@@ -19,6 +20,7 @@ public boolean matches(final String name) {
     return this.name.equalsIgnoreCase(name);
   }
 
+  @Nullable
   public static HttpHeader from(final String name) {
     return Values.HEADERS.get(name.toLowerCase(Locale.ROOT));
   }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
index c9178b749c1..01f5e568061 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
@@ -15,6 +15,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +26,7 @@ public class ObjectVisitor {
 
   private static final int MAX_VISITED_OBJECTS = 1000;
   private static final int MAX_DEPTH = 10;
-  private static final Method TRY_SET_ACCESSIBLE;
+  @Nullable private static final Method TRY_SET_ACCESSIBLE;
 
   static {
     TRY_SET_ACCESSIBLE = fetchTrySetAccessibleMethod();
@@ -210,6 +211,7 @@ private static boolean inspectField(final Field field) {
     return true;
   }
 
+  @Nullable
   private static Method fetchTrySetAccessibleMethod() {
     Method method = null;
     if (Platform.isJavaVersionAtLeast(9)) {
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
index 1cde27dc057..645fb58cfdc 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
@@ -5,6 +5,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
 
 public interface Ranged {
 
@@ -62,6 +63,7 @@ default List<Ranged> remove(final Ranged range) {
   }
 
   /** Computes the intersection of the ranges or {@code null} if they do not intersect */
+  @Nullable
   default Ranged intersection(final Ranged range) {
     if (this.getStart() == range.getStart() && this.getLength() == range.getLength()) {
       return this;
@@ -84,7 +86,7 @@ default Ranged intersection(final Ranged range) {
     }
   }
 
-  default boolean isBefore(final Ranged range) {
+  default boolean isBefore(@Nullable final Ranged range) {
     if (range == null) {
       return true;
     }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
index faef93afde0..4e66a2bf5a1 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
@@ -9,8 +9,10 @@
 /** */
 public interface RangedDeque<E extends Ranged> {
 
+  @Nullable
   E poll();
 
+  @Nullable
   E peek();
 
   void addFirst(@Nonnull E item);
@@ -31,8 +33,9 @@ abstract class BaseRangedDequeue<E extends Ranged> implements RangedDeque<E> {
 
     private final Deque<E> head = new LinkedList<>();
 
-    protected E next;
+    @Nullable protected E next;
 
+    @Nullable
     @Override
     public final E poll() {
       final E result = next;
@@ -40,6 +43,7 @@ public final E poll() {
       return result;
     }
 
+    @Nullable
     @Override
     public final E peek() {
       return next;
@@ -58,15 +62,18 @@ public final boolean isEmpty() {
       return next == null;
     }
 
+    @Nullable
     protected final E fetchNext() {
       return head.isEmpty() ? internalPoll() : head.poll();
     }
 
+    @Nullable
     protected abstract E internalPoll();
   }
 
   class EmptyRangedDequeue<E extends Ranged> extends BaseRangedDequeue<E> {
 
+    @Nullable
     @Override
     protected E internalPoll() {
       return null;
@@ -82,6 +89,7 @@ class TokenizerQueue extends BaseRangedDequeue<Ranged> {
       next = fetchNext();
     }
 
+    @Nullable
     @Override
     protected Ranged internalPoll() {
       return tokenizer.next() ? tokenizer.current() : null;
@@ -99,6 +107,7 @@ class ArrayQueue<E extends Ranged> extends BaseRangedDequeue<E> {
       next = fetchNext();
     }
 
+    @Nullable
     @Override
     protected E internalPoll() {
       return index >= array.length ? null : array[index++];
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/GrpcRequestMessageHandlerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/GrpcRequestMessageHandlerTest.groovy
index d3c31196f87..2d9597e728b 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/GrpcRequestMessageHandlerTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/GrpcRequestMessageHandlerTest.groovy
@@ -1,5 +1,6 @@
 package com.datadog.iast
 
+import com.datadog.iast.propagation.PropagationModuleImpl
 import com.datadog.iast.protobuf.Test2
 import com.datadog.iast.protobuf.Test3
 import com.datadog.iast.util.ObjectVisitor
@@ -8,6 +9,8 @@ import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
+import datadog.trace.api.iast.telemetry.IastMetric
+import datadog.trace.api.iast.telemetry.IastMetricCollector
 import datadog.trace.test.util.DDSpecification
 import foo.bar.VisitableClass
 
@@ -22,9 +25,9 @@ class GrpcRequestMessageHandlerTest extends DDSpecification {
   private RequestContext ctx
 
   void setup() {
-    propagation = Mock(PropagationModule)
+    propagation = Spy(new PropagationModuleImpl())
     InstrumentationBridge.registerIastModule(propagation)
-    iastCtx = Mock(IastRequestContext)
+    iastCtx = Spy(new IastRequestContext())
     ctx = Mock(RequestContext) {
       getData(RequestContextSlot.IAST) >> iastCtx
     }
@@ -62,7 +65,7 @@ class GrpcRequestMessageHandlerTest extends DDSpecification {
     handler.apply(ctx, target)
 
     then:
-    1 * propagation.taintDeeply(iastCtx, SourceTypes.GRPC_BODY, target, _ as Predicate<Class<?>>)
+    1 * propagation.taintDeeply(iastCtx, target, SourceTypes.GRPC_BODY, _ as Predicate<Class<?>>)
   }
 
   void 'the handler only takes into account protobuf v.#protobufVersion related messages'() {
@@ -73,7 +76,6 @@ class GrpcRequestMessageHandlerTest extends DDSpecification {
         return CONTINUE
       }
     }
-    final url = 'https://dd.datad0g.com/'
     final nonProtobufMessage = new VisitableClass(name: 'test')
     final filter = GrpcRequestMessageHandler::isProtobufArtifact
 
@@ -102,6 +104,24 @@ class GrpcRequestMessageHandlerTest extends DDSpecification {
     protobufMessage << [buildProto2Message(), buildProto3Message()]
   }
 
+  void 'test that metrics are properly generated'() {
+    given:
+    final collector = Spy(new IastMetricCollector())
+    iastCtx.getMetricCollector() >> collector
+    final handler = new GrpcRequestMessageHandler()
+
+    when:
+    handler.apply(ctx, message)
+
+    then:
+    1 * collector.addMetric(IastMetric.EXECUTED_SOURCE, SourceTypes.GRPC_BODY, 6)
+
+    where:
+    message              | _
+    buildProto2Message() | _
+    buildProto3Message() | _
+  }
+
   private static def buildProto2Message() {
     final child = Test2.Proto2Child.newBuilder()
     .setOptional("optional")
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastModuleImplTestBase.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastModuleImplTestBase.groovy
index d47ce8e0a14..9ad167ed6c6 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastModuleImplTestBase.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastModuleImplTestBase.groovy
@@ -1,6 +1,5 @@
 package com.datadog.iast
 
-import com.datadog.iast.HasDependencies.Dependencies
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
 import datadog.trace.api.Config
@@ -25,6 +24,8 @@ class IastModuleImplTestBase extends DDSpecification {
   // TODO replace by mock an fix all mock assertions (0 * _ will usually fail)
   protected StackWalker stackWalker = StackWalkerFactory.INSTANCE
 
+  protected Dependencies dependencies = new Dependencies(Config.get(), reporter, overheadController, stackWalker)
+
   void setup() {
     AgentTracer.forceRegister(tracer)
     overheadController.acquireRequest() >> true
@@ -34,9 +35,4 @@ class IastModuleImplTestBase extends DDSpecification {
   void cleanup() {
     AgentTracer.forceRegister(ORIGINAL_TRACER)
   }
-
-  protected <E extends HasDependencies> E registerDependencies(final E module) {
-    module.registerDependencies(new Dependencies(Config.get(), reporter, overheadController, stackWalker))
-    return module
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestEndedHandlerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestEndedHandlerTest.groovy
index b205d9d3eba..b325a373d90 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestEndedHandlerTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestEndedHandlerTest.groovy
@@ -1,6 +1,5 @@
 package com.datadog.iast
 
-import com.datadog.iast.HasDependencies.Dependencies
 import com.datadog.iast.overhead.OverheadController
 import datadog.trace.api.Config
 import datadog.trace.api.gateway.Flow
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestStartedHandlerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestStartedHandlerTest.groovy
index f70e087b146..8a0ca4e2c4a 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestStartedHandlerTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/RequestStartedHandlerTest.groovy
@@ -1,6 +1,5 @@
 package com.datadog.iast
 
-import com.datadog.iast.HasDependencies.Dependencies
 import com.datadog.iast.overhead.OverheadController
 import datadog.trace.api.Config
 import datadog.trace.api.gateway.Flow
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/RangeTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/RangeTest.groovy
index 5a3561fe7f8..c4992278756 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/RangeTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/RangeTest.groovy
@@ -35,7 +35,7 @@ class RangeTest extends DDSpecification {
   def 'shift zero'() {
     given:
     final source = new Source(SourceTypes.NONE, null, null)
-    final orig = new Range(0, 1, source, Range.NOT_MARKED)
+    final orig = new Range(0, 1, source, VulnerabilityMarks.NOT_MARKED)
 
     when:
     final result = orig.shift(0)
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy
index 51568f75e64..408219c9000 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy
@@ -27,9 +27,6 @@ class VulnerabilityTypeTest extends DDSpecification {
     WEAK_CIPHER                 | getSpanAndClassAndMethodLocation(123) | new Evidence("MD5")         | 3265519776
     WEAK_CIPHER                 | getSpanAndClassAndMethodLocation(456) | new Evidence("MD4")         | 3265519776
     WEAK_CIPHER                 | getSpanAndClassAndMethodLocation(789) | null                        | 3265519776
-    WEAK_CIPHER                 | null                                  | new Evidence("MD5")         | 1272119222
-    WEAK_CIPHER                 | null                                  | new Evidence("MD4")         | 1272119222
-    WEAK_CIPHER                 | null                                  | null                        | 1272119222
     INSECURE_COOKIE             | getSpanAndStackLocation(123)          | null                        | 3471934557
     INSECURE_COOKIE             | getSpanAndStackLocation(123)          | new Evidence("cookieName1") | 360083726
     INSECURE_COOKIE             | getSpanAndStackLocation(123)          | new Evidence("cookieName2") | 2357141684
@@ -47,19 +44,19 @@ class VulnerabilityTypeTest extends DDSpecification {
     HSTS_HEADER_MISSING         | getSpanLocation(123, 'serviceName2')  | null                        | 1268102093
   }
 
-  private Location getSpanAndStackLocation(final long spanId){
+  private Location getSpanAndStackLocation(final long spanId) {
     final span = Mock(AgentSpan)
     span.getSpanId() >> spanId
     return Location.forSpanAndStack(span, new StackTraceElement("foo", "foo", "foo", 1))
   }
 
-  private Location getSpanAndClassAndMethodLocation(final long spanId){
+  private Location getSpanAndClassAndMethodLocation(final long spanId) {
     final span = Mock(AgentSpan)
     span.getSpanId() >> spanId
     return Location.forSpanAndClassAndMethod(span, "foo", "foo")
   }
 
-  private Location getSpanLocation(final long spanId, final String serviceName){
+  private Location getSpanLocation(final long spanId, final String serviceName) {
     final span = Mock(AgentSpan)
     span.getSpanId() >> spanId
     span.getServiceName() >> serviceName
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceEncodingTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceEncodingTest.groovy
index c946e53f70a..9b3d67e9339 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceEncodingTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceEncodingTest.groovy
@@ -10,6 +10,8 @@ import datadog.trace.test.util.DDSpecification
 import org.skyscreamer.jsonassert.JSONAssert
 import spock.lang.Shared
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
+
 class EvidenceEncodingTest extends DDSpecification {
 
   private static final List<Source> SOURCES_SUITE = (0..2).collect { new Source((byte) it, "name$it", "value$it") }
@@ -65,7 +67,7 @@ class EvidenceEncodingTest extends DDSpecification {
   }
 
   private static Range range(final int start, final int length, final Source source) {
-    return new Range(start, length, source, Range.NOT_MARKED)
+    return new Range(start, length, source, NOT_MARKED)
   }
 
   private static Source source(final int index) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/TaintedObjectEncodingTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/TaintedObjectEncodingTest.groovy
index 55956358225..dfbc0fb8275 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/TaintedObjectEncodingTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/TaintedObjectEncodingTest.groovy
@@ -10,6 +10,8 @@ import org.skyscreamer.jsonassert.JSONAssert
 
 import java.lang.ref.ReferenceQueue
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
+
 class TaintedObjectEncodingTest extends DDSpecification {
 
   @Override
@@ -87,7 +89,7 @@ class TaintedObjectEncodingTest extends DDSpecification {
   private TaintedObject taintedObject(final String value, final byte sourceType, final String sourceName, final String sourceValue) {
     return new TaintedObject(
       value,
-      [new Range(0, value.length(), new Source(sourceType, sourceName, sourceValue), Range.NOT_MARKED)] as Range[],
+      [new Range(0, value.length(), new Source(sourceType, sourceName, sourceValue), NOT_MARKED)] as Range[],
       Mock(ReferenceQueue))
   }
 }
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy
index e56e6afa77b..4ade1c08a8d 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy
@@ -16,7 +16,7 @@ import org.skyscreamer.jsonassert.JSONAssert
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 
 class VulnerabilityEncodingTest extends DDSpecification {
 
@@ -539,6 +539,25 @@ class VulnerabilityEncodingTest extends DDSpecification {
 
   }
 
+  void 'exception during serialization is caught'() {
+    given:
+    final value = new VulnerabilityBatch()
+    final type = Mock(VulnerabilityType) {
+      name() >> { throw new RuntimeException("ERROR") }
+    }
+    final vuln = new Vulnerability(type, null, null)
+    value.add(vuln)
+
+    when:
+    final result = VulnerabilityEncoding.toJson(value)
+
+    then:
+    JSONAssert.assertEquals('''{
+      "vulnerabilities": [
+      ]
+    }''', result, true)
+  }
+
   private static String generateLargeString(){
     int targetSize = 25 * 1024
     StringBuilder sb = new StringBuilder()
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy
index c8b45e183ec..e573d5dfb2c 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy
@@ -4,6 +4,9 @@ import com.datadog.iast.IastModuleImplTestBase
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.model.Range
 import com.datadog.iast.model.Source
+import com.datadog.iast.taint.Ranges
+import com.datadog.iast.taint.TaintedObject
+import datadog.trace.api.Config
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.SourceTypes
@@ -11,25 +14,19 @@ import datadog.trace.api.iast.Taintable
 import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.propagation.PropagationModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import groovy.transform.CompileDynamic
+import org.junit.Assume
 
-import static com.datadog.iast.model.Range.NOT_MARKED
-import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
-import static com.datadog.iast.taint.TaintUtils.fromTaintFormat
-import static datadog.trace.api.iast.VulnerabilityMarks.SQL_INJECTION_MARK
-import static datadog.trace.api.iast.VulnerabilityMarks.XPATH_INJECTION_MARK
-import static datadog.trace.api.iast.VulnerabilityMarks.XSS_MARK
+import static com.datadog.iast.taint.Ranges.highestPriorityRange
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 
-@CompileDynamic
 class PropagationModuleTest extends IastModuleImplTestBase {
 
   private PropagationModule module
-  private List<Object> objectHolder
+
   private IastRequestContext ctx
 
-  def setup() {
+  void setup() {
     module = new PropagationModuleImpl()
-    objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
       getData(RequestContextSlot.IAST) >> ctx
@@ -40,54 +37,49 @@ class PropagationModuleTest extends IastModuleImplTestBase {
     tracer.activeSpan() >> span
   }
 
-  void '#method null or empty'() {
-    when:
+  void '#method(#args) not taintable'() {
+    when: 'there is no context by default'
     module.&"$method".call(args.toArray())
 
-    then:
+    then: 'no mock calls should happen'
+    0 * _
+
+    when: 'there is a context'
+    args.add(0, ctx)
+    module.&"$method".call(args.toArray())
+
+    then: 'no mock calls should happen'
     0 * _
 
     where:
-    method                                     | args
-    'taintIfInputIsTainted'                    | [null, null]
-    'taintIfInputIsTainted'                    | [null, new Object()]
-    'taintIfInputIsTainted'                    | [null, 'test']
-    'taintIfInputIsTainted'                    | [new Object(), null]
-    'taintIfInputIsTainted'                    | [null as String, null]
-    'taintIfInputIsTainted'                    | ['', null]
-    'taintIfInputIsTainted'                    | ['', new Object()]
-    'taintIfInputIsTainted'                    | [null as String, new Object()]
-    'taintIfInputIsTainted'                    | ['test', null]
-    'taintIfInputIsTainted'                    | [null as String, 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', null as String, null]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', '', null]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', '', new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', null as String, new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'test', null]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', null as String, 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [].toSet(), 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, ['test'].toSet(), null]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [:].entrySet().toList(), 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [key: "value"].entrySet().toList(), null]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', null as Collection, 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', [], 'test']
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', ['value'], null]
-    'taintObjectIfInputIsTaintedKeepingRanges' | [null, new Object()]
-    'taintObjectIfInputIsTaintedKeepingRanges' | [new Object(), null]
-    'taintIfAnyInputIsTainted'                 | [null, null]
-    'taintIfAnyInputIsTainted'                 | [null, [].toArray()]
-    'taintIfAnyInputIsTainted'                 | ['test', [].toArray()]
-    'taint'                                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', null as String]
-    'taint'                                    | [SourceTypes.REQUEST_PARAMETER_VALUE, null as String, null as String]
-    'taint'                                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', '']
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, null as Object[]]
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, [] as Object[]]
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, null as Collection]
-    'taintIfInputIsTaintedWithMarks'           | ['', null, VulnerabilityMarks.XSS_MARK]
-    'taintIfInputIsTaintedWithMarks'           | ['', new Object(), VulnerabilityMarks.XSS_MARK]
-    'taintIfInputIsTaintedWithMarks'           | [null as String, new Object(), VulnerabilityMarks.XSS_MARK]
-    'taintIfInputIsTaintedWithMarks'           | ['test', null, VulnerabilityMarks.XSS_MARK]
-    'taintIfInputIsTaintedWithMarks'           | [null as String, 'test', VulnerabilityMarks.XSS_MARK]
+    method              | args
+    'taint'             | [null, SourceTypes.REQUEST_PARAMETER_VALUE]
+    'taint'             | [null, SourceTypes.REQUEST_PARAMETER_VALUE, 'name']
+    'taint'             | [null, SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
+    'taintIfTainted'    | [null, 'test']
+    'taintIfTainted'    | ['test', null]
+    'taintIfTainted'    | [null, 'test', false, NOT_MARKED]
+    'taintIfTainted'    | ['test', null, false, NOT_MARKED]
+    'taintIfTainted'    | [null, 'test']
+    'taintIfTainted'    | ['test', null]
+    'taintIfTainted'    | [null, 'test', SourceTypes.REQUEST_PARAMETER_VALUE]
+    'taintIfTainted'    | ['test', null, SourceTypes.REQUEST_PARAMETER_VALUE]
+    'taintIfTainted'    | [null, 'test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name']
+    'taintIfTainted'    | ['test', null, SourceTypes.REQUEST_PARAMETER_VALUE, 'name']
+    'taintIfTainted'    | [null, 'test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
+    'taintIfTainted'    | ['test', null, SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
+    'taintIfAnyTainted' | [null, ['test'] as Object[]]
+    'taintIfAnyTainted' | ['test', null]
+    'taintIfAnyTainted' | ['test', [] as Object[]]
+    'taintDeeply'       | [
+      null,
+      SourceTypes.REQUEST_PARAMETER_VALUE,
+      {
+        true
+      }
+    ]
+    'findSource'        | [null]
+    'isTainted'         | [null]
   }
 
   void '#method without span'() {
@@ -99,379 +91,264 @@ class PropagationModuleTest extends IastModuleImplTestBase {
     0 * _
 
     where:
-    method                                     | args
-    'taintIfInputIsTainted'                    | [new Object(), new Object()]
-    'taintIfInputIsTainted'                    | [new Object(), 'test']
-    'taintIfInputIsTainted'                    | ['test', new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value', new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', ['value'], new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, ['value'].toSet(), new Object()]
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [key: 'value'].entrySet().toList(), new Object()]
-    'taintObjectIfInputIsTaintedKeepingRanges' | [new Object(), new Object()]
-    'taintIfAnyInputIsTainted'                 | ['value', ['test', 'test2'].toArray()]
-    'taint'                                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, [new Object()] as Object[]]
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, [new Object()]]
-    'taintObjects'                             | [SourceTypes.REQUEST_PARAMETER_VALUE, [new Object()] as Collection<Object>]
-    'taintIfInputIsTaintedWithMarks'           | ['test', new Object(), VulnerabilityMarks.XSS_MARK]
+    method              | args
+    'taint'             | ['test', SourceTypes.REQUEST_PARAMETER_VALUE]
+    'taint'             | ['test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name']
+    'taint'             | ['test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
+    'taintIfTainted'    | ['test', 'test']
+    'taintIfTainted'    | ['test', 'test', false, NOT_MARKED]
+    'taintIfTainted'    | ['test', 'test', SourceTypes.REQUEST_PARAMETER_VALUE]
+    'taintIfTainted'    | ['test', 'test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name']
+    'taintIfTainted'    | ['test', 'test', SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value']
+    'taintIfAnyTainted' | ['test', ['test']]
+    'taintDeeply'       | [
+      'test',
+      SourceTypes.REQUEST_PARAMETER_VALUE,
+      {
+        true
+      }
+    ]
+    'findSource'        | ['test']
+    'isTainted'         | ['test']
   }
 
-  void 'test propagation for #method'() {
+  void 'test taint'() {
     given:
-    final toTaint = toTaintClosure.call(args)
-    final targetMethod = module.&"$method"
-    final arguments = args.toArray()
-    final input = inputClosure.call(arguments)
+    final value = (target instanceof CharSequence) ? target.toString() : null
+    final source = taintedSource(value)
+    final ranges = Ranges.forObject(source)
 
     when:
-    targetMethod.call(arguments)
+    module.taint(target, source.origin, source.name, source.value)
 
     then:
-    assertNotTainted(toTaint)
-
-    when:
-    taint(input)
-    targetMethod.call(arguments)
-
-    then:
-    assertTainted(toTaint)
+    final tainted = getTaintedObject(target)
+    if (shouldTaint) {
+      assertTainted(tainted, ranges)
+    } else {
+      assert tainted == null
+    }
 
     where:
-    method                                     | args                                                                                            | toTaintClosure            | inputClosure
-    'taintIfInputIsTainted'                    | [new Object(), 'I am an string']                                                                | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | [new Object(), new Object()]                                                                    | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | [new Object(), new MockTaintable()]                                                             | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | ['Hello', 'I am an string']                                                                     | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | ['Hello', new Object()]                                                                         | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | ['Hello', new MockTaintable()]                                                                  | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value', 'I am an string']                        | {
-      it[2]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value', new Object()]                            | {
-      it[2]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value', new MockTaintable()]                     | {
-      it[2]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', ['value'], 'I am an string']                      | {
-      it[2][0]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', ['value'], new Object()]                          | {
-      it[2][0]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, 'name', ['value'], new MockTaintable()]                   | {
-      it[2][0]
-    }                                                                                                                                                                        | {
-      it[3]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, ['value'].toSet(), 'I am an string']                      | {
-      it[1][0]
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, ['value'].toSet(), new Object()]                          | {
-      it[1][0]
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, ['value'].toSet(), new MockTaintable()]                   | {
-      it[1][0]
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [name: 'value'].entrySet().toList(), 'I am an string']    | {
-      it[1][0].value
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [name: 'value'].entrySet().toList(), new Object()]        | {
-      it[1][0].value
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintIfInputIsTainted'                    | [SourceTypes.REQUEST_PARAMETER_VALUE, [name: 'value'].entrySet().toList(), new MockTaintable()] | {
-      it[1][0].value
-    }                                                                                                                                                                        | {
-      it[2]
-    }
-    'taintObjectIfInputIsTaintedKeepingRanges' | [new Object(), new Object()]                                                                    | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintObjectIfInputIsTaintedKeepingRanges' | [new Object(), new MockTaintable()]                                                             | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfAnyInputIsTainted'                 | [new Object(), ['I am an string'].toArray()]                                                    | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfAnyInputIsTainted'                 | [new Object(), [new Object()].toArray()]                                                        | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfAnyInputIsTainted'                 | [new Object(), [new MockTaintable()].toArray()]                                                 | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfAnyInputIsTainted'                 | ['Hello', ['I am an string'].toArray()]                                                         | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfAnyInputIsTainted'                 | ['Hello', [new Object()].toArray()]                                                             | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfAnyInputIsTainted'                 | ['Hello', [new MockTaintable()].toArray()]                                                      | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1][0]
-    }
-    'taintIfInputIsTaintedWithMarks'           | ['Hello', 'I am an string', VulnerabilityMarks.XSS_MARK]                                        | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTaintedWithMarks'           | ['Hello', new Object(), VulnerabilityMarks.XSS_MARK]                                            | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
-    'taintIfInputIsTaintedWithMarks'           | ['Hello', new MockTaintable(), VulnerabilityMarks.XSS_MARK]                                     | {
-      it[0]
-    }                                                                                                                                                                        | {
-      it[1]
-    }
+    target                         | shouldTaint
+    string('string')               | true
+    stringBuilder('stringBuilder') | true
+    date()                         | true
+    taintable()                    | true
   }
 
-  void 'test value source for #method'() {
+  void 'test taintIfTainted keeping ranges'() {
     given:
-    final span = Mock(AgentSpan)
-    tracer.activeSpan() >> span
-    final reqCtx = Mock(RequestContext)
-    span.getRequestContext() >> reqCtx
-    final ctx = new IastRequestContext()
-    reqCtx.getData(RequestContextSlot.IAST) >> ctx
+    def (target, input) = suite
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
 
-    when:
-    module."$method"(source, name, value)
+    when: 'input is not tainted'
+    module.taintIfTainted(target, input, true, NOT_MARKED)
 
     then:
-    1 * tracer.activeSpan() >> span
-    1 * span.getRequestContext() >> reqCtx
-    1 * reqCtx.getData(RequestContextSlot.IAST) >> ctx
-    0 * _
-    ctx.getTaintedObjects().get(name) == null
-    def to = ctx.getTaintedObjects().get(value)
-    to != null
-    to.get() == value
-    to.ranges.size() == 1
-    to.ranges[0].start == 0
-    to.ranges[0].length == value.length()
-    to.ranges[0].source == new Source(source, name, value)
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfTainted(target, input, true, NOT_MARKED)
+
+    then:
+    final tainted = getTaintedObject(target)
+    if (target instanceof Taintable) {
+      // only first range is kept
+      assertTainted(tainted, [taintedFrom.ranges[0]] as Range[])
+    } else {
+      assertTainted(tainted, taintedFrom.ranges)
+    }
 
     where:
-    method  | name   | value   | source
-    'taint' | null   | 'value' | SourceTypes.REQUEST_PARAMETER_VALUE
-    'taint' | 'name' | 'value' | SourceTypes.REQUEST_PARAMETER_VALUE
+    suite << taintIfSuite()
   }
 
-  void 'taint with context for #method'() {
-    setup:
-    def ctx = new IastRequestContext()
+  void 'test taintIfTainted keeping ranges with a mark'() {
+    given:
+    def (target, input) = suite
+    Assume.assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+    final mark = VulnerabilityMarks.UNVALIDATED_REDIRECT_MARK
 
-    when:
-    module."$method"(ctx as Object, source, name, value)
+    when: 'input is not tainted'
+    module.taintIfTainted(target, input, true, mark)
 
     then:
-    ctx.getTaintedObjects().get(name) == null
-    def to = ctx.getTaintedObjects().get(value)
-    to != null
-    to.get() == value
-    to.ranges.size() == 1
-    to.ranges[0].start == 0
-    to.ranges[0].length == value.length()
-    to.ranges[0].source == new Source(source, name, value)
-    0 * _
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfTainted(target, input, true, mark)
+
+    then:
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, taintedFrom.ranges, mark)
 
     where:
-    method  | name    | value   | source
-    'taint' | null    | "value" | SourceTypes.REQUEST_PATH_PARAMETER
-    'taint' | ""      | "value" | SourceTypes.REQUEST_PATH_PARAMETER
-    'taint' | "param" | "value" | SourceTypes.REQUEST_PATH_PARAMETER
+    suite << taintIfSuite()
   }
 
-  void 'test taintObject'() {
-    when:
-    module.taintObject(origin, toTaint)
+  void 'test taintIfTainted not keeping ranges'() {
+    given:
+    def (target, input) = suite
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+
+    when: 'input is not tainted'
+    module.taintIfTainted(target, input, false, NOT_MARKED)
 
     then:
-    assertTainted(toTaint)
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfTainted(target, input, false, NOT_MARKED)
+
+    then:
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, [highestPriorityRange(taintedFrom.ranges)] as Range[])
 
     where:
-    origin                              | toTaint
-    SourceTypes.REQUEST_PARAMETER_VALUE | new Object()
-    SourceTypes.REQUEST_PARAMETER_VALUE | new MockTaintable()
+    suite << taintIfSuite()
   }
 
-  void 'test taintObjects[array]'() {
-    when:
-    module.taintObjects(origin, new Object[]{
-      toTaint
-    })
+  void 'test taintIfTainted not keeping ranges with a mark'() {
+    given:
+    def (target, input) = suite
+    Assume.assumeFalse(target instanceof Taintable) // taintable does not support marks
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+    final mark = VulnerabilityMarks.LDAP_INJECTION_MARK
+
+    when: 'input is not tainted'
+    module.taintIfTainted(target, input, false, mark)
 
     then:
-    assertTainted(toTaint)
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfTainted(target, input, false, mark)
+
+    then:
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, [highestPriorityRange(taintedFrom.ranges)] as Range[], mark)
 
     where:
-    origin                              | toTaint
-    SourceTypes.REQUEST_PARAMETER_VALUE | new Object()
-    SourceTypes.REQUEST_PARAMETER_VALUE | new MockTaintable()
+    suite << taintIfSuite()
   }
 
-  void 'onJsonFactoryCreateParser'() {
+  void 'test taintIfAnyTainted keeping ranges'() {
     given:
-    final taintedObjects = ctx.getTaintedObjects()
-    def shouldBeTainted = true
+    def (target, input) = suite
+    final inputs = ['test', input].toArray()
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
 
-    def firstParam
-    if (param1 instanceof String) {
-      firstParam = addFromTaintFormat(taintedObjects, param1)
-      objectHolder.add(firstParam)
-    } else {
-      firstParam = param1
-    }
+    when: 'input is not tainted'
+    module.taintIfAnyTainted(target, inputs, true, NOT_MARKED)
 
-    def secondParam
-    if (param2 instanceof String) {
-      secondParam = addFromTaintFormat(taintedObjects, param2)
-      objectHolder.add(secondParam)
-      shouldBeTainted = fromTaintFormat(param2) != null
+    then:
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfAnyTainted(target, inputs, true, NOT_MARKED)
+
+    then:
+    final tainted = getTaintedObject(target)
+    if (target instanceof Taintable) {
+      // only first range is kept
+      assertTainted(tainted, [taintedFrom.ranges[0]] as Range[])
     } else {
-      secondParam = param2
+      assertTainted(tainted, taintedFrom.ranges)
     }
 
-    if (shouldBeTainted) {
-      def ranges = new Range[1]
-      ranges[0] = new Range(0, Integer.MAX_VALUE, new Source((byte) 1, "test", "test"), NOT_MARKED)
-      taintedObjects.taint(secondParam, ranges)
-    }
+    where:
+    suite << taintIfSuite()
+  }
 
-    when:
-    module.taintIfInputIsTainted(firstParam, secondParam)
+  void 'test taintIfAnyTainted keeping ranges with a mark'() {
+    given:
+    def (target, input) = suite
+    Assume.assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
+    final inputs = ['test', input].toArray()
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+    final mark = VulnerabilityMarks.UNVALIDATED_REDIRECT_MARK
+
+    when: 'input is not tainted'
+    module.taintIfAnyTainted(target, inputs, true, mark)
 
     then:
-    def to = ctx.getTaintedObjects().get(param1)
-    if (shouldBeTainted) {
-      assert to != null
-      assert to.get() == param1
-      if (param1 instanceof String) {
-        final ranges = to.getRanges()
-        assert ranges.length == 1
-        assert ranges[0].start == 0
-        assert ranges[0].length == param1.length()
-      } else {
-        final ranges = to.getRanges()
-        assert ranges.length == 1
-        assert ranges[0].start == 0
-        assert ranges[0].length == Integer.MAX_VALUE
-      }
-    } else {
-      assert to == null
-    }
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfAnyTainted(target, inputs, true, mark)
+
+    then:
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, taintedFrom.ranges, mark)
 
     where:
-    param1       | param2
-    '123'        | new Object()
-    new Object() | new Object()
-    new Object() | '123'
-    new Object() | '==>123<=='
+    suite << taintIfSuite()
   }
 
-  void 'test first tainted source'() {
-    when:
-    final before = module.firstTaintedSource(target)
+  void 'test taintIfAnyTainted not keeping ranges'() {
+    given:
+    def (target, input) = suite
+    final inputs = ['test', input].toArray()
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+
+    when: 'input is not tainted'
+    module.taintIfAnyTainted(target, inputs, false, NOT_MARKED)
 
     then:
-    before == null
+    assert getTaintedObject(target) == null
 
-    when:
-    module.taintObject(origin, target)
-    final after = module.firstTaintedSource(target)
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfAnyTainted(target, inputs, false, NOT_MARKED)
 
     then:
-    after.origin == origin
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, [highestPriorityRange(taintedFrom.ranges)] as Range[])
 
     where:
-    target              | origin
-    'this is a string'  | SourceTypes.REQUEST_PARAMETER_VALUE
-    new Object()        | SourceTypes.REQUEST_PARAMETER_VALUE
-    new MockTaintable() | SourceTypes.REQUEST_PARAMETER_VALUE
+    suite << taintIfSuite()
   }
 
-  void 'test taintIfInputIsTaintedWithMarks marks ranges for #mark'() {
+  void 'test taintIfAnyTainted not keeping ranges with a mark'() {
     given:
-    final toTaint = 'this is a string'
-    final tainted = new Object()
-    ctx.getTaintedObjects().taint(tainted, previousRanges)
-    objectHolder.add(toTaint)
+    def (target, input) = suite
+    Assume.assumeFalse(target instanceof Taintable) // taintable does not support marks
+    final inputs = ['test', input].toArray()
+    final source = taintedSource()
+    final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
+    final mark = VulnerabilityMarks.LDAP_INJECTION_MARK
 
-    when:
-    module.taintIfInputIsTaintedWithMarks(toTaint, tainted, mark)
+    when: 'input is not tainted'
+    module.taintIfAnyTainted(target, inputs, false, mark)
 
     then:
-    final to = ctx.getTaintedObjects().get(toTaint)
-    final ranges = to.getRanges()
-    ranges != null && ranges.length == 1
-    ranges[0].marks == expected
+    assert getTaintedObject(target) == null
+
+    when: 'input is tainted'
+    final taintedFrom = taintObject(input, ranges)
+    module.taintIfAnyTainted(target, inputs, false, mark)
+
+    then:
+    final tainted = getTaintedObject(target)
+    assertTainted(tainted, [highestPriorityRange(taintedFrom.ranges)] as Range[], mark)
 
     where:
-    previousRanges                                                                                                                  | mark     | expected
-    [new Range(0, Integer.MAX_VALUE, getDefaultSource(), NOT_MARKED)] as Range[]                                                    | XSS_MARK | XSS_MARK
-    [new Range(0, 1, getDefaultSource(), SQL_INJECTION_MARK), new Range(2, 3, getDefaultSource(), NOT_MARKED)] as Range[]           | XSS_MARK | XSS_MARK
-    [new Range(2, 3, getDefaultSource(), NOT_MARKED), new Range(0, 1, getDefaultSource(), SQL_INJECTION_MARK)] as Range[]           | XSS_MARK | XSS_MARK
-    [new Range(2, 3, getDefaultSource(), XPATH_INJECTION_MARK), new Range(0, 1, getDefaultSource(), SQL_INJECTION_MARK)] as Range[] | XSS_MARK | getMarks(XPATH_INJECTION_MARK, XSS_MARK)
+    suite << taintIfSuite()
   }
 
   void 'test taint deeply'() {
@@ -479,81 +356,222 @@ class PropagationModuleTest extends IastModuleImplTestBase {
     final target = [Hello: " World!", Age: 25]
 
     when:
-    module.taintDeeply(null, SourceTypes.GRPC_BODY, target)
+    module.taintDeeply(target, SourceTypes.GRPC_BODY, { true })
 
     then:
-    ctx.getTaintedObjects().empty
+    final taintedObjects = ctx.taintedObjects
+    target.keySet().each { key ->
+      assert taintedObjects.get(key) != null
+    }
+    assert taintedObjects.get(target['Hello']) != null
+    assert taintedObjects.size() == 3 // two keys and one string value
+  }
+
+  void 'test taint deeply char sequence'() {
+    given:
+    final target = stringBuilder('taint me')
 
     when:
-    module.taintDeeply(ctx, SourceTypes.GRPC_BODY, target)
+    module.taintDeeply(target, SourceTypes.GRPC_BODY, { true })
 
     then:
     final taintedObjects = ctx.taintedObjects
-    target.keySet().each {
-      key ->
-      assert taintedObjects.get(key) != null
+    assert taintedObjects.size() == 1
+    final tainted = taintedObjects.get(target)
+    assert tainted != null
+    final source = tainted.ranges[0].source
+    assert source.origin == SourceTypes.GRPC_BODY
+    assert source.value == target.toString()
+  }
+
+  void 'test is tainted and find source'() {
+    given:
+    if (source != null) {
+      taintObject(target, source)
     }
-    assert taintedObjects.get(target['Hello']) != null
-    assert taintedObjects.size() == 3 // two keys and one string value
+
+    when:
+    final tainted = module.isTainted(target)
+
+    then:
+    tainted == (source != null)
+
+    when:
+    final foundSource = module.findSource(target)
+
+    then:
+    foundSource == source
+
+    where:
+    target                         | source
+    string('string')               | null
+    stringBuilder('stringBuilder') | null
+    date()                         | null
+    taintable()                    | null
+    string('string')               | taintedSource()
+    stringBuilder('stringBuilder') | taintedSource()
+    date()                         | taintedSource()
+    taintable()                    | taintedSource()
+  }
+
+  void 'test source names over threshold'() {
+    given:
+    final maxSize = Config.get().iastTruncationMaxValueLength
+
+    when:
+    module.taint(target, SourceTypes.REQUEST_PARAMETER_VALUE)
+
+    then:
+    final tainted = ctx.getTaintedObjects().get(target)
+    tainted != null
+    final sourceValue  = tainted.ranges.first().source.value
+    sourceValue.length() <= target.length()
+    sourceValue.length() <= maxSize
+
+    where:
+    target                                                                          | _
+    string((0..Config.get().getIastTruncationMaxValueLength() * 2).join(''))        | _
+    stringBuilder((0..Config.get().getIastTruncationMaxValueLength() * 2).join('')) | _
   }
 
-  private <E> E taint(final E toTaint) {
-    final source = new Source(SourceTypes.REQUEST_PARAMETER_VALUE, null, null)
-    if (toTaint instanceof Taintable) {
-      toTaint.$$DD$setSource(source)
+  void 'test that source names should not make a strong reference over the value'() {
+    given:
+    final name = 'name'
+
+    when:
+    module.taint(name, SourceTypes.REQUEST_PARAMETER_NAME, name)
+
+    then:
+    final tainted = ctx.getTaintedObjects().get(name)
+    final taintedName = tainted.ranges[0].source.name
+    assert !taintedName.is(name) : 'Weak value should not be retained by the source name'
+  }
+
+  private List<Tuple<Object>> taintIfSuite() {
+    return [
+      Tuple.tuple(string('string'), string('string')),
+      Tuple.tuple(string('string'), stringBuilder('stringBuilder')),
+      Tuple.tuple(string('string'), date()),
+      Tuple.tuple(string('string'), taintable()),
+      Tuple.tuple(stringBuilder('stringBuilder'), string('string')),
+      Tuple.tuple(stringBuilder('stringBuilder'), stringBuilder('stringBuilder')),
+      Tuple.tuple(stringBuilder('stringBuilder'), date()),
+      Tuple.tuple(stringBuilder('stringBuilder'), taintable()),
+      Tuple.tuple(date(), string('string')),
+      Tuple.tuple(date(), stringBuilder('stringBuilder')),
+      Tuple.tuple(date(), date()),
+      Tuple.tuple(date(), taintable()),
+      Tuple.tuple(taintable(), string('string')),
+      Tuple.tuple(taintable(), stringBuilder('stringBuilder')),
+      Tuple.tuple(taintable(), date()),
+      Tuple.tuple(taintable(), taintable())
+    ]
+  }
+
+  private TaintedObject getTaintedObject(final Object target) {
+    if (target instanceof Taintable) {
+      final source = (target as Taintable).$$DD$getSource() as Source
+      return source == null ? null : new TaintedObject(target, Ranges.forObject(source), null)
+    }
+    return ctx.getTaintedObjects().get(target)
+  }
+
+  private TaintedObject taintObject(final Object target, Source source, int mark = NOT_MARKED) {
+    if (target instanceof Taintable) {
+      target.$$DD$setSource(source)
+    } else if (target instanceof CharSequence) {
+      ctx.getTaintedObjects().taint(target, Ranges.forCharSequence(target, source, mark))
     } else {
-      ctx.taintedObjects.taintInputObject(toTaint, source)
-      objectHolder.add(toTaint)
+      ctx.getTaintedObjects().taint(target, Ranges.forObject(source, mark))
     }
-    return toTaint
+    return getTaintedObject(target)
   }
 
-  private void assertTainted(final Object toTaint) {
-    final tainted = ctx.getTaintedObjects().get(toTaint)
-    if (toTaint instanceof Taintable) {
-      assert tainted == null
-      assert toTaint.$$DD$getSource() != null
+  private TaintedObject taintObject(final Object target, Range[] ranges) {
+    if (target instanceof Taintable) {
+      target.$$DD$setSource(ranges[0].getSource())
     } else {
-      assert tainted != null
+      ctx.getTaintedObjects().taint(target, ranges)
     }
+    return getTaintedObject(target)
   }
 
-  private void assertNotTainted(final Object toTaint) {
-    final tainted = ctx.getTaintedObjects().get(toTaint)
-    assert tainted == null
-    if (toTaint instanceof Taintable) {
-      assert toTaint.$$DD$getSource() == null
+  private String string(String value, Source source = null, int mark = NOT_MARKED) {
+    final result = new String(value)
+    if (source != null) {
+      taintObject(result, source, mark)
     }
+    return result
   }
 
-  private static Source getDefaultSource() {
-    return new Source(SourceTypes.REQUEST_PARAMETER_VALUE, null, null)
+  private StringBuilder stringBuilder(String value, Source source = null, int mark = NOT_MARKED) {
+    final result = new StringBuilder(value)
+    if (source != null) {
+      taintObject(result, source, mark)
+    }
+    return result
+  }
+
+  private Date date(Source source = null, int mark = NOT_MARKED) {
+    final result = new Date()
+    if (source != null) {
+      taintObject(result, source, mark)
+    }
+    return result
   }
 
-  private static int getMarks(int ... marks) {
-    int result = NOT_MARKED
-    for (int mark : marks) {
-      result = result | mark
+  private Taintable taintable(Source source = null) {
+    final result = new MockTaintable()
+    if (source != null) {
+      taintObject(result, source)
     }
     return result
   }
 
-  /**
-   * Mocking makes the test a bit more confusing*/
-  private static final class MockTaintable implements Taintable {
+  private Source taintedSource(String value = 'value') {
+    return new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', value)
+  }
+
+  private static void assertTainted(final TaintedObject tainted, final Range[] ranges, final int mark = NOT_MARKED) {
+    assert tainted != null
+    final originalValue = tainted.get()
+    assert tainted.ranges.length == ranges.length
+    ranges.eachWithIndex { Range expected, int i ->
+      final range = tainted.ranges[i]
+      if (mark == NOT_MARKED) {
+        assert range.marks == expected.marks
+      } else {
+        assert (range.marks & mark) > 0
+      }
+      final source = range.source
+      assert !source.name.is(originalValue): 'Weak value should not be retained by the source name'
+      assert !source.value.is(originalValue): 'Weak value should not be retained by the source value'
+
+      final expectedSource = expected.source
+      assert source.origin == expectedSource.origin
+      assert source.name == expectedSource.name
+      assert source.value == expectedSource.value
+    }
+  }
 
+  private static class MockTaintable implements Taintable {
     private Source source
 
-    @Override
     @SuppressWarnings('CodeNarc')
+    @Override
     Source $$DD$getSource() {
       return source
     }
 
-    @Override
     @SuppressWarnings('CodeNarc')
+    @Override
     void $$DD$setSource(Source source) {
       this.source = source
     }
+
+    @Override
+    String toString() {
+      return Taintable.name
+    }
   }
 }
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy
index 9bc9148bb30..30b8adf5166 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy
@@ -11,7 +11,7 @@ import datadog.trace.api.iast.sink.CommandInjectionModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileDynamic
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 
@@ -27,7 +27,7 @@ class CommandInjectionModuleTest extends IastModuleImplTestBase {
   private AgentSpan span
 
   def setup() {
-    module = registerDependencies(new CommandInjectionModuleImpl())
+    module = new CommandInjectionModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy
index 58009e2d5c7..505776b3ea4 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy
@@ -1,13 +1,10 @@
 package com.datadog.iast.sink
 
-import com.datadog.iast.HasDependencies
 import com.datadog.iast.IastModuleImplTestBase
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.RequestEndedHandler
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
-import com.datadog.iast.overhead.OverheadController
-import datadog.trace.api.Config
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.gateway.IGSpanInfo
 import datadog.trace.api.gateway.RequestContext
@@ -15,9 +12,8 @@ import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.internal.TraceSegment
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import datadog.trace.util.stacktrace.StackWalker
 
-public class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
+class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
 
   private List<Object> objectHolder
 
@@ -29,7 +25,7 @@ public class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new HstsMissingHeaderModuleImpl())
+    module = new HstsMissingHeaderModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(module)
     objectHolder = []
     ctx = new IastRequestContext()
@@ -46,14 +42,9 @@ public class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
   void 'hsts vulnerability'() {
     given:
     Vulnerability savedVul1
-    final OverheadController overheadController = Mock(OverheadController)
     final iastCtx = Mock(IastRequestContext)
     iastCtx.getxForwardedProto() >> 'https'
     iastCtx.getContentType() >> "text/html"
-    final StackWalker stackWalker = Mock(StackWalker)
-    final dependencies = new HasDependencies.Dependencies(
-    Config.get(), reporter, overheadController, stackWalker
-    )
     final handler = new RequestEndedHandler(dependencies)
     final TraceSegment traceSegment = Mock(TraceSegment)
     final reqCtx = Mock(RequestContext)
@@ -96,15 +87,9 @@ public class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
 
   void 'no hsts vulnerability reported'() {
     given:
-    Vulnerability savedVul1
-    final OverheadController overheadController = Mock(OverheadController)
     final iastCtx = Mock(IastRequestContext)
     iastCtx.getxForwardedProto() >> 'https'
     iastCtx.getContentType() >> "text/html"
-    final StackWalker stackWalker = Mock(StackWalker)
-    final dependencies = new HasDependencies.Dependencies(
-    Config.get(), reporter, overheadController, stackWalker
-    )
     final handler = new RequestEndedHandler(dependencies)
     final TraceSegment traceSegment = Mock(TraceSegment)
     final reqCtx = Mock(RequestContext)
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy
index f884b16f60d..f3e30e1e180 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy
@@ -25,13 +25,13 @@ class HttpResponseHeaderModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new HttpResponseHeaderModuleImpl())
+    module = new HttpResponseHeaderModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(module)
     InstrumentationBridge.registerIastModule(new InsecureCookieModuleImpl())
     InstrumentationBridge.registerIastModule(new NoHttpOnlyCookieModuleImpl())
     InstrumentationBridge.registerIastModule(new NoSameSiteCookieModuleImpl())
-    InstrumentationBridge.registerIastModule(new HstsMissingHeaderModuleImpl())
-    InstrumentationBridge.registerIastModule(new UnvalidatedRedirectModuleImpl())
+    InstrumentationBridge.registerIastModule(new HstsMissingHeaderModuleImpl(dependencies))
+    InstrumentationBridge.registerIastModule(new UnvalidatedRedirectModuleImpl(dependencies))
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy
index bf74a709519..b160f37a28b 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy
@@ -24,7 +24,7 @@ class InsecureCookieModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new HttpResponseHeaderModuleImpl())
+    module = new HttpResponseHeaderModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(new InsecureCookieModuleImpl())
     objectHolder = []
     ctx = new IastRequestContext()
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy
index 2159276a958..682e8dfef39 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy
@@ -11,7 +11,7 @@ import datadog.trace.api.iast.sink.LdapInjectionModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileDynamic
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 
@@ -27,7 +27,7 @@ class LdapInjectionModuleTest extends IastModuleImplTestBase {
   private AgentSpan span
 
   def setup() {
-    module = registerDependencies(new LdapInjectionModuleImpl())
+    module = new LdapInjectionModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy
index 28fda1aeecb..a246f30ee9f 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy
@@ -24,7 +24,7 @@ class NoHttpCookieModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new HttpResponseHeaderModuleImpl())
+    module = new HttpResponseHeaderModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(new NoHttpOnlyCookieModuleImpl())
     objectHolder = []
     ctx = new IastRequestContext()
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy
index f4a97aaffa1..4e32a9b7722 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy
@@ -24,7 +24,7 @@ class NoSameSiteCookieModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new HttpResponseHeaderModuleImpl())
+    module = new HttpResponseHeaderModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(new NoSameSiteCookieModuleImpl())
     objectHolder = []
     ctx = new IastRequestContext()
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy
index d55e2975e7e..6c25122e393 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy
@@ -10,7 +10,7 @@ import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.sink.PathTraversalModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.fromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.getStringFromTaintFormat
@@ -27,7 +27,7 @@ class PathTraversalModuleTest extends IastModuleImplTestBase {
   private IastRequestContext ctx
 
   def setup() {
-    module = registerDependencies(new PathTraversalModuleImpl())
+    module = new PathTraversalModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy
index 3041c928a2a..69b30fe5ef3 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy
@@ -10,7 +10,7 @@ import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.sink.SqlInjectionModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 import static datadog.trace.api.iast.sink.SqlInjectionModule.DATABASE_PARAMETER
@@ -24,7 +24,7 @@ class SqlInjectionModuleTest extends IastModuleImplTestBase {
   private IastRequestContext ctx
 
   def setup() {
-    module = registerDependencies(new SqlInjectionModuleImpl())
+    module = new SqlInjectionModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy
index 6884da0e616..c379cea4b8f 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy
@@ -6,6 +6,7 @@ import com.datadog.iast.model.Range
 import com.datadog.iast.model.Source
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import com.datadog.iast.taint.Ranges
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.SourceTypes
@@ -24,7 +25,7 @@ class SsrfModuleTest extends IastModuleImplTestBase {
   private AgentSpan span
 
   def setup() {
-    module = registerDependencies(new SsrfModuleImpl())
+    module = new SsrfModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
@@ -82,6 +83,6 @@ class SsrfModuleTest extends IastModuleImplTestBase {
   }
 
   private void taint(final Object value) {
-    ctx.getTaintedObjects().taintInputObject(value, new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', value.toString()))
+    ctx.getTaintedObjects().taint(value, Ranges.forObject(new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', value.toString())))
   }
 }
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/StacktraceLeakModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/StacktraceLeakModuleTest.groovy
new file mode 100644
index 00000000000..ecf8aaa3bd0
--- /dev/null
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/StacktraceLeakModuleTest.groovy
@@ -0,0 +1,51 @@
+package com.datadog.iast.sink
+
+import com.datadog.iast.IastModuleImplTestBase
+import com.datadog.iast.model.Evidence
+import com.datadog.iast.model.Vulnerability
+import com.datadog.iast.model.VulnerabilityType
+import datadog.trace.api.iast.sink.StacktraceLeakModule
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan
+
+class StacktraceLeakModuleTest extends IastModuleImplTestBase {
+  private StacktraceLeakModule module
+
+  def setup() {
+    module = new StacktraceLeakModuleImpl(dependencies)
+  }
+
+  void 'iast stacktrace leak module'() {
+    given:
+    final spanId = 123456
+    final span = Mock(AgentSpan)
+
+    def throwable = new Exception('some exception')
+    def moduleName = 'moduleName'
+    def className = 'className'
+    def methodName = 'methodName'
+
+    when:
+    module.onStacktraceLeak(throwable, moduleName, className, methodName)
+
+    then:
+    1 * tracer.activeSpan() >> span
+    1 * span.getSpanId() >> spanId
+    1 * span.getServiceName()
+    1 * reporter.report(_, _) >> { args ->
+      Vulnerability vuln = args[1] as Vulnerability
+      assert vuln != null
+      assert vuln.getType() == VulnerabilityType.STACKTRACE_LEAK
+      assert vuln.getEvidence() == new Evidence('ExceptionHandler in moduleName \r\nthrown java.lang.Exception')
+      assert vuln.getLocation() != null
+    }
+    0 * _
+  }
+
+  void 'iast stacktrace leak no exception'() {
+    when:
+    module.onStacktraceLeak(null, null, null, null)
+
+    then:
+    0 * _
+  }
+}
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy
index e50a7b26674..a3fce16d195 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy
@@ -5,6 +5,7 @@ import com.datadog.iast.IastRequestContext
 import com.datadog.iast.model.Source
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import com.datadog.iast.taint.Ranges
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.InstrumentationBridge
@@ -24,7 +25,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new TrustBoundaryViolationModuleImpl())
+    module = new TrustBoundaryViolationModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
@@ -60,7 +61,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     given:
     Vulnerability savedVul
     final name = "name"
-    ctx.getTaintedObjects().taintInputString(name, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(name, Ranges.forCharSequence(name, new Source(SourceTypes.NONE, null, null)))
 
     when:
     module.onSessionValue(name, "value")
@@ -77,7 +78,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     Vulnerability savedVul
     final name = "name"
     final badValue = "theValue"
-    ctx.getTaintedObjects().taintInputString(badValue, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(badValue, Ranges.forCharSequence(badValue, new Source(SourceTypes.NONE, null, null)))
 
     when:
     module.onSessionValue(name, badValue)
@@ -95,7 +96,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     Vulnerability savedVul
     final name = "name"
     final badValue = "badValue"
-    ctx.getTaintedObjects().taintInputString(badValue, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(badValue, Ranges.forCharSequence(badValue, new Source(SourceTypes.NONE, null, null)))
     final values = ["A", "B", badValue]
 
     when:
@@ -113,7 +114,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     Vulnerability savedVul
     final name = "name"
     final badValue = "badValue"
-    ctx.getTaintedObjects().taintInputString(badValue, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(badValue, Ranges.forCharSequence(badValue, new Source(SourceTypes.NONE, null, null)))
     final values = new String[3]
     values[0] = "A"
     values[1] = "B"
@@ -134,7 +135,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     Vulnerability savedVul
     final name = "name"
     final badValue = "badValue"
-    ctx.getTaintedObjects().taintInputString(badValue, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(badValue, Ranges.forCharSequence(badValue, new Source(SourceTypes.NONE, null, null)))
     final values = new LinkedHashMap<String,String>()
     values.put("A", "A")
     values.put("B", "B")
@@ -155,7 +156,7 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase {
     Vulnerability savedVul
     final name = "name"
     final badValue = "badValue"
-    ctx.getTaintedObjects().taintInputString(badValue, new Source(SourceTypes.NONE, null, null))
+    ctx.getTaintedObjects().taint(badValue, Ranges.forCharSequence(badValue, new Source(SourceTypes.NONE, null, null)))
     final value = new VisitableClass(name: badValue)
 
     when:
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy
index 708b665a902..5dabb12cc52 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy
@@ -6,6 +6,7 @@ import com.datadog.iast.model.Range
 import com.datadog.iast.model.Source
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import com.datadog.iast.taint.Ranges
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.InstrumentationBridge
@@ -14,7 +15,7 @@ import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.sink.UnvalidatedRedirectModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 
@@ -27,7 +28,7 @@ class UnvalidatedRedirectModuleTest extends IastModuleImplTestBase {
   private IastRequestContext ctx
 
   def setup() {
-    module = registerDependencies(new UnvalidatedRedirectModuleImpl())
+    module = new UnvalidatedRedirectModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
@@ -64,7 +65,7 @@ class UnvalidatedRedirectModuleTest extends IastModuleImplTestBase {
 
   void 'iast module detects URI redirect (#value)'(final URI value, final String expected) {
     setup:
-    ctx.taintedObjects.taintInputObject(value, new Source(SourceTypes.NONE, null, null))
+    ctx.taintedObjects.taint(value, Ranges.forObject(new Source(SourceTypes.NONE, null, null)))
 
     when:
     module.onURIRedirect(value)
@@ -107,7 +108,7 @@ class UnvalidatedRedirectModuleTest extends IastModuleImplTestBase {
 
   void 'if onHeader receives a Location header call onRedirect'() {
     setup:
-    final urm = Spy(UnvalidatedRedirectModuleImpl)
+    final urm = Spy(new UnvalidatedRedirectModuleImpl(dependencies))
     InstrumentationBridge.registerIastModule(urm)
 
     when:
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy
index 5b71caa24d4..802df43ec28 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy
@@ -12,7 +12,7 @@ class WeakCipherModuleTest extends IastModuleImplTestBase {
   private WeakCipherModule module
 
   def setup() {
-    module = registerDependencies(new WeakCipherModuleImpl())
+    module = new WeakCipherModuleImpl(dependencies)
   }
 
   void 'iast module vulnerable cipher algorithm'(final String algorithm){
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy
index b3e83664558..2cfebb744e0 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy
@@ -12,7 +12,7 @@ class WeakHashModuleTest extends IastModuleImplTestBase {
   private WeakHashModule module
 
   def setup() {
-    module = registerDependencies(new WeakHashModuleImpl())
+    module = new WeakHashModuleImpl(dependencies)
   }
 
   void 'iast module vulnerable hash algorithm'(final String algorithm){
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy
index a7401b01a5f..fa3db3c8f19 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy
@@ -14,7 +14,7 @@ class WeakRandomnessModuleTest extends IastModuleImplTestBase {
   private AgentSpan span
 
   def setup() {
-    module = registerDependencies(new WeakRandomnessModuleImpl())
+    module = new WeakRandomnessModuleImpl(dependencies)
     span = Mock(AgentSpan) {
       getSpanId() >> 123456
     }
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy
index dfda4e18cdb..a8d377e968b 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy
@@ -1,13 +1,10 @@
 package com.datadog.iast.sink
 
-import com.datadog.iast.HasDependencies
 import com.datadog.iast.IastModuleImplTestBase
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.RequestEndedHandler
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
-import com.datadog.iast.overhead.OverheadController
-import datadog.trace.api.Config
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.gateway.IGSpanInfo
 import datadog.trace.api.gateway.RequestContext
@@ -15,7 +12,6 @@ import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.internal.TraceSegment
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import datadog.trace.util.stacktrace.StackWalker
 
 public class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
 
@@ -29,7 +25,7 @@ public class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
 
   def setup() {
     InstrumentationBridge.clearIastModules()
-    module = registerDependencies(new XContentTypeModuleImpl())
+    module = new XContentTypeModuleImpl(dependencies)
     InstrumentationBridge.registerIastModule(module)
     objectHolder = []
     ctx = new IastRequestContext()
@@ -46,13 +42,8 @@ public class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
   void 'x content options sniffing vulnerability'() {
     given:
     Vulnerability savedVul1
-    final OverheadController overheadController = Mock(OverheadController)
     final iastCtx = Mock(IastRequestContext)
     iastCtx.getContentType() >> "text/html"
-    final StackWalker stackWalker = Mock(StackWalker)
-    final dependencies = new HasDependencies.Dependencies(
-    Config.get(), reporter, overheadController, stackWalker
-    )
     final handler = new RequestEndedHandler(dependencies)
     final TraceSegment traceSegment = Mock(TraceSegment)
     final reqCtx = Mock(RequestContext)
@@ -93,15 +84,9 @@ public class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
 
   void 'no x content options sniffing reported'() {
     given:
-    Vulnerability savedVul1
-    final OverheadController overheadController = Mock(OverheadController)
     final iastCtx = Mock(IastRequestContext)
     iastCtx.getxForwardedProto() >> 'https'
     iastCtx.getContentType() >> "text/html"
-    final StackWalker stackWalker = Mock(StackWalker)
-    final dependencies = new HasDependencies.Dependencies(
-    Config.get(), reporter, overheadController, stackWalker
-    )
     final handler = new RequestEndedHandler(dependencies)
     final TraceSegment traceSegment = Mock(TraceSegment)
     final reqCtx = Mock(RequestContext)
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy
index 6a44afd10b8..3638b6f431b 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy
@@ -10,7 +10,7 @@ import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.sink.XPathInjectionModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 
@@ -23,7 +23,7 @@ class XPathInjectionModuleTest extends IastModuleImplTestBase {
   private IastRequestContext ctx
 
   def setup() {
-    module = registerDependencies(new XPathInjectionModuleImpl())
+    module = new XPathInjectionModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy
index ff0340a99df..bbebbceae97 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy
@@ -5,6 +5,7 @@ import com.datadog.iast.IastRequestContext
 import com.datadog.iast.model.Source
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import com.datadog.iast.taint.Ranges
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.iast.SourceTypes
@@ -12,7 +13,7 @@ import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.api.iast.sink.XssModule
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.TaintUtils.addFromTaintFormat
 import static com.datadog.iast.taint.TaintUtils.taintFormat
 
@@ -25,7 +26,7 @@ class XssModuleTest extends IastModuleImplTestBase {
   private IastRequestContext ctx
 
   def setup() {
-    module = registerDependencies(new XssModuleImpl())
+    module = new XssModuleImpl(dependencies)
     objectHolder = []
     ctx = new IastRequestContext()
     final reqCtx = Mock(RequestContext) {
@@ -65,7 +66,7 @@ class XssModuleTest extends IastModuleImplTestBase {
   void 'module detects char[] XSS'() {
     setup:
     if (tainted) {
-      ctx.taintedObjects.taintInputObject(buf, new Source(SourceTypes.NONE, '', ''), mark)
+      ctx.taintedObjects.taint(buf, Ranges.forObject(new Source(SourceTypes.NONE, '', ''), mark))
     }
 
     when:
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/source/WebModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/source/WebModuleTest.groovy
deleted file mode 100644
index 1e93f5e3fb4..00000000000
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/source/WebModuleTest.groovy
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.datadog.iast.source
-
-import com.datadog.iast.IastModuleImplTestBase
-import com.datadog.iast.IastRequestContext
-import com.datadog.iast.model.Source
-import datadog.trace.api.gateway.RequestContext
-import datadog.trace.api.gateway.RequestContextSlot
-import datadog.trace.api.iast.SourceTypes
-import datadog.trace.api.iast.source.WebModule
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import groovy.transform.CompileDynamic
-
-@CompileDynamic
-class WebModuleTest extends IastModuleImplTestBase {
-
-  private WebModule module
-
-  def setup() {
-    module = new WebModuleImpl()
-  }
-
-  void 'test #method: null or empty'() {
-    when:
-    module."$method"(*args)
-
-    then:
-    0 * _
-
-    where:
-    method              | args
-    'onParameterNames'  | [null]
-    'onParameterNames'  | [[]]
-    'onParameterValues' | [null, null]
-    'onParameterValues' | ['', []]
-    'onParameterValues' | [null, null as String[]]
-    'onParameterValues' | ['', [] as String[]]
-    'onParameterValues' | [[:]]
-    'onHeaderNames'     | [null]
-    'onHeaderNames'     | [[]]
-    'onHeaderValues'    | [null, null]
-    'onHeaderValues'    | ['', []]
-    'onCookieNames'     | [null]
-    'onCookieNames'     | [[]]
-  }
-
-  void 'test #method: without span'() {
-    when:
-    module."$method"(*args)
-
-    then:
-    1 * tracer.activeSpan() >> null
-    0 * _
-
-    where:
-    method              | args
-    'onParameterNames'  | [['param']]
-    'onParameterValues' | ['name', ['value']]
-    'onParameterValues' | ['name', ['value'] as String[]]
-    'onParameterValues' | [[name: ['value'] as String[]]]
-    'onHeaderNames'     | [['header']]
-    'onHeaderValues'    | ['name', ['value']]
-    'onCookieNames'     | [['name']]
-    'onNamed'           | ['name', ['v1'], (byte)0]
-    'onNamed'           | ['name', ['v1'] as String[], (byte)0]
-    'onNamed'           | [[name: 'v1'], (byte)0]
-  }
-
-  void 'onNamed #variant'() {
-    given:
-    final span = Mock(AgentSpan)
-    tracer.activeSpan() >> span
-    final reqCtx = Mock(RequestContext)
-    span.getRequestContext() >> reqCtx
-    final ctx = new IastRequestContext()
-    reqCtx.getData(RequestContextSlot.IAST) >> ctx
-
-    when:
-    module.onNamed(*args, SourceTypes.REQUEST_PARAMETER_NAME)
-
-    then:
-    1 * tracer.activeSpan() >> span
-    1 * span.getRequestContext() >> reqCtx
-    1 * reqCtx.getData(RequestContextSlot.IAST) >> ctx
-    0 * _
-    def tos = ctx.taintedObjects
-    def to = tos.get('foo')
-    to.ranges.size() == 1
-    to.ranges[0].start == 0
-    to.ranges[0].length == 3
-    to.ranges[0].source == new Source(SourceTypes.REQUEST_PARAMETER_NAME, 'var', 'foo')
-
-    where:
-    variant      | args
-    'collection' | ['var', ['foo']]
-    'array'      | ['var', ['foo'] as String[]]
-    'map'        | [[var: ['foo'] as String[]]]
-  }
-
-  void 'test #method'() {
-    given:
-    final span = Mock(AgentSpan)
-    tracer.activeSpan() >> span
-    final reqCtx = Mock(RequestContext)
-    span.getRequestContext() >> reqCtx
-    final ctx = new IastRequestContext()
-    reqCtx.getData(RequestContextSlot.IAST) >> ctx
-
-    when:
-    module."$method"([name])
-
-    then:
-    1 * tracer.activeSpan() >> span
-    1 * span.getRequestContext() >> reqCtx
-    1 * reqCtx.getData(RequestContextSlot.IAST) >> ctx
-    0 * _
-    def to = ctx.getTaintedObjects().get(name)
-    to != null
-    to.get() == name
-    to.ranges.size() == 1
-    to.ranges[0].start == 0
-    to.ranges[0].length == name.length()
-    to.ranges[0].source == new Source(source, name, name)
-
-    where:
-    method             | name    | source
-    'onParameterNames' | 'param' | SourceTypes.REQUEST_PARAMETER_NAME
-    'onHeaderNames'    | 'param' | SourceTypes.REQUEST_HEADER_NAME
-    'onCookieNames'    | 'param' | SourceTypes.REQUEST_COOKIE_NAME
-  }
-}
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy
index 3c80b068b92..60525afa7e2 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy
@@ -8,7 +8,7 @@ import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.VulnerabilityMarks
 import datadog.trace.test.util.DDSpecification
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static com.datadog.iast.taint.Ranges.mergeRanges
 import static com.datadog.iast.taint.Ranges.rangesProviderFor
 import static datadog.trace.api.iast.SourceTypes.REQUEST_HEADER_NAME
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy
index 7db1a75c673..88b21e9406b 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy
@@ -4,7 +4,7 @@ import com.datadog.iast.model.Range
 import com.datadog.iast.model.Source
 import datadog.trace.api.iast.SourceTypes
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 
 class TaintUtils {
 
@@ -76,7 +76,7 @@ class TaintUtils {
     if (value instanceof String) {
       return addFromTaintFormat(tos, value as String)
     }
-    tos.taintInputObject(value, new Source(SourceTypes.NONE, null, null))
+    tos.taint(value, Ranges.forObject(new Source(SourceTypes.NONE, null, null)))
     return value
   }
 
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectTest.groovy
index cb0351bf0b0..d809f5b8b69 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectTest.groovy
@@ -7,7 +7,7 @@ import com.datadog.iast.model.Range
 
 import java.lang.ref.ReferenceQueue
 
-import static com.datadog.iast.model.Range.NOT_MARKED
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
 import static datadog.trace.api.iast.SourceTypes.REQUEST_HEADER_NAME
 
 class TaintedObjectTest extends Specification {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLazyTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLazyTest.groovy
deleted file mode 100644
index 94c6f4b0171..00000000000
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLazyTest.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.datadog.iast.taint
-
-import com.datadog.iast.IastModuleImplTestBase
-import com.datadog.iast.IastRequestContext
-import com.datadog.iast.model.Source
-import datadog.trace.api.gateway.RequestContext
-import datadog.trace.api.gateway.RequestContextSlot
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-
-class TaintedObjectsLazyTest extends IastModuleImplTestBase {
-
-  private TaintedObjects delegate = Mock(TaintedObjects)
-  private IastRequestContext iastCtx
-  private RequestContext reqCtx
-  private AgentSpan span
-
-  void setup() {
-    delegate = Mock(TaintedObjects)
-    iastCtx = Mock(IastRequestContext)
-    iastCtx.getTaintedObjects() >> delegate
-    reqCtx = Mock(RequestContext)
-    reqCtx.getData(RequestContextSlot.IAST) >> iastCtx
-    span = Mock(AgentSpan)
-    span.getRequestContext() >> reqCtx
-  }
-
-  void 'get non lazy instance'() {
-    when:
-    final to = TaintedObjects.activeTaintedObjects()
-
-    then:
-    1 * tracer.activeSpan() >> span
-    !(to instanceof TaintedObjects.LazyTaintedObjects)
-  }
-
-  void 'get lazy objects instance'() {
-    when:
-    final to = TaintedObjects.activeTaintedObjects(true)
-
-    then:
-    to instanceof TaintedObjects.LazyTaintedObjects
-
-    when:
-    to.&"$method".call(args as Object[])
-
-    then: 'first time the active tainted objects if fetched'
-    1 * delegate._
-    1 * tracer.activeSpan() >> span
-
-    when:
-    to.&"$method".call(args as Object[])
-
-    then: 'the active tainted objets is already fetched'
-    1 * delegate._
-    0 * _
-
-    where:
-    method             | args
-    'getEstimatedSize' | []
-    'isFlat'           | []
-    'taintInputString' | ['', new Source((byte) 0, null, null)]
-    'taintInputCharSequence' | ['', new Source((byte) 0, null, null)]
-    'taintInputObject' | ['', new Source((byte) 0, null, null)]
-    'taint'            | ['', Ranges.EMPTY]
-    'get'              | ['']
-    'release'          | []
-    'count'            | []
-    'iterator'         | []
-  }
-}
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLogTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLogTest.groovy
index fd50a1f9de3..ea01efa3989 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLogTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsLogTest.groovy
@@ -3,7 +3,6 @@ package com.datadog.iast.taint
 import ch.qos.logback.classic.Level
 import ch.qos.logback.classic.Logger
 import com.datadog.iast.IastSystem
-import com.datadog.iast.model.Range
 import com.datadog.iast.model.Source
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.test.util.DDSpecification
@@ -35,7 +34,7 @@ class TaintedObjectsLogTest extends DDSpecification {
     final value = "A"
 
     when:
-    def tainted = taintedObjects.taintInputString(value, new Source(SourceTypes.NONE, null, null))
+    def tainted = taintedObjects.taint(value, Ranges.forCharSequence(value, new Source(SourceTypes.NONE, null, null)))
 
     then:
     noExceptionThrown()
@@ -54,10 +53,8 @@ class TaintedObjectsLogTest extends DDSpecification {
     IastSystem.DEBUG = true
     logger.level = Level.ALL
     TaintedObjects taintedObjects = TaintedObjects.acquire()
-    taintedObjects.taint('A', [new Range(0, 1, new Source(SourceTypes.NONE, null, null), Range.NOT_MARKED)] as Range[])
-    taintedObjects.taintInputString('B', new Source(SourceTypes.REQUEST_PARAMETER_NAME, 'test', 'value'))
-    taintedObjects.taintInputCharSequence(new StringBuffer('B'), new Source(SourceTypes.REQUEST_PARAMETER_NAME, 'test', 'value'))
-    taintedObjects.taintInputObject(new Date(), new Source(SourceTypes.REQUEST_HEADER_VALUE, 'test', 'value'))
+    final obj = 'A'
+    taintedObjects.taint(obj, Ranges.forCharSequence(obj, new Source(SourceTypes.NONE, null, null)))
 
     when:
     taintedObjects.release()
@@ -65,5 +62,21 @@ class TaintedObjectsLogTest extends DDSpecification {
     then:
     noExceptionThrown()
   }
+
+  void "test TaintedObjects api calls"() {
+    given:
+    IastSystem.DEBUG = true
+    logger.level = Level.ALL
+    TaintedObjects taintedObjects = TaintedObjects.acquire()
+    final obj = 'A'
+
+    when:
+    taintedObjects.taint(obj, Ranges.forCharSequence(obj, new Source(SourceTypes.NONE, null, null)))
+
+    then:
+    taintedObjects.size() == 1
+    taintedObjects.iterator().size() == 1
+    !taintedObjects.flat
+  }
 }
 
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsNoOpTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsNoOpTest.groovy
index 304a2e7187b..c8f1f91fe86 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsNoOpTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintedObjectsNoOpTest.groovy
@@ -12,15 +12,12 @@ class TaintedObjectsNoOpTest extends Specification {
     final toTaint = 'test'
 
     when:
-    final taintedString = instance.taintInputString(toTaint, new Source(0 as byte, 'test', 'test'))
-    final taintedCharSequence = instance.taintInputCharSequence(toTaint, new Source(0 as byte, 'test', 'test'))
-    final taintedObject = instance.taintInputObject(toTaint, new Source(0 as byte, 'test', 'test'))
+    final tainted = instance.taint(toTaint, Ranges.forCharSequence(toTaint, new Source(0 as byte, 'test', 'test')))
 
     then:
-    taintedString == null
-    taintedCharSequence == null
-    taintedObject == null
+    tainted == null
     instance.get(toTaint) == null
+    instance.count() == 0
     instance.estimatedSize == 0
     instance.size() == 0
     !instance.flat
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/AbstractTelemetryCallbackTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/AbstractTelemetryCallbackTest.groovy
index aefaf6c46a1..92f03e910d2 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/AbstractTelemetryCallbackTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/AbstractTelemetryCallbackTest.groovy
@@ -1,7 +1,7 @@
 package com.datadog.iast.telemetry
 
 
-import com.datadog.iast.HasDependencies.Dependencies
+import com.datadog.iast.Dependencies
 import com.datadog.iast.IastModuleImplTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.gateway.RequestContext
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/TelemetryRequestEndedHandlerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/TelemetryRequestEndedHandlerTest.groovy
index 24e2ef187b5..30a61959d98 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/TelemetryRequestEndedHandlerTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/TelemetryRequestEndedHandlerTest.groovy
@@ -3,6 +3,7 @@ package com.datadog.iast.telemetry
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.RequestEndedHandler
 import com.datadog.iast.model.Source
+import com.datadog.iast.taint.Ranges
 import com.datadog.iast.taint.TaintedObjects
 import com.datadog.iast.telemetry.taint.TaintedObjectsWithTelemetry
 import datadog.trace.api.gateway.RequestContextSlot
@@ -41,7 +42,7 @@ class TelemetryRequestEndedHandlerTest extends AbstractTelemetryCallbackTest {
     final handler = new TelemetryRequestEndedHandler(delegate)
     final toTaint = 'hello'
     final source = new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value')
-    iastCtx.taintedObjects.taintInputString(toTaint, source)
+    iastCtx.taintedObjects.taint(toTaint, Ranges.forCharSequence(toTaint, source))
 
     when:
     handler.apply(reqCtx, span)
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy
index bca55f07c11..c20ca32dace 100644
--- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy
+++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy
@@ -2,13 +2,11 @@ package com.datadog.iast.telemetry.taint
 
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.model.Range
-import com.datadog.iast.model.Source
 import com.datadog.iast.taint.Ranges
 import com.datadog.iast.taint.TaintedObject
 import com.datadog.iast.taint.TaintedObjects
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
-import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.telemetry.IastMetric
 import datadog.trace.api.iast.telemetry.IastMetricCollector
 import datadog.trace.api.iast.telemetry.Verbosity
@@ -74,13 +72,11 @@ class TaintedObjectsWithTelemetryTest extends DDSpecification {
     final taintedObjects = TaintedObjectsWithTelemetry.build(verbosity, Mock(TaintedObjects))
 
     when:
-    taintedObjects.taintInputString('test', new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', 'value'))
-    taintedObjects.taintInputObject(new Date(), new Source(SourceTypes.REQUEST_HEADER_VALUE, 'name', 'value'))
     taintedObjects.taint('test', new Range[0])
 
     then:
     if (IastMetric.EXECUTED_TAINTED.isEnabled(verbosity)) {
-      3 * mockCollector.addMetric(IastMetric.EXECUTED_TAINTED, _, 1) // two calls with one element
+      1 * mockCollector.addMetric(IastMetric.EXECUTED_TAINTED, _, 1)
     } else {
       0 * mockCollector.addMetric
     }
diff --git a/dd-java-agent/agent-iast/src/test/resources/redaction/evidence-redaction-suite.yml b/dd-java-agent/agent-iast/src/test/resources/redaction/evidence-redaction-suite.yml
index 485afe29f2c..cf92538ae54 100644
--- a/dd-java-agent/agent-iast/src/test/resources/redaction/evidence-redaction-suite.yml
+++ b/dd-java-agent/agent-iast/src/test/resources/redaction/evidence-redaction-suite.yml
@@ -247,6 +247,38 @@ suite:
           }
         ]
       }
+  - type: 'VULNERABILITIES'
+    description: 'Query with single quoted string literal and null source'
+    input: >
+      [
+        {
+          "type": "SQL_INJECTION",
+          "evidence": {
+            "value": "select * from users where username = 'user'",
+            "ranges": [
+              { "start" : 38, "length" : 4, "source": { "origin": "http.request.body" } }
+            ]
+          }
+        }
+      ]
+    expected: >
+      {
+        "sources": [
+          { "origin": "http.request.body" }
+        ],
+        "vulnerabilities": [
+          {
+            "type": "SQL_INJECTION",
+            "evidence": {
+              "valueParts": [
+                { "value": "select * from users where username = '" },
+                { "redacted": true, "source": 0, "pattern": "****" },
+                { "value": "'" }
+              ]
+            }
+          }
+        ]
+      }
   - type: 'VULNERABILITIES'
     description: '$1 query with double quoted string literal $2'
     parameters:
@@ -1753,6 +1785,40 @@ suite:
         ]
       } 
 
+
+  - type: 'VULNERABILITIES'
+    description: 'Tainted range based redaction - with null source '
+    input: >
+      [
+        {
+          "type": "XSS",
+          "evidence": {
+            "value": "this could be a super long text, so we need to reduce it before send it to the backend. This redaction strategy applies to XSS vulnerability but can be extended to future ones",
+            "ranges": [
+              { "start" : 123, "length" : 3, "source": { "origin": "http.request.body" } }
+            ]
+          }
+        }
+      ]
+    expected: >
+      {
+        "sources": [
+          { "origin": "http.request.body" }
+        ],
+        "vulnerabilities": [
+          {
+            "type": "XSS",
+            "evidence": {
+              "valueParts": [
+                { "redacted": true },
+                { "source": 0, "value": "XSS" },
+                { "redacted": true }
+              ]
+            }
+          }
+        ]
+      }
+
   - type: 'VULNERABILITIES'
     description: 'Tainted range based redaction - multiple ranges'
     input: >
diff --git a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy
index ffa956d5ded..6e0b849f6ca 100644
--- a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy
+++ b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy
@@ -3,16 +3,9 @@ package com.datadog.iast.test
 import com.datadog.iast.IastRequestContext
 import com.datadog.iast.IastSystem
 import com.datadog.iast.model.Range
-import com.datadog.iast.model.Source
 import com.datadog.iast.taint.TaintedObject
 import com.datadog.iast.taint.TaintedObjects
-import datadog.trace.api.gateway.CallbackProvider
-import datadog.trace.api.gateway.EventType
-import datadog.trace.api.gateway.Events
-import datadog.trace.api.gateway.Flow
-import datadog.trace.api.gateway.IGSpanInfo
-import datadog.trace.api.gateway.RequestContext
-import datadog.trace.api.gateway.RequestContextSlot
+import datadog.trace.api.gateway.*
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import org.slf4j.Logger
@@ -68,22 +61,12 @@ trait IastRequestContextPreparationTrait {
 
       List<Object> objects = Collections.synchronizedList([])
 
-      TaintedObject taintInputString(String obj, Source source, int mark) {
-        objects << obj
-        this.delegate.taintInputString(obj, source, mark)
-        logTaint obj
-      }
-
-      TaintedObject taintInputObject(Object obj, Source source, int mark) {
-        objects << obj
-        this.delegate.taintInputObject(obj, source, mark)
-        logTaint obj
-      }
-
+      @Override
       TaintedObject taint(Object obj, Range[] ranges) {
         objects << obj
-        this.delegate.taintInputString(obj, ranges)
+        final tainted = this.delegate.taint(obj, ranges)
         logTaint obj
+        return tainted
       }
 
       private final static Logger LOGGER = LoggerFactory.getLogger("map tainted objects")
diff --git a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/NoopOverheadController.groovy b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/NoopOverheadController.groovy
index 74964a13634..32152663dc1 100644
--- a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/NoopOverheadController.groovy
+++ b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/NoopOverheadController.groovy
@@ -2,6 +2,7 @@ package com.datadog.iast.test
 
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
+import com.github.javaparser.quality.Nullable
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileStatic
 
@@ -18,12 +19,12 @@ class NoopOverheadController implements OverheadController {
   }
 
   @Override
-  boolean hasQuota(Operation operation, AgentSpan span) {
+  boolean hasQuota(Operation operation, @Nullable AgentSpan span) {
     true
   }
 
   @Override
-  boolean consumeQuota(Operation operation, AgentSpan span) {
+  boolean consumeQuota(Operation operation, @Nullable AgentSpan span) {
     true
   }
 
diff --git a/dd-java-agent/agent-jmxfetch/integrations-core b/dd-java-agent/agent-jmxfetch/integrations-core
index 03aed80d105..d211ef6ec4c 160000
--- a/dd-java-agent/agent-jmxfetch/integrations-core
+++ b/dd-java-agent/agent-jmxfetch/integrations-core
@@ -1 +1 @@
-Subproject commit 03aed80d105aa81b047e74c6da086165cac5ff6f
+Subproject commit d211ef6ec4c9584df4b9f430dd10382f169d4727
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
index 958dfe6f14d..99e9d2fbd97 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
@@ -329,7 +329,7 @@ public void formatLog(LogLevel level, Marker marker, String format, Object arg)
     }
 
     FormattingTuple tuple = MessageFormatter.format(format, arg);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    alwaysLog(level, marker, format, tuple.getMessage(), tuple.getThrowable());
   }
 
   public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
@@ -338,7 +338,7 @@ public void formatLog(LogLevel level, Marker marker, String format, Object arg1,
     }
 
     FormattingTuple tuple = MessageFormatter.format(format, arg1, arg2);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    alwaysLog(level, marker, format, tuple.getMessage(), tuple.getThrowable());
   }
 
   public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
@@ -347,17 +347,17 @@ public void formatLog(LogLevel level, Marker marker, String format, Object... ar
     }
 
     FormattingTuple tuple = MessageFormatter.arrayFormat(format, arguments);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    alwaysLog(level, marker, format, tuple.getMessage(), tuple.getThrowable());
   }
 
   private void log(LogLevel level, Marker marker, String msg, Throwable t) {
     if (!helper.enabled(level, marker)) {
       return;
     }
-    alwaysLog(level, marker, msg, t);
+    alwaysLog(level, marker, null, msg, t);
   }
 
-  private void alwaysLog(LogLevel level, Marker marker, String msg, Throwable t) {
+  protected void alwaysLog(LogLevel level, Marker marker, String format, String msg, Throwable t) {
     helper.log(level, marker, msg, t);
   }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
index afa838ae20a..efd8ef2293f 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
@@ -1,5 +1,6 @@
 package datadog.trace.logging.ddlogger;
 
+import datadog.trace.api.Platform;
 import datadog.trace.logging.LogLevel;
 import datadog.trace.logging.LogLevelSwitcher;
 import datadog.trace.logging.LoggerHelper;
@@ -12,8 +13,9 @@
 
 public class DDLoggerFactory implements ILoggerFactory, LogLevelSwitcher {
 
-  private volatile LoggerHelperFactory helperFactory = null;
+  private final boolean telemetryLogCollectionEnabled = getLogCollectionEnabled(false);
 
+  private volatile LoggerHelperFactory helperFactory = null;
   private volatile LogLevel override = null;
 
   public DDLoggerFactory() {}
@@ -59,7 +61,12 @@ public void log(LogLevel level, Marker marker, String message, Throwable t) {
   @Override
   public Logger getLogger(String name) {
     LoggerHelper helper = getHelperFactory().loggerHelperForName(name);
-    return new DDLogger(new HelperWrapper(helper), name);
+    HelperWrapper helperWrapper = new HelperWrapper(helper);
+    if (!telemetryLogCollectionEnabled || Platform.isNativeImageBuilder()) {
+      return new DDLogger(helperWrapper, name);
+    } else {
+      return new DDTelemetryLogger(helperWrapper, name);
+    }
   }
 
   private LoggerHelperFactory getHelperFactory() {
@@ -75,4 +82,29 @@ private LoggerHelperFactory getHelperFactory() {
     }
     return factory;
   }
+
+  @Override
+  public void reinitialize() {
+    helperFactory = null;
+  }
+
+  // DDLoggerFactory can be called at very early stage, before Config loaded
+  // So to get property/env we use this custom function
+  private static boolean getLogCollectionEnabled(boolean defaultValue) {
+    String value = System.getProperty("dd.telemetry.log-collection.enabled");
+    if ("true".equalsIgnoreCase(value)) {
+      return true;
+    }
+    if ("false".equalsIgnoreCase(value)) {
+      return false;
+    }
+    value = System.getenv("DD_TELEMETRY_LOG_COLLECTION_ENABLED");
+    if ("true".equalsIgnoreCase(value)) {
+      return true;
+    }
+    if ("false".equalsIgnoreCase(value)) {
+      return false;
+    }
+    return defaultValue;
+  }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
new file mode 100644
index 00000000000..781a51d06d0
--- /dev/null
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
@@ -0,0 +1,31 @@
+package datadog.trace.logging.ddlogger;
+
+import datadog.trace.api.Platform;
+import datadog.trace.api.telemetry.LogCollector;
+import datadog.trace.logging.LogLevel;
+import datadog.trace.logging.LoggerHelper;
+import org.slf4j.Marker;
+
+public class DDTelemetryLogger extends DDLogger {
+
+  public DDTelemetryLogger(LoggerHelper helper, String name) {
+    super(helper, name);
+  }
+
+  @Override
+  protected void alwaysLog(LogLevel level, Marker marker, String format, String msg, Throwable t) {
+    super.alwaysLog(level, marker, format, msg, t);
+    if (!Platform.isNativeImageBuilder()) {
+      // We report only messages with Throwable or explicitly marked with SEND_TELEMETRY
+      if (t != null || marker == LogCollector.SEND_TELEMETRY) {
+        // We are scrubbing all data from messages, and only send static (compile time)
+        // log messages, plus redacted stack traces.
+        if (format != null) {
+          LogCollector.get().addLogMessage(level.name(), format, t);
+        } else if (msg != null) {
+          LogCollector.get().addLogMessage(level.name(), msg, t);
+        }
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/ddlogger/DDTelemetryLoggerTest.groovy b/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/ddlogger/DDTelemetryLoggerTest.groovy
new file mode 100644
index 00000000000..fe68514c72f
--- /dev/null
+++ b/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/ddlogger/DDTelemetryLoggerTest.groovy
@@ -0,0 +1,52 @@
+package datadog.trace.logging.ddlogger
+
+import datadog.trace.api.telemetry.LogCollector
+import datadog.trace.logging.LogValidatingSpecification
+import datadog.trace.logging.simplelogger.SLCompatFactory
+import datadog.trace.logging.simplelogger.SLCompatSettings
+
+class DDTelemetryLoggerTest extends LogValidatingSpecification {
+  def "test logging with log collector"() {
+    setup:
+    def name = "foo.bar"
+    Properties props = new Properties()
+    props.setProperty(SLCompatSettings.Keys.DEFAULT_LOG_LEVEL, "debug")
+    props.setProperty(SLCompatSettings.Keys.SHOW_THREAD_NAME, "false")
+    def settings = new SLCompatSettings(props)
+    def factory = new SLCompatFactory(props, settings)
+    def logger = new DDTelemetryLogger(factory.loggerHelperForName(name), name)
+
+    when:
+    logger.debug("debug message {}", 42, new Exception())
+    def collection = LogCollector.get().drain()
+
+    then:
+    collection.size() == 1
+    collection[0].message() == 'debug message {}'
+
+    when:
+    logger.warn(LogCollector.SEND_TELEMETRY, "warning message {}", 42)
+    collection = LogCollector.get().drain()
+
+    then:
+    collection.size() == 1
+    collection[0].message() == 'warning message {}'
+
+    when:
+    logger.error(LogCollector.SEND_TELEMETRY, "plain error message")
+    collection = LogCollector.get().drain()
+
+    then:
+    collection.size() == 1
+    collection[0].message() == 'plain error message'
+
+    when:
+    logger.debug(LogCollector.SEND_TELEMETRY, null)
+    logger.error(null, new Exception())
+    logger.warn("warn message", null)
+    collection = LogCollector.get().drain()
+
+    then:
+    collection.size() == 0
+  }
+}
diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle
index 23a64cc6aa9..410efe145a6 100644
--- a/dd-java-agent/agent-profiling/build.gradle
+++ b/dd-java-agent/agent-profiling/build.gradle
@@ -4,6 +4,14 @@ plugins {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+excludedClassesCoverage += [
+  // ControllerFactory gets better tested in actual controller implementations
+  'com.datadog.profiling.agent.ControllerFactory',
+  'com.datadog.profiling.agent.ProfilingAgent',
+  'com.datadog.profiling.agent.ProfilingAgent.ShutdownHook',
+  'com.datadog.profiling.agent.ProfilingAgent.DataDumper'
+]
+
 dependencies {
   api deps.slf4j
   api project(':internal-api')
@@ -16,6 +24,9 @@ dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller-ddprof')
   api project(':dd-java-agent:agent-profiling:profiling-controller-openjdk')
   api project(':dd-java-agent:agent-profiling:profiling-controller-oracle')
+
+  testImplementation deps.junit5
+  testImplementation deps.mockito
 }
 
 Project parent_project = project
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java
index bf3dc01fdc7..43cc0bdf0e5 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java
@@ -2,10 +2,10 @@
 
 import com.datadog.profiling.auxiliary.AuxiliaryImplementation;
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.ddprof.DatadogProfiler;
 import com.datadog.profiling.utils.ProfilingMode;
 import com.google.auto.service.AutoService;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java
index b3d955167d1..0f28f087c37 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java
@@ -1,8 +1,8 @@
 package com.datadog.profiling.auxiliary;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.utils.ProfilingMode;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.Collections;
 import java.util.Set;
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryProfiler.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryProfiler.java
index 9aa8b064a9d..f4a73d03196 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryProfiler.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryProfiler.java
@@ -38,7 +38,8 @@ private AuxiliaryProfiler() {
     this(ConfigProvider.getInstance());
   }
 
-  AuxiliaryProfiler(ConfigProvider configProvider) {
+  /** This constructor allows passing in a custom config provider for testing purposes */
+  public AuxiliaryProfiler(ConfigProvider configProvider) {
     String auxilliaryType =
         Platform.isLinux()
                 && configProvider.getBoolean(
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java
index 155775e054d..4de89e7c428 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java
@@ -1,7 +1,7 @@
 package com.datadog.profiling.auxiliary;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.IOException;
 import java.time.Instant;
 import javax.annotation.Nonnull;
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java
index 3109a5b7e35..e7b9f56fa5f 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java
@@ -1,7 +1,7 @@
 package com.datadog.profiling.auxiliary;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java
index 319591cd749..fec7322970f 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java
@@ -2,9 +2,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java
index 764a2199940..aeb47f30b03 100644
--- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java
+++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java
@@ -1,9 +1,9 @@
 package com.datadog.profiling.auxiliary;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.utils.ProfilingMode;
 import com.google.auto.service.AutoService;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
index 855c5b68bca..0bcf681ca5b 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
@@ -30,6 +30,7 @@ dependencies {
   testImplementation deps.junit5
   testImplementation deps.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
+  testImplementation project(':dd-java-agent:agent-profiling')
 }
 
 /*
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
index 38086ae0746..f094c7ab859 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
@@ -31,6 +31,10 @@ public final class DatadogProfilerController implements Controller {
 
   private final DatadogProfiler datadogProfiler;
 
+  public static Controller instance(ConfigProvider configProvider) {
+    return new DatadogProfilerController(configProvider);
+  }
+
   /**
    * Main constructor for Async profiling controller.
    *
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
index 00b44761bc6..1d61e984768 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
@@ -17,11 +17,11 @@
 
 import com.datadog.profiling.controller.OngoingRecording;
 import com.datadog.profiling.controller.ProfilerSettingsSupport;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.ddprof.DatadogProfiler;
 import datadog.trace.api.Platform;
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
 import java.time.Instant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
index 7d3e4d74960..8cdcec2eca4 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import com.datadog.profiling.agent.ControllerFactory;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
@@ -20,8 +21,7 @@ public class ControllerFactoryTest {
    * tests with java11 that is guaranteed to have JFR.
    */
   @Test
-  public void testCreateController()
-      throws UnsupportedEnvironmentException, ConfigurationException {
+  public void testCreateController() throws UnsupportedEnvironmentException {
     // Enable test on OpenJ9 only
     final String javaVendor = System.getProperty("java.vendor");
     final String javaVmName = System.getProperty("java.vm.name");
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
index 8f344543279..ca07b0d3229 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
@@ -1,9 +1,9 @@
 package com.datadog.profiling.controller.ddprof;
 
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_AUXILIARY_TYPE;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.datadog.profiling.controller.RecordingData;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
index a40d67a9a8a..6ebe1f63029 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
@@ -2,9 +2,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.ddprof.DatadogProfiler;
+import datadog.trace.api.profiling.RecordingData;
 import java.time.Instant;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/resources/jfr/dd.jfp b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/resources/jfr/dd.jfp
index f5e10fa9c38..63027a566a2 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/resources/jfr/dd.jfp
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/resources/jfr/dd.jfp
@@ -248,3 +248,5 @@ datadog.ExceptionSample#enabled=true
 datadog.ExceptionCount#enabled=true
 datadog.ProfilerSetting#enabled=true
 datadog.ContextInterval#enabled=true
+datadog.Timeline#enabled=true
+datadog.Timeline#threshold=10 ms
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
index 5de37b3baaa..ae24e90e76e 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
@@ -17,6 +17,9 @@ apply plugin: 'idea'
 dependencies {
   api deps.slf4j
   api project(':internal-api')
+  api(project(':dd-java-agent:agent-bootstrap')) {
+    exclude group: 'com.datadoghq', module: 'agent-logging'
+  }
   api project(':dd-java-agent:agent-profiling:profiling-auxiliary')
   api project(':dd-java-agent:agent-profiling:profiling-controller')
   api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
@@ -25,6 +28,7 @@ dependencies {
   testImplementation deps.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
+  testImplementation project(':dd-java-agent:agent-profiling')
 }
 
 /*
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java
new file mode 100644
index 00000000000..36f5efc7813
--- /dev/null
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java
@@ -0,0 +1,38 @@
+package com.datadog.profiling.controller.openjdk;
+
+import com.datadog.profiling.controller.openjdk.events.TimelineEvent;
+import com.datadog.profiling.utils.ExcludedVersions;
+import datadog.trace.api.Stateful;
+import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
+import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
+
+public class JFREventContextIntegration implements ProfilingContextIntegration {
+
+  public JFREventContextIntegration() {
+    ExcludedVersions.checkVersionExclusion();
+  }
+
+  private volatile boolean isStarted = false;
+
+  @Override
+  public void onStart() {
+    // avoid initialising JFR until called
+    isStarted = true;
+  }
+
+  @Override
+  public Stateful newScopeState(ProfilerContext profilerContext) {
+    if (!isStarted) {
+      return Stateful.DEFAULT;
+    }
+    return new TimelineEvent(
+        profilerContext.getRootSpanId(),
+        profilerContext.getSpanId(),
+        String.valueOf(profilerContext.getOperationName()));
+  }
+
+  @Override
+  public String name() {
+    return "jfr";
+  }
+}
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
index c8b680acf21..2cee895827b 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
@@ -20,6 +20,8 @@
 import static datadog.trace.api.Platform.isJavaVersionAtLeast;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_ULTRA_MINIMAL;
 
 import com.datadog.profiling.controller.ConfigurationException;
@@ -30,6 +32,7 @@
 import datadog.trace.api.Platform;
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
+import datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionProfiling;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.IOException;
 import java.time.Duration;
@@ -53,8 +56,18 @@ public final class OpenJdkController implements Controller {
 
   private static final Logger log = LoggerFactory.getLogger(OpenJdkController.class);
 
+  private final ConfigProvider configProvider;
   private final Map<String, String> recordingSettings;
 
+  public static Controller instance(ConfigProvider configProvider) {
+    try {
+      return new OpenJdkController(configProvider);
+    } catch (ConfigurationException | ClassNotFoundException e) {
+      log.debug("Unable to create OpenJDK controller", e);
+      return new MisconfiguredController(e);
+    }
+  }
+
   /**
    * Main constructor for OpenJDK profiling controller.
    *
@@ -68,6 +81,8 @@ public OpenJdkController(final ConfigProvider configProvider)
     Class.forName("jdk.jfr.Recording");
     Class.forName("jdk.jfr.FlightRecorder");
 
+    this.configProvider = configProvider;
+
     boolean ultraMinimal = configProvider.getBoolean(PROFILING_ULTRA_MINIMAL, false);
 
     Map<String, String> recordingSettings;
@@ -109,7 +124,15 @@ public OpenJdkController(final ConfigProvider configProvider)
             "enabling Datadog heap histogram on JVM without an efficient implementation of the jdk.ObjectCount event. "
                 + "This may increase p99 latency. Consider upgrading to JDK 17.0.9+ or 21+ to reduce latency impact.");
       }
-      enableEvent(recordingSettings, "jdk.ObjectCount", "user enabled histogram heap collection");
+      String mode =
+          configProvider.getString(
+              PROFILING_HEAP_HISTOGRAM_MODE, PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT);
+      if ("periodic".equalsIgnoreCase(mode)) {
+        enableEvent(recordingSettings, "jdk.ObjectCount", "user enabled histogram heap collection");
+      } else {
+        enableEvent(
+            recordingSettings, "jdk.ObjectCountAfterGC", "user enabled histogram heap collection");
+      }
     }
 
     // Toggle settings from override file
@@ -182,6 +205,10 @@ && isEventEnabled(recordingSettings, "jdk.NativeMethodSample")) {
 
     this.recordingSettings = Collections.unmodifiableMap(recordingSettings);
 
+    if (isEventEnabled(this.recordingSettings, "datadog.ExceptionSample")) {
+      ExceptionProfiling.getInstance().start();
+    }
+
     // Register periodic events
     AvailableProcessorCoresEvent.register();
   }
@@ -197,7 +224,7 @@ int getMaxSize() {
   public OpenJdkOngoingRecording createRecording(final String recordingName)
       throws UnsupportedEnvironmentException {
     return new OpenJdkOngoingRecording(
-        recordingName, recordingSettings, getMaxSize(), RECORDING_MAX_AGE);
+        recordingName, recordingSettings, getMaxSize(), RECORDING_MAX_AGE, configProvider);
   }
 
   private static void disableEvent(
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
index 9c0f4401b5a..aa030361289 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
@@ -3,10 +3,11 @@
 import com.datadog.profiling.auxiliary.AuxiliaryProfiler;
 import com.datadog.profiling.auxiliary.AuxiliaryRecordingData;
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.utils.ProfilingMode;
 import datadog.trace.api.profiling.ProfilingListenersRegistry;
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Map;
@@ -28,13 +29,26 @@ public class OpenJdkOngoingRecording implements OngoingRecording {
 
   OpenJdkOngoingRecording(
       String recordingName, Map<String, String> settings, int maxSize, Duration maxAge) {
+    this(recordingName, settings, maxSize, maxAge, ConfigProvider.getInstance());
+  }
+
+  OpenJdkOngoingRecording(
+      String recordingName,
+      Map<String, String> settings,
+      int maxSize,
+      Duration maxAge,
+      ConfigProvider configProvider) {
     log.debug("Creating new recording: {}", recordingName);
     recording = new Recording();
     recording.setName(recordingName);
     recording.setSettings(settings);
     recording.setMaxSize(maxSize);
     recording.setMaxAge(maxAge);
-    this.auxiliaryProfiler = AuxiliaryProfiler.getInstance();
+    // for testing purposes we are supporting passing in a custom config provider
+    this.auxiliaryProfiler =
+        (configProvider == ConfigProvider.getInstance()
+            ? AuxiliaryProfiler.getInstance()
+            : new AuxiliaryProfiler(configProvider));
     if (auxiliaryProfiler.isEnabled()) {
       auxiliaryRecording = auxiliaryProfiler.start();
       if (auxiliaryRecording != null) {
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
index 3c0b3a0d13b..6cedf96691b 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
@@ -15,8 +15,8 @@
  */
 package com.datadog.profiling.controller.openjdk;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.IOException;
 import java.time.Instant;
 import javax.annotation.Nonnull;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java
new file mode 100644
index 00000000000..b7ac1615da8
--- /dev/null
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java
@@ -0,0 +1,47 @@
+package com.datadog.profiling.controller.openjdk.events;
+
+import datadog.trace.api.Stateful;
+import jdk.jfr.Category;
+import jdk.jfr.Description;
+import jdk.jfr.Event;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.StackTrace;
+
+@Name("datadog.Timeline")
+@Label("Profiler Timeline Event")
+@Description("Datadog profiler timeline event")
+@Category("Datadog")
+@StackTrace(false)
+public class TimelineEvent extends Event implements Stateful {
+
+  @Label("Local Root Span Id")
+  private final long localRootSpanId;
+
+  @Label("Span Id")
+  private final long spanId;
+
+  @Label("Span Name")
+  @Name("_dd.trace.operation")
+  private final String operation;
+
+  public TimelineEvent(long localRootSpanId, long spanId, String operation) {
+    this.localRootSpanId = localRootSpanId;
+    this.spanId = spanId;
+    this.operation = operation;
+    begin();
+  }
+
+  @Override
+  public void close() {
+    end();
+    if (shouldCommit()) {
+      commit();
+    }
+  }
+
+  @Override
+  public void activate(Object context) {
+    // nothing to do, either we get an event or we don't
+  }
+}
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
index 45d4c13cf20..dae26c9d48f 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
@@ -6,6 +6,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
+import com.datadog.profiling.agent.ControllerFactory;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -24,8 +25,7 @@ public class ControllerFactoryTest {
    * tests with java11 that is guaranteed to have JFR.
    */
   @Test
-  public void testCreateController()
-      throws UnsupportedEnvironmentException, ConfigurationException {
+  public void testCreateController() throws UnsupportedEnvironmentException {
     assertEquals(
         "com.datadog.profiling.controller.openjdk.OpenJdkController",
         ControllerFactory.createController(configProvider).getClass().getName());
@@ -35,10 +35,10 @@ public void testCreateController()
   public void testConfigurationException() {
     when(configProvider.getString(eq(PROFILING_TEMPLATE_OVERRIDE_FILE)))
         .thenReturn("some-path-that-is-not-supposed-to-exist!!!");
-    assertThrows(
-        ConfigurationException.class,
-        () -> {
-          ControllerFactory.createController(configProvider);
-        });
+    UnsupportedEnvironmentException exception =
+        assertThrows(
+            UnsupportedEnvironmentException.class,
+            () -> ControllerFactory.createController(configProvider));
+    assertEquals(ConfigurationException.class, exception.getCause().getClass());
   }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
index d1a4ee5d9c2..a2c1fa2e961 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
@@ -2,12 +2,15 @@
 
 import static com.datadog.profiling.controller.ProfilingSupport.*;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_ALLOCATION_ENABLED;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_AUXILIARY_TYPE;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE;
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.controller.jfr.JfpUtilsTest;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.Properties;
 import jdk.jfr.Recording;
@@ -23,8 +26,9 @@ public class OpenJdkControllerTest {
 
   @Test
   public void testCreateContinuousRecording() throws Exception {
-    Properties props = new Properties();
-    props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpUtilsTest.OVERRIDES);
+    Properties props = getConfigProperties();
+    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -39,7 +43,8 @@ public void testCreateContinuousRecording() throws Exception {
 
   @Test
   public void testHeapProfilerIsDisabledOnUnsupportedVersion() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -54,8 +59,9 @@ public void testHeapProfilerIsDisabledOnUnsupportedVersion() throws Exception {
 
   @Test
   public void testHeapProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
     props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpUtilsTest.OVERRIDES_OLD_OBJECT_SAMPLE);
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -71,8 +77,9 @@ public void testHeapProfilerIsStillOverriddenOnUnsupportedVersion() throws Excep
 
   @Test
   public void testHeapProfilerIsStillOverriddenThroughConfig() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
     props.put(PROFILING_HEAP_ENABLED, "true");
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -87,7 +94,8 @@ public void testHeapProfilerIsStillOverriddenThroughConfig() throws Exception {
 
   @Test
   public void testAllocationProfilerIsDisabledOnUnsupportedVersion() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -126,7 +134,7 @@ public void testAllocationProfilerIsDisabledOnUnsupportedVersion() throws Except
 
   @Test
   public void testAllocationProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
     props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpUtilsTest.OVERRIDES_OBJECT_ALLOCATION);
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
@@ -149,8 +157,9 @@ public void testAllocationProfilerIsStillOverriddenOnUnsupportedVersion() throws
 
   @Test
   public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Exception {
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
     props.put(PROFILING_ALLOCATION_ENABLED, "true");
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -172,7 +181,8 @@ public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Except
   @Test
   public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception {
     Assumptions.assumeFalse(isNativeMethodSampleAvailable());
-    Properties props = new Properties();
+    Properties props = getConfigProperties();
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -186,8 +196,8 @@ public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception
 
   @Test
   public void testNativeProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = new Properties();
-    props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpUtilsTest.OVERRIDES_NATIVE_METHOD_SAMPLE);
+    Properties props = getConfigProperties();
+
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
     OpenJdkController controller = new OpenJdkController(configProvider);
@@ -200,4 +210,12 @@ public void testNativeProfilerIsStillOverriddenOnUnsupportedVersion() throws Exc
       }
     }
   }
+
+  private static Properties getConfigProperties() {
+    Properties props = new Properties();
+    // make sure the async profiler is not force-enabled
+    props.put(PROFILING_AUXILIARY_TYPE, PROFILING_AUXILIARY_TYPE_DEFAULT);
+    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
+    return props;
+  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
index 226305b6469..7ce507aeef7 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
@@ -5,7 +5,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.datadog.profiling.controller.RecordingData;
+import datadog.trace.api.profiling.RecordingData;
 import java.time.Instant;
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle
index 03d245fd32f..8ed1fe90038 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle
@@ -26,6 +26,7 @@ dependencies {
   testImplementation deps.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
+  testImplementation project(':dd-java-agent:agent-profiling')
 }
 
 // Oracle JDK requires extra JVM arguments to enable JFR
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
index 5d177d8fc7b..cae24a49e3a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
@@ -26,6 +26,15 @@ public final class OracleJdkController implements Controller {
   private final Map<String, String> eventSettings;
   private final JfrMBeanHelper helper;
 
+  public static Controller instance(ConfigProvider configProvider) {
+    try {
+      return new OracleJdkController(configProvider);
+    } catch (ConfigurationException e) {
+      log.debug("Unable to create OracleJdkController", e);
+      return new MisconfiguredController(e);
+    }
+  }
+
   /**
    * Main constructor for Oracle JDK profiling controller.
    *
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
index e66d32dccb3..226e1b0f24d 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
@@ -15,8 +15,8 @@
  */
 package com.datadog.profiling.controller.oracle;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.Instant;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
index 279e1643be6..3b076f67f19 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
@@ -22,6 +22,21 @@
  * want to support multiple versions later.
  */
 public interface Controller {
+  /** A special type for a noop controller instance which could not be properly configured */
+  class MisconfiguredController implements Controller {
+    public final Exception exception;
+
+    public MisconfiguredController(Exception exception) {
+      this.exception = exception;
+    }
+
+    @Nonnull
+    @Override
+    public OngoingRecording createRecording(@Nonnull String recordingName)
+        throws UnsupportedEnvironmentException {
+      throw new UnsupportedEnvironmentException("Controller is not configured");
+    }
+  }
   /**
    * Creates a continuous recording using the specified template.
    *
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
index f2b0630ae6c..767957adf3a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
@@ -1,6 +1,7 @@
 package com.datadog.profiling.controller;
 
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
 import java.io.Closeable;
 import java.time.Instant;
 import javax.annotation.Nonnull;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
index d5ae0359da5..f1bf7757dae 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
@@ -18,6 +18,9 @@
 import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_RECORDING_SCHEDULER;
 
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingDataListener;
+import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.util.AgentTaskScheduler;
 import java.time.Duration;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
index f3cb16ff88d..286790b315c 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
@@ -15,7 +15,7 @@
  */
 package com.datadog.profiling.controller;
 
-import static com.datadog.profiling.controller.RecordingType.CONTINUOUS;
+import static datadog.trace.api.profiling.RecordingType.CONTINUOUS;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_RECORDING_SCHEDULER;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
@@ -36,6 +36,8 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingDataListener;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.util.AgentTaskScheduler;
 import java.time.Duration;
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
index 0178fb76d3b..8f29aba8365 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
@@ -16,6 +16,7 @@
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isCpuProfilerEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isLiveHeapSizeTrackingEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isMemoryLeakProfilingEnabled;
+import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isResourceNameContextAttributeEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isSpanNameContextAttributeEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isWallClockProfilerEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.omitLineNumbers;
@@ -27,12 +28,12 @@
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.utils.ProfilingMode;
 import com.datadoghq.profiler.ContextSetter;
 import com.datadoghq.profiler.JavaProfiler;
 import datadog.trace.api.config.ProfilingConfig;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -58,6 +59,7 @@ public final class DatadogProfiler {
   private static final int[] EMPTY = new int[0];
 
   private static final String OPERATION = "_dd.trace.operation";
+  private static final String RESOURCE = "_dd.trace.resource";
 
   private static final int MAX_NUM_ENDPOINTS = 8192;
 
@@ -149,7 +151,7 @@ private DatadogProfiler(ConfigProvider configProvider) throws UnsupportedEnviron
                   ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH,
                   ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH_DEFAULT));
     } catch (IOException e) {
-      throw new UnsupportedOperationException("Unable to instantiate datadog profiler");
+      throw new UnsupportedOperationException("Unable to instantiate datadog profiler", e);
     }
     if (profiler == null) {
       throw new UnsupportedEnvironmentException("Unable to instantiate datadog profiler");
@@ -173,6 +175,9 @@ private DatadogProfiler(ConfigProvider configProvider) throws UnsupportedEnviron
     if (isSpanNameContextAttributeEnabled(configProvider)) {
       orderedContextAttributes.add(OPERATION);
     }
+    if (isResourceNameContextAttributeEnabled(configProvider)) {
+      orderedContextAttributes.add(RESOURCE);
+    }
     this.contextSetter = new ContextSetter(profiler, orderedContextAttributes);
     this.queueTimeThreshold =
         configProvider.getLong(
@@ -367,6 +372,10 @@ public int operationNameOffset() {
     return offsetOf(OPERATION);
   }
 
+  public int resourceNameOffset() {
+    return offsetOf(RESOURCE);
+  }
+
   public int offsetOf(String attribute) {
     return contextSetter.offsetOf(attribute);
   }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
index d6eeac40899..3746ca29936 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
@@ -3,6 +3,7 @@
 import static datadog.trace.api.Platform.isJ9;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_ALLOCATION_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES;
+import static datadog.trace.api.config.ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED_DEFAULT;
@@ -289,6 +290,10 @@ public static boolean isSpanNameContextAttributeEnabled(ConfigProvider configPro
     return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED, true);
   }
 
+  public static boolean isResourceNameContextAttributeEnabled(ConfigProvider configProvider) {
+    return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED, false);
+  }
+
   public static String getString(ConfigProvider configProvider, String key, String defaultValue) {
     return configProvider.getString(key, configProvider.getString(normalizeKey(key), defaultValue));
   }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
index d1e0781b964..8154a8a444e 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
@@ -1,8 +1,8 @@
 package com.datadog.profiling.ddprof;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
index e9cb4f03393..954e79834d2 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
@@ -1,7 +1,7 @@
 package com.datadog.profiling.ddprof;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
index 1fe10273789..ab31d14f3bc 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
@@ -1,5 +1,6 @@
 package com.datadog.profiling.ddprof;
 
+import datadog.trace.api.Stateful;
 import datadog.trace.api.profiling.ProfilingContextAttribute;
 import datadog.trace.api.profiling.ProfilingScope;
 import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
@@ -13,11 +14,32 @@ public class DatadogProfilingIntegration implements ProfilingContextIntegration
 
   private static final DatadogProfiler DDPROF = DatadogProfiler.getInstance();
   private static final int SPAN_NAME_INDEX = DDPROF.operationNameOffset();
+  private static final int RESOURCE_NAME_INDEX = DDPROF.resourceNameOffset();
   private static final boolean WALLCLOCK_ENABLED =
       DatadogProfilerConfig.isWallClockProfilerEnabled();
 
-  private static final boolean QUEUEING_TIME_ENABLED =
-      WALLCLOCK_ENABLED && DatadogProfilerConfig.isQueueingTimeEnabled();
+  private final Stateful contextManager =
+      new Stateful() {
+        @Override
+        public void close() {
+          // this implementation is stateless so nothing to do here
+        }
+
+        @Override
+        public void activate(Object context) {
+          if (context instanceof ProfilerContext) {
+            ProfilerContext profilerContext = (ProfilerContext) context;
+            DDPROF.setSpanContext(profilerContext.getSpanId(), profilerContext.getRootSpanId());
+            DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getEncodedOperationName());
+            DDPROF.setContextValue(RESOURCE_NAME_INDEX, profilerContext.getEncodedResourceName());
+          }
+        }
+      };
+
+  @Override
+  public Stateful newScopeState(ProfilerContext profilerContext) {
+    return contextManager;
+  }
 
   @Override
   public void onAttach() {
@@ -28,6 +50,7 @@ public void onAttach() {
 
   @Override
   public void onDetach() {
+    clearContext();
     if (WALLCLOCK_ENABLED) {
       DDPROF.removeThread();
     }
@@ -39,20 +62,30 @@ public int encode(CharSequence constant) {
   }
 
   @Override
-  public void setContext(ProfilerContext profilerContext) {
-    DDPROF.setSpanContext(profilerContext.getSpanId(), profilerContext.getRootSpanId());
-    DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getEncodedOperationName());
+  public int encodeOperationName(CharSequence constant) {
+    if (SPAN_NAME_INDEX >= 0) {
+      return DDPROF.encode(constant);
+    }
+    return 0;
   }
 
   @Override
-  public void clearContext() {
-    DDPROF.clearSpanContext();
-    DDPROF.clearContextValue(SPAN_NAME_INDEX);
+  public int encodeResourceName(CharSequence constant) {
+    if (RESOURCE_NAME_INDEX >= 0) {
+      return DDPROF.encode(constant);
+    }
+    return 0;
   }
 
   @Override
-  public void setContext(long rootSpanId, long spanId) {
-    DDPROF.setSpanContext(spanId, rootSpanId);
+  public String name() {
+    return "ddprof";
+  }
+
+  public void clearContext() {
+    DDPROF.clearSpanContext();
+    DDPROF.clearContextValue(SPAN_NAME_INDEX);
+    DDPROF.clearContextValue(RESOURCE_NAME_INDEX);
   }
 
   @Override
@@ -64,12 +97,4 @@ public ProfilingContextAttribute createContextAttribute(String attribute) {
   public ProfilingScope newScope() {
     return new DatadogProfilingScope(DDPROF);
   }
-
-  @Override
-  public boolean isQueuingTimeEnabled() {
-    return QUEUEING_TIME_ENABLED;
-  }
-
-  @Override
-  public void recordQueueingTime(long duration) {}
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
index 6d9ab83f3e2..da5f9d7ad60 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
@@ -2,7 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.datadog.profiling.controller.RecordingData;
+import datadog.trace.api.Platform;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -22,6 +23,7 @@ class DatadogProfilerRecordingTest {
 
   @BeforeEach
   void setup() throws Exception {
+    Assume.assumeTrue(Platform.isLinux());
     profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
     log.info(
         "Datadog Profiler: available={}, active={}", profiler.isAvailable(), profiler.isActive());
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
index 67531996499..4c586ccc9c8 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
@@ -6,11 +6,12 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.RecordingData;
 import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.utils.ProfilingMode;
+import datadog.trace.api.Platform;
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.api.profiling.ProfilingScope;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -20,6 +21,8 @@
 import java.util.UUID;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -32,6 +35,11 @@
 class DatadogProfilerTest {
   private static final Logger log = LoggerFactory.getLogger(DatadogProfilerTest.class);
 
+  @BeforeEach
+  public void setup() {
+    Assumptions.assumeTrue(Platform.isLinux());
+  }
+
   @Test
   void test() throws Exception {
     DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
@@ -143,7 +151,7 @@ private static ConfigProvider configProvider(
     props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, Boolean.toString(wall));
     props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, Boolean.toString(alloc));
     props.put(
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED, Boolean.toString(memleak));
+        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, Boolean.toString(memleak));
     return ConfigProvider.withPropertiesOverride(props);
   }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle
index a531d2af6c3..3ff1658ee27 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle
@@ -29,7 +29,7 @@ dependencies {
   implementation project(':dd-java-agent:agent-profiling:profiling-controller')
 
   implementation deps.okhttp
-  implementation group: 'org.lz4', name: 'lz4-java', version: '1.7.1'
+  implementation deps.lz4
 
   testImplementation deps.junit5
   testImplementation project(':dd-java-agent:agent-profiling:profiling-testing')
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
index eadf3c998ec..d41511d1b0a 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
@@ -1,6 +1,7 @@
 package com.datadog.profiling.uploader;
 
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.Platform;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,8 +24,17 @@
  */
 final class CompressingRequestBody extends RequestBody {
 
-  private static final LZ4Factory LZ4_FACTORY = LZ4Factory.fastestJavaInstance();
-  private static final XXHashFactory XXHASH_FACTORY = XXHashFactory.fastestJavaInstance();
+  /*
+   * LZ4 is not available in native image.
+   * LZ4Factory is using reflection heavily and since we are shading the lz4 classes for the usage in profiler
+   * it seems to be impossible to configure the native-image generation such as to make the reflection work.
+   *
+   * For now, we are disabling the lz4 compression in native image.
+   */
+  private static final LZ4Factory LZ4_FACTORY =
+      Platform.isNativeImage() ? null : LZ4Factory.fastestJavaInstance();
+  private static final XXHashFactory XXHASH_FACTORY =
+      Platform.isNativeImage() ? null : XXHashFactory.fastestJavaInstance();
 
   static final class MissingInputException extends IOException {
     public MissingInputException(String message) {
@@ -323,6 +333,10 @@ private static OutputStreamMappingFunction getOutputStreamMapper(
       @Nonnull CompressionType compressionType) {
     // currently only gzip and off are supported
     // this needs to be updated once more compression types are added
+    compressionType =
+        (Platform.isNativeImage() && compressionType != CompressionType.OFF
+            ? CompressionType.GZIP
+            : compressionType);
     switch (compressionType) {
       case GZIP:
         {
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
index 19c4ae3d21f..159c16ecb9a 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
@@ -17,8 +17,6 @@
 
 import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_HTTP_DISPATCHER;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingType;
 import com.datadog.profiling.uploader.util.JfrCliHelper;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
@@ -29,6 +27,8 @@
 import datadog.trace.api.DDTags;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.GitInfoProvider;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.relocate.api.IOLogger;
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
index 68d8a0bab2d..9668dc61d72 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
@@ -2,7 +2,7 @@
 
 import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_HTTP_DISPATCHER;
 
-import com.datadog.profiling.controller.RecordingData;
+import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.relocate.api.IOLogger;
 import datadog.trace.util.AgentThreadFactory;
 import java.io.ByteArrayOutputStream;
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
index 5b2cf5bec79..9dd3a6e23ac 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
@@ -5,7 +5,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingInputStream;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
index cb6a2f284e3..fce3459ddec 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
@@ -33,9 +33,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
-import com.datadog.profiling.controller.RecordingType;
 import com.datadog.profiling.testing.ProfilingTestUtils;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,6 +42,9 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.profiling.ProfilingSnapshot;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.relocate.api.IOLogger;
 import datadog.trace.util.PidHelper;
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
index 892d9ea96c0..a8d2c1fd7a1 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
@@ -9,8 +9,8 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingInputStream;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingInputStream;
 import datadog.trace.relocate.api.IOLogger;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerFactory.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ControllerFactory.java
similarity index 76%
rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerFactory.java
rename to dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ControllerFactory.java
index 0608ab201ec..94c8a641e4b 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerFactory.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ControllerFactory.java
@@ -13,13 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datadog.profiling.controller;
+package com.datadog.profiling.agent;
 
+import com.datadog.profiling.controller.ConfigurationException;
+import com.datadog.profiling.controller.Controller;
+import com.datadog.profiling.controller.UnsupportedEnvironmentException;
+import com.datadog.profiling.controller.ddprof.DatadogProfilerController;
+import com.datadog.profiling.controller.openjdk.OpenJdkController;
+import com.datadog.profiling.controller.oracle.OracleJdkController;
 import datadog.trace.api.Config;
 import datadog.trace.api.Platform;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.lang.reflect.InvocationTargetException;
+import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,25 +34,32 @@
 public final class ControllerFactory {
   private static final Logger log = LoggerFactory.getLogger(ControllerFactory.class);
 
-  private static enum Implementation {
+  private enum Implementation {
     NONE(),
-    ORACLE("com.datadog.profiling.controller.oracle.OracleJdkController"),
-    OPENJDK("com.datadog.profiling.controller.openjdk.OpenJdkController"),
-    ASYNC("com.datadog.profiling.controller.ddprof.DatadogProfilerController");
+    ORACLE(OracleJdkController::instance, OracleJdkController.class.getName()),
+    OPENJDK(OpenJdkController::instance, OpenJdkController.class.getName()),
+    DDPROF(DatadogProfilerController::instance, DatadogProfilerController.class.getName());
 
+    private final Function<ConfigProvider, Controller> instantiator;
     private final String className;
 
     Implementation() {
-      this.className = null;
+      this.instantiator = null;
+      this.className = "<none>";
     }
 
-    Implementation(String className) {
+    Implementation(Function<ConfigProvider, Controller> instantiator, String className) {
+      this.instantiator = instantiator;
       this.className = className;
     }
 
     String className() {
       return className;
     }
+
+    Controller instance(ConfigProvider configProvider) {
+      return instantiator.apply(configProvider);
+    }
   }
 
   /**
@@ -58,7 +72,7 @@ String className() {
    */
   @SuppressForbidden
   public static Controller createController(final ConfigProvider configProvider)
-      throws UnsupportedEnvironmentException, ConfigurationException {
+      throws UnsupportedEnvironmentException {
     Implementation impl = Implementation.NONE;
     boolean isOracleJDK8 = Platform.isOracleJDK8();
     boolean isDatadogProfilerEnabled = Config.get().isDatadogProfilerEnabled();
@@ -87,7 +101,7 @@ public static Controller createController(final ConfigProvider configProvider)
               datadogProfilerClass
                   .getMethod("isAvailable")
                   .invoke(datadogProfilerClass.getMethod("getInstance").invoke(null))) {
-            impl = Implementation.ASYNC;
+            impl = Implementation.DDPROF;
           } else {
             log.debug("Failed to load Datadog profiler, it is not available");
           }
@@ -103,22 +117,13 @@ public static Controller createController(final ConfigProvider configProvider)
       throw new UnsupportedEnvironmentException(getFixProposalMessage());
     }
 
-    try {
-      log.debug("Trying to load {}", impl.className());
-      return Class.forName(impl.className())
-          .asSubclass(Controller.class)
-          .getDeclaredConstructor(ConfigProvider.class)
-          .newInstance(configProvider);
-    } catch (final ClassNotFoundException
-        | NoSuchMethodException
-        | InstantiationException
-        | IllegalAccessException
-        | InvocationTargetException e) {
-      if (e.getCause() != null && e.getCause() instanceof ConfigurationException) {
-        throw (ConfigurationException) e.getCause();
-      }
-      throw new UnsupportedEnvironmentException(getFixProposalMessage(), e);
+    Controller instance = impl.instance(configProvider);
+    if (instance instanceof Controller.MisconfiguredController) {
+      throw new UnsupportedEnvironmentException(
+          "Failed to configure controller " + impl.className,
+          ((Controller.MisconfiguredController) instance).exception);
     }
+    return instance;
   }
 
   private static String getFixProposalMessage() {
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
index 3a0832f5c8e..3bd212adc82 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
@@ -6,16 +6,15 @@
 
 import com.datadog.profiling.controller.ConfigurationException;
 import com.datadog.profiling.controller.Controller;
-import com.datadog.profiling.controller.ControllerFactory;
 import com.datadog.profiling.controller.ProfilingSystem;
-import com.datadog.profiling.controller.RecordingData;
-import com.datadog.profiling.controller.RecordingDataListener;
-import com.datadog.profiling.controller.RecordingType;
 import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.uploader.ProfileUploader;
 import datadog.trace.api.Config;
 import datadog.trace.api.Platform;
 import datadog.trace.api.config.ProfilingConfig;
+import datadog.trace.api.profiling.RecordingData;
+import datadog.trace.api.profiling.RecordingDataListener;
+import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ControllerFactoryTest.java
similarity index 78%
rename from dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
rename to dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ControllerFactoryTest.java
index 86c8473ad8c..de3b6cb5f03 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
+++ b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ControllerFactoryTest.java
@@ -1,12 +1,10 @@
-package com.datadog.profiling.controller;
+package com.datadog.profiling.agent;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 
+import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -18,14 +16,15 @@ public class ControllerFactoryTest {
   @Mock private ConfigProvider configProvider;
 
   @Test
-  @EnabledOnJre({JAVA_8})
-  public void testCreateControllerJava8() {
-    final UnsupportedEnvironmentException unsupportedEnvironmentException =
-        assertThrows(
-            UnsupportedEnvironmentException.class,
-            () -> {
-              ControllerFactory.createController(configProvider);
-            });
+  public void testCreateControllerSanity() {
+    UnsupportedEnvironmentException unsupportedEnvironmentException = null;
+    try {
+      ControllerFactory.createController(configProvider);
+      // successfully created controller, return
+      return;
+    } catch (UnsupportedEnvironmentException e) {
+      unsupportedEnvironmentException = e;
+    }
     final String javaVendor = System.getProperty("java.vendor");
     final String javaRuntimeName = System.getProperty("java.runtime.name");
     final String javaVersion = System.getProperty("java.version");
diff --git a/dd-java-agent/agent-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/dd-java-agent/agent-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ b/dd-java-agent/agent-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle
index 93e2e2f84ff..3fec4166c59 100644
--- a/dd-java-agent/agent-tooling/build.gradle
+++ b/dd-java-agent/agent-tooling/build.gradle
@@ -42,6 +42,7 @@ dependencies {
   api(project(':dd-java-agent:agent-bootstrap')) {
     exclude group: 'com.datadoghq', module: 'agent-logging'
   }
+  compileOnly project(':dd-java-agent:agent-profiling')
   api group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.17'
   api deps.bytebuddy
   api deps.bytebuddyagent
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java
new file mode 100644
index 00000000000..651ff96cd04
--- /dev/null
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java
@@ -0,0 +1,16 @@
+package datadog.trace.agent.tooling;
+
+import com.datadog.profiling.agent.ProfilingAgent;
+import datadog.trace.api.Config;
+
+public class ProfilerInstaller {
+  public static void installProfiler() {
+    if (Config.get().isProfilingEnabled()) {
+      try {
+        ProfilingAgent.run(true, null);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
index d83fd6f44a3..12839ab8bd0 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
@@ -21,6 +21,7 @@ public static synchronized void installGlobalTracer(
             CoreTracer.builder()
                 .sharedCommunicationObjects(sharedCommunicationObjects)
                 .profilingContextIntegration(profilingContextIntegration)
+                .pollForTracerFlareRequests()
                 .pollForTracingConfiguration()
                 .build());
       } else {
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java
new file mode 100644
index 00000000000..51464848f33
--- /dev/null
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java
@@ -0,0 +1,44 @@
+package datadog.trace.agent.tooling.bytebuddy.matcher;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.is;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class ScalaTraitMatchers {
+  public static ElementMatcher.Junction<MethodDescription> isTraitMethod(
+      String traitName, String name, Object... argumentTypes) {
+
+    ElementMatcher.Junction<MethodDescription> scalaOldArgs =
+        isStatic()
+            .and(takesArguments(argumentTypes.length + 1))
+            .and(takesArgument(0, named(traitName)));
+    ElementMatcher.Junction<MethodDescription> scalaNewArgs =
+        not(isStatic()).and(takesArguments(argumentTypes.length));
+
+    for (int i = 0; i < argumentTypes.length; i++) {
+      Object argumentType = argumentTypes[i];
+      ElementMatcher<? super TypeDescription> matcher;
+      if (argumentType instanceof ElementMatcher) {
+        matcher = (ElementMatcher<? super TypeDescription>) argumentType;
+      } else if (argumentType instanceof String) {
+        matcher = named((String) argumentType);
+      } else if (argumentType instanceof Class) {
+        matcher = is((Class<?>) argumentType);
+      } else {
+        throw new IllegalArgumentException("Unexpected type for argument type specification");
+      }
+      scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, matcher));
+      scalaNewArgs = scalaNewArgs.and(takesArgument(i, matcher));
+    }
+
+    return isMethod().and(named(name)).and(scalaOldArgs.or(scalaNewArgs));
+  }
+}
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java
new file mode 100644
index 00000000000..cfc8fb3b44f
--- /dev/null
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java
@@ -0,0 +1,101 @@
+package datadog.trace.agent.tooling.iast;
+
+import datadog.trace.api.iast.IastContext;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import datadog.trace.util.stacktrace.StackUtils;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import java.util.Enumeration;
+import javax.annotation.Nullable;
+
+public class TaintableEnumeration implements Enumeration<String> {
+
+  private static final String CLASS_NAME = TaintableEnumeration.class.getName();
+
+  private volatile IastContext context;
+  private volatile boolean contextFetched;
+
+  private final PropagationModule module;
+
+  private final byte origin;
+
+  private final CharSequence name;
+
+  private final boolean useValueAsName;
+
+  private final Enumeration<String> delegate;
+
+  private TaintableEnumeration(
+      @NonNull final Enumeration<String> delegate,
+      @NonNull final PropagationModule module,
+      final byte origin,
+      @Nullable final CharSequence name,
+      final boolean useValueAsName) {
+    this.delegate = delegate;
+    this.module = module;
+    this.origin = origin;
+    this.name = name;
+    this.useValueAsName = useValueAsName;
+  }
+
+  @Override
+  public boolean hasMoreElements() {
+    try {
+      return delegate.hasMoreElements();
+    } catch (Throwable e) {
+      StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
+      throw e;
+    }
+  }
+
+  @Override
+  public String nextElement() {
+    final String next;
+    try {
+      next = delegate.nextElement();
+    } catch (Throwable e) {
+      StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
+      throw e;
+    }
+    try {
+      module.taint(context(), next, origin, name(next));
+    } catch (final Throwable e) {
+      module.onUnexpectedException("Failed to taint enumeration", e);
+    }
+    return next;
+  }
+
+  private IastContext context() {
+    if (!contextFetched) {
+      contextFetched = true;
+      context = IastContext.Provider.get();
+    }
+    return context;
+  }
+
+  private CharSequence name(final String value) {
+    if (name != null) {
+      return name;
+    }
+    return useValueAsName ? value : null;
+  }
+
+  private static boolean nonTaintableEnumerationStack(final StackTraceElement element) {
+    return !CLASS_NAME.equals(element.getClassName());
+  }
+
+  public static Enumeration<String> wrap(
+      @NonNull final Enumeration<String> delegate,
+      @NonNull final PropagationModule module,
+      final byte origin,
+      @Nullable final CharSequence name) {
+    return new TaintableEnumeration(delegate, module, origin, name, false);
+  }
+
+  public static Enumeration<String> wrap(
+      @NonNull final Enumeration<String> delegate,
+      @NonNull final PropagationModule module,
+      final byte origin,
+      boolean useValueAsName) {
+    return new TaintableEnumeration(delegate, module, origin, null, useValueAsName);
+  }
+}
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java
index 219dcda7e11..802393601d7 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java
@@ -1,7 +1,9 @@
 package datadog.trace.agent.tooling.log;
 
+import java.io.Serializable;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -11,7 +13,7 @@
  * New entries are put in the primary map while old entries are deleted from both, as appropriate.
  * Lazy deduplication occurs once: before iterating over entries/values, or when combining sizes.
  */
-public final class UnionMap<K, V> extends AbstractMap<K, V> {
+public final class UnionMap<K, V> extends AbstractMap<K, V> implements Serializable {
   private final Map<K, V> primaryMap;
   private final Map<K, V> secondaryMap;
   private transient Set<Map.Entry<K, V>> entrySet;
@@ -145,4 +147,8 @@ public void remove() {
     }
     return entrySet;
   }
+
+  public Object writeReplace() {
+    return new HashMap<>(this); // serialize de-duplicated copy
+  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
index 200ec799963..c2af65a7624 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
@@ -1,6 +1,7 @@
 package datadog.trace.agent.tooling.nativeimage;
 
 import datadog.communication.ddagent.SharedCommunicationObjects;
+import datadog.trace.agent.tooling.ProfilerInstaller;
 import datadog.trace.agent.tooling.TracerInstaller;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import org.slf4j.Logger;
@@ -12,8 +13,10 @@ public final class TracerActivation {
 
   public static void activate() {
     try {
-      TracerInstaller.installGlobalTracer(
-          new SharedCommunicationObjects(), ProfilingContextIntegration.NoOp.INSTANCE);
+      // the JFR based profiling does not allow context propagation - use the noop integration
+      ProfilingContextIntegration contextIntegration = ProfilingContextIntegration.NoOp.INSTANCE;
+      TracerInstaller.installGlobalTracer(new SharedCommunicationObjects(), contextIntegration);
+      ProfilerInstaller.installProfiler();
     } catch (Throwable e) {
       log.warn("Problem activating datadog tracer", e);
     }
diff --git a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
index fd259e3cd80..74cb0df43b1 100644
--- a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
+++ b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
@@ -42,7 +42,8 @@
 1 io.opentelemetry.javaagent.*
 1 java.*
 # allow exception profiling instrumentation
-0 java.lang.Throwable
+0 java.lang.Exception
+0 java.lang.Error
 # allow ProcessImpl instrumentation
 0 java.lang.ProcessImpl
 0 java.net.http.*
@@ -187,11 +188,17 @@
 2 com.github.mustachejava.*
 2 com.google.api.*
 0 com.google.api.client.http.HttpRequest
+0 com.google.api.gax.grpc.*
+0 com.google.api.gax.retrying.*
+0 com.google.cloud.pubsub.v1.*
 2 com.google.cloud.*
 2 com.google.common.*
 0 com.google.common.base.internal.Finalizer
 0 com.google.common.util.concurrent.*
 2 com.google.gson.*
+# Need for IAST: we instrument this class
+0 com.google.gson.Gson
+0 com.google.gson.stream.JsonReader
 2 com.google.inject.*
 # We instrument Runnable there
 0 com.google.inject.internal.AbstractBindingProcessor$*
@@ -250,6 +257,7 @@
 0 org.springframework.beans.factory.support.AbstractBeanFactory
 0 org.springframework.beans.factory.support.DefaultListableBeanFactory
 0 org.springframework.beans.factory.support.DisposableBeanAdapter
+1 org.springframework.boot.SpringApplicationShutdownHook$Handlers
 2 org.springframework.boot.*
 0 org.apache.xalan.transformer.TransformerImpl
 # More runnables to deal with
@@ -284,8 +292,9 @@
 2 org.springframework.expression.*
 2 org.springframework.format.*
 2 org.springframework.http.*
-# Need for IAST: calls ServletRequest methods instrumented at callsite
-0 org.springframework.http.server.ServletServerHttpRequest
+# Need for IAST: Spring gson support
+0 org.springframework.http.converter.json.AbstractJsonHttpMessageConverter
+0 org.springframework.http.converter.json.GsonHttpMessageConverter
 # Need for IAST: we instrument these classes
 0 org.springframework.http.HttpHeaders
 0 org.springframework.http.ReadOnlyHttpHeaders
@@ -321,16 +330,15 @@
 2 org.springframework.validation.*
 2 org.springframework.web.*
 0 org.springframework.web.context.request.async.*
-0 org.springframework.web.context.request.*
 0 org.springframework.web.context.support.AbstractRefreshableWebApplicationContext
 0 org.springframework.web.context.support.GenericWebApplicationContext
 0 org.springframework.web.context.support.XmlWebApplicationContext
 0 org.springframework.web.reactive.*
 0 org.springframework.web.servlet.*
-# Included for IAST
-0 org.springframework.web.util.WebUtils
 # Need for IAST so propagation of tainted objects is complete in spring 2.7.5
 0 org.springframework.util.StreamUtils$NonClosingInputStream
+# Need for IAST gson propagation
+0 org.springframework.util.StreamUtils
 # Included for IAST Spring mvc unvalidated redirect and xss vulnerability
 0 org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite
 2 org.xml.*
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/TaintableEnumerationTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/TaintableEnumerationTest.groovy
new file mode 100644
index 00000000000..78566a8bec7
--- /dev/null
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/TaintableEnumerationTest.groovy
@@ -0,0 +1,99 @@
+package datadog.trace.agent.tooling.iast
+
+import datadog.trace.api.gateway.RequestContext
+import datadog.trace.api.gateway.RequestContextSlot
+import datadog.trace.api.iast.IastContext
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
+import datadog.trace.test.util.DDSpecification
+import spock.lang.Shared
+
+class TaintableEnumerationTest extends DDSpecification {
+
+  @Shared
+  protected static final AgentTracer.TracerAPI ORIGINAL_TRACER = AgentTracer.get()
+
+  protected AgentTracer.TracerAPI tracer = Mock(AgentTracer.TracerAPI)
+
+  protected IastContext iastCtx = Mock(IastContext)
+
+  protected RequestContext reqCtx = Mock(RequestContext) {
+    getData(RequestContextSlot.IAST) >> iastCtx
+  }
+
+  protected AgentSpan span = Mock(AgentSpan) {
+    getRequestContext() >> reqCtx
+  }
+
+  protected PropagationModule module
+
+
+  void setup() {
+    AgentTracer.forceRegister(tracer)
+    module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+  }
+
+  void cleanup() {
+    AgentTracer.forceRegister(ORIGINAL_TRACER)
+    InstrumentationBridge.clearIastModules()
+  }
+
+  void 'underlying enumerated values are tainted with a name'() {
+    given:
+    final values = (1..10).collect { "value$it".toString() }
+    final origin = SourceTypes.REQUEST_PARAMETER_NAME
+    final name = 'test'
+    final enumeration = TaintableEnumeration.wrap(Collections.enumeration(values), module, origin, name)
+
+    when:
+    final result = enumeration.collect()
+
+    then:
+    result == values
+    values.each { 1 * module.taint(_, it, origin, name) }
+    1 * tracer.activeSpan() >> span // only one access to the active context
+  }
+
+  void 'underlying enumerated values are tainted with the value as a name'() {
+    given:
+    final values = (1..10).collect { "value$it".toString() }
+    final origin = SourceTypes.REQUEST_PARAMETER_NAME
+    final enumeration = TaintableEnumeration.wrap(Collections.enumeration(values), module, origin, true)
+
+    when:
+    final result = enumeration.collect()
+
+    then:
+    result == values
+    values.each { 1 * module.taint(_, it, origin, it) }
+  }
+
+  void 'taintable enumeration leaves no trace in case of error'() {
+    given:
+    final origin = SourceTypes.REQUEST_PARAMETER_NAME
+    final enumeration = TaintableEnumeration.wrap(new BadEnumeration(), module, origin, true)
+
+    when:
+    enumeration.hasMoreElements()
+
+    then:
+    final first = thrown(Error)
+    first.stackTrace.find { it.className == TaintableEnumeration.name } == null
+  }
+
+  private static class BadEnumeration implements Enumeration<String> {
+    @Override
+    boolean hasMoreElements() {
+      throw new Error('Ooops!!!')
+    }
+
+    @Override
+    String nextElement() {
+      throw new Error('Boom!!!')
+    }
+  }
+}
diff --git a/dd-java-agent/appsec/src/main/resources/default_config.json b/dd-java-agent/appsec/src/main/resources/default_config.json
index a6e01468548..172558f06e3 100644
--- a/dd-java-agent/appsec/src/main/resources/default_config.json
+++ b/dd-java-agent/appsec/src/main/resources/default_config.json
@@ -1,7 +1,7 @@
 {
   "version": "2.2",
   "metadata": {
-    "rules_version": "1.8.0"
+    "rules_version": "1.9.0"
   },
   "rules": [
     {
@@ -3004,6 +3004,7 @@
             ],
             "regex": "<script[^>]*>[\\s\\S]*?",
             "options": {
+              "case_sensitive": false,
               "min_length": 8
             }
           },
@@ -4207,7 +4208,6 @@
       "name": "Remote Command Execution: Java process spawn (CVE-2017-9805)",
       "tags": {
         "type": "java_code_injection",
-        "crs_id": "944110",
         "category": "attack_attempt",
         "cwe": "94",
         "capec": "1000/152/242"
@@ -4235,48 +4235,16 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "(?:runtime|processbuilder)",
+            "regex": "(?:unmarshaller|base64data|java\\.).*(?:runtime|processbuilder)",
             "options": {
-              "case_sensitive": true,
-              "min_length": 7
-            }
-          },
-          "operator": "match_regex"
-        },
-        {
-          "parameters": {
-            "inputs": [
-              {
-                "address": "server.request.query"
-              },
-              {
-                "address": "server.request.body"
-              },
-              {
-                "address": "server.request.path_params"
-              },
-              {
-                "address": "server.request.headers.no_cookies"
-              },
-              {
-                "address": "grpc.server.request.message"
-              },
-              {
-                "address": "graphql.server.all_resolvers"
-              }
-            ],
-            "regex": "(?:unmarshaller|base64data|java\\.)",
-            "options": {
-              "case_sensitive": true,
-              "min_length": 5
+              "case_sensitive": false,
+              "min_length": 13
             }
           },
           "operator": "match_regex"
         }
       ],
-      "transformers": [
-        "lowercase"
-      ]
+      "transformers": []
     },
     {
       "id": "crs-944-130",
@@ -4479,6 +4447,9 @@
               },
               {
                 "address": "graphql.server.all_resolvers"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
               }
             ],
             "regex": "[#%$]{(?:[^}]+[^\\w\\s}\\-_][^}]+|\\d+-\\d+)}",
@@ -4752,7 +4723,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "\\bqualysperiscope\\.com\\b"
+            "regex": "\\bqualysperiscope\\.com\\b|\\.oscomm\\."
           },
           "operator": "match_regex"
         }
@@ -4833,7 +4804,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "\\b(?:webhook\\.site|\\.canarytokens\\.com|vii\\.one|act1on3\\.ru|gdsburp\\.com)\\b"
+            "regex": "\\b(?:webhook\\.site|\\.canarytokens\\.com|vii\\.one|act1on3\\.ru|gdsburp\\.com|arcticwolf\\.net|oob\\.li|htbiw\\.com|h4\\.vc|mochan\\.cloud|imshopping\\.com|bootstrapnodejs\\.com|mooo-ng\\.com|securitytrails\\.com|canyouhackit\\.io|7bae\\.xyz)\\b"
           },
           "operator": "match_regex"
         }
@@ -4955,7 +4926,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "\\b(?:interact\\.sh|oast\\.(?:pro|live|site|online|fun|me))\\b"
+            "regex": "\\b(?:interact\\.sh|oast\\.(?:pro|live|site|online|fun|me)|indusfacefinder\\.in|where\\.land|syhunt\\.net|tssrt\\.de|boardofcyber\\.io|assetnote-callback\\.com|praetorianlabs\\.dev|netspi\\.sh)\\b"
           },
           "operator": "match_regex"
         }
@@ -4996,7 +4967,187 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "\\b(?:\\.|(?:\\\\|&#)(?:0*46|x0*2e);)r87(?:\\.|(?:\\\\|&#)(?:0*46|x0*2e);)(?:me|com)\\b",
+            "regex": "\\b(?:\\.|(?:\\\\|&#)(?:0*46|x0*2e);)?r87(?:\\.|(?:\\\\|&#)(?:0*46|x0*2e);)(?:me|com)\\b",
+            "options": {
+              "case_sensitive": false,
+              "min_length": 7
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
+    {
+      "id": "dog-913-009",
+      "name": "WhiteHat Security OOB domain",
+      "tags": {
+        "type": "commercial_scanner",
+        "category": "attack_attempt",
+        "tool_name": "WhiteHatSecurity",
+        "cwe": "200",
+        "capec": "1000/118/169",
+        "confidence": "0"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
+              },
+              {
+                "address": "grpc.server.request.message"
+              },
+              {
+                "address": "graphql.server.all_resolvers"
+              }
+            ],
+            "regex": "\\bwhsec(?:\\.|(?:\\\\|&#)(?:0*46|x0*2e);)us\\b",
+            "options": {
+              "case_sensitive": false,
+              "min_length": 8
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
+    {
+      "id": "dog-913-010",
+      "name": "Nessus OOB domain",
+      "tags": {
+        "type": "commercial_scanner",
+        "category": "attack_attempt",
+        "tool_name": "Nessus",
+        "cwe": "200",
+        "capec": "1000/118/169",
+        "confidence": "0"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
+              },
+              {
+                "address": "grpc.server.request.message"
+              },
+              {
+                "address": "graphql.server.all_resolvers"
+              }
+            ],
+            "regex": "\\b\\.nessus\\.org\\b",
+            "options": {
+              "case_sensitive": false,
+              "min_length": 8
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
+    {
+      "id": "dog-913-011",
+      "name": "Watchtowr OOB domain",
+      "tags": {
+        "type": "commercial_scanner",
+        "category": "attack_attempt",
+        "tool_name": "Watchtowr",
+        "cwe": "200",
+        "capec": "1000/118/169",
+        "confidence": "0"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
+              },
+              {
+                "address": "grpc.server.request.message"
+              },
+              {
+                "address": "graphql.server.all_resolvers"
+              }
+            ],
+            "regex": "\\bwatchtowr\\.com\\b",
+            "options": {
+              "case_sensitive": false,
+              "min_length": 8
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
+    {
+      "id": "dog-913-012",
+      "name": "AppCheck NG OOB domain",
+      "tags": {
+        "type": "commercial_scanner",
+        "category": "attack_attempt",
+        "tool_name": "AppCheckNG",
+        "cwe": "200",
+        "capec": "1000/118/169",
+        "confidence": "0"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
+              },
+              {
+                "address": "grpc.server.request.message"
+              },
+              {
+                "address": "graphql.server.all_resolvers"
+              }
+            ],
+            "regex": "\\bptst\\.io\\b",
             "options": {
               "case_sensitive": false,
               "min_length": 7
@@ -5048,6 +5199,50 @@
       ],
       "transformers": []
     },
+    {
+      "id": "dog-932-100",
+      "name": "Shell spawn executing network command",
+      "tags": {
+        "type": "command_injection",
+        "category": "attack_attempt",
+        "cwe": "77",
+        "capec": "1000/152/248/88",
+        "confidence": "0"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              },
+              {
+                "address": "server.request.headers.no_cookies"
+              },
+              {
+                "address": "grpc.server.request.message"
+              },
+              {
+                "address": "graphql.server.all_resolvers"
+              }
+            ],
+            "regex": "(?:(?:['\"\\x60({|;&]|(?:^|['\"\\x60({|;&])(?:cmd(?:\\.exe)?\\s+(?:/\\w(?::\\w+)?\\s+)*))(?:ping|curl|wget|telnet)|\\bnslookup)[\\s,]",
+            "options": {
+              "case_sensitive": true,
+              "min_length": 5
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
     {
       "id": "dog-934-001",
       "name": "XXE - XML file loads external entity",
@@ -5056,7 +5251,7 @@
         "category": "attack_attempt",
         "cwe": "91",
         "capec": "1000/152/248/250",
-        "confidence": "0"
+        "confidence": "1"
       },
       "conditions": [
         {
@@ -5091,7 +5286,7 @@
         "category": "attack_attempt",
         "cwe": "83",
         "capec": "1000/152/242/63/591/243",
-        "confidence": "0"
+        "confidence": "1"
       },
       "conditions": [
         {
@@ -5125,7 +5320,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "<(?:iframe|esi:include)(?:(?:\\s|/)*\\w+=[\"'\\w]+)*(?:\\s|/)*src(?:doc)?=[\"']?(?:data:|javascript:|http:|//)[^\\s'\"]+['\"]?",
+            "regex": "<(?:iframe|esi:include)(?:(?:\\s|/)*\\w+=[\"'\\w]+)*(?:\\s|/)*src(?:doc)?=[\"']?(?:data:|javascript:|http:|dns:|//)[^\\s'\"]+['\"]?",
             "options": {
               "min_length": 14
             }
@@ -5171,7 +5366,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "https?:\\/\\/(?:.*\\.)?(?:bxss\\.in|xss\\.ht|js\\.rip)",
+            "regex": "https?:\\/\\/(?:.*\\.)?(?:bxss\\.(?:in|me)|xss\\.ht|js\\.rip)",
             "options": {
               "case_sensitive": false
             }
@@ -6110,7 +6305,7 @@
                 "address": "graphql.server.all_resolvers"
               }
             ],
-            "regex": "(http|https):\\/\\/(?:.*\\.)?(?:burpcollaborator\\.net|localtest\\.me|mail\\.ebc\\.apple\\.com|bugbounty\\.dod\\.network|.*\\.[nx]ip\\.io|oastify\\.com|oast\\.(?:pro|live|site|online|fun|me)|sslip\\.io|requestbin\\.com|requestbin\\.net|hookbin\\.com|webhook\\.site|canarytokens\\.com|interact\\.sh|ngrok\\.io|bugbounty\\.click|prbly\\.win|qualysperiscope\\.com|vii.one|act1on3.ru)"
+            "regex": "(http|https):\\/\\/(?:.*\\.)?(?:burpcollaborator\\.net|localtest\\.me|mail\\.ebc\\.apple\\.com|bugbounty\\.dod\\.network|.*\\.[nx]ip\\.io|oastify\\.com|oast\\.(?:pro|live|site|online|fun|me)|sslip\\.io|requestbin\\.com|requestbin\\.net|hookbin\\.com|webhook\\.site|canarytokens\\.com|interact\\.sh|ngrok\\.io|bugbounty\\.click|prbly\\.win|qualysperiscope\\.com|vii\\.one|act1on3\\.ru)"
           },
           "operator": "match_regex"
         }
@@ -7610,6 +7805,35 @@
       ],
       "transformers": []
     },
+    {
+      "id": "ua0-600-63x",
+      "name": "FeroxBuster",
+      "tags": {
+        "type": "attack_tool",
+        "category": "attack_attempt",
+        "cwe": "200",
+        "capec": "1000/118/169",
+        "tool_name": "feroxbuster",
+        "confidence": "1"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.headers.no_cookies",
+                "key_path": [
+                  "user-agent"
+                ]
+              }
+            ],
+            "regex": "^feroxbuster/"
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": []
+    },
     {
       "id": "ua0-600-6xx",
       "name": "Stealthy scanner",
@@ -7631,7 +7855,7 @@
                 ]
               }
             ],
-            "regex": "mozilla/4\\.0 \\(compatible(; msie (?:6\\.0; win32|4\\.0; Windows NT))?\\)",
+            "regex": "mozilla/4\\.0 \\(compatible(; msie (?:6\\.0; (?:win32|Windows NT 5\\.0)|4\\.0; Windows NT))?\\)",
             "options": {
               "case_sensitive": false
             }
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
index 0e31e9aa07f..810db9e782c 100644
--- a/dd-java-agent/build.gradle
+++ b/dd-java-agent/build.gradle
@@ -275,7 +275,7 @@ tasks.register('checkAgentJarSize').configure {
   doLast {
     // Arbitrary limit to prevent unintentional increases to the agent jar size
     // Raise or lower as required
-    def megs = (project.rootProject.hasProperty("agentIncludeCwsTls") && agentIncludeCwsTls) ? 28 : 27
+    def megs = (project.rootProject.hasProperty("agentIncludeCwsTls") && agentIncludeCwsTls) ? 29 : 28
     assert shadowJar.archiveFile.get().getAsFile().length() <= megs * 1024 * 1024
   }
 
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
index 589bc3d81b4..c5aabac9926 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
@@ -1,6 +1,7 @@
 package datadog.trace.instrumentation.akkahttp;
 
 import akka.http.javadsl.model.HttpHeader;
+import akka.http.javadsl.model.headers.RawRequestURI;
 import akka.http.javadsl.model.headers.RemoteAddress;
 import akka.http.javadsl.model.headers.TimeoutAccess;
 import akka.http.scaladsl.model.ContentType;
@@ -45,7 +46,9 @@ private static void doForEachKey(
 
     for (final HttpHeader header : carrier.getHeaders()) {
       // skip synthetic headers
-      if (header instanceof RemoteAddress || header instanceof TimeoutAccess) {
+      if (header instanceof RemoteAddress
+          || header instanceof TimeoutAccess
+          || header instanceof RawRequestURI) {
         continue;
       }
       if (!classifier.accept(header.lowercaseName(), header.value())) {
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
index 064448c764f..046d6c96bdb 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
@@ -10,6 +10,7 @@
 import akka.http.scaladsl.model.HttpResponse;
 import akka.http.scaladsl.model.ResponseEntity;
 import akka.http.scaladsl.model.StatusCode;
+import akka.http.scaladsl.model.StatusCodes;
 import akka.util.ByteString;
 import datadog.appsec.api.blocking.BlockingContentType;
 import datadog.trace.api.gateway.BlockResponseFunction;
@@ -95,7 +96,12 @@ public static HttpResponse maybeCreateBlockingResponse(
                         RawHeader.create(e.getKey(), e.getValue()))
             .collect(ScalaListCollector.toScalaList());
 
-    return HttpResponse.apply(
-        StatusCode.int2StatusCode(httpCode), headersList, entity, request.protocol());
+    StatusCode code;
+    try {
+      code = StatusCode.int2StatusCode(httpCode);
+    } catch (RuntimeException e) {
+      code = StatusCodes.custom(httpCode, "Request Blocked", "", false, true);
+    }
+    return HttpResponse.apply(code, headersList, entity, request.protocol());
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
index b631cb87154..ab6e90c1517 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
@@ -1,7 +1,7 @@
 package datadog.trace.instrumentation.akkahttp.appsec;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static datadog.trace.instrumentation.akkahttp.iast.TraitMethodMatchers.isTraitMethod;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ScalaTraitMatchers.isTraitMethod;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import akka.http.scaladsl.unmarshalling.MultipartUnmarshallers;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
index 0cda26c28bf..ab01b6c94a3 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
@@ -2,7 +2,7 @@
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
-import static datadog.trace.instrumentation.akkahttp.iast.TraitMethodMatchers.isTraitMethod;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ScalaTraitMatchers.isTraitMethod;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
index eeb85b694ee..2e5aa79515f 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
@@ -1,7 +1,7 @@
 package datadog.trace.instrumentation.akkahttp.appsec;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static datadog.trace.instrumentation.akkahttp.iast.TraitMethodMatchers.isTraitMethod;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ScalaTraitMatchers.isTraitMethod;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import akka.http.scaladsl.unmarshalling.Unmarshaller;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
index fa9e098b81e..1c8b35e4bb3 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
@@ -12,13 +12,11 @@
 import akka.http.scaladsl.model.headers.HttpCookiePair;
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.ArrayList;
-import java.util.List;
 import net.bytebuddy.asm.Advice;
 import scala.collection.Iterator;
 import scala.collection.immutable.Seq;
@@ -56,23 +54,22 @@ static class TaintAllCookiesAdvice {
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     static void after(
         @Advice.This HttpHeader cookie, @Advice.Return Seq<HttpCookiePair> cookiePairs) {
-      WebModule mod = InstrumentationBridge.WEB;
       PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (mod == null || prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
+      if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
         return;
       }
       if (!prop.isTainted(cookie)) {
         return;
       }
 
+      final IastContext ctx = IastContext.Provider.get();
       Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
-      List<String> cookieNames = new ArrayList<>();
       while (iterator.hasNext()) {
         HttpCookiePair pair = iterator.next();
-        cookieNames.add(pair.name());
-        prop.taint(SourceTypes.REQUEST_COOKIE_VALUE, pair.name(), pair.value());
+        final String name = pair.name(), value = pair.value();
+        prop.taint(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        prop.taint(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
       }
-      mod.onCookieNames(cookieNames);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
index 6122b91b361..f7f330a14b5 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
@@ -26,7 +26,7 @@ public static String after(@CallSite.This HttpHeader header, @CallSite.Return St
       return result;
     }
     try {
-      module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, result, result, header);
+      module.taintIfTainted(result, header, SourceTypes.REQUEST_HEADER_NAME, result);
     } catch (final Throwable e) {
       module.onUnexpectedException("onHeaderNames threw", e);
     }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
index 2c9b5cb507b..57cd04ce127 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
@@ -62,7 +62,7 @@ static void onExit(@Advice.This HttpHeader h, @Advice.Return String retVal) {
         return;
       }
 
-      propagation.taintIfInputIsTainted(retVal, h);
+      propagation.taintIfTainted(retVal, h);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
index 16b124624f8..a0c5f432e85 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
@@ -13,6 +13,7 @@
 import akka.http.scaladsl.model.HttpRequest;
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.Source;
@@ -70,6 +71,7 @@ static void onExit(
         return;
       }
 
+      final IastContext ctx = IastContext.Provider.get();
       Iterator<HttpHeader> iterator = headers.iterator();
       while (iterator.hasNext()) {
         HttpHeader h = iterator.next();
@@ -78,7 +80,7 @@ static void onExit(
         }
         // unfortunately, the call to h.value() is instrumented, but
         // because the call to taint() only happens after, the call is a noop
-        propagation.taintObject(SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value(), h);
+        propagation.taint(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
       }
     }
   }
@@ -98,7 +100,7 @@ static void onExit(
         return;
       }
 
-      propagation.taintIfInputIsTainted(entity, thiz);
+      propagation.taintIfTainted(entity, thiz);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
index 1a4dcf27ce2..80c3b2687f0 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
@@ -11,6 +11,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -68,11 +69,8 @@ static void onExit(
       }
 
       if (value instanceof String) {
-        module.taint(
-            reqCtx.getData(RequestContextSlot.IAST),
-            SourceTypes.REQUEST_PATH_PARAMETER,
-            null,
-            (String) value);
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        module.taint(ctx, value, SourceTypes.REQUEST_PATH_PARAMETER);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
index 0cdd0266796..f18148a7ceb 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
@@ -53,7 +53,7 @@ static void onExit(
         return;
       }
 
-      propagation.taintIfInputIsTainted(request, requestContext);
+      propagation.taintIfTainted(request, requestContext);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
index d9db76ece90..fb58538102e 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
@@ -1,46 +1,15 @@
 package datadog.trace.instrumentation.akkahttp.iast;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.isMethod;
-import static net.bytebuddy.matcher.ElementMatchers.isStatic;
-import static net.bytebuddy.matcher.ElementMatchers.not;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ScalaTraitMatchers.isTraitMethod;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
-import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
-import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import net.bytebuddy.description.method.MethodDescription;
-import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class TraitMethodMatchers {
-  public static ElementMatcher.Junction<MethodDescription> isTraitMethod(
-      String traitName, String name, Object... argumentTypes) {
-
-    ElementMatcher.Junction<MethodDescription> scalaOldArgs =
-        isStatic()
-            .and(takesArguments(argumentTypes.length + 1))
-            .and(takesArgument(0, named(traitName)));
-    ElementMatcher.Junction<MethodDescription> scalaNewArgs =
-        not(isStatic()).and(takesArguments(argumentTypes.length));
-
-    for (int i = 0; i < argumentTypes.length; i++) {
-      Object argumentType = argumentTypes[i];
-      ElementMatcher<? super TypeDescription> matcher;
-      if (argumentType instanceof ElementMatcher) {
-        matcher = (ElementMatcher<? super TypeDescription>) argumentType;
-      } else {
-        matcher = named((String) argumentType);
-      }
-      scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, matcher));
-      scalaNewArgs = scalaNewArgs.and(takesArgument(i, matcher));
-    }
-
-    return isMethod().and(named(name)).and(scalaOldArgs.or(scalaNewArgs));
-  }
-
   public static ElementMatcher.Junction<MethodDescription> isTraitDirectiveMethod(
-      String traitName, String name, String... argumentTypes) {
-
+      String traitName, String name, Object... argumentTypes) {
     return isTraitMethod(traitName, name, (Object[]) argumentTypes)
         .and(returns(named("akka.http.scaladsl.server.Directive")));
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
index 9faab16a32b..49a03c9bf32 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
@@ -11,13 +11,12 @@
 import akka.http.scaladsl.model.Uri;
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.Collections;
 import net.bytebuddy.asm.Advice;
 import scala.Tuple2;
 import scala.collection.Iterator;
@@ -70,7 +69,7 @@ static void after(@Advice.This Uri uri, @Advice.Return scala.Option<String> ret)
       if (mod == null || ret.isEmpty()) {
         return;
       }
-      mod.taintIfInputIsTainted(ret.get(), uri);
+      mod.taintIfTainted(ret.get(), uri);
     }
   }
 
@@ -80,9 +79,8 @@ public static class TaintQueryAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     static void after(@Advice.This /*Uri*/ Object uri, @Advice.Return Uri.Query ret) {
-      WebModule web = InstrumentationBridge.WEB;
       PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || web == null || ret.isEmpty()) {
+      if (prop == null || ret.isEmpty()) {
         return;
       }
 
@@ -90,11 +88,13 @@ static void after(@Advice.This /*Uri*/ Object uri, @Advice.Return Uri.Query ret)
         return;
       }
 
+      final IastContext ctx = IastContext.Provider.get();
       Iterator<Tuple2<String, String>> iterator = ret.iterator();
       while (iterator.hasNext()) {
         Tuple2<String, String> pair = iterator.next();
-        web.onParameterNames(Collections.singleton(pair._1()));
-        prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, pair._1(), pair._2());
+        final String name = pair._1(), value = pair._2();
+        prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+        prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
index 2d9c23c51ba..0955a0a9e49 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
@@ -16,10 +16,13 @@ public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
     HttpCookiePair httpCookiePair = v1._1();
 
     PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
+    if (mod == null || httpCookiePair == null) {
       return v1;
     }
-    mod.taint(SourceTypes.REQUEST_COOKIE_VALUE, httpCookiePair.name(), httpCookiePair.value());
+    final String name = httpCookiePair.name();
+    final String value = httpCookiePair.value();
+    mod.taint(name, SourceTypes.REQUEST_COOKIE_NAME, name);
+    mod.taint(value, SourceTypes.REQUEST_COOKIE_VALUE, name);
     return v1;
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
index 922397f52f6..c1ff9dbc8c2 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
@@ -10,7 +10,7 @@ public static <T> Future<T> wrapFuture(
       Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
     JFunction1<T, T> mapf =
         t -> {
-          mod.taintIfInputIsTainted(t, input);
+          mod.taintIfTainted(t, input);
           return t;
         };
     return f.map(mapf, ec);
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
index 40d75a9e15f..705b1921742 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.akkahttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import scala.Tuple1;
 import scala.Tuple2;
 import scala.collection.Iterator;
@@ -19,18 +19,17 @@ public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
     Map<String, String> m = v1._1;
 
     PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    WebModule web = InstrumentationBridge.WEB;
-    if (web == null || prop == null || m == null) {
+    if (prop == null || m == null || m.isEmpty()) {
       return v1;
     }
 
-    java.util.List<String> keysAsCollection = ScalaToJava.keySetAsCollection(m);
-    web.onParameterNames(keysAsCollection);
-
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, String>> iterator = m.iterator();
     while (iterator.hasNext()) {
       Tuple2<String, String> e = iterator.next();
-      prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, e._1(), e._2());
+      final String name = e._1(), value = e._2();
+      prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+      prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
index dcfe919d598..b72ac179c0b 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
@@ -1,7 +1,9 @@
 package datadog.trace.instrumentation.akkahttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.source.WebModule;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
 import scala.Tuple1;
 import scala.Tuple2;
 import scala.collection.Iterator;
@@ -17,19 +19,21 @@ public class TaintMultiMapFunction
   public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
     Map<String, List<String>> m = v1._1;
 
-    WebModule mod = InstrumentationBridge.WEB;
-    if (mod == null || m == null) {
+    PropagationModule mod = InstrumentationBridge.PROPAGATION;
+    if (mod == null || m == null || m.isEmpty()) {
       return v1;
     }
 
-    java.util.List<String> keysAsCollection = ScalaToJava.keySetAsCollection(m);
-    mod.onParameterNames(keysAsCollection);
-
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
     while (entriesIterator.hasNext()) {
       Tuple2<String, List<String>> e = entriesIterator.next();
+      final String name = e._1();
+      mod.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
       List<String> values = e._2();
-      mod.onParameterValues(e._1(), ScalaToJava.listAsList(values));
+      for (final String value : ScalaToJava.listAsList(values)) {
+        mod.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+      }
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
index 1f6d8bb62a2..620bea2ebf8 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
@@ -17,13 +17,14 @@ public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
     Option<HttpCookiePair> httpCookiePair = v1._1();
 
     PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpCookiePair.isEmpty()) {
+    if (mod == null || httpCookiePair == null || httpCookiePair.isEmpty()) {
       return v1;
     }
-    mod.taint(
-        SourceTypes.REQUEST_COOKIE_VALUE,
-        httpCookiePair.get().name(),
-        httpCookiePair.get().value());
+    final HttpCookiePair cookie = httpCookiePair.get();
+    final String name = cookie.name();
+    final String value = cookie.value();
+    mod.taint(name, SourceTypes.REQUEST_COOKIE_NAME, name);
+    mod.taint(value, SourceTypes.REQUEST_COOKIE_VALUE, name);
     return v1;
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
index c4c8cbb2d5c..bc86e937643 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
@@ -16,10 +16,10 @@ public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
     RequestContext reqCtx = v1._1();
 
     PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
+    if (mod == null || reqCtx == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_BODY, reqCtx);
+    mod.taint(reqCtx, SourceTypes.REQUEST_BODY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
index e1b9a5e4af4..7894326ab89 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
@@ -17,10 +17,10 @@ public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
     HttpRequest httpRequest = v1._1();
 
     PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
+    if (mod == null || httpRequest == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_BODY, httpRequest);
+    mod.taint(httpRequest, SourceTypes.REQUEST_BODY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
index 0d41fc32e56..fdec8e35b4e 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.akkahttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.Set;
@@ -22,22 +22,22 @@ public class TaintSeqFunction
   public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
     Seq<Tuple2<String, String>> seq = v1._1;
 
-    WebModule web = InstrumentationBridge.WEB;
     PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (web == null || prop == null || seq == null) {
+    if (prop == null || seq == null || seq.isEmpty()) {
       return v1;
     }
 
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, String>> iterator = seq.iterator();
-    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<String, Boolean>());
+    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
     while (iterator.hasNext()) {
       Tuple2<String, String> t = iterator.next();
       String name = t._1();
       String value = t._2();
       if (seenKeys.add(name)) {
-        web.onParameterNames(Collections.singleton(name));
+        prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
       }
-      prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
+      prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
index e3130be8062..f6c1073fff8 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.akkahttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -40,15 +41,16 @@ public Tuple1<Object> apply(Tuple1<Object> v1) {
     }
 
     if (value instanceof Iterable) {
-      Iterator iterator = ((Iterable) value).iterator();
+      final IastContext ctx = IastContext.Provider.get();
+      Iterator<?> iterator = ((Iterable<?>) value).iterator();
       while (iterator.hasNext()) {
         Object o = iterator.next();
         if (o instanceof String) {
-          mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+          mod.taint(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     } else if (value instanceof String) {
-      mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) value);
+      mod.taint((String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
index 88d1580643a..d109cc92d9d 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
@@ -28,7 +28,7 @@ public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B>
 
   @Override
   public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
-    propagationModule.taintObject(SourceTypes.REQUEST_BODY, value);
+    propagationModule.taint(value, SourceTypes.REQUEST_BODY);
     return delegate.apply(value, ec, materializer);
   }
 
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
index d11830b047e..5feb8315119 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
@@ -18,7 +18,7 @@ public Tuple1<Uri> apply(Tuple1<Uri> v1) {
     if (mod == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_QUERY, uri);
+    mod.taint(uri, SourceTypes.REQUEST_QUERY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java b/dd-java-agent/instrumentation/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
index 213ee7638e1..87008ac5ab4 100644
--- a/dd-java-agent/instrumentation/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
+++ b/dd-java-agent/instrumentation/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.akkahttp102.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -33,15 +34,16 @@ public Tuple1<T> apply(Tuple1<T> v1) {
     }
 
     if (value instanceof Iterable) {
-      Iterator iterator = ((Iterable) value).iterator();
+      final IastContext ctx = IastContext.Provider.get();
+      Iterator<?> iterator = ((Iterable<?>) value).iterator();
       while (iterator.hasNext()) {
         Object o = iterator.next();
         if (o instanceof String) {
-          mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+          mod.taint(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     } else if (value instanceof String) {
-      mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) value);
+      mod.taint((String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
index 9e7aed6b735..158c7c72d01 100644
--- a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
+++ b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
@@ -68,7 +68,9 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
     final AgentSpan span =
         startSpan(DECORATE.instrumentationNames()[0], GRPC_SERVER, spanContext).setMeasured(true);
 
-    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0);
+    AgentTracer.get()
+        .getDataStreamsMonitoring()
+        .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
 
     RequestContext reqContext = span.getRequestContext();
     if (reqContext != null) {
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle
index 2e036a050e1..6625bc50fb0 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle
@@ -49,6 +49,8 @@ dependencies {
 
   // needed for kinesis:
   testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson
+  testImplementation group: 'org.json', name: 'json', version: '20231013'
+
 
   test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-s3') {
     version {
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy
index 9bf73151744..9874e1a5510 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy
@@ -39,6 +39,7 @@ import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.test.util.Flaky
+import org.json.XML
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 
@@ -61,12 +62,23 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
   def credentialsProvider = new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())
   @Shared
   def responseBody = new AtomicReference<String>()
+  @Shared
+  def jsonPointer = new AtomicReference<String>()
+
   @AutoCleanup
   @Shared
   def server = httpServer {
     handlers {
       all {
-        response.status(200).send(responseBody.get())
+        def body = responseBody.get()
+        if (request.headers.get("Content-Type")?.contains("json")) {
+          def json = XML.toJSONObject(body)
+          if (jsonPointer.get() != null) {
+            json = json.query(jsonPointer.get())
+          }
+          body = json.toString()
+        }
+        response.status(200).send(body)
       }
     }
   }
@@ -131,6 +143,7 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
   def "send #operation request with mocked response"() {
     setup:
     responseBody.set(body)
+    jsonPointer.set(jsonPointerStr)
 
     when:
     def response = call.call(client)
@@ -181,19 +194,22 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
     server.lastRequest.headers.get("x-datadog-trace-id") == null
     server.lastRequest.headers.get("x-datadog-parent-id") == null
 
+    cleanup:
+    jsonPointer.set(null)
+
     where:
-    service      | operation           | method  | path                  | client                                                                                                                                             | call                                                                            | additionalTags                                                | body              | peerService
-    "S3"         | "CreateBucket"      |  "PUT"  | "/testbucket/"        | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.createBucket("testbucket") }                                           | ["aws.bucket.name": "testbucket", "bucketname": "testbucket"] | ""                | "aws.bucket.name"
-    "S3"         | "GetObject"         |  "GET"  | "/someBucket/someKey" | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.getObject("someBucket", "someKey") }                                   | ["aws.bucket.name": "someBucket", "bucketname": "someBucket"] | ""                | "aws.bucket.name"
-    "DynamoDBv2" | "CreateTable"       |  "POST" | "/"                   | AmazonDynamoDBClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                            | { c -> c.createTable(new CreateTableRequest("sometable", null)) }               | ["aws.table.name": "sometable", "tablename": "sometable"]   | ""                  | "aws.table.name"
-    "Kinesis"    | "DeleteStream"      |  "POST" | "/"                   | AmazonKinesisClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                             | { c -> c.deleteStream(new DeleteStreamRequest().withStreamName("somestream")) } | ["aws.stream.name": "somestream", "streamname": "somestream"] | ""                | "aws.stream.name"
+    service      | operation           | method  | path                  | client                                                                                                                                             | call                                                                            | additionalTags                                                | body              | peerService         | jsonPointerStr
+    "S3"         | "CreateBucket"      |  "PUT"  | "/testbucket/"        | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.createBucket("testbucket") }                                           | ["aws.bucket.name": "testbucket", "bucketname": "testbucket"] | ""                | "aws.bucket.name"   | null
+    "S3"         | "GetObject"         |  "GET"  | "/someBucket/someKey" | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.getObject("someBucket", "someKey") }                                   | ["aws.bucket.name": "someBucket", "bucketname": "someBucket"] | ""                | "aws.bucket.name"   | null
+    "DynamoDBv2" | "CreateTable"       |  "POST" | "/"                   | AmazonDynamoDBClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                            | { c -> c.createTable(new CreateTableRequest("sometable", null)) }               | ["aws.table.name": "sometable", "tablename": "sometable"]   | ""                  | "aws.table.name"    | null
+    "Kinesis"    | "DeleteStream"      |  "POST" | "/"                   | AmazonKinesisClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                             | { c -> c.deleteStream(new DeleteStreamRequest().withStreamName("somestream")) } | ["aws.stream.name": "somestream", "streamname": "somestream"] | ""                | "aws.stream.name"   | null
     "SQS"        | "CreateQueue"       |  "POST" | "/"                   | AmazonSQSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.createQueue(new CreateQueueRequest("somequeue")) }                     | ["aws.queue.name": "somequeue", "queuename": "somequeue"]   | """
 
         <CreateQueueResponse>
             <CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
             <ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
         </CreateQueueResponse>
-      """  | "aws.queue.name"
+      """  | "aws.queue.name" | "/CreateQueueResponse/CreateQueueResult"
     "SQS"        | "SendMessage"       | "POST" | "/someurl"            | AmazonSQSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.sendMessage(new SendMessageRequest("someurl", "")) }                   | ["aws.queue.url": "someurl"]      | """
         <SendMessageResponse>
             <SendMessageResult>
@@ -203,7 +219,7 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
             </SendMessageResult>
             <ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
         </SendMessageResponse>
-      """  | "aws.queue.url"
+      """  | "aws.queue.url" | "/SendMessageResponse/SendMessageResult"
     "SNS"        | "Publish"           | "POST" | "/"                   | AmazonSNSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.publish(new PublishRequest("arn:aws:sns::123:some-topic", "")) }       | ["aws.topic.name": "some-topic", "topicname": "some-topic"]  | """
         <PublishResponse xmlns="https://sns.amazonaws.com/doc/2010-03-31/">
             <PublishResult>
@@ -211,22 +227,21 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
             </PublishResult>
             <ResponseMetadata><RequestId>d74b8436-ae13-5ab4-a9ff-ce54dfea72a0</RequestId></ResponseMetadata>
         </PublishResponse>
-    """      | "aws.topic.name"
+    """      | "aws.topic.name" | "/PublishResponse/PublishResult"
     "EC2"        | "AllocateAddress"   |  "POST" | "/"                   | AmazonEC2ClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.allocateAddress() }                                          | [:]                               | """
         <AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2016-11-15/">
           <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
           <publicIp>192.0.2.1</publicIp>
           <domain>standard</domain>
         </AllocateAddressResponse>
-    """   | null
-
+    """   | null | "/AllocateAddressResponse"
     "RDS"        | "DeleteOptionGroup" |  "POST" | "/"                   | AmazonRDSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.deleteOptionGroup(new DeleteOptionGroupRequest()) }          | [:]                               | """
         <DeleteOptionGroupResponse xmlns="http://rds.amazonaws.com/doc/2014-09-01/">
           <ResponseMetadata>
             <RequestId>0ac9cda2-bbf4-11d3-f92b-31fa5e8dbc99</RequestId>
           </ResponseMetadata>
         </DeleteOptionGroupResponse>
-      """    | null
+      """    | null | null
   }
 
   def "send #operation request to closed port"() {
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy
index e59540b4ab5..a03133a45c8 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy
@@ -36,6 +36,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.test.util.Flaky
 import org.apache.http.conn.HttpHostConnectException
 import org.apache.http.impl.execchain.RequestAbortedException
+import org.json.XML
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 
@@ -68,12 +69,23 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
   def credentialsProvider = new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())
   @Shared
   def responseBody = new AtomicReference<String>()
+  @Shared
+  def jsonPointer = new AtomicReference<String>()
+
   @AutoCleanup
   @Shared
   def server = httpServer {
     handlers {
       all {
-        response.status(200).send(responseBody.get())
+        def body = responseBody.get()
+        if (request.headers.get("Content-Type")?.contains("json")) {
+          def json = XML.toJSONObject(body)
+          if (jsonPointer.get() != null) {
+            json = json.query(jsonPointer.get())
+          }
+          body = json.toString()
+        }
+        response.status(200).send(body)
       }
     }
   }
@@ -124,6 +136,7 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
   def "send #operation request with mocked response"() {
     setup:
     responseBody.set(body)
+    jsonPointer.set(jsonPointerStr)
 
     when:
     def response = call.call(client)
@@ -187,18 +200,21 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
     server.lastRequest.headers.get("x-datadog-trace-id") == null
     server.lastRequest.headers.get("x-datadog-parent-id") == null
 
+    cleanup:
+    jsonPointer.set(null)
+
     where:
-    service      | operation           | ddService      | method | path                  | client                                                                                                                                             | call                                                                            | additionalTags                    | body
-    "S3"         | "CreateBucket"      | "java-aws-sdk" | "PUT"  | "/testbucket/"        | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.createBucket("testbucket") }                                           | ["aws.bucket.name": "testbucket", "bucketname": "testbucket"] | ""
-    "S3"         | "GetObject"         | "java-aws-sdk" | "GET"  | "/someBucket/someKey" | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.getObject("someBucket", "someKey") }                                   | ["aws.bucket.name": "someBucket", "bucketname": "someBucket"] | ""
-    "DynamoDBv2" | "CreateTable"       | "java-aws-sdk" | "POST" | "/"                   | AmazonDynamoDBClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                            | { c -> c.createTable(new CreateTableRequest("sometable", null)) }               | ["aws.table.name": "sometable", "tablename": "sometable"]   | ""
-    "Kinesis"    | "DeleteStream"      | "java-aws-sdk" | "POST" | "/"                   | AmazonKinesisClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                             | { c -> c.deleteStream(new DeleteStreamRequest().withStreamName("somestream")) } | ["aws.stream.name": "somestream", "streamname": "somestream"] | ""
+    service      | operation           | ddService      | method | path                  | client                                                                                                                                             | call                                                                            | additionalTags                    | body                            | jsonPointerStr
+    "S3"         | "CreateBucket"      | "java-aws-sdk" | "PUT"  | "/testbucket/"        | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.createBucket("testbucket") }                                           | ["aws.bucket.name": "testbucket", "bucketname": "testbucket"] | ""  | null
+    "S3"         | "GetObject"         | "java-aws-sdk" | "GET"  | "/someBucket/someKey" | AmazonS3ClientBuilder.standard().withPathStyleAccessEnabled(true).withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build() | { c -> c.getObject("someBucket", "someKey") }                                   | ["aws.bucket.name": "someBucket", "bucketname": "someBucket"] | ""  | null
+    "DynamoDBv2" | "CreateTable"       | "java-aws-sdk" | "POST" | "/"                   | AmazonDynamoDBClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                            | { c -> c.createTable(new CreateTableRequest("sometable", null)) }               | ["aws.table.name": "sometable", "tablename": "sometable"]   | ""    | null
+    "Kinesis"    | "DeleteStream"      | "java-aws-sdk" | "POST" | "/"                   | AmazonKinesisClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                             | { c -> c.deleteStream(new DeleteStreamRequest().withStreamName("somestream")) } | ["aws.stream.name": "somestream", "streamname": "somestream"] | ""  | null
     "SQS"        | "CreateQueue"       | "java-aws-sdk" | "POST" | "/"                   | AmazonSQSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.createQueue(new CreateQueueRequest("somequeue")) }                     | ["aws.queue.name": "somequeue", "queuename": "somequeue"]   | """
         <CreateQueueResponse>
             <CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
             <ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
         </CreateQueueResponse>
-      """
+      """ | "/CreateQueueResponse/CreateQueueResult"
     "SQS"        | "SendMessage"       | "sqs"          | "POST" | "/someurl"            | AmazonSQSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.sendMessage(new SendMessageRequest("someurl", "")) }                   | ["aws.queue.url": "someurl"]      | """
         <SendMessageResponse>
             <SendMessageResult>
@@ -208,7 +224,7 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
             </SendMessageResult>
             <ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
         </SendMessageResponse>
-      """
+      """ | "/SendMessageResponse/SendMessageResult"
     "SNS"        | "Publish"           | "sns"          | "POST" | "/"                   | AmazonSNSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.publish(new PublishRequest("arn:aws:sns::123:some-topic", "")) }       | ["aws.topic.name": "some-topic", "topicname": "some-topic"]  | """
         <PublishResponse xmlns="https://sns.amazonaws.com/doc/2010-03-31/">
             <PublishResult>
@@ -216,21 +232,21 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
             </PublishResult>
             <ResponseMetadata><RequestId>d74b8436-ae13-5ab4-a9ff-ce54dfea72a0</RequestId></ResponseMetadata>
         </PublishResponse>
-      """
+      """ | "/PublishResponse/PublishResult"
     "EC2"        | "AllocateAddress"   | "java-aws-sdk" | "POST" | "/"                   | AmazonEC2ClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.allocateAddress() }                                                    | [:]                               | """
         <AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2016-11-15/">
            <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
            <publicIp>192.0.2.1</publicIp>
            <domain>standard</domain>
         </AllocateAddressResponse>
-      """
+      """ | null
     "RDS"        | "DeleteOptionGroup" | "java-aws-sdk" | "POST" | "/"                   | AmazonRDSClientBuilder.standard().withEndpointConfiguration(endpoint).withCredentials(credentialsProvider).build()                                 | { c -> c.deleteOptionGroup(new DeleteOptionGroupRequest()) }                    | [:]                               | """
         <DeleteOptionGroupResponse xmlns="http://rds.amazonaws.com/doc/2014-09-01/">
           <ResponseMetadata>
             <RequestId>0ac9cda2-bbf4-11d3-f92b-31fa5e8dbc99</RequestId>
           </ResponseMetadata>
         </DeleteOptionGroupResponse>
-      """
+      """ | null
   }
 
   def "send #operation request to closed port"() {
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle
index 3f9a4eca2cf..e979e34e7fd 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle
@@ -12,6 +12,7 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
 dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.0'
@@ -23,7 +24,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:jms')
 
   // SQS<->JMS testing:
-  testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.2.3'
+  testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.4.7'
   testImplementation group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '1.0.8'
 
   latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '+'
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle
index a292ea34a70..adff4418500 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle
@@ -13,6 +13,8 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
+
 
 dependencies {
   compileOnly group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
@@ -24,7 +26,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:jms')
 
   // SQS<->JMS testing:
-  testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.2.3'
+  testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.4.7'
   testImplementation group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '2.0.0'
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '2.20.33'
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
index c5b47dff8af..ee58cbf3538 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
+++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
@@ -91,7 +91,7 @@ protected void startNewMessageSpan(Message message) {
         sortedTags.put(DIRECTION_TAG, DIRECTION_IN);
         sortedTags.put(TOPIC_TAG, urlFileName(queueUrl));
         sortedTags.put(TYPE_TAG, "sqs");
-        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, sortedTags, 0);
+        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, sortedTags, 0, 0);
 
         CONSUMER_DECORATE.afterStart(span);
         CONSUMER_DECORATE.onConsume(span, queueUrl, requestId);
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy
index d2692a61d0c..84ad8f22268 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy
@@ -94,7 +94,7 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
             "aws.operation" "SendMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
@@ -140,7 +140,7 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
             "aws.operation" "ReceiveMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
@@ -222,7 +222,7 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
             "aws.operation" "SendMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
@@ -285,7 +285,7 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
             "aws.operation" "DeleteMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
@@ -330,7 +330,7 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
             "aws.operation" "ReceiveMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy
index 05b5b5a0971..ad1219478f5 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy
@@ -394,7 +394,7 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
             "aws.operation" "DeleteMessage"
             "aws.agent" "java-aws-sdk"
             "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-            "aws.requestId" "00000000-0000-0000-0000-000000000000"
+            "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
             defaultTags()
           }
         }
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy
index 7c864453979..b19b99c0c82 100644
--- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy
@@ -302,7 +302,7 @@ class TimeInQueueForkedTest extends AgentTestRunner {
         "aws.operation" "SendMessageBatch"
         "aws.agent" "java-aws-sdk"
         "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-        "aws.requestId" "00000000-0000-0000-0000-000000000000"
+        "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
         defaultTags()
       }
     }
@@ -325,7 +325,7 @@ class TimeInQueueForkedTest extends AgentTestRunner {
         "aws.operation" "ReceiveMessage"
         "aws.agent" "java-aws-sdk"
         "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-        "aws.requestId" "00000000-0000-0000-0000-000000000000"
+        "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
         defaultTags(parent.resourceName as String == "Sqs.SendMessageBatch")
       }
     }
@@ -344,7 +344,7 @@ class TimeInQueueForkedTest extends AgentTestRunner {
         "$Tags.COMPONENT" "java-aws-sdk"
         "$Tags.SPAN_KIND" Tags.SPAN_KIND_BROKER
         "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue"
-        "aws.requestId" "00000000-0000-0000-0000-000000000000"
+        "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n
         defaultTags(true)
       }
     }
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
index 3847c8b9dd0..1d22aba7ebe 100644
--- a/dd-java-agent/instrumentation/build.gradle
+++ b/dd-java-agent/instrumentation/build.gradle
@@ -99,7 +99,7 @@ subprojects { Project subProj ->
 
       onlyIf { !project.rootProject.hasProperty("skipInstTests") }
 
-      if (subTask.name == 'latestDepTest') {
+      if (subTask.name in ['latestDepTest', 'latestDepForkedTest']) {
         subTask.jvmArgs '-Dtest.dd.latestDepTest=true'
       }
     }
diff --git a/dd-java-agent/instrumentation/commons-fileupload/build.gradle b/dd-java-agent/instrumentation/commons-fileupload/build.gradle
new file mode 100644
index 00000000000..eadd96edbea
--- /dev/null
+++ b/dd-java-agent/instrumentation/commons-fileupload/build.gradle
@@ -0,0 +1,13 @@
+
+apply from: "$rootDir/gradle/java.gradle"
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'org.apache.commons', name: 'commons-fileupload2', version: '2.0.0-M1'
+  testImplementation group: 'org.apache.commons', name: 'commons-fileupload2', version: '2.0.0-M1'
+  testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.0'
+
+
+  testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
+  latestDepTestImplementation group: 'org.apache.commons', name: 'commons-fileupload2', version: '+'
+}
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java
new file mode 100644
index 00000000000..8f67ae94cb0
--- /dev/null
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java
@@ -0,0 +1,65 @@
+package datadog.trace.instrumentation.commons.fileupload;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Source;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class CommonsFileuploadInstrumenter extends Instrumenter.Iast
+    implements Instrumenter.ForKnownTypes {
+
+  public CommonsFileuploadInstrumenter() {
+    super("commons-fileupload");
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(named("parse"))
+            .and(isPublic())
+            .and(returns(Map.class))
+            .and(takesArguments(char[].class, int.class, int.class, char.class)),
+        getClass().getName() + "$ParseAdvice");
+  }
+
+  @Override
+  public String[] knownMatchingTypes() {
+    return new String[] {
+      "org.apache.commons.fileupload.ParameterParser",
+      "org.apache.tomcat.util.http.fileupload.ParameterParser"
+    };
+  }
+
+  public static class ParseAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+    public static Map<String, String> onExit(@Advice.Return final Map<String, String> map) {
+      if (!map.isEmpty()) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final Map.Entry<String, String> entry : map.entrySet()) {
+            if (entry.getValue() != null) {
+              module.taint(
+                  ctx, entry.getValue(), SourceTypes.REQUEST_MULTIPART_PARAMETER, entry.getKey());
+            }
+          }
+        }
+      }
+      return map;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/MultipartInstrumentationTest.groovy b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/MultipartInstrumentationTest.groovy
new file mode 100644
index 00000000000..4e780a02d1a
--- /dev/null
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/MultipartInstrumentationTest.groovy
@@ -0,0 +1,40 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
+
+
+class MultipartInstrumentationTest extends AgentTestRunner {
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig('dd.iast.enabled', 'true')
+  }
+
+  @Override
+  void cleanup() {
+    InstrumentationBridge.clearIastModules()
+  }
+
+  void 'test commons fileupload2 ParameterParser.parse'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final content = "Content-Disposition: form-data; name=\"file\"; filename=\"=?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?= =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=\"\r\n"
+    final parser = clazz.newInstance()
+
+    when:
+    parser.parse(content, new char[]{
+      ',', ';'
+    })
+
+    then:
+    1 * module.taint(null, 'file', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'name')
+    1 * module.taint(null, _, SourceTypes.REQUEST_MULTIPART_PARAMETER, 'filename')
+    0 * _
+
+    where:
+    clazz | _
+    org.apache.commons.fileupload.ParameterParser | _
+    org.apache.tomcat.util.http.fileupload.ParameterParser | _
+  }
+}
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
index 8371ad69442..11522f224fd 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
@@ -51,7 +51,7 @@ public static void afterCtor(
         @Advice.This final Object self, @Advice.Argument(0) final Object argument) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(self, argument);
+        module.taintIfTainted(self, argument);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/src/test/groovy/IastCommonsHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/commons-httpclient-2/src/test/groovy/IastCommonsHttpClientInstrumentationTest.groovy
index 3624973f60e..0a3f5ba5bc7 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2/src/test/groovy/IastCommonsHttpClientInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/commons-httpclient-2/src/test/groovy/IastCommonsHttpClientInstrumentationTest.groovy
@@ -51,7 +51,7 @@ class IastCommonsHttpClientInstrumentationTest extends AgentTestRunner {
 
   private void mockPropagation() {
     final propagation = Mock(PropagationModule) {
-      taintIfInputIsTainted(_, _) >> {
+      taintIfTainted(_, _) >> {
         if (tainteds.containsKey(it[1])) {
           tainteds.put(it[0], null)
         }
diff --git a/dd-java-agent/instrumentation/commons-lang-2/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-lang-2/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
index 63e71ac0325..d7fdd84417d 100644
--- a/dd-java-agent/instrumentation/commons-lang-2/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-lang-2/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
@@ -6,7 +6,7 @@
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.VulnerabilityMarks;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 @Propagation
 @CallSite(spi = IastCallSites.class)
@@ -21,11 +21,11 @@ public class StringEscapeUtilsCallSite {
   @CallSite.After(
       "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeXml(java.lang.String)")
   public static String afterEscape(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscape threw", e);
       }
@@ -36,11 +36,11 @@ public static String afterEscape(
   @CallSite.After(
       "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeSql(java.lang.String)")
   public static String afterEscapeSQL(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.SQL_INJECTION_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscapeSQL threw", e);
       }
diff --git a/dd-java-agent/instrumentation/commons-lang-2/src/test/groovy/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSiteTest.groovy b/dd-java-agent/instrumentation/commons-lang-2/src/test/groovy/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSiteTest.groovy
index 7a4d9457619..348aaa57503 100644
--- a/dd-java-agent/instrumentation/commons-lang-2/src/test/groovy/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/commons-lang-2/src/test/groovy/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSiteTest.groovy
@@ -27,7 +27,7 @@ class StringEscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], mark)
+    1 * module.taintIfTainted(_ as String, args[0], false, mark)
     0 * _
 
     where:
diff --git a/dd-java-agent/instrumentation/commons-lang-3/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-lang-3/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
index e151128f760..b52f57c57e9 100644
--- a/dd-java-agent/instrumentation/commons-lang-3/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-lang-3/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
@@ -6,7 +6,7 @@
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.VulnerabilityMarks;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 @Propagation
 @CallSite(spi = IastCallSites.class)
@@ -23,11 +23,11 @@ public class StringEscapeUtilsCallSite {
   @CallSite.After(
       "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript(java.lang.String)")
   public static String afterEscape(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscape threw", e);
       }
@@ -38,11 +38,11 @@ public static String afterEscape(
   @CallSite.After(
       "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeJson(java.lang.String)")
   public static String afterEscapeJson(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, input);
+        module.taintIfTainted(result, input);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscapeJson threw", e);
       }
diff --git a/dd-java-agent/instrumentation/commons-lang-3/src/test/groovy/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSiteTest.groovy b/dd-java-agent/instrumentation/commons-lang-3/src/test/groovy/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSiteTest.groovy
index dc7147fe6e4..18730b70612 100644
--- a/dd-java-agent/instrumentation/commons-lang-3/src/test/groovy/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/commons-lang-3/src/test/groovy/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSiteTest.groovy
@@ -25,7 +25,7 @@ class StringEscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    1 * module.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
@@ -47,7 +47,7 @@ class StringEscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTainted(_ as String, args[0])
+    1 * module.taintIfTainted(_ as String, args[0])
     0 * _
 
     where:
diff --git a/dd-java-agent/instrumentation/commons-text/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-text/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
index 68620efd078..ebd592fa241 100644
--- a/dd-java-agent/instrumentation/commons-text/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-text/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
@@ -6,7 +6,7 @@
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.VulnerabilityMarks;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 @Propagation
 @CallSite(spi = IastCallSites.class)
@@ -25,11 +25,11 @@ public class StringEscapeUtilsCallSite {
   @CallSite.After(
       "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeXml11(java.lang.String)")
   public static String afterEscape(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscape threw", e);
       }
@@ -40,11 +40,11 @@ public static String afterEscape(
   @CallSite.After(
       "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeJson(java.lang.String)")
   public static String afterEscapeJson(
-      @CallSite.Argument(0) @Nonnull final String input, @CallSite.Return final String result) {
+      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, input);
+        module.taintIfTainted(result, input);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscapeJson threw", e);
       }
diff --git a/dd-java-agent/instrumentation/commons-text/src/test/groovy/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSiteTest.groovy b/dd-java-agent/instrumentation/commons-text/src/test/groovy/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSiteTest.groovy
index 12296ad58c2..440e31ea3be 100644
--- a/dd-java-agent/instrumentation/commons-text/src/test/groovy/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/commons-text/src/test/groovy/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSiteTest.groovy
@@ -25,7 +25,7 @@ class StringEscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    1 * module.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
@@ -48,7 +48,7 @@ class StringEscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTainted(_ as String, args[0])
+    1 * module.taintIfTainted(_ as String, args[0])
     0 * _
 
     where:
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
index a1e62890976..c50eceebd82 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
@@ -2,10 +2,15 @@
 
 import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_TYPE;
 
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.api.normalize.SQLNormalizer;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
   private static final String DB_TYPE = "couchbase";
@@ -16,6 +21,13 @@ class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
   public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
   public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
 
+  private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
+  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
+
+  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+  private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
+      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
   @Override
   protected String[] instrumentationNames() {
     return new String[] {"couchbase"};
@@ -55,4 +67,8 @@ protected String dbInstance(final Object o) {
   protected String dbHostname(Object o) {
     return null;
   }
+
+  protected static UTF8BytesString normalizedQuery(String sql) {
+    return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
+  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
index bf36d0b4ee5..0e4af4d1373 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
@@ -64,7 +64,11 @@ public void setAttribute(String key, String value) {
     // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
     //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
     //  the actual work at the end
-    span.setTag(key, value);
+    if ("db.statement".equals(key)) {
+      span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
+    } else {
+      span.setTag(key, value);
+    }
   }
 
   // This method shows up in later versions
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy
index afdc418332a..20ce3f32219 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy
@@ -139,7 +139,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], 'select * from `test-bucket` limit 1')
+        ], 'select * from `test-bucket` limit ?')
         assertCouchbaseDispatchCall(it, span(0))
       }
     }
@@ -148,6 +148,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
   def "check query spans with parent"() {
     setup:
     def query = 'select * from `test-bucket` limit 1'
+    def normalizedQuery = 'select * from `test-bucket` limit ?'
 
     when:
     runUnderTrace('query.parent') {
@@ -163,7 +164,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false)
+        ], normalizedQuery, span(0), false)
         assertCouchbaseDispatchCall(it, span(1))
       }
     }
@@ -171,6 +172,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
 
   def "check query spans with parent and adhoc #adhoc"() {
     def query = 'select count(1) from `test-bucket` where (`something` = "else") limit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "else") limit ?'
     int count = 0
 
     when:
@@ -192,12 +194,12 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false)
+        ], normalizedQuery, span(0), false)
         if (!adhoc) {
           assertCouchbaseCall(it, "prepare", [
             'db.couchbase.retries'   : { Long },
             'db.couchbase.service'   : 'query',
-          ], "PREPARE $query", span(1), true)
+          ], "PREPARE $normalizedQuery", span(1), true)
         }
         assertCouchbaseDispatchCall(it, span(adhoc ? 1 : 2))
       }
@@ -209,6 +211,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
 
   def "check multiple query spans with parent and adhoc false"() {
     def query = 'select count(1) from `test-bucket` where (`something` = "wonderful") limit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "wonderful") limit ?'
     int count1 = 0
     int count2 = 0
 
@@ -237,20 +240,20 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false)
+        ], normalizedQuery, span(0), false)
         assertCouchbaseCall(it, "prepare", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], "PREPARE $query", span(1), true)
+        ], "PREPARE $normalizedQuery", span(1), true)
         assertCouchbaseDispatchCall(it, span(2))
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false)
+        ], normalizedQuery, span(0), false)
         assertCouchbaseCall(it, "execute", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(4), true)
+        ], normalizedQuery, span(4), true)
         assertCouchbaseDispatchCall(it, span(5))
       }
     }
@@ -259,6 +262,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
   def "check error query spans with parent"() {
     setup:
     def query = 'select * from `test-bucket` limeit 1'
+    def normalizedQuery = 'select * from `test-bucket` limeit ?'
     Throwable ex = null
 
     when:
@@ -280,7 +284,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false, ex)
+        ], normalizedQuery, span(0), false, ex)
         assertCouchbaseDispatchCall(it, span(1))
       }
     }
@@ -288,6 +292,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
 
   def "check multiple error query spans with parent and adhoc false"() {
     def query = 'select count(1) from `test-bucket` where (`something` = "wonderful") limeit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "wonderful") limeit ?'
     int count1 = 0
     int count2 = 0
     Throwable ex1 = null
@@ -328,20 +333,20 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false, ex1)
+        ], normalizedQuery, span(0), false, ex1)
         assertCouchbaseCall(it, "prepare", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], "PREPARE $query", span(1), true, ex1)
+        ], "PREPARE $normalizedQuery", span(1), true, ex1)
         assertCouchbaseDispatchCall(it, span(2))
         assertCouchbaseCall(it, "cb.query", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], query, span(0), false, ex2)
+        ], normalizedQuery, span(0), false, ex2)
         assertCouchbaseCall(it, "prepare", [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
-        ], "PREPARE $query", span(4), true, ex2)
+        ], "PREPARE $normalizedQuery", span(4), true, ex2)
         assertCouchbaseDispatchCall(it, span(5))
       }
     }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
index 2b84ad23c07..cad336cc2de 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
@@ -2,10 +2,15 @@
 
 import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_TYPE;
 
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.api.normalize.SQLNormalizer;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
   private static final String DB_TYPE = "couchbase";
@@ -16,6 +21,13 @@ class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
   public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
   public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
 
+  private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
+  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
+
+  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+  private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
+      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
   @Override
   protected String[] instrumentationNames() {
     return new String[] {"couchbase"};
@@ -55,4 +67,8 @@ protected String dbInstance(final Object o) {
   protected String dbHostname(Object o) {
     return null;
   }
+
+  protected static UTF8BytesString normalizedQuery(String sql) {
+    return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
+  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
index ac3b0e20b40..11d452bf45d 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
@@ -77,7 +77,11 @@ public void attribute(String key, String value) {
     // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
     //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
     //  the actual work at the end
-    span.setTag(key, value);
+    if ("db.statement".equals(key)) {
+      span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
+    } else {
+      span.setTag(key, value);
+    }
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy
index 7fb5feba1fd..d692cbe2077 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy
@@ -149,7 +149,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
     assertTraces(1) {
       sortSpansByStart()
       trace(2) {
-        assertCouchbaseCall(it, 'select * from `test-bucket` limit 1', [
+        assertCouchbaseCall(it, 'select * from `test-bucket` limit ?', [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ])
@@ -161,7 +161,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
   def "check query spans with parent"() {
     setup:
     def query = 'select * from `test-bucket` limit 1'
-
+    def normalizedQuery = 'select * from `test-bucket` limit ?'
     when:
     runUnderTrace('query.parent') {
       cluster.query(query)
@@ -172,7 +172,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
       sortSpansByStart()
       trace(3) {
         basicSpan(it, 'query.parent')
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0))
@@ -184,6 +184,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
   def "check async query spans with parent and adhoc #adhoc"() {
     setup:
     def query = 'select count(1) from `test-bucket` where (`something` = "else") limit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "else") limit ?'
     int count = 0
 
     when:
@@ -202,12 +203,12 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
       sortSpansByStart()
       trace(adhoc ? 3 : 4) {
         basicSpan(it, 'async.parent')
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0))
         if (!adhoc) {
-          assertCouchbaseCall(it, "PREPARE $query", [
+          assertCouchbaseCall(it, "PREPARE $normalizedQuery", [
             'db.couchbase.retries': { Long },
             'db.couchbase.service': 'query'
           ], span(1), true)
@@ -223,6 +224,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
   def "check multiple async query spans with parent and adhoc false"() {
     setup:
     def query = 'select count(1) from `test-bucket` where (`something` = "wonderful") limit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "wonderful") limit ?'
     int count1 = 0
     int count2 = 0
     def extraPrepare = isLatestDepTest
@@ -249,26 +251,26 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
       sortSpansByStart()
       trace(extraPrepare ? 8 : 7) {
         basicSpan(it, 'async.multiple')
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0))
-        assertCouchbaseCall(it, "PREPARE $query", [
+        assertCouchbaseCall(it, "PREPARE $normalizedQuery", [
           'db.couchbase.retries': { Long },
           'db.couchbase.service': 'query'
         ], span(1), true)
         assertCouchbaseDispatchCall(it, span(2))
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0))
         if (extraPrepare) {
-          assertCouchbaseCall(it, "PREPARE $query", [
+          assertCouchbaseCall(it, "PREPARE $normalizedQuery", [
             'db.couchbase.retries': { Long },
             'db.couchbase.service': 'query'
           ], span(4), true)
         }
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries': { Long },
           'db.couchbase.service': 'query'
         ], span(4), true)
@@ -280,12 +282,13 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
   def "check error query spans with parent"() {
     setup:
     def query = 'select * from `test-bucket` limeit 1'
+    def normalizedQuery = "select * from `test-bucket` limeit ?"
     Throwable ex = null
 
     when:
     runUnderTrace('query.failure') {
       try {
-        cluster.query('select * from `test-bucket` limeit 1')
+        cluster.query(query)
       } catch (ParsingFailureException expected) {
         ex = expected
       }
@@ -297,7 +300,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
       sortSpansByStart()
       trace(3) {
         basicSpan(it, 'query.failure')
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query',
           'db.system'              : 'couchbase',
@@ -310,6 +313,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
   def "check multiple async error query spans with parent and adhoc false"() {
     setup:
     def query = 'select count(1) from `test-bucket` where (`something` = "wonderful") limeit 1'
+    def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "wonderful") limeit ?'
     int count1 = 0
     int count2 = 0
     Throwable ex1 = null
@@ -347,20 +351,20 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase {
       sortSpansByStart()
       trace(7) {
         basicSpan(it, 'async.failure')
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0), false, ex1)
-        assertCouchbaseCall(it, "PREPARE $query", [
+        assertCouchbaseCall(it, "PREPARE $normalizedQuery", [
           'db.couchbase.retries': { Long },
           'db.couchbase.service': 'query'
         ], span(1), true, ex1)
         assertCouchbaseDispatchCall(it, span(2))
-        assertCouchbaseCall(it, query, [
+        assertCouchbaseCall(it, normalizedQuery, [
           'db.couchbase.retries'   : { Long },
           'db.couchbase.service'   : 'query'
         ], span(0), false, ex2)
-        assertCouchbaseCall(it, "PREPARE $query", [
+        assertCouchbaseCall(it, "PREPARE $normalizedQuery", [
           'db.couchbase.retries': { Long },
           'db.couchbase.service': 'query'
         ], span(4), true, ex2)
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
index 8775d27baec..946e1b762a5 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
+++ b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
@@ -134,11 +134,15 @@ abstract class CassandraClientTest extends VersionedNamingTestBase {
     "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                         | "async_test" | true
   }
 
+  String normalize(String statement){
+    return statement.replaceAll("'alice'", "?")
+  }
+
   def cassandraSpan(TraceAssert trace, String statement, String keyspace, boolean renameService, Object parentSpan = null, Throwable exception = null) {
     trace.span {
       serviceName renameService && keyspace ? keyspace : service()
       operationName operation()
-      resourceName statement
+      resourceName normalize(statement)
       spanType DDSpanTypes.CASSANDRA
       if (parentSpan == null) {
         parent()
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
index 28d5b32eddf..ffe7c81fb25 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
@@ -3,11 +3,15 @@
 import com.datastax.driver.core.Host;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.api.normalize.SQLNormalizer;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
+import java.util.function.ToIntFunction;
 
 public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Session> {
   private static final String DB_TYPE = "cassandra";
@@ -19,6 +23,15 @@ public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDeco
 
   public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
 
+  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
+  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+  private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
+      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
+  protected static UTF8BytesString normalizedQuery(CharSequence sql) {
+    return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
+  }
+
   @Override
   protected String[] instrumentationNames() {
     return new String[] {"cassandra"};
@@ -60,6 +73,11 @@ protected String dbHostname(Session session) {
     return null;
   }
 
+  public AgentSpan onStatement(final AgentSpan span, final CharSequence statement) {
+    span.setResourceName(normalizedQuery(statement));
+    return span;
+  }
+
   public AgentSpan onResponse(final AgentSpan span, final ResultSet result) {
     if (result != null) {
       final Host host = result.getExecutionInfo().getQueriedHost();
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
index 8775d27baec..946e1b762a5 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
+++ b/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
@@ -134,11 +134,15 @@ abstract class CassandraClientTest extends VersionedNamingTestBase {
     "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                         | "async_test" | true
   }
 
+  String normalize(String statement){
+    return statement.replaceAll("'alice'", "?")
+  }
+
   def cassandraSpan(TraceAssert trace, String statement, String keyspace, boolean renameService, Object parentSpan = null, Throwable exception = null) {
     trace.span {
       serviceName renameService && keyspace ? keyspace : service()
       operationName operation()
-      resourceName statement
+      resourceName normalize(statement)
       spanType DDSpanTypes.CASSANDRA
       if (parentSpan == null) {
         parent()
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
index 98817ca2b5d..dc1cb7d5b31 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
@@ -5,7 +5,10 @@
 import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.servererrors.CoordinatorException;
 import com.datastax.oss.driver.api.core.session.Session;
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.api.normalize.SQLNormalizer;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
@@ -13,6 +16,7 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Objects;
+import java.util.function.ToIntFunction;
 
 public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Session> {
   private static final String DB_TYPE = "cassandra";
@@ -24,6 +28,15 @@ public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDeco
 
   public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
 
+  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
+  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+  private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
+      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
+  protected static UTF8BytesString normalizedQuery(CharSequence sql) {
+    return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
+  }
+
   @Override
   protected String[] instrumentationNames() {
     return new String[] {"cassandra"};
@@ -64,6 +77,11 @@ protected String dbHostname(Session session) {
     return null;
   }
 
+  public AgentSpan onStatement(final AgentSpan span, final CharSequence statement) {
+    span.setResourceName(normalizedQuery(statement));
+    return span;
+  }
+
   public AgentSpan onResponse(final AgentSpan span, final ResultSet result) {
     if (result != null) {
       return onResponse(span, result.getExecutionInfo().getCoordinator());
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy
index bdafd0f4a1f..21bb4bf3ff3 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy
+++ b/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy
@@ -210,11 +210,15 @@ abstract class CassandraClientTest extends VersionedNamingTestBase {
       .withConfigLoader(configLoader)
   }
 
+  String normalize(String statement){
+    return statement.replaceAll("'alice'", "?")
+  }
+
   def cassandraSpan(TraceAssert trace, String statement, String keyspace, boolean renameService, Object parentSpan = null, Throwable throwable = null) {
     trace.span {
       serviceName renameService && keyspace ? keyspace : service()
       operationName operation()
-      resourceName statement
+      resourceName normalize(statement)
       spanType DDSpanTypes.CASSANDRA
       if (parentSpan == null) {
         parent()
diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java b/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
index 08a9b11997c..8f37f033e23 100644
--- a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
+++ b/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
@@ -1,21 +1,15 @@
 package datadog.exceptions.instrumentation;
 
-import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField;
-import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.api.Platform;
-import net.bytebuddy.description.type.TypeDescription;
-import net.bytebuddy.matcher.ElementMatcher;
 
-/** Provides instrumentation of {@linkplain Throwable} constructor. */
+/** Provides instrumentation of {@linkplain Exception} and {@linkplain Error} constructors. */
 @AutoService(Instrumenter.class)
 public final class ThrowableInstrumentation extends Instrumenter.Profiling
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure {
+    implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes {
 
   public ThrowableInstrumentation() {
     super("throwables");
@@ -27,17 +21,14 @@ public boolean isEnabled() {
   }
 
   @Override
-  public String instrumentedType() {
-    return "java.lang.Throwable";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("stackTrace"));
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(isConstructor(), packageName + ".ThrowableInstanceAdvice");
   }
 
   @Override
-  public void adviceTransformations(AdviceTransformation transformation) {
-    transformation.applyAdvice(isConstructor(), packageName + ".ThrowableInstanceAdvice");
+  public String[] knownMatchingTypes() {
+    return new String[] {
+      "java.lang.Exception", "java.lang.Error", "kotlin.Exception", "kotlin.Error"
+    };
   }
 }
diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java b/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
index 32072e031ed..3c2623f5a48 100644
--- a/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
+++ b/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
@@ -11,12 +11,7 @@
 
 public class ThrowableInstanceAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.This final Throwable t,
-      @Advice.FieldValue("stackTrace") StackTraceElement[] stackTrace) {
-    if (t.getClass().getName().endsWith(".ResourceLeakDetector$TraceRecord")) {
-      return;
-    }
+  public static void onExit(@Advice.This final Object t) {
     /*
      * This instrumentation handler is sensitive to any throwables thrown from its body -
      * it will go into infinite loop of trying to handle the new throwable instance and generating
@@ -31,24 +26,23 @@ public static void onExit(
     }
     try {
       /*
-       * Exclude internal agent threads from exception profiling.
+       * We may get into a situation when this is called before exception sampling is active.
        */
-      if (Config.get().isProfilingExcludeAgentThreads()
-          && AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
+      if (!InstrumentationBasedProfiling.isJFRReady()) {
         return;
       }
       /*
-       * We may get into a situation when this is called before exception sampling is active.
+       * Exclude internal agent threads from exception profiling.
        */
-      if (!InstrumentationBasedProfiling.isJFRReady()) {
+      if (Config.get().isProfilingExcludeAgentThreads()
+          && AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
         return;
       }
       /*
        * JFR will assign the stacktrace depending on the place where the event is committed.
        * Therefore we need to commit the event here, right in the 'Exception' constructor
        */
-      final ExceptionSampleEvent event =
-          ExceptionProfiling.getInstance().process(t, stackTrace == null ? 0 : stackTrace.length);
+      final ExceptionSampleEvent event = ExceptionProfiling.getInstance().process((Throwable) t);
       if (event != null && event.shouldCommit()) {
         event.commit();
       }
diff --git a/dd-java-agent/instrumentation/freemarker/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java b/dd-java-agent/instrumentation/freemarker/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
index 8ee9bc4ea2a..391339f528b 100644
--- a/dd-java-agent/instrumentation/freemarker/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
+++ b/dd-java-agent/instrumentation/freemarker/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
@@ -29,7 +29,7 @@ public static String afterEscape(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscape threw", e);
       }
diff --git a/dd-java-agent/instrumentation/freemarker/src/test/groovy/datadog/trace/instrumentation/freemarker/StringUtilCallSiteTest.groovy b/dd-java-agent/instrumentation/freemarker/src/test/groovy/datadog/trace/instrumentation/freemarker/StringUtilCallSiteTest.groovy
index 51b0512a5e3..18d86d6aef5 100644
--- a/dd-java-agent/instrumentation/freemarker/src/test/groovy/datadog/trace/instrumentation/freemarker/StringUtilCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/freemarker/src/test/groovy/datadog/trace/instrumentation/freemarker/StringUtilCallSiteTest.groovy
@@ -23,17 +23,17 @@ class StringUtilCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    1 * module.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
-    method       | args                  | expected
-    'HTMLEnc' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
-    'XMLEnc' | ['<xmlTag>"escape this < </xmlTag>'] | '&lt;xmlTag&gt;&quot;escape this &lt; &lt;/xmlTag&gt;'
-    'XHTMLEnc' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
-    'javaStringEnc' | ['<script>function a(){console.log("escape this < ")}<script>'] | '<script>function a(){console.log(\\"escape this < \\")}<script>'
+    method                | args                                                            | expected
+    'HTMLEnc'             | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    'XMLEnc'              | ['<xmlTag>"escape this < </xmlTag>']                            | '&lt;xmlTag&gt;&quot;escape this &lt; &lt;/xmlTag&gt;'
+    'XHTMLEnc'            | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    'javaStringEnc'       | ['<script>function a(){console.log("escape this < ")}<script>'] | '<script>function a(){console.log(\\"escape this < \\")}<script>'
     'javaScriptStringEnc' | ['<script>function a(){console.log("escape this < ")}<script>'] | '<script>function a(){console.log(\\"escape this < \\")}<script>'
-    'jsonStringEnc' | ['["a":{"b":2}]'] | '[\\"a\\":{\\"b\\":2}]'
+    'jsonStringEnc'       | ['["a":{"b":2}]']                                               | '[\\"a\\":{\\"b\\":2}]'
   }
 
   void 'test #method with null args'() {
@@ -47,16 +47,15 @@ class StringUtilCallSiteTest extends AgentTestRunner {
     then:
     def thrownException = thrown (Exception)
     assert  thrownException.stackTrace[0].getClassName().startsWith('freemarker')
-    0 * module.taintIfInputIsTaintedWithMarks(_)
     0 * _
 
     where:
-    method       | _
-    'HTMLEnc' | _
-    'XMLEnc' | _
-    'XHTMLEnc' | _
-    'javaStringEnc' | _
+    method                | ex
+    'HTMLEnc'             | _
+    'XMLEnc'              | _
+    'XHTMLEnc'            | _
+    'javaStringEnc'       | _
     'javaScriptStringEnc' | _
-    'jsonStringEnc' | _
+    'jsonStringEnc'       | _
   }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub/build.gradle b/dd-java-agent/instrumentation/google-pubsub/build.gradle
new file mode 100644
index 00000000000..386a943bff8
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/build.gradle
@@ -0,0 +1,26 @@
+muzzle {
+  pass {
+    group = "com.google.cloud"
+    module = "google-cloud-pubsub"
+    versions = "[1.116.0,)"
+    excludeDependency "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
+  }
+}
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
+
+
+dependencies {
+  compileOnly group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.116.0'
+  testImplementation "org.testcontainers:gcloud:${versions.testcontainers}"
+  testImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.116.0'
+  testImplementation project(":dd-java-agent:instrumentation:grpc-1.5")
+  testImplementation project(":dd-java-agent:instrumentation:guava-10")
+  latestDepTestImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '+'
+}
+
+tasks.withType(Test).configureEach {
+  usesService(testcontainersLimit)
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java
new file mode 100644
index 00000000000..aa6ba981dd4
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java
@@ -0,0 +1,32 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.CONSUMER_DECORATE;
+
+import com.google.cloud.pubsub.v1.AckReplyConsumerWithResponse;
+import com.google.cloud.pubsub.v1.MessageReceiverWithAckResponse;
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.bootstrap.instrumentation.api.AgentScope;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+
+public class MessageReceiverWithAckResponseWrapper implements MessageReceiverWithAckResponse {
+  private final String subscription;
+  private final MessageReceiverWithAckResponse delegate;
+
+  public MessageReceiverWithAckResponseWrapper(
+      String subscription, MessageReceiverWithAckResponse delegate) {
+    this.subscription = subscription;
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) {
+    final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription);
+    try (final AgentScope scope = activateSpan(span)) {
+      this.delegate.receiveMessage(message, consumer);
+    } finally {
+      CONSUMER_DECORATE.beforeFinish(span);
+      span.finish();
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java
new file mode 100644
index 00000000000..fc87a410a08
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java
@@ -0,0 +1,31 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.CONSUMER_DECORATE;
+
+import com.google.cloud.pubsub.v1.AckReplyConsumer;
+import com.google.cloud.pubsub.v1.MessageReceiver;
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.bootstrap.instrumentation.api.AgentScope;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+
+public final class MessageReceiverWrapper implements MessageReceiver {
+  private final String subscription;
+  private final MessageReceiver delegate;
+
+  public MessageReceiverWrapper(String subscription, MessageReceiver delegate) {
+    this.subscription = subscription;
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
+    final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription);
+    try (final AgentScope scope = activateSpan(span)) {
+      this.delegate.receiveMessage(message, consumer);
+    } finally {
+      CONSUMER_DECORATE.beforeFinish(span);
+      span.finish();
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java
new file mode 100644
index 00000000000..b4165c68838
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java
@@ -0,0 +1,156 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
+import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_IN;
+import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_TAG;
+import static datadog.trace.core.datastreams.TagsProcessor.SUBSCRIPTION_TAG;
+import static datadog.trace.core.datastreams.TagsProcessor.TYPE_TAG;
+
+import com.google.protobuf.Timestamp;
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.api.Functions;
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
+import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
+import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
+import datadog.trace.bootstrap.instrumentation.decorator.MessagingClientDecorator;
+import java.util.LinkedHashMap;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PubSubDecorator extends MessagingClientDecorator {
+  private static class RegexExtractor implements Function<CharSequence, CharSequence> {
+    private final Pattern pattern;
+    private final int group;
+
+    public RegexExtractor(final String regex, final int group) {
+      pattern = Pattern.compile(regex);
+      this.group = group;
+    }
+
+    @Override
+    public CharSequence apply(CharSequence input) {
+      final Matcher matcher = pattern.matcher(input);
+      if (matcher.matches() && group <= matcher.groupCount()) {
+        return matcher.group(group);
+      }
+      return input;
+    }
+  }
+
+  private static final String PUBSUB = "google-pubsub";
+  public static final CharSequence JAVA_PUBSUB = UTF8BytesString.create("java-google-pubsub");
+  public static final CharSequence PUBSUB_CONSUME =
+      UTF8BytesString.create(
+          SpanNaming.instance().namingSchema().messaging().inboundOperation(PUBSUB));
+  public static final CharSequence PUBSUB_PRODUCE =
+      UTF8BytesString.create(
+          SpanNaming.instance().namingSchema().messaging().outboundOperation(PUBSUB));
+
+  private static final DDCache<CharSequence, CharSequence> TOPIC_NAME_CACHE =
+      DDCaches.newFixedSizeCache(32);
+  private static final DDCache<CharSequence, CharSequence> SUBSCRIPTION_NAME_CACHE =
+      DDCaches.newFixedSizeCache(32);
+
+  private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
+      DDCaches.newFixedSizeCache(32);
+  private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
+      DDCaches.newFixedSizeCache(32);
+  private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
+  private static final Functions.Prefix CONSUMER_PREFIX =
+      new Functions.Prefix("Consume Subscription ");
+
+  private static final Function<CharSequence, CharSequence> TOPIC_EXTRACTION_FUNCTION =
+      new RegexExtractor("^projects/(.+)/topics/(.+)$", 2).andThen(UTF8BytesString::create);
+  private static final Function<CharSequence, CharSequence> SUBSCRIPTION_EXTRACTION_FUNCTION =
+      new RegexExtractor("^projects/(.+)/subscriptions/(.+)$", 2).andThen(UTF8BytesString::create);
+
+  public static final PubSubDecorator PRODUCER_DECORATE =
+      new PubSubDecorator(
+          Tags.SPAN_KIND_PRODUCER,
+          InternalSpanTypes.MESSAGE_PRODUCER,
+          SpanNaming.instance().namingSchema().messaging().outboundService(PUBSUB, true));
+
+  public static final PubSubDecorator CONSUMER_DECORATE =
+      new PubSubDecorator(
+          Tags.SPAN_KIND_CONSUMER,
+          InternalSpanTypes.MESSAGE_CONSUMER,
+          SpanNaming.instance().namingSchema().messaging().inboundService(PUBSUB, true));
+  private final String spanKind;
+  private final CharSequence spanType;
+  private final String serviceName;
+
+  protected PubSubDecorator(String spanKind, CharSequence spanType, String serviceName) {
+    this.spanKind = spanKind;
+    this.spanType = spanType;
+    this.serviceName = serviceName;
+  }
+
+  @Override
+  protected CharSequence spanType() {
+    return spanType;
+  }
+
+  @Override
+  protected String[] instrumentationNames() {
+    return new String[] {"google-pubsub"};
+  }
+
+  @Override
+  protected String service() {
+    return serviceName;
+  }
+
+  @Override
+  protected CharSequence component() {
+    return JAVA_PUBSUB;
+  }
+
+  @Override
+  protected String spanKind() {
+    return spanKind;
+  }
+
+  public AgentSpan onConsume(final PubsubMessage message, final String subscription) {
+    final AgentSpan.Context spanContext =
+        propagate().extract(message, TextMapExtractAdapter.GETTER);
+    final AgentSpan span = startSpan(PUBSUB_CONSUME, spanContext);
+    final CharSequence parsedSubscription = extractSubscription(subscription);
+    final LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>(3);
+    sortedTags.put(DIRECTION_TAG, DIRECTION_IN);
+    sortedTags.put(SUBSCRIPTION_TAG, parsedSubscription.toString());
+    sortedTags.put(TYPE_TAG, "google-pubsub");
+    final Timestamp publishTime = message.getPublishTime();
+    // FIXME: use full nanosecond resolution when this method will accept nanos
+    AgentTracer.get()
+        .getDataStreamsMonitoring()
+        .setCheckpoint(
+            span,
+            sortedTags,
+            publishTime.getSeconds() * 1_000 + publishTime.getNanos() / (int) 1e6,
+            message.getSerializedSize());
+    afterStart(span);
+    span.setResourceName(
+        CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(parsedSubscription, CONSUMER_PREFIX));
+    return span;
+  }
+
+  public void onProduce(final AgentSpan span, final CharSequence topic) {
+    span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
+  }
+
+  public CharSequence extractTopic(String fullTopic) {
+    return TOPIC_NAME_CACHE.computeIfAbsent(fullTopic, TOPIC_EXTRACTION_FUNCTION);
+  }
+
+  public CharSequence extractSubscription(String fullSubscription) {
+    return SUBSCRIPTION_NAME_CACHE.computeIfAbsent(
+        fullSubscription, SUBSCRIPTION_EXTRACTION_FUNCTION);
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java
new file mode 100644
index 00000000000..edcabb68364
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java
@@ -0,0 +1,97 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
+import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE;
+import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_OUT;
+import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_TAG;
+import static datadog.trace.core.datastreams.TagsProcessor.TOPIC_TAG;
+import static datadog.trace.core.datastreams.TagsProcessor.TYPE_TAG;
+import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.PRODUCER_DECORATE;
+import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.PUBSUB_PRODUCE;
+import static datadog.trace.instrumentation.googlepubsub.TextMapInjectAdapter.SETTER;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+
+import com.google.auto.service.AutoService;
+import com.google.cloud.pubsub.v1.Publisher;
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.agent.tooling.ExcludeFilterProvider;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.bootstrap.instrumentation.api.AgentScope;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public final class PublisherInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType, ExcludeFilterProvider {
+
+  public PublisherInstrumentation() {
+    super("google-pubsub", "google-pubsub-publisher");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PubSubDecorator",
+      packageName + ".PubSubDecorator$RegexExtractor",
+      packageName + ".TextMapInjectAdapter",
+      packageName + ".TextMapExtractAdapter",
+    };
+  }
+
+  @Override
+  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+    return singletonMap(RUNNABLE, singletonList("com.google.api.gax.rpc.Watchdog"));
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "com.google.cloud.pubsub.v1.Publisher";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(isMethod().and(named("publish")), getClass().getName() + "$Wrap");
+  }
+
+  public static final class Wrap {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AgentScope before(
+        @Advice.Argument(value = 0, readOnly = false) PubsubMessage msg,
+        @Advice.This Publisher publisher) {
+      final AgentSpan span = startSpan(PUBSUB_PRODUCE);
+
+      final CharSequence topicName = PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString());
+      PRODUCER_DECORATE.afterStart(span);
+      PRODUCER_DECORATE.onProduce(span, topicName);
+
+      LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>(3);
+      sortedTags.put(DIRECTION_TAG, DIRECTION_OUT);
+      sortedTags.put(TOPIC_TAG, topicName.toString());
+      sortedTags.put(TYPE_TAG, "google-pubsub");
+
+      PubsubMessage.Builder builder = msg.toBuilder();
+      propagate().inject(span, builder, SETTER);
+      propagate().injectPathwayContext(span, builder, SETTER, sortedTags);
+      msg = builder.build();
+      return activateSpan(span);
+    }
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+        @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) {
+      PRODUCER_DECORATE.onError(scope, throwable);
+      PRODUCER_DECORATE.beforeFinish(scope);
+      scope.span().finish();
+      scope.close();
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java
new file mode 100644
index 00000000000..312a9fa9929
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java
@@ -0,0 +1,54 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+
+import com.google.auto.service.AutoService;
+import com.google.cloud.pubsub.v1.MessageReceiver;
+import datadog.trace.agent.tooling.Instrumenter;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class ReceiverInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+
+  public ReceiverInstrumentation() {
+    super("google-pubsub", "google-pubsub-receiver");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PubSubDecorator",
+      packageName + ".PubSubDecorator$RegexExtractor",
+      packageName + ".TextMapInjectAdapter",
+      packageName + ".TextMapExtractAdapter",
+      packageName + ".MessageReceiverWrapper",
+    };
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "com.google.cloud.pubsub.v1.Subscriber";
+  }
+
+  @Override
+  public void adviceTransformations(Instrumenter.AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(named("newBuilder"))
+            .and(takesArgument(0, String.class))
+            .and(takesArgument(1, named("com.google.cloud.pubsub.v1.MessageReceiver"))),
+        getClass().getName() + "$Wrap");
+  }
+
+  public static final class Wrap {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void before(
+        @Advice.Argument(value = 0) final String subscription,
+        @Advice.Argument(value = 1, readOnly = false) MessageReceiver receiver) {
+      receiver = new MessageReceiverWrapper(subscription, receiver);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java
new file mode 100644
index 00000000000..905079d1b87
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java
@@ -0,0 +1,55 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameEndsWith;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+
+import com.google.auto.service.AutoService;
+import com.google.cloud.pubsub.v1.MessageReceiverWithAckResponse;
+import datadog.trace.agent.tooling.Instrumenter;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public final class ReceiverWithAckInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+
+  public ReceiverWithAckInstrumentation() {
+    super("google-pubsub", "google-pubsub-receiver");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PubSubDecorator",
+      packageName + ".PubSubDecorator$RegexExtractor",
+      packageName + ".TextMapInjectAdapter",
+      packageName + ".TextMapExtractAdapter",
+      packageName + ".MessageReceiverWithAckResponseWrapper",
+    };
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "com.google.cloud.pubsub.v1.Subscriber";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(named("newBuilder"))
+            .and(takesArgument(0, String.class))
+            .and(takesArgument(1, nameEndsWith("MessageReceiverWithAckResponse"))),
+        getClass().getName() + "$Wrap");
+  }
+
+  public static final class Wrap {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void before(
+        @Advice.Argument(value = 0) final String subscription,
+        @Advice.Argument(value = 1, readOnly = false) MessageReceiverWithAckResponse receiver) {
+      receiver = new MessageReceiverWithAckResponseWrapper(subscription, receiver);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java
new file mode 100644
index 00000000000..d84d0176c80
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java
@@ -0,0 +1,36 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import java.util.Map;
+
+public class TextMapExtractAdapter
+    implements AgentPropagation.ContextVisitor<PubsubMessage>,
+        AgentPropagation.BinaryContextVisitor<PubsubMessage> {
+
+  public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
+
+  @Override
+  public void forEachKey(PubsubMessage carrier, AgentPropagation.KeyClassifier classifier) {
+    for (Map.Entry<String, String> kv : carrier.getAttributesMap().entrySet()) {
+      String value = kv.getValue();
+      if (null != value) {
+        if (!classifier.accept(kv.getKey(), value)) {
+          return;
+        }
+      }
+    }
+  }
+
+  @Override
+  public void forEachKey(PubsubMessage carrier, AgentPropagation.BinaryKeyClassifier classifier) {
+    for (Map.Entry<String, String> kv : carrier.getAttributesMap().entrySet()) {
+      String value = kv.getValue();
+      if (null != value) {
+        if (!classifier.accept(kv.getKey(), value.getBytes())) {
+          return;
+        }
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java
new file mode 100644
index 00000000000..defb1513bbe
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java
@@ -0,0 +1,22 @@
+package datadog.trace.instrumentation.googlepubsub;
+
+import com.google.pubsub.v1.PubsubMessage;
+import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import java.nio.charset.StandardCharsets;
+
+public class TextMapInjectAdapter
+    implements AgentPropagation.Setter<PubsubMessage.Builder>,
+        AgentPropagation.BinarySetter<PubsubMessage.Builder> {
+
+  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+
+  @Override
+  public void set(final PubsubMessage.Builder msg, final String key, final String value) {
+    msg.putAttributes(key, value);
+  }
+
+  @Override
+  public void set(PubsubMessage.Builder msg, String key, byte[] value) {
+    msg.putAttributes(key, new String(value, StandardCharsets.UTF_8));
+  }
+}
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
new file mode 100644
index 00000000000..da075a39d1f
--- /dev/null
+++ b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
@@ -0,0 +1,378 @@
+import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
+
+import com.google.api.gax.core.NoCredentialsProvider
+import com.google.api.gax.grpc.GrpcTransportChannel
+import com.google.api.gax.rpc.FixedTransportChannelProvider
+import com.google.api.gax.rpc.TransportChannelProvider
+import com.google.cloud.pubsub.v1.AckReplyConsumer
+import com.google.cloud.pubsub.v1.AckReplyConsumerWithResponse
+import com.google.cloud.pubsub.v1.MessageReceiver
+import com.google.cloud.pubsub.v1.MessageReceiverWithAckResponse
+import com.google.cloud.pubsub.v1.Publisher
+import com.google.cloud.pubsub.v1.Subscriber
+import com.google.cloud.pubsub.v1.SubscriptionAdminClient
+import com.google.cloud.pubsub.v1.SubscriptionAdminSettings
+import com.google.cloud.pubsub.v1.TopicAdminClient
+import com.google.cloud.pubsub.v1.TopicAdminSettings
+import com.google.protobuf.ByteString
+import com.google.pubsub.v1.PubsubMessage
+import com.google.pubsub.v1.PushConfig
+import com.google.pubsub.v1.SubscriptionName
+import com.google.pubsub.v1.TopicName
+import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.agent.test.naming.VersionedNamingTestBase
+import datadog.trace.agent.test.utils.TraceUtils
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
+import datadog.trace.api.config.GeneralConfig
+import datadog.trace.api.config.TraceInstrumentationConfig
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.core.DDSpan
+import datadog.trace.core.datastreams.StatsGroup
+import datadog.trace.instrumentation.grpc.client.GrpcClientDecorator
+import io.grpc.ManagedChannel
+import io.grpc.ManagedChannelBuilder
+import org.testcontainers.containers.PubSubEmulatorContainer
+import org.testcontainers.utility.DockerImageName
+import spock.lang.Shared
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.CountDownLatch
+import java.util.function.Function
+import java.util.function.ToDoubleFunction
+import java.util.function.ToIntFunction
+import java.util.function.ToLongFunction
+
+abstract class PubSubTest extends VersionedNamingTestBase {
+  private static final String PROJECT_ID = "dd-trace-java"
+
+  private static final String TOPIC_ID = "test-topic"
+
+  private static final String SUBSCRIPTION_ID = "my-subscription"
+
+  @Shared
+  PubSubEmulatorContainer emulator
+
+  @Shared
+  ManagedChannel channel
+
+  @Shared
+  TransportChannelProvider transportChannelProvider
+
+  @Shared
+  def noCredentialsProvider = NoCredentialsProvider.create()
+
+  @Shared
+  String subscriptionName
+
+  @Override
+  String operation() {
+    //specialized methods below
+    null
+  }
+
+  @Override
+  boolean useStrictTraceWrites() {
+    false
+  }
+
+  boolean shadowGrpcSpans() {
+    true
+  }
+
+  abstract String operationForConsumer()
+
+  abstract String operationForProducer()
+
+  Object createMessageReceiver(final CountDownLatch latch) {
+    return new MessageReceiver() {
+        @Override
+        void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
+          consumer.ack()
+          latch.countDown()
+        }
+      }
+  }
+
+  def setupSpec() {
+    emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:emulators"))
+    emulator.start()
+    channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build()
+    transportChannelProvider = FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel))
+    createTopic(TOPIC_ID)
+    subscriptionName = createSubscription(SUBSCRIPTION_ID, TOPIC_ID).getName()
+  }
+
+  def cleanupSpec() {
+    channel.shutdown()
+    emulator.stop()
+  }
+
+  def createTopic(String topicId) throws IOException {
+    TopicAdminSettings topicAdminSettings = TopicAdminSettings
+    .newBuilder()
+    .setTransportChannelProvider(transportChannelProvider)
+    .setCredentialsProvider(noCredentialsProvider)
+    .build()
+    try (TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings)) {
+      TopicName topicName = TopicName.of(PROJECT_ID, topicId)
+      topicAdminClient.createTopic(topicName)
+    }
+  }
+
+  def createSubscription(String subscriptionId, String topicId) throws IOException {
+    SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings
+    .newBuilder()
+    .setTransportChannelProvider(transportChannelProvider)
+    .setCredentialsProvider(noCredentialsProvider)
+    .build()
+    try (final SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings)) {
+      SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId)
+      subscriptionAdminClient.createSubscription(subscriptionName, TopicName.of(PROJECT_ID, topicId), PushConfig.getDefaultInstance(), 100)
+    }
+  }
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    injectSysConfig(GeneralConfig.SERVICE_NAME, "A-service")
+    injectSysConfig(GeneralConfig.DATA_STREAMS_ENABLED, isDataStreamsEnabled().toString())
+    if (!shadowGrpcSpans()) {
+      injectSysConfig(TraceInstrumentationConfig.GOOGLE_PUBSUB_IGNORED_GRPC_METHODS, "")
+    }
+  }
+
+  def "trace is propagated between producer and consumer"() {
+    setup:
+    def publisher = Publisher
+    .newBuilder(TopicName.of(PROJECT_ID, TOPIC_ID))
+    .setChannelProvider(transportChannelProvider)
+    .setCredentialsProvider(noCredentialsProvider)
+    .build()
+    def latch = new CountDownLatch(1)
+
+
+    def subscriber = Subscriber.newBuilder(subscriptionName, createMessageReceiver(latch))
+    .setChannelProvider(transportChannelProvider)
+    .setCredentialsProvider(noCredentialsProvider)
+    .build()
+    subscriber.startAsync().awaitRunning()
+    TEST_WRITER.clear()
+    TEST_DATA_STREAMS_WRITER.clear()
+
+    when:
+    TraceUtils.runUnderTrace('parent', {
+      publisher.publish(PubsubMessage.newBuilder().setData(ByteString.copyFrom('sometext', StandardCharsets.UTF_8)).build())
+    })
+    // wait for messages to be consumed
+    latch.await()
+
+    then:
+    def sendSpan
+    assertTraces(shadowGrpcSpans() ? 2 : 4, [
+      compare            : { List<DDSpan> o1, List<DDSpan> o2 ->
+        // trace will never be empty
+        o1[0].localRootSpan.getTag(Tags.SPAN_KIND) <=> o2[0].localRootSpan.getTag(Tags.SPAN_KIND)
+      },
+    ] as Comparator) {
+      trace(shadowGrpcSpans() ? 2 : 4) {
+        sortSpansByStart()
+        basicSpan(it, "parent")
+        span {
+          serviceName service()
+          operationName operationForProducer()
+          resourceName "Produce Topic test-topic"
+          spanType DDSpanTypes.MESSAGE_PRODUCER
+          errored false
+          measured true
+          childOfPrevious()
+          tags {
+            "$Tags.COMPONENT" "java-google-pubsub"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER
+            if ({ isDataStreamsEnabled() }) {
+              "$DDTags.PATHWAY_HASH" { String }
+            }
+            defaultTagsNoPeerService()
+          }
+        }
+        // Publish
+        if (!shadowGrpcSpans()) {
+          grpcSpans(it)
+        }
+        sendSpan = span(1)
+      }
+      if (!shadowGrpcSpans()) {
+        // Acknowledge
+        trace(2) {
+          grpcSpans(it, "A-service", true)
+        }
+        // ModifyAckDeadline
+        trace(2) {
+          grpcSpans(it, "A-service", true)
+        }
+      }
+      trace(1) {
+        span {
+          serviceName service()
+          operationName operationForConsumer()
+          resourceName "Consume Subscription my-subscription"
+          spanType DDSpanTypes.MESSAGE_CONSUMER
+          topLevel true
+          errored false
+          measured true
+          tags {
+            "$Tags.COMPONENT" "java-google-pubsub"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER
+            if ({ isDataStreamsEnabled() }) {
+              "$DDTags.PATHWAY_HASH" { String }
+            }
+            defaultTags(true)
+          }
+        }
+      }
+    }
+    and:
+    if (isDataStreamsEnabled()) {
+      TEST_DATA_STREAMS_WRITER.waitForGroups(2)
+
+      StatsGroup sendStat = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0}
+      verifyAll (sendStat) {
+        edgeTags.containsAll(["direction:out" , "topic:test-topic", "type:google-pubsub"])
+        edgeTags.size() == 3
+      }
+      StatsGroup receiveStat = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == sendStat.hash}
+      verifyAll(receiveStat) {
+        edgeTags.containsAll(["direction:in" , "subscription:my-subscription", "type:google-pubsub"])
+        edgeTags.size() == 3
+        pathwayLatency.count == 1
+        pathwayLatency.minValue > 0.0
+        edgeLatency.count == 1
+        edgeLatency.minValue > 0.0
+        payloadSize.minValue > 0.0
+      }
+    }
+    cleanup:
+    publisher.shutdown()
+    subscriber.stopAsync().awaitTerminated()
+  }
+
+
+  def grpcSpans(TraceAssert traceAssert, String service = service(), boolean traceRoot = false) {
+    traceAssert.span {
+      serviceName service
+      operationName GrpcClientDecorator.OPERATION_NAME.toString()
+      resourceName { true }
+      spanType DDSpanTypes.RPC
+      errored false
+      measured true
+      if (traceRoot) {
+        topLevel true
+      } else {
+        childOfPrevious()
+      }
+      tags {
+        "$Tags.COMPONENT" "grpc-client"
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+        "request.type" { String }
+        "response.type" { String }
+        "$Tags.RPC_SERVICE" { String }
+        "status.code" { String }
+        if ({ isDataStreamsEnabled() }) {
+          "$DDTags.PATHWAY_HASH" { String }
+        }
+        "$Tags.PEER_HOSTNAME" "localhost"
+        "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+        "$Tags.PEER_PORT" { Integer }
+        peerServiceFrom(Tags.RPC_SERVICE)
+        defaultTags()
+      }
+    }
+    traceAssert.span {
+      serviceName service
+      operationName "grpc.message"
+      resourceName "grpc.message"
+      spanType DDSpanTypes.RPC
+      errored false
+      measured true
+      childOfPrevious()
+      tags {
+        "$Tags.COMPONENT" "grpc-client"
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+        "message.type" { String }
+        defaultTagsNoPeerService()
+      }
+    }
+  }
+}
+
+class PubSubNamingV0Test extends PubSubTest {
+  @Override
+  String operationForConsumer() {
+    "google-pubsub.consume"
+  }
+
+  @Override
+  String operationForProducer() {
+    "google-pubsub.produce"
+  }
+
+  @Override
+  int version() {
+    return 0
+  }
+
+  @Override
+  String service() {
+    "google-pubsub"
+  }
+}
+
+
+class PubSubNamingV1ForkedTest extends PubSubTest {
+  @Override
+  String operationForConsumer() {
+    "gcp.pubsub.process"
+  }
+
+  @Override
+  String operationForProducer() {
+    "gcp.pubsub.send"
+  }
+
+  @Override
+  int version() {
+    return 1
+  }
+
+  @Override
+  String service() {
+    "A-service"
+  }
+}
+
+class PubSubLogGrpcSpansForkedTest extends PubSubNamingV0Test {
+  @Override
+  boolean shadowGrpcSpans() {
+    false
+  }
+}
+
+class PubSubMessageReceiverWithAckResponseTest extends PubSubNamingV0Test {
+  @Override
+  Object createMessageReceiver(CountDownLatch latch) {
+    new MessageReceiverWithAckResponse() {
+      @Override
+      void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) {
+        consumer.ack().get()
+        latch.countDown()
+      }
+    }
+  }
+}
+
+class PubSubDataStreamEnabledForkedTest extends PubSubNamingV0Test {
+  @Override
+  protected boolean isDataStreamsEnabled() {
+    return true
+  }
+}
diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
index 319d3c9c0a5..fc9fa0d368c 100644
--- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
@@ -55,10 +55,15 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
               + "META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json";
       args[oldLength++] =
           "-H:ClassInitialization="
+              + "com.datadog.profiling.controller.openjdk.events.AvailableProcessorCoresEvent:build_time,"
+              + "com.datadog.profiling.controller.openjdk.events.ProfilerSettingEvent:build_time,"
               + "datadog.trace.api.Config:rerun,"
               + "datadog.trace.api.Platform:rerun,"
+              + "datadog.trace.api.Platform$Captured:build_time,"
               + "datadog.trace.api.env.CapturedEnvironment:build_time,"
+              + "datadog.trace.api.ConfigCollector:rerun,"
               + "datadog.trace.api.ConfigDefaults:build_time,"
+              + "datadog.trace.api.ConfigSetting:build_time,"
               + "datadog.trace.api.InstrumenterConfig:build_time,"
               + "datadog.trace.api.Functions:build_time,"
               + "datadog.trace.api.GlobalTracer:build_time,"
@@ -79,6 +84,8 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
               + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter:build_time,"
               + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimeHelper:build_time,"
               + "datadog.trace.bootstrap.instrumentation.java.concurrent.TPEHelper:build_time,"
+              + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionCountEvent:build_time,"
+              + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionSampleEvent:build_time,"
               + "datadog.trace.logging.LoggingSettingsDescription:build_time,"
               + "datadog.trace.logging.simplelogger.SLCompatFactory:build_time,"
               + "datadog.trace.util.CollectionUtils:build_time,"
diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
index 5495d1ea758..561aef19703 100644
--- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
@@ -37,7 +37,12 @@ public static void onExit() {
         "dd-trace-api.version",
         "trace/dd-trace-core.version",
         "shared/dogstatsd/version.properties",
-        "shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz"
+        "shared/version-utils.version",
+        "shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz",
+        "profiling/jfr/dd.jfp",
+        "profiling/jfr/safepoints.jfp",
+        "profiling/jfr/overrides/comprehensive.jfp",
+        "profiling/jfr/overrides/minimal.jfp"
       };
 
       for (String original : tracerResources) {
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
new file mode 100644
index 00000000000..04fb13ba7b6
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
@@ -0,0 +1,217 @@
+package datadog.trace.instrumentation.gradle;
+
+import datadog.trace.api.Config;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.gradle.BuildAdapter;
+import org.gradle.BuildResult;
+import org.gradle.StartParameter;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.internal.BuildDefinition;
+import org.gradle.api.internal.StartParameterInternal;
+import org.gradle.api.internal.project.taskfactory.TaskIdentity;
+import org.gradle.api.invocation.Gradle;
+import org.gradle.api.plugins.PluginManager;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.services.BuildServiceRegistry;
+import org.gradle.api.tasks.TaskState;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.build.event.BuildEventsListenerRegistry;
+import org.gradle.execution.taskgraph.TaskListenerInternal;
+import org.gradle.internal.InternalBuildListener;
+import org.gradle.internal.build.BuildState;
+import org.gradle.internal.build.NestedBuildState;
+import org.gradle.internal.build.RootBuildState;
+import org.gradle.internal.service.scopes.ListenerService;
+
+@ListenerService
+public class CiVisibilityGradleListener extends BuildAdapter
+    implements InternalBuildListener, TaskListenerInternal {
+
+  private static final String TRACER_VERSION;
+
+  static {
+    try (BufferedReader reader =
+        new BufferedReader(
+            new InputStreamReader(
+                ClassLoader.getSystemResourceAsStream("dd-java-agent.version")))) {
+      TRACER_VERSION = reader.lines().collect(Collectors.joining());
+    } catch (IOException e) {
+      throw new RuntimeException("Could not read tracer version from dd-java-agent.version", e);
+    }
+  }
+
+  {
+    /*
+     * Gradle's configuration cache has a set of "inputs" that determine whether an existing entry
+     * can be reused, or a new one should be created.
+     * Presence or absence of a javaagent and the variables that are used for the tracer configuration are
+     * not among those inputs.
+     * That means that a cache entry created without the tracer can be reused when the tracer is present:
+     * as the result test tasks will not be instrumented.
+     * Or the other way around, a cache entry created with the tracer can be reused when the tracer is absent:
+     * as the result a test task may try to access CI Visibility services and fail.
+     * Likewise, a cache entry created with an older version of the tracer can be reused with the newer version
+     * of the tracer, which is undesirable if there are some changes in the tasks configuration logic.
+     * To prevent this we have to ensure that the presence or absence of tracer, as well as the version of the tracer,
+     * is a part of the configuration cache inputs.
+     * We do this by settings the system property below, since all properties with the prefix "org.gradle.project."
+     * are included into configuration cache inputs by default.
+     *
+     * Please note that this has to be done for every build, so this block has to be dynamic and not static.
+     */
+    System.setProperty("org.gradle.project.datadog.tracer.version", TRACER_VERSION);
+  }
+
+  private final Config config = Config.get();
+  private final Gradle gradle;
+  private final CiVisibilityService ciVisibilityService;
+
+  public CiVisibilityGradleListener(
+      Gradle gradle,
+      BuildState buildState,
+      BuildEventsListenerRegistry buildEventsListenerRegistry) {
+    this.gradle = gradle;
+
+    BuildServiceRegistry sharedServices = gradle.getSharedServices();
+    Provider<CiVisibilityService> ciVisibilityServiceProvider =
+        sharedServices.registerIfAbsent(
+            "ciVisibilityService", CiVisibilityService.class, spec -> {});
+    // registration is needed to keep the service alive until the end of the build
+    buildEventsListenerRegistry.onTaskCompletion(ciVisibilityServiceProvider);
+    ciVisibilityService = ciVisibilityServiceProvider.get();
+
+    String buildPath = buildState.getBuildIdentifier().getBuildPath();
+    Path projectRoot = buildState.getBuildRootDir().toPath();
+
+    boolean nestedBuild;
+    String nestedBuildPath;
+    if (buildState instanceof NestedBuildState) {
+      nestedBuild = true;
+      nestedBuildPath = buildPath;
+    } else {
+      nestedBuild = false;
+      nestedBuildPath = null;
+    }
+
+    StartParameterInternal startParameter = getStartParameter(buildState);
+    String startCommand = recreateStartCommand(startParameter, nestedBuildPath);
+    String gradleVersion = gradle.getGradleVersion();
+    ciVisibilityService.onBuildStart(
+        buildPath, projectRoot, startCommand, gradleVersion, nestedBuild);
+  }
+
+  private static StartParameterInternal getStartParameter(BuildState buildState) {
+    if (buildState instanceof RootBuildState) {
+      RootBuildState rootBuildState = (RootBuildState) buildState;
+      return rootBuildState.getStartParameter();
+    } else if (buildState instanceof NestedBuildState) {
+      NestedBuildState nestedBuildState = (NestedBuildState) buildState;
+      BuildDefinition buildDefinition = nestedBuildState.getBuildDefinition();
+      return buildDefinition.getStartParameter();
+    } else {
+      throw new IllegalArgumentException("Unexpected build state: " + buildState);
+    }
+  }
+
+  /**
+   * Returns command line used to start the build. We instrument Gradle daemon process, not the
+   * client process that is launched from the command line, so the result of this method is an
+   * approximation of what the actual command could look like
+   */
+  private static String recreateStartCommand(StartParameter startParameter, String buildPath) {
+    StringBuilder command = new StringBuilder("gradle");
+
+    if (buildPath != null && !buildPath.isEmpty()) {
+      command.append(' ').append(buildPath);
+    }
+
+    for (String taskName : startParameter.getTaskNames()) {
+      command.append(' ').append(taskName);
+    }
+
+    for (String excludedTaskName : startParameter.getExcludedTaskNames()) {
+      command.append(" -x").append(excludedTaskName);
+    }
+
+    for (Map.Entry<String, String> e : startParameter.getProjectProperties().entrySet()) {
+      String propertyKey = e.getKey();
+      String propertyValue = e.getValue();
+      command.append(" -P").append(propertyKey);
+      if (propertyValue != null && !propertyValue.isEmpty()) {
+        command.append('=').append(propertyValue);
+      }
+    }
+
+    for (Map.Entry<String, String> e : startParameter.getSystemPropertiesArgs().entrySet()) {
+      String propertyKey = e.getKey();
+      String propertyValue = e.getValue();
+      command.append(" -D").append(propertyKey);
+      if (propertyValue != null && !propertyValue.isEmpty()) {
+        command.append('=').append(propertyValue);
+      }
+    }
+
+    return command.toString();
+  }
+
+  @Override
+  public void projectsEvaluated(Gradle gradle) {
+    if (!config.isCiVisibilityAutoConfigurationEnabled()) {
+      return;
+    }
+
+    Project rootProject = gradle.getRootProject();
+    Set<Project> projects = rootProject.getAllprojects();
+    for (Project project : projects) {
+      PluginManager pluginManager = project.getPluginManager();
+      pluginManager.apply(CiVisibilityPlugin.class);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public void beforeExecute(TaskIdentity<?> taskIdentity) {
+    if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
+      return;
+    }
+
+    String projectPath = taskIdentity.getProjectPath();
+    String taskPath = taskIdentity.getTaskPath();
+
+    Project project = gradle.getRootProject().project(projectPath);
+    Task task = project.getTasks().getByName(taskIdentity.name);
+
+    Collection<File> compiledClassFolders =
+        (Collection<File>)
+            task.getInputs()
+                .getProperties()
+                .get(CiVisibilityPluginExtension.COMPILED_CLASS_FOLDERS_PROPERTY);
+    ciVisibilityService.onModuleStart(taskPath, compiledClassFolders);
+  }
+
+  @Override
+  public void afterExecute(TaskIdentity<?> taskIdentity, TaskState state) {
+    if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
+      return;
+    }
+
+    String taskPath = taskIdentity.getTaskPath();
+    Throwable failure = state.getFailure();
+    String reason = state.getSkipped() || !state.getDidWork() ? state.getSkipMessage() : null;
+    ciVisibilityService.onModuleFinish(taskPath, failure, reason);
+  }
+
+  @Override
+  public void buildFinished(BuildResult result) {
+    ciVisibilityService.onBuildFinish(result.getFailure());
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerProvider.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerProvider.java
new file mode 100644
index 00000000000..a0d561fff70
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerProvider.java
@@ -0,0 +1,36 @@
+package datadog.trace.instrumentation.gradle;
+
+import org.gradle.initialization.ClassLoaderRegistry;
+import org.gradle.internal.service.ServiceRegistration;
+
+public class CiVisibilityGradleListenerProvider {
+  private final ClassLoaderRegistry classLoaderRegistry;
+
+  public CiVisibilityGradleListenerProvider(ClassLoaderRegistry classLoaderRegistry) {
+    this.classLoaderRegistry = classLoaderRegistry;
+  }
+
+  public void configure(ServiceRegistration serviceRegistration) {
+    Class<?> ciVisibilityGradleListener = loadCiVisibilityGradleListener();
+    serviceRegistration.add(ciVisibilityGradleListener);
+  }
+
+  /**
+   * There are several class loaders in Gradle that load various parts of the system: core classes,
+   * plugins, etc. This provider class is injected into the core classloader since it is invoked by
+   * the build service registry, which is a part of the Gradle core. The CI Visibility listener
+   * (that is being registered as a service here) is injected into the plugins classloader because
+   * it needs to work with domain objects from Gradle Testing JVM (e.g. {@link
+   * org.gradle.api.tasks.testing.Test} task), which is a plugin. Therefore, we cannot reference its
+   * {@code Class} instance directly, and instead have to load it explicitly.
+   */
+  private Class<?> loadCiVisibilityGradleListener() {
+    try {
+      return classLoaderRegistry
+          .getPluginsClassLoader()
+          .loadClass("datadog.trace.instrumentation.gradle.CiVisibilityGradleListener");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException("Could not load CI Visibility Gradle Listener", e);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java
new file mode 100644
index 00000000000..bacb7914fa6
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java
@@ -0,0 +1,154 @@
+package datadog.trace.instrumentation.gradle;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.SourceSetOutput;
+import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.testing.jacoco.plugins.JacocoPluginExtension;
+
+public abstract class CiVisibilityPlugin implements Plugin<Project> {
+
+  private static final Logger LOGGER = Logging.getLogger(CiVisibilityPlugin.class);
+
+  private static final String PLUGIN_EXTENSION_NAME = "dd-ci-visibility";
+  private static final String JACOCO_PLUGIN_ID = "jacoco";
+
+  private Project project;
+
+  @Override
+  public void apply(Project project) {
+    this.project = project;
+
+    CiVisibilityPluginExtension extension =
+        project
+            .getExtensions()
+            .create(PLUGIN_EXTENSION_NAME, CiVisibilityPluginExtension.class, project.getObjects());
+    calculateCompiledClassesFolders(extension);
+    applyCompilerPlugin(extension);
+    applyJacocoPlugin(extension);
+    applyToTestTasks(extension);
+  }
+
+  private void calculateCompiledClassesFolders(CiVisibilityPluginExtension extension) {
+    FileCollection compiledClassFolders = project.files();
+    SourceSetContainer sourceSets = project.getExtensions().findByType(SourceSetContainer.class);
+    if (sourceSets == null) {
+      return;
+    }
+    List<String> sourceSetNames = extension.getCoverageEnabledSourceSets();
+    for (String sourceSetName : sourceSetNames) {
+      SourceSet sourceSet = sourceSets.findByName(sourceSetName);
+      if (sourceSet != null) {
+        SourceSetOutput output = sourceSet.getOutput();
+        FileCollection classesDirs = output.getClassesDirs();
+        compiledClassFolders = compiledClassFolders.plus(classesDirs);
+      }
+    }
+    extension.setCompiledClassesFolders(compiledClassFolders);
+  }
+
+  private void applyCompilerPlugin(CiVisibilityPluginExtension extension) {
+    if (extension.isCompilerPluginEnabled()) {
+      addCompilerPluginConfigurations(extension);
+      addModuleName(extension);
+      applyToCompileTasks(extension);
+    }
+  }
+
+  public void addCompilerPluginConfigurations(CiVisibilityPluginExtension extension) {
+    Configuration configuration =
+        project
+            .getConfigurations()
+            .detachedConfiguration(
+                project
+                    .getDependencies()
+                    .create(
+                        String.format(
+                            "com.datadoghq:dd-javac-plugin:%s",
+                            extension.getCompilerPluginVersion())),
+                project
+                    .getDependencies()
+                    .create(
+                        String.format(
+                            "com.datadoghq:dd-javac-plugin-client:%s",
+                            extension.getCompilerPluginVersion())));
+
+    // if instrumented project does dependency verification,
+    // we need to exclude the detached configurations that we're adding
+    // as corresponding entries are not in the project's verification-metadata.xml
+    configuration.getResolutionStrategy().disableDependencyVerification();
+
+    extension.setCompilerPluginClasspath(configuration);
+  }
+
+  private void addModuleName(CiVisibilityPluginExtension extension) {
+    extension.setModuleName(getModuleName());
+  }
+
+  private static final Pattern MODULE_NAME_PATTERN =
+      Pattern.compile("\\s*module\\s*((\\w|\\.)+)\\s*\\{");
+
+  private String getModuleName() {
+    Path projectDir = project.getProjectDir().toPath();
+    Path moduleInfo = projectDir.resolve(Paths.get("src", "main", "java", "module-info.java"));
+    try {
+      if (Files.exists(moduleInfo)) {
+        List<String> lines = Files.readAllLines(moduleInfo);
+        for (String line : lines) {
+          Matcher matcher = MODULE_NAME_PATTERN.matcher(line);
+          if (matcher.matches()) {
+            return matcher.group(1);
+          }
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not read module name from {}", moduleInfo, e);
+    }
+    return null;
+  }
+
+  private void applyToCompileTasks(CiVisibilityPluginExtension extension) {
+    project.getTasks().withType(JavaCompile.class).configureEach(extension::applyTo);
+  }
+
+  private void applyJacocoPlugin(CiVisibilityPluginExtension extension) {
+    if (!extension.isCodeCoverageEnabled(project)
+        || project.getPluginManager().hasPlugin(JACOCO_PLUGIN_ID)) {
+      return;
+    }
+
+    project.getPluginManager().apply(JACOCO_PLUGIN_ID);
+    JacocoPluginExtension jacocoExtension =
+        project.getExtensions().getByType(JacocoPluginExtension.class);
+    jacocoExtension.setToolVersion(extension.getJacocoVersion());
+
+    List<Configuration> jacocoConfigurations =
+        project.getConfigurations().stream()
+            .filter(c -> c.getName().startsWith("jacoco"))
+            .collect(Collectors.toList());
+    for (Configuration jacocoConfiguration : jacocoConfigurations) {
+      // if instrumented project does dependency verification,
+      // we need to exclude configurations added by Jacoco
+      // as corresponding entries are not in the project's verification-metadata.xml
+      jacocoConfiguration.getResolutionStrategy().disableDependencyVerification();
+    }
+  }
+
+  private void applyToTestTasks(CiVisibilityPluginExtension extension) {
+    project.getTasks().withType(Test.class).configureEach(extension::applyTo);
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
new file mode 100644
index 00000000000..dbd42508f6d
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
@@ -0,0 +1,183 @@
+package datadog.trace.instrumentation.gradle;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.inject.Inject;
+import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.Property;
+import org.gradle.api.services.ServiceReference;
+import org.gradle.api.tasks.compile.CompileOptions;
+import org.gradle.api.tasks.compile.ForkOptions;
+import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.internal.jvm.Jvm;
+import org.gradle.jvm.toolchain.JavaLauncher;
+import org.gradle.process.CommandLineArgumentProvider;
+import org.gradle.testing.jacoco.plugins.JacocoTaskExtension;
+
+public abstract class CiVisibilityPluginExtension {
+
+  private static final Logger LOGGER = Logging.getLogger(CiVisibilityPluginExtension.class);
+
+  public static final String COMPILED_CLASS_FOLDERS_PROPERTY = "compiledClassFolders";
+
+  private final ObjectFactory objectFactory;
+  private FileCollection compilerPluginClasspath;
+  private String moduleName;
+  private FileCollection compiledClassFolders;
+
+  @Inject
+  public CiVisibilityPluginExtension(ObjectFactory objectFactory) {
+    this.objectFactory = objectFactory;
+  }
+
+  public void setCompilerPluginClasspath(FileCollection compilerPluginClasspath) {
+    this.compilerPluginClasspath = compilerPluginClasspath;
+  }
+
+  public void setModuleName(String moduleName) {
+    this.moduleName = moduleName;
+  }
+
+  public void setCompiledClassesFolders(FileCollection compiledClassFolders) {
+    this.compiledClassFolders = compiledClassFolders;
+  }
+
+  @ServiceReference
+  abstract Property<CiVisibilityService> getCiVisibilityService();
+
+  public boolean isCompilerPluginEnabled() {
+    return getCiVisibilityService().get().isCompilerPluginEnabled();
+  }
+
+  public String getCompilerPluginVersion() {
+    return getCiVisibilityService().get().getCompilerPluginVersion();
+  }
+
+  public boolean isCodeCoverageEnabled(Project project) {
+    CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
+    return project.getTasks().withType(Test.class).stream()
+        .map(this::getEffectiveExecutable)
+        .anyMatch(ciVisibilityService::isCodeCoverageEnabled);
+  }
+
+  public List<String> getCoverageEnabledSourceSets() {
+    return getCiVisibilityService().get().getCoverageEnabledSourceSets();
+  }
+
+  public String getJacocoVersion() {
+    return getCiVisibilityService().get().getJacocoVersion();
+  }
+
+  public void applyTo(JavaCompile javaCompile) {
+    CompileOptions options = javaCompile.getOptions();
+    ForkOptions forkOptions = options.getForkOptions();
+    String compilerExecutable = forkOptions.getExecutable();
+    if (compilerExecutable != null && !compilerExecutable.isEmpty()) {
+      // assuming a non-standard compiler is used
+      return;
+    }
+
+    FileCollection classpath = javaCompile.getClasspath();
+    FileCollection updatedClasspath =
+        classpath != null ? classpath.plus(compilerPluginClasspath) : compilerPluginClasspath;
+    javaCompile.setClasspath(updatedClasspath);
+
+    FileCollection annotationProcessorPath = options.getAnnotationProcessorPath();
+    FileCollection updatedAnnotationProcessorPath =
+        annotationProcessorPath != null
+            ? annotationProcessorPath.plus(compilerPluginClasspath)
+            : compilerPluginClasspath;
+    options.setAnnotationProcessorPath(updatedAnnotationProcessorPath);
+
+    CommandLineArgumentProvider argumentProvider =
+        new JavaCompilerPluginArgumentsProvider(moduleName);
+    options.getCompilerArgumentProviders().add(argumentProvider);
+  }
+
+  public void applyTo(Test task) {
+    task.getInputs().property(COMPILED_CLASS_FOLDERS_PROPERTY, compiledClassFolders.getFiles());
+
+    Path jvmExecutable = getEffectiveExecutable(task);
+    applyTracerSettings(
+        jvmExecutable, task.getPath(), getProjectProperties(task), task.getJvmArgumentProviders());
+
+    JacocoTaskExtension jacocoTaskExtension =
+        task.getExtensions().findByType(JacocoTaskExtension.class);
+    if (jacocoTaskExtension != null) {
+      applyJacocoSettings(jvmExecutable, jacocoTaskExtension);
+    }
+  }
+
+  private Path getEffectiveExecutable(Test task) {
+    Property<JavaLauncher> javaLauncher = task.getJavaLauncher();
+    if (javaLauncher.isPresent()) {
+      try {
+        return javaLauncher.get().getExecutablePath().getAsFile().toPath();
+      } catch (Exception e) {
+        LOGGER.error("Could not get Java launcher for test task", e);
+      }
+    }
+    String executable = task.getExecutable();
+    if (executable != null && !executable.isEmpty()) {
+      return Paths.get(executable);
+    } else {
+      return Jvm.current().getJavaExecutable().toPath();
+    }
+  }
+
+  private static Map<String, String> getProjectProperties(Test task) {
+    Map<String, String> projectProperties = new HashMap<>();
+    for (Map.Entry<String, ?> e : task.getProject().getProperties().entrySet()) {
+      String propertyName = e.getKey();
+      Object propertyValue = e.getValue();
+      if (propertyValue instanceof String) {
+        projectProperties.put(propertyName, (String) propertyValue);
+      }
+    }
+    return projectProperties;
+  }
+
+  private void applyJacocoSettings(Path jvmExecutable, JacocoTaskExtension jacocoTaskExtension) {
+    CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
+
+    List<String> taskExcludeClassLoader = jacocoTaskExtension.getExcludeClassLoaders();
+    if (taskExcludeClassLoader != null) {
+      taskExcludeClassLoader.addAll(ciVisibilityService.getExcludeClassLoaders());
+    } else {
+      jacocoTaskExtension.setExcludeClassLoaders(
+          new ArrayList<>(ciVisibilityService.getExcludeClassLoaders()));
+    }
+
+    List<String> taskIncludePackages = jacocoTaskExtension.getIncludes();
+    if (taskIncludePackages == null) {
+      taskIncludePackages = new ArrayList<>();
+      jacocoTaskExtension.setIncludes(taskIncludePackages);
+    }
+    for (String coverageEnabledPackage :
+        ciVisibilityService.getCoverageEnabledPackages(jvmExecutable)) {
+      if (coverageEnabledPackage != null && !coverageEnabledPackage.isEmpty()) {
+        taskIncludePackages.add(coverageEnabledPackage);
+      }
+    }
+  }
+
+  private void applyTracerSettings(
+      Path jvmExecutable,
+      String taskPath,
+      Map<String, String> projectProperties,
+      List<CommandLineArgumentProvider> jvmArgumentProviders) {
+    CommandLineArgumentProvider tracerArgumentsProvider =
+        objectFactory.newInstance(
+            TracerArgumentsProvider.class, taskPath, jvmExecutable, projectProperties);
+    jvmArgumentProviders.add(tracerArgumentsProvider);
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java
new file mode 100644
index 00000000000..4c283f1df9c
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java
@@ -0,0 +1,147 @@
+package datadog.trace.instrumentation.gradle;
+
+import datadog.trace.api.Config;
+import datadog.trace.api.civisibility.InstrumentationBridge;
+import datadog.trace.api.civisibility.config.ModuleExecutionSettings;
+import datadog.trace.api.civisibility.events.BuildEventsHandler;
+import datadog.trace.api.config.CiVisibilityConfig;
+import datadog.trace.bootstrap.DatadogClassLoader;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
+import datadog.trace.util.Strings;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.gradle.api.services.BuildService;
+import org.gradle.api.services.BuildServiceParameters;
+import org.gradle.tooling.events.FinishEvent;
+import org.gradle.tooling.events.OperationCompletionListener;
+
+public abstract class CiVisibilityService
+    implements BuildService<BuildServiceParameters.None>, OperationCompletionListener {
+
+  // using constant session key, since the service is already build-scoped
+  private static final Object SESSION_KEY = new Object();
+  private final Config config = Config.get();
+  private final BuildEventsHandler<Object> buildEventsHandler =
+      InstrumentationBridge.createBuildEventsHandler();
+
+  public boolean isCompilerPluginEnabled() {
+    return config.isCiVisibilityCompilerPluginAutoConfigurationEnabled();
+  }
+
+  public String getCompilerPluginVersion() {
+    return config.getCiVisibilityCompilerPluginVersion();
+  }
+
+  public boolean isCodeCoverageEnabled(Path jvmExecutable) {
+    ModuleExecutionSettings moduleExecutionSettings =
+        buildEventsHandler.getModuleExecutionSettings(SESSION_KEY, jvmExecutable);
+    return moduleExecutionSettings.isCodeCoverageEnabled();
+  }
+
+  public String getJacocoVersion() {
+    return config.getCiVisibilityJacocoPluginVersion();
+  }
+
+  public List<String> getExcludeClassLoaders() {
+    return Collections.singletonList(DatadogClassLoader.class.getName());
+  }
+
+  public List<String> getCoverageEnabledSourceSets() {
+    return config.getCiVisibilityJacocoGradleSourceSets();
+  }
+
+  public List<String> getCoverageEnabledPackages(Path jvmExecutable) {
+    ModuleExecutionSettings moduleExecutionSettings =
+        buildEventsHandler.getModuleExecutionSettings(SESSION_KEY, jvmExecutable);
+    return moduleExecutionSettings.getCoverageEnabledPackages();
+  }
+
+  @SuppressForbidden
+  public Collection<String> getTracerJvmArgs(String taskPath, Path jvmExecutable) {
+    List<String> jvmArgs = new ArrayList<>();
+
+    ModuleExecutionSettings moduleExecutionSettings =
+        buildEventsHandler.getModuleExecutionSettings(SESSION_KEY, jvmExecutable);
+    Map<String, String> propagatedSystemProperties = moduleExecutionSettings.getSystemProperties();
+    // propagate to child process all "dd." system properties available in current process
+    for (Map.Entry<String, String> e : propagatedSystemProperties.entrySet()) {
+      jvmArgs.add("-D" + e.getKey() + '=' + e.getValue());
+    }
+
+    Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort();
+    if (ciVisibilityDebugPort != null) {
+      jvmArgs.add(
+          "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + ciVisibilityDebugPort);
+    }
+
+    String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs();
+    if (additionalArgs != null) {
+      List<String> splitArgs = Arrays.asList(additionalArgs.split(" "));
+      jvmArgs.addAll(splitArgs);
+    }
+
+    jvmArgs.add("-javaagent:" + config.getCiVisibilityAgentJarFile().toPath());
+
+    BuildEventsHandler.ModuleInfo moduleInfo =
+        buildEventsHandler.getModuleInfo(SESSION_KEY, taskPath);
+    jvmArgs.add(arg(CiVisibilityConfig.CIVISIBILITY_SESSION_ID, moduleInfo.sessionId));
+    jvmArgs.add(arg(CiVisibilityConfig.CIVISIBILITY_MODULE_ID, moduleInfo.moduleId));
+    jvmArgs.add(
+        arg(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST, moduleInfo.signalServerHost));
+    jvmArgs.add(
+        arg(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT, moduleInfo.signalServerPort));
+    return jvmArgs;
+  }
+
+  private String arg(String propertyName, Object value) {
+    return "-D" + Strings.propertyNameToSystemPropertyName(propertyName) + "=" + value;
+  }
+
+  public void onBuildStart(
+      String buildPath,
+      Path projectRoot,
+      String startCommand,
+      String gradleVersion,
+      boolean nestedBuild) {
+    Map<String, Object> additionalTags =
+        nestedBuild
+            ? Collections.singletonMap(Tags.TEST_GRADLE_NESTED_BUILD, true)
+            : Collections.emptyMap();
+    buildEventsHandler.onTestSessionStart(
+        SESSION_KEY, buildPath, projectRoot, startCommand, "gradle", gradleVersion, additionalTags);
+  }
+
+  public void onModuleStart(String taskPath, Collection<File> compiledClassFolders) {
+    buildEventsHandler.onTestModuleStart(SESSION_KEY, taskPath, compiledClassFolders, null);
+  }
+
+  public void onModuleFinish(
+      String taskPath, @Nullable Throwable failure, @Nullable String skipReason) {
+    if (failure != null) {
+      buildEventsHandler.onTestModuleFail(SESSION_KEY, taskPath, failure);
+    } else if (skipReason != null) {
+      buildEventsHandler.onTestModuleSkip(SESSION_KEY, taskPath, skipReason);
+    }
+    buildEventsHandler.onTestModuleFinish(SESSION_KEY, taskPath);
+  }
+
+  public void onBuildFinish(@Nullable Throwable failure) {
+    if (failure != null) {
+      buildEventsHandler.onTestSessionFail(SESSION_KEY, failure);
+    }
+    buildEventsHandler.onTestSessionFinish(SESSION_KEY);
+  }
+
+  @Override
+  public void onFinish(FinishEvent event) {
+    // do nothing
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServicesInstrumentation.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServicesInstrumentation.java
new file mode 100644
index 00000000000..453451aabed
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServicesInstrumentation.java
@@ -0,0 +1,62 @@
+package datadog.trace.instrumentation.gradle;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.Config;
+import java.util.Set;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.matcher.ElementMatcher;
+import org.gradle.initialization.ClassLoaderRegistry;
+import org.gradle.internal.service.ServiceRegistry;
+import org.gradle.internal.service.scopes.BuildScopeServices;
+
+@AutoService(Instrumenter.class)
+public class GradleBuildScopeServicesInstrumentation extends Instrumenter.CiVisibility
+    implements Instrumenter.ForSingleType {
+
+  public GradleBuildScopeServicesInstrumentation() {
+    super("gradle", "gradle-build-scope-services");
+  }
+
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    // Only instrument Gradle 8.3+
+    return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.gradle.internal.service.scopes.BuildScopeServices";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".CiVisibilityGradleListenerProvider",
+    };
+  }
+
+  @Override
+  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+    return super.isApplicable(enabledSystems)
+        && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+  }
+
+  public static class Construct {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+        @Advice.This final BuildScopeServices buildScopeServices,
+        @Advice.Argument(0) final ServiceRegistry parent) {
+      ClassLoaderRegistry classLoaderRegistry = parent.get(ClassLoaderRegistry.class);
+      buildScopeServices.addProvider(new CiVisibilityGradleListenerProvider(classLoaderRegistry));
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java
new file mode 100644
index 00000000000..71a77303807
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java
@@ -0,0 +1,47 @@
+package datadog.trace.instrumentation.gradle;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.logging.GlobalLogLevelSwitcher;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class GradleDaemonLoggingInstrumentation extends Instrumenter.CiVisibility
+    implements Instrumenter.ForSingleType {
+
+  public GradleDaemonLoggingInstrumentation() {
+    super("gradle", "gradle-daemon-logging");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.gradle.launcher.daemon.bootstrap.DaemonMain";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("initialiseLogging"),
+        GradleDaemonLoggingInstrumentation.class.getName() + "$ReinitialiseLogging");
+  }
+
+  /**
+   * Gradle Daemon closes original {@link System.out} and {@link System.err} streams (see {@link
+   * org.gradle.launcher.daemon.bootstrap.DaemonMain#daemonStarted}), and replaces them with Gradle
+   * Daemon log streams (see {@link
+   * org.gradle.launcher.daemon.bootstrap.DaemonMain#initialiseLogging}).
+   *
+   * <p>{@link datadog.trace.logging.simplelogger.SLCompatFactory} that contains logging settings
+   * gets initialized before Gradle Daemon, so DD logging settings refer to the original streams
+   * that the daemon closes. They need to refer to the new streams created by the daemon, so here we
+   * reset the settings letting them re-initialize to capture the new streams.
+   */
+  public static class ReinitialiseLogging {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void reinitialiseTracerLogging() {
+      GlobalLogLevelSwitcher.get().reinitialize();
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
new file mode 100644
index 00000000000..5b3e8ce5db9
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
@@ -0,0 +1,63 @@
+package datadog.trace.instrumentation.gradle;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.HelperInjector;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.Config;
+import java.util.Set;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(Instrumenter.class)
+public class GradlePluginInjectorInstrumentation extends Instrumenter.CiVisibility
+    implements Instrumenter.ForSingleType {
+
+  public GradlePluginInjectorInstrumentation() {
+    super("gradle", "gradle-plugin-injector");
+  }
+
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    // Only instrument Gradle 8.3+
+    return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions");
+  }
+
+  /**
+   * There are several class loaders in Gradle that load various parts of the system: core classes,
+   * plugins, etc. CI Visibility listener and plugin (as well as the rest of the helper classes)
+   * need to be injected into the plugins classloader because they refer to classes from Gradle
+   * Testing JVM (e.g. {@link org.gradle.api.tasks.testing.Test}), which are loaded by the plugins
+   * CL. The purpose of this instrumentation is only to inject the classes into the classloader, so
+   * that they could be used from elsewhere.
+   *
+   * <p>{@link org.gradle.platform.base.Platform} was chosen as the instrumented type since it is
+   * loaded early in the build lifecycle, therefore the injected classes can be safely used by the
+   * services that are initialized later on.
+   */
+  @Override
+  public String instrumentedType() {
+    return "org.gradle.platform.base.Platform";
+  }
+
+  @Override
+  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+    return super.isApplicable(enabledSystems)
+        && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+  }
+
+  @Override
+  public AdviceTransformer transformer() {
+    return new HelperInjector(
+        "gradle-plugin-injector",
+        packageName + ".CiVisibilityService",
+        packageName + ".JavaCompilerPluginArgumentsProvider",
+        packageName + ".TracerArgumentsProvider",
+        packageName + ".CiVisibilityGradleListener",
+        packageName + ".CiVisibilityPluginExtension",
+        packageName + ".CiVisibilityPlugin");
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {}
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java
new file mode 100644
index 00000000000..2860506252e
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java
@@ -0,0 +1,31 @@
+package datadog.trace.instrumentation.gradle;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.gradle.process.CommandLineArgumentProvider;
+
+public class JavaCompilerPluginArgumentsProvider implements CommandLineArgumentProvider {
+  private final String moduleName;
+
+  public JavaCompilerPluginArgumentsProvider(String moduleName) {
+    this.moduleName = moduleName;
+  }
+
+  @Override
+  public Iterable<String> asArguments() {
+    List<String> arguments = new ArrayList<>();
+    arguments.add("-Xplugin:DatadogCompilerPlugin");
+
+    // disable compiler warnings related to annotation processing,
+    // since "fail-on-warning" linters might complain about the annotation that the compiler plugin
+    // injects
+    arguments.add("-Xlint:-processing");
+
+    if (moduleName != null) {
+      arguments.add("--add-reads");
+      arguments.add(moduleName + "=ALL-UNNAMED");
+    }
+
+    return arguments;
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java
new file mode 100644
index 00000000000..51e6e98fcee
--- /dev/null
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java
@@ -0,0 +1,50 @@
+package datadog.trace.instrumentation.gradle;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import org.gradle.api.provider.Property;
+import org.gradle.api.services.ServiceReference;
+import org.gradle.process.CommandLineArgumentProvider;
+
+public abstract class TracerArgumentsProvider implements CommandLineArgumentProvider {
+  private static final Pattern PROJECT_PROPERTY_REFERENCE = Pattern.compile("\\$\\{([^}]+)\\}");
+
+  private final String taskPath;
+  private final Path jvmExecutable;
+  private final Map<String, String> projectProperties;
+
+  @Inject
+  public TracerArgumentsProvider(
+      String taskPath, Path jvmExecutable, Map<String, String> projectProperties) {
+    this.taskPath = taskPath;
+    this.jvmExecutable = jvmExecutable;
+    this.projectProperties = projectProperties;
+  }
+
+  @ServiceReference
+  abstract Property<CiVisibilityService> getCiVisibilityService();
+
+  @Override
+  public Iterable<String> asArguments() {
+    Collection<String> tracerJvmArgs =
+        getCiVisibilityService().get().getTracerJvmArgs(taskPath, jvmExecutable);
+    return tracerJvmArgs.stream().map(this::replaceProjectProperties).collect(Collectors.toList());
+  }
+
+  private String replaceProjectProperties(String s) {
+    StringBuffer output = new StringBuffer();
+    Matcher matcher = PROJECT_PROPERTY_REFERENCE.matcher(s);
+    while (matcher.find()) {
+      String propertyName = matcher.group(1);
+      Object propertyValue = projectProperties.get(propertyName);
+      matcher.appendReplacement(output, Matcher.quoteReplacement(String.valueOf(propertyValue)));
+    }
+    matcher.appendTail(output);
+    return output.toString();
+  }
+}
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListener.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
similarity index 98%
rename from dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListener.java
rename to dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
index 6a6019b2d91..8b51e987ebc 100644
--- a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListener.java
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.gradle;
+package datadog.trace.instrumentation.gradle.legacy;
 
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.InstrumentationBridge;
@@ -46,7 +46,7 @@ public void settingsEvaluated(Settings settings) {
     String startCommand = GradleUtils.recreateStartCommand(settings.getStartParameter());
     String gradleVersion = gradle.getGradleVersion();
     buildEventsHandler.onTestSessionStart(
-        gradle, projectName, projectRoot, startCommand, "gradle", gradleVersion);
+        gradle, projectName, projectRoot, startCommand, "gradle", gradleVersion, null);
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListenerInstrumentation.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
similarity index 78%
rename from dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListenerInstrumentation.java
rename to dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
index 8abfeeb7e05..28cab2d074a 100644
--- a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
@@ -1,12 +1,15 @@
-package datadog.trace.instrumentation.gradle;
+package datadog.trace.instrumentation.gradle.legacy;
 
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.api.Config;
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.matcher.ElementMatcher;
 import org.gradle.invocation.DefaultGradle;
 
 @AutoService(Instrumenter.class)
@@ -17,6 +20,12 @@ public GradleBuildListenerInstrumentation() {
     super("gradle", "gradle-build-listener");
   }
 
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    // Only instrument Gradle older than 8.3
+    return not(hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions"));
+  }
+
   @Override
   public String instrumentedType() {
     return "org.gradle.invocation.DefaultGradle";
@@ -54,4 +63,9 @@ public static void afterConstructor(@Advice.This final DefaultGradle gradle) {
       gradle.addBuildListener(new GradleBuildListener());
     }
   }
+
+  @Override
+  public String muzzleDirective() {
+    return "skipMuzzle";
+  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleProjectConfigurator.groovy b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
similarity index 97%
rename from dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleProjectConfigurator.groovy
rename to dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
index 650f578e893..9c55bda87c7 100644
--- a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleProjectConfigurator.groovy
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.gradle
+package datadog.trace.instrumentation.gradle.legacy
 
 import datadog.trace.api.Config
 import datadog.trace.api.civisibility.config.ModuleExecutionSettings
@@ -39,9 +39,9 @@ class GradleProjectConfigurator {
 
   private static final Logger log = LoggerFactory.getLogger(GradleProjectConfigurator.class)
 
-  /**
+  /*
    * Each Groovy Closure in here is a separate class.
-   * When adding or removing a closure, be sure to update {@link datadog.trace.instrumentation.gradle.GradleBuildListenerInstrumentation#helperClassNames()}
+   * When adding or removing a closure, be sure to update {@link GradleBuildListenerInstrumentation#helperClassNames()}
    */
 
   public static final GradleProjectConfigurator INSTANCE = new GradleProjectConfigurator()
@@ -75,7 +75,9 @@ class GradleProjectConfigurator {
 
     jvmArgs.add("-javaagent:" + config.ciVisibilityAgentJarFile.toPath())
 
-    task.jvmArgs(jvmArgs)
+    // be sure to use setJvmArgs() and not jvmArgs()
+    // as the latter will add the arguments rather than replacing them
+    task.setJvmArgs(jvmArgs)
   }
 
   private static final Pattern PROJECT_PROPERTY_REFERENCE = Pattern.compile("\\\$\\{([^}]+)\\}")
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleUtils.groovy b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy
similarity index 93%
rename from dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleUtils.groovy
rename to dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy
index b5336aeb6f1..99d0e7f265f 100644
--- a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradleUtils.groovy
+++ b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.gradle
+package datadog.trace.instrumentation.gradle.legacy
 
 import org.gradle.StartParameter
 import org.gradle.api.Project
@@ -68,9 +68,12 @@ abstract class GradleUtils {
     def sourceSets = project.sourceSets
     Collection<File> allOutputClassesDirs = new HashSet<>()
     for (String sourceSetName : sourceSetNames) {
-      def sourceSet = sourceSets.getByName(sourceSetName)
-      def sourceSetOutput = sourceSet.output
+      def sourceSet = sourceSets.findByName(sourceSetName)
+      if (sourceSet == null) {
+        continue
+      }
 
+      def sourceSetOutput = sourceSet.output
       if (sourceSetOutput.hasProperty('classesDirs')) {
         def outputClassesDirs = sourceSetOutput.classesDirs
         allOutputClassesDirs.addAll(outputClassesDirs.files)
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
index ea52721257d..414c8d23df9 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
@@ -16,10 +16,13 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import io.grpc.ClientCall;
+import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
 import io.grpc.StatusException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.Collections;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -156,6 +159,11 @@ public static void before(
         @Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Throwable cause) {
       AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
       if (null != span) {
+        final SocketAddress socketAddress =
+            call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+        if (socketAddress instanceof InetSocketAddress) {
+          DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+        }
         if (cause instanceof StatusException) {
           DECORATE.onClose(span, ((StatusException) cause).getStatus());
         }
@@ -170,6 +178,11 @@ public static void closeObserver(
         @Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Status status) {
       AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
       if (null != span) {
+        final SocketAddress socketAddress =
+            call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+        if (socketAddress instanceof InetSocketAddress) {
+          DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+        }
         DECORATE.onClose(span, status);
         span.finish();
       }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
index 9deaaa32e11..a238d7ac5f6 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
@@ -67,7 +67,9 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
     CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
     final AgentSpan span = startSpan(GRPC_SERVER, spanContext).setMeasured(true);
 
-    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0);
+    AgentTracer.get()
+        .getDataStreamsMonitoring()
+        .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
 
     RequestContext reqContext = span.getRequestContext();
     if (reqContext != null) {
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
index ce7d28b785a..fe4261ed10c 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
@@ -22,6 +22,8 @@ import io.grpc.Status
 import io.grpc.StatusRuntimeException
 import io.grpc.inprocess.InProcessChannelBuilder
 import io.grpc.inprocess.InProcessServerBuilder
+import io.grpc.netty.NettyChannelBuilder
+import io.grpc.netty.NettyServerBuilder
 import io.grpc.stub.StreamObserver
 import spock.lang.Shared
 
@@ -112,11 +114,12 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           }
         }
       }
-    def builder = InProcessServerBuilder.forName(getClass().name).addService(greeter).executor(executor)
+    def builder = NettyServerBuilder.forPort(0).addService(greeter).executor(executor)
     (0..extraBuildCalls).each { builder.build() }
     Server server = builder.build().start()
 
-    ManagedChannel channel = InProcessChannelBuilder.forName(getClass().name).build()
+
+    ManagedChannel channel = NettyChannelBuilder.forAddress("localhost", server.getPort()).usePlaintext().build()
     GreeterGrpc.GreeterBlockingStub client = GreeterGrpc.newBlockingStub(channel)
 
     when:
@@ -146,6 +149,9 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "$Tags.PEER_HOSTNAME" "localhost"
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" server.port
             "status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -362,9 +368,9 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           throw error
         }
       }
-    Server server = InProcessServerBuilder.forName(getClass().name).addService(greeter).directExecutor().build().start()
+    Server server = NettyServerBuilder.forPort(0).addService(greeter).directExecutor().build().start()
 
-    ManagedChannel channel = InProcessChannelBuilder.forName(getClass().name).build()
+    ManagedChannel channel = NettyChannelBuilder.forAddress("localhost", server.getPort()).usePlaintext().build()
     GreeterGrpc.GreeterBlockingStub client = GreeterGrpc.newBlockingStub(channel)
 
     when:
@@ -388,6 +394,9 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "$Tags.PEER_HOSTNAME" "localhost"
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" server.port
             "status.code" "UNKNOWN"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
diff --git a/dd-java-agent/instrumentation/gson-1.6/build.gradle b/dd-java-agent/instrumentation/gson-1.6/build.gradle
new file mode 100644
index 00000000000..953d6dec9b9
--- /dev/null
+++ b/dd-java-agent/instrumentation/gson-1.6/build.gradle
@@ -0,0 +1,23 @@
+muzzle {
+  pass {
+    group = 'com.google.code.gson'
+    module = 'gson'
+    versions = '[1.6, ]'
+    skipVersions = ['1.7'] //only has html
+    assertInverse = true
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'com.google.code.gson', name: 'gson', version: '1.6'
+
+  testImplementation group: 'com.google.code.gson', name: 'gson', version: '1.6'
+
+  testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
+
+  latestDepTestImplementation group: 'com.google.code.gson', name: 'gson', version: '+'
+}
diff --git a/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java
new file mode 100644
index 00000000000..cffcd7787f4
--- /dev/null
+++ b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java
@@ -0,0 +1,76 @@
+package datadog.trace.instrumentation.gson;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(Instrumenter.class)
+public class JsonReaderInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public JsonReaderInstrumentation() {
+    super("gson");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "com.google.gson.stream.JsonReader";
+  }
+
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    return hasClassNamed("com.google.gson.stream.JsonReader");
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor().and(takesArguments(1)).and(takesArgument(0, named("java.io.Reader"))),
+        getClass().getName() + "$ConstructAdvice");
+    transformation.applyAdvice(
+        isMethod()
+            .and(isPublic())
+            .and(returns(String.class))
+            .and(namedOneOf("nextName", "nextString"))
+            .and(takesNoArguments()),
+        getClass().getName() + "$MethodAdvice");
+  }
+
+  public static class ConstructAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterInit(
+        @Advice.This Object self, @Advice.Argument(0) final java.io.Reader input) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && input != null) {
+        iastModule.taintIfTainted(self, input);
+      }
+    }
+  }
+
+  public static class MethodAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final String result) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && result != null) {
+        iastModule.taintIfTainted(result, self);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/gson-1.6/src/test/groovy/datadog/trace/instrumentation/gson/JsonReaderInstrumentationTest.groovy b/dd-java-agent/instrumentation/gson-1.6/src/test/groovy/datadog/trace/instrumentation/gson/JsonReaderInstrumentationTest.groovy
new file mode 100644
index 00000000000..58e3621e92e
--- /dev/null
+++ b/dd-java-agent/instrumentation/gson-1.6/src/test/groovy/datadog/trace/instrumentation/gson/JsonReaderInstrumentationTest.groovy
@@ -0,0 +1,52 @@
+package datadog.trace.instrumentation.gson
+
+import com.google.gson.Gson
+import com.google.gson.stream.JsonReader
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+
+class JsonReaderInstrumentationTest extends AgentTestRunner {
+
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final gson = new Gson()
+
+    when:
+    final reader = new JsonReader(new StringReader(json))
+
+    then:
+    1 * module.taintIfTainted(_ as JsonReader, _ as StringReader)
+
+    when:
+    gson.fromJson(reader, clazz)
+
+    then:
+    calls * module.taintIfTainted(_ as String, _ as JsonReader)
+    0 * _
+
+    where:
+    json | clazz | calls
+    '"Test"' | String | 1
+    '{"name": "nameTest", "value" : "valueTest"}' | TestBean | 4
+    '[{"name": "nameTest", "value" : "valueTest"}]' | TestBean[] | 4
+    '[{"name": "nameTest", "value" : "valueTest"}, {"name": "nameTest2", "value" : "valueTest2"}]' | TestBean[].class | 8
+  }
+
+
+  static final class TestBean {
+
+    @SuppressWarnings('CodeNarc')
+    private String name
+
+    @SuppressWarnings('CodeNarc')
+    private String value
+  }
+}
diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie b/dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie
index 46b10db7876..45f3b31dbaf 100644
--- a/dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie
+++ b/dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie
@@ -75,6 +75,8 @@
 1 com.github.benmanes.caffeine.*
 1 com.github.jknack.handlebars.*
 1 com.google.*
+#Need for gson propagation
+2 com.google.gson.Gson
 1 com.googlecode.*
 1 com.hazelcast.*
 1 com.hdivsecurity.*
@@ -161,6 +163,8 @@
 1 nano.xml.*
 1 net.bytebuddy.*
 1 net.jcip.*
+# Weak randomness false positive in net.jodah.failsafe.RetryPolicyExecutor
+1 net.jodah.failsafe.*
 # Amusing weak randomness false positive in XXHashFactory
 1 net.jpountz.xxhash.*
 1 net.logstash.*
@@ -272,6 +276,9 @@
 2 org.springframework.security.web.authentication.*
 2 org.springframework.web.context.request.*
 2 org.springframework.web.util.WebUtils
+# Need for Spring gson support
+2 org.springframework.http.converter.json.AbstractJsonHttpMessageConverter
+2 org.springframework.http.converter.json.GsonHttpMessageConverter
 # Need for ServletRequestCallSite.getInputStream()
 2 org.springframework.http.server.*
 1 org.sqlite.*
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
index 39a63861b39..0b32bc6f012 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
@@ -52,7 +52,7 @@ public static void onExit(
       if (input != null) {
         final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
         if (propagation != null) {
-          propagation.taintIfInputIsTainted(parser, input);
+          propagation.taintIfTainted(parser, input);
         }
         if (input instanceof URL) {
           final SsrfModule ssrf = InstrumentationBridge.SSRF;
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
index c230e513382..1f9eba240cc 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
@@ -61,7 +61,7 @@ public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return Str
       if (jsonParser != null && result != null) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          module.taintIfInputIsTainted(result, jsonParser);
+          module.taintIfTainted(result, jsonParser);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1FactoryInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1FactoryInstrumentationTest.groovy
index ab38630beef..287967222f3 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1FactoryInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1FactoryInstrumentationTest.groovy
@@ -40,7 +40,7 @@ class Json1FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, content)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, content)
     0 * _
   }
 
@@ -55,7 +55,7 @@ class Json1FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, is)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, is)
     2 * is.read(_,_,_)
     0 * _
   }
@@ -72,7 +72,7 @@ class Json1FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, reader)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, reader)
     0 * _
   }
 
@@ -88,7 +88,7 @@ class Json1FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     parser != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, url)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, url)
     1 * ssrfModule.onURLConnection(url)
     0 * _
   }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy
index f7fa84db25a..cd7e9e098ce 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy
@@ -25,7 +25,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -46,7 +46,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -67,7 +67,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'value1'
-    1 * propagationModule.taintIfInputIsTainted('value1', jsonParser)
+    1 * propagationModule.taintIfTainted('value1', jsonParser)
     0 * _
 
     where:
diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
index a3503994918..354ab309e8b 100644
--- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
@@ -52,7 +52,7 @@ public static void onExit(
       if (input != null) {
         final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
         if (propagation != null) {
-          propagation.taintIfInputIsTainted(parser, input);
+          propagation.taintIfTainted(parser, input);
         }
         if (input instanceof URL) {
           final SsrfModule ssrf = InstrumentationBridge.SSRF;
diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2ParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2ParserInstrumentation.java
index e1342316f4f..fd2d28b3b2d 100644
--- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2ParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2ParserInstrumentation.java
@@ -80,7 +80,7 @@ public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return Str
       if (jsonParser != null && result != null) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          module.taintIfInputIsTainted(result, jsonParser);
+          module.taintIfTainted(result, jsonParser);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
index 5d1a3bc9bb0..60320765f37 100644
--- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
@@ -49,7 +49,7 @@ public static void onExit(
         @Advice.This TokenBuffer tokenBuffer, @Advice.Return JsonParser parser) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(parser, tokenBuffer);
+        module.taintIfTainted(parser, tokenBuffer);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2FactoryInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2FactoryInstrumentationTest.groovy
index a3618b95ec9..50b5bb119dd 100644
--- a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2FactoryInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2FactoryInstrumentationTest.groovy
@@ -43,7 +43,7 @@ class Json2FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, content)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, content)
     0 * _
   }
 
@@ -59,7 +59,7 @@ class Json2FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, is)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, is)
     2 * is.read(_, _, _)
     0 * _
   }
@@ -76,7 +76,7 @@ class Json2FactoryInstrumentationTest extends AgentTestRunner {
 
     then:
     result != null
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, reader)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, reader)
     0 * _
   }
 
@@ -95,9 +95,9 @@ class Json2FactoryInstrumentationTest extends AgentTestRunner {
     then:
     parser != null
     json == [key: 'value']
-    1 * propagationModule.taintIfInputIsTainted(_ as JsonParser, url)
-    1 * propagationModule.taintIfInputIsTainted('key', _ as JsonParser)
-    1 * propagationModule.taintIfInputIsTainted('value', _ as JsonParser)
+    1 * propagationModule.taintIfTainted(_ as JsonParser, url)
+    1 * propagationModule.taintIfTainted('key', _ as JsonParser)
+    1 * propagationModule.taintIfTainted('value', _ as JsonParser)
     1 * ssrfModule.onURLConnection(url)
     0 * _
   }
diff --git a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2ParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2ParserInstrumentationTest.groovy
index 9bb11aeca63..86f9cc707bb 100644
--- a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2ParserInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/Json2ParserInstrumentationTest.groovy
@@ -27,7 +27,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -48,7 +48,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -69,7 +69,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -90,7 +90,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'value1'
-    1 * propagationModule.taintIfInputIsTainted('value1', jsonParser)
+    1 * propagationModule.taintIfTainted('value1', jsonParser)
     0 * _
 
     where:
@@ -111,7 +111,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'key1'
-    1 * propagationModule.taintIfInputIsTainted('key1', jsonParser)
+    1 * propagationModule.taintIfTainted('key1', jsonParser)
     0 * _
 
     where:
@@ -132,7 +132,7 @@ class Json2ParserInstrumentationTest extends AgentTestRunner {
 
     then:
     result == 'value1'
-    1 * propagationModule.taintIfInputIsTainted('value1', jsonParser)
+    1 * propagationModule.taintIfTainted('value1', jsonParser)
     0 * _
 
     where:
diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
index caf72cff507..424138d6942 100644
--- a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
@@ -56,7 +56,7 @@ public static void onExit(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       try {
         if (module != null) {
-          module.taintIfInputIsTainted(self, param);
+          module.taintIfTainted(self, param);
         }
       } catch (final Throwable e) {
         module.onUnexpectedException("InputStreamAdvice onExit threw", e);
diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java
new file mode 100644
index 00000000000..a73115ffb3b
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java
@@ -0,0 +1,30 @@
+package datadog.trace.instrumentation.java.lang;
+
+import datadog.trace.agent.tooling.csi.CallSite;
+import datadog.trace.api.iast.IastCallSites;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import java.io.InputStreamReader;
+import javax.annotation.Nonnull;
+
+@Propagation
+@CallSite(spi = IastCallSites.class)
+public class InputStreamReaderCallSite {
+
+  @CallSite.After(
+      "void java.io.InputStreamReader.<init>(java.io.InputStream, java.nio.charset.Charset)")
+  public static InputStreamReader afterInit(
+      @CallSite.AllArguments @Nonnull final Object[] params,
+      @CallSite.Return @Nonnull final InputStreamReader result) {
+    final PropagationModule module = InstrumentationBridge.PROPAGATION;
+    if (module != null) {
+      try {
+        module.taintIfTainted(result, params[0]);
+      } catch (final Throwable e) {
+        module.onUnexpectedException("afterInit threw", e);
+      }
+    }
+    return result;
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java
new file mode 100644
index 00000000000..09f203efa60
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java
@@ -0,0 +1,25 @@
+package datadog.trace.instrumentation.java.lang;
+
+import datadog.trace.agent.tooling.csi.CallSite;
+import datadog.trace.api.iast.IastCallSites;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import java.io.StringReader;
+import javax.annotation.Nonnull;
+
+@Propagation
+@CallSite(spi = IastCallSites.class)
+public class StringReaderCallSite {
+
+  @CallSite.After("void java.io.StringReader.<init>(java.lang.String)")
+  public static StringReader afterInit(
+      @CallSite.AllArguments @Nonnull final Object[] params,
+      @CallSite.Return @Nonnull final StringReader result) {
+    final PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+    if (propagationModule != null) {
+      propagationModule.taintIfTainted(result, params[0]);
+    }
+    return result;
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy
index 12e3f9fecf2..a73e5f5e524 100644
--- a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy
@@ -23,6 +23,6 @@ class InputStreamInstrumentationTest extends AgentTestRunner {
     TestInputStreamSuite.pushbackInputStreamFromIS(is)
 
     then:
-    (1.._) * propagationModule.taintIfInputIsTainted(_ as InputStream, is)
+    (1.._) * propagationModule.taintIfTainted(_ as InputStream, is)
   }
 }
diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy
new file mode 100644
index 00000000000..f8b522e3e24
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy
@@ -0,0 +1,23 @@
+package datadog.trace.instrumentation.java.io
+
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import foo.bar.TestInputStreamReaderSuite
+
+import java.nio.charset.Charset
+
+class InputStreamReaderCallSiteTest extends  BaseIoCallSiteTest{
+
+  void 'test InputStreamReader.<init>'(){
+    given:
+    PropagationModule iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+
+    when:
+    TestInputStreamReaderSuite.init(new ByteArrayInputStream("test".getBytes()), Charset.defaultCharset())
+
+    then:
+    1 * iastModule.taintIfTainted(_ as InputStreamReader, _ as InputStream)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy
new file mode 100644
index 00000000000..f99dca913f4
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy
@@ -0,0 +1,21 @@
+package datadog.trace.instrumentation.java.io
+
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import foo.bar.TestStringReaderSuite
+
+class StringReaderCallSiteTest extends  BaseIoCallSiteTest{
+
+  void 'test StringReader.<init>'(){
+    given:
+    PropagationModule iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final input = 'Test input'
+
+    when:
+    TestStringReaderSuite.init(input)
+
+    then:
+    1 * iastModule.taintIfTainted(_ as StringReader, input)
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamReaderSuite.java b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamReaderSuite.java
new file mode 100644
index 00000000000..57c572575a5
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamReaderSuite.java
@@ -0,0 +1,12 @@
+package foo.bar;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+public class TestInputStreamReaderSuite {
+
+  public static InputStreamReader init(final InputStream in, Charset charset) {
+    return new InputStreamReader(in, charset);
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestStringReaderSuite.java b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestStringReaderSuite.java
new file mode 100644
index 00000000000..36d5e9b330a
--- /dev/null
+++ b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestStringReaderSuite.java
@@ -0,0 +1,10 @@
+package foo.bar;
+
+import java.io.StringReader;
+
+public class TestStringReaderSuite {
+
+  public static void init(String input) {
+    new StringReader(input);
+  }
+}
diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
index a46594b8aa9..eaa00a0d469 100644
--- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
+++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
@@ -1,5 +1,7 @@
 package datadog.trace.instrumentation.java.lang;
 
+import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
+
 import datadog.trace.agent.tooling.csi.CallSite;
 import datadog.trace.api.iast.IastCallSites;
 import datadog.trace.api.iast.InstrumentationBridge;
@@ -327,7 +329,7 @@ public static char[] afterToCharArray(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintObjectIfInputIsTaintedKeepingRanges(result, self);
+        module.taintIfTainted(result, self, true, NOT_MARKED);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterToCharArray threw", e);
       }
diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
index f28c86e8b79..66bc25d625f 100644
--- a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
+++ b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
@@ -20,7 +20,7 @@ public static URI afterCreate(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfAnyInputIsTainted(result, value);
+          module.taintIfTainted(result, value);
         } catch (final Throwable e) {
           module.onUnexpectedException("create threw", e);
         }
@@ -43,7 +43,7 @@ public static URI afterCtor(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfAnyInputIsTainted(result, args);
+          module.taintIfAnyTainted(result, args);
         } catch (final Throwable e) {
           module.onUnexpectedException("ctor threw", e);
         }
@@ -59,7 +59,7 @@ public static String afterToString(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, url);
+        module.taintIfTainted(result, url);
       } catch (final Throwable e) {
         module.onUnexpectedException("After toString threw", e);
       }
@@ -73,7 +73,7 @@ public static URI afterNormalize(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, url);
+        module.taintIfTainted(result, url);
       } catch (final Throwable e) {
         module.onUnexpectedException("After toString threw", e);
       }
diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
index 285de99c329..da954219bf4 100644
--- a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
+++ b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
@@ -32,7 +32,7 @@ public static URL afterCtor(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfAnyInputIsTainted(result, args);
+          module.taintIfAnyTainted(result, args);
         } catch (final Throwable e) {
           module.onUnexpectedException("ctor threw", e);
         }
@@ -49,7 +49,7 @@ public static String afterToString(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, url);
+        module.taintIfTainted(result, url);
       } catch (final Throwable e) {
         module.onUnexpectedException("After toString threw", e);
       }
@@ -63,7 +63,7 @@ public static URI afterToURI(@CallSite.This final URL url, @CallSite.Return fina
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTainted(result, url);
+        module.taintIfTainted(result, url);
       } catch (final Throwable e) {
         module.onUnexpectedException("After toURI threw", e);
       }
diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
index bc7de98c3a6..7c219bcf6ba 100644
--- a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
+++ b/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
@@ -32,7 +32,7 @@ private static String encode(final String result, final String value) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTaintedWithMarks(result, value, VulnerabilityMarks.XSS_MARK);
+          module.taintIfTainted(result, value, false, VulnerabilityMarks.XSS_MARK);
         } catch (final Throwable e) {
           module.onUnexpectedException("afterEncode threw", e);
         }
diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy
index 067e4241b01..398d94779d7 100644
--- a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy
+++ b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy
@@ -24,16 +24,32 @@ class URICallSIteTest extends AgentTestRunner {
 
     then:
     uri.toString() == expected
-    1 * module.taintIfAnyInputIsTainted(_ as URI, args as Object[])
+    1 * module.taintIfAnyTainted(_ as URI, args as Object[])
 
     where:
-    method   | args                                                                          | expected
-    'uri'    | ['http://test.com/index?name=value#fragment']                                 | 'http://test.com/index?name=value#fragment'
-    'uri'    | ['http', 'user:password', 'test.com', 80, '/index', 'name=value', 'fragment'] | 'http://user:password@test.com:80/index?name=value#fragment'
-    'uri'    | ['http', 'user:password@test.com', '/index', 'name=value', 'fragment']        | 'http://user:password@test.com/index?name=value#fragment'
-    'uri'    | ['http', 'test.com', '/index', 'fragment']                                    | 'http://test.com/index#fragment'
-    'uri'    | ['http', '//test.com/index?name=value', 'fragment']                           | 'http://test.com/index?name=value#fragment'
-    'create' | ['http://test.com/index?name=value#fragment']                                 | 'http://test.com/index?name=value#fragment'
+    method | args                                                                          | expected
+    'uri'  | ['http://test.com/index?name=value#fragment']                                 | 'http://test.com/index?name=value#fragment'
+    'uri'  | ['http', 'user:password', 'test.com', 80, '/index', 'name=value', 'fragment'] | 'http://user:password@test.com:80/index?name=value#fragment'
+    'uri'  | ['http', 'user:password@test.com', '/index', 'name=value', 'fragment']        | 'http://user:password@test.com/index?name=value#fragment'
+    'uri'  | ['http', 'test.com', '/index', 'fragment']                                    | 'http://test.com/index#fragment'
+    'uri'  | ['http', '//test.com/index?name=value', 'fragment']                           | 'http://test.com/index?name=value#fragment'
+  }
+
+  void 'test uri create propagation'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+
+    when:
+    final uri = TestURICallSiteSuite.&"$method".call(args as Object[])
+
+    then:
+    uri.toString() == expected
+    1 * module.taintIfTainted(_ as URI, args[0])
+
+    where:
+    method   | args                                          | expected
+    'create' | ['http://test.com/index?name=value#fragment'] | 'http://test.com/index?name=value#fragment'
   }
 
   void 'test uri propagation'() {
@@ -45,7 +61,7 @@ class URICallSIteTest extends AgentTestRunner {
     TestURICallSiteSuite.&"$method".call(args as Object[])
 
     then:
-    1 * module.taintIfInputIsTainted(_, _ as URI)
+    1 * module.taintIfTainted(_, _ as URI)
 
     where:
     method          | args
diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy
index 5417c00a03f..a51038e769c 100644
--- a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy
@@ -23,7 +23,7 @@ class URLCallSiteTest extends AgentTestRunner {
 
     then:
     uri.toString() == expected
-    1 * module.taintIfAnyInputIsTainted(_ as URL, args as Object[])
+    1 * module.taintIfAnyTainted(_ as URL, args as Object[])
 
     where:
     method | args                                                                             | expected
@@ -44,7 +44,7 @@ class URLCallSiteTest extends AgentTestRunner {
     TestURLCallSiteSuite.&"$method".call(args as Object[])
 
     then:
-    1 * module.taintIfInputIsTainted(_, _ as URL)
+    1 * module.taintIfTainted(_, _ as URL)
 
     where:
     method           | args
diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy
index b97b448f688..aefc594c745 100644
--- a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy
@@ -19,16 +19,16 @@ class URLEncoderCallSiteTest extends AgentTestRunner {
     InstrumentationBridge.registerIastModule(iastModule)
 
     when:
-    final result = TestURLEncoderCallSiteSuite.&encode.call(args)
+    final result = TestURLEncoderCallSiteSuite.&encode.call(*args)
 
     then:
-    result == espected
-    1 * iastModule.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    result == expected
+    1 * iastModule.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
-    args | espected
-    ['my test.asp?name=ståle&car=saab'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
+    args                                         | expected
+    ['my test.asp?name=ståle&car=saab']          | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
     ['my test.asp?name=ståle&car=saab', 'UTF-8'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
   }
 
@@ -38,17 +38,16 @@ class URLEncoderCallSiteTest extends AgentTestRunner {
     InstrumentationBridge.registerIastModule(iastModule)
 
     when:
-    TestURLEncoderCallSiteSuite.&encode.call(args)
+    TestURLEncoderCallSiteSuite.&encode.call(*args)
 
     then:
     def ex = thrown(Exception)
     assert ex.stackTrace[0].getClassName().startsWith('java.net.')
-    0 * iastModule.taintIfInputIsTaintedWithMarks(_)
     0 * _
 
     where:
-    args | _
-    [null, null]| _
-    [null]| _
+    args         | _
+    [null, null] | _
+    [null]       | _
   }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
index 92b694ae757..69f945518c0 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
@@ -73,8 +73,10 @@ public static AgentScope onEnter(@Advice.This final Statement statement) {
 
         final AgentSpan span = startSpan(DATABASE_QUERY);
         DECORATE.afterStart(span);
-        DECORATE.onConnection(
-            span, connection, InstrumentationContext.get(Connection.class, DBInfo.class));
+        DBInfo dbInfo =
+            JDBCDecorator.parseDBInfo(
+                connection, InstrumentationContext.get(Connection.class, DBInfo.class));
+        DECORATE.onConnection(span, dbInfo);
         DECORATE.onPreparedStatement(span, queryInfo);
         return activateSpan(span);
       } catch (SQLException e) {
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
index cdec1cbf95a..04a9e793256 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
@@ -11,7 +11,6 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
@@ -26,7 +25,7 @@
 
 @AutoService(Instrumenter.class)
 public class DBMCompatibleConnectionInstrumentation extends AbstractConnectionInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType {
+    implements Instrumenter.ForKnownTypes {
 
   /** Instrumentation class for connections for Database Monitoring supported DBs * */
   public DBMCompatibleConnectionInstrumentation() {
@@ -36,7 +35,6 @@ public DBMCompatibleConnectionInstrumentation() {
   // Classes to cover all currently supported
   // db types for the Database Monitoring product
   static final String[] CONCRETE_TYPES = {
-    "com.microsoft.sqlserver.jdbc.SQLServerConnection",
     // should cover mysql
     "com.mysql.jdbc.Connection",
     "com.mysql.jdbc.jdbc1.Connection",
@@ -64,13 +62,8 @@ public DBMCompatibleConnectionInstrumentation() {
     "postgresql.Connection",
     // EDB version of postgresql
     "com.edb.jdbc.PgConnection",
-    // jtds (for SQL Server and Sybase)
-    "net.sourceforge.jtds.jdbc.ConnectionJDBC2", // 1.2
-    "net.sourceforge.jtds.jdbc.JtdsConnection", // 1.3
     // aws-mysql-jdbc
     "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ConnectionImpl",
-    // IBM Informix
-    "com.informix.jdbc.IfmxConnection",
   };
 
   @Override
@@ -85,12 +78,6 @@ public String[] knownMatchingTypes() {
     return CONCRETE_TYPES;
   }
 
-  @Override
-  public String configuredMatchingType() {
-    // this won't match any class unless the property is set
-    return InstrumenterConfig.get().getJdbcConnectionClassName();
-  }
-
   @Override
   public void adviceTransformations(AdviceTransformation transformation) {
     transformation.applyAdvice(
@@ -124,7 +111,7 @@ public static String onEnter(
         final DBInfo dbInfo =
             JDBCDecorator.parseDBInfo(
                 connection, InstrumentationContext.get(Connection.class, DBInfo.class));
-        sql = SQLCommenter.inject(sql, DECORATE.getDbService(dbInfo));
+        sql = SQLCommenter.prepend(sql, DECORATE.getDbService(dbInfo));
         return inputSql;
       }
       return sql;
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
index e32eabc4c50..98c65e69863 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
@@ -38,6 +38,8 @@ public class DefaultConnectionInstrumentation extends AbstractConnectionInstrume
     "oadd.org.apache.calcite.avatica.AvaticaConnection",
     // SAP HANA in-memory DB
     "com.sap.db.jdbc.ConnectionSapDB",
+    // IBM Informix
+    "com.informix.jdbc.IfmxConnection",
     // for testing purposes
     "test.TestConnection"
   };
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
index f8416b978df..74c099a249c 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -44,9 +44,11 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
   public static final boolean INJECT_COMMENT =
       DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL)
           || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC);
-  public static final boolean INJECT_TRACE_CONTEXT =
+  private static final boolean INJECT_TRACE_CONTEXT =
       DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL);
 
+  private volatile boolean warnedAboutDBMPropagationMode = false; // to log a warning only once
+
   public static void logMissingQueryInfo(Statement statement) throws SQLException {
     if (log.isDebugEnabled()) {
       log.debug(
@@ -117,12 +119,7 @@ protected String dbHostname(final DBInfo info) {
     return info.getHost();
   }
 
-  public AgentSpan onConnection(
-      final AgentSpan span,
-      final Connection connection,
-      ContextStore<Connection, DBInfo> contextStore) {
-
-    final DBInfo dbInfo = parseDBInfo(connection, contextStore);
+  public AgentSpan onConnection(final AgentSpan span, DBInfo dbInfo) {
     if (dbInfo != null) {
       processDatabaseType(span, dbInfo.getType());
     }
@@ -233,4 +230,18 @@ protected void postProcessServiceAndOperationName(
     }
     span.setOperationName(namingEntry.getOperation());
   }
+
+  public boolean shouldInjectTraceContext(DBInfo dbInfo) {
+    if (INJECT_TRACE_CONTEXT && !dbInfo.getFullPropagationSupport()) {
+      if (!warnedAboutDBMPropagationMode) {
+        log.warn(
+            "Using DBM_PROPAGATION_MODE in 'full' mode is not supported for {}. "
+                + "See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm/ for more info.",
+            dbInfo.getType());
+        warnedAboutDBMPropagationMode = true;
+      }
+      return false;
+    }
+    return INJECT_TRACE_CONTEXT;
+  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
index 0ac3bb6335d..02eabb8e5fa 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
@@ -19,23 +19,29 @@ public class SQLCommenter {
   private static final char EQUALS = '=';
   private static final char COMMA = ',';
   private static final char QUOTE = '\'';
+  private static final char SPACE = ' ';
   private static final String OPEN_COMMENT = "/*";
-  private static final String CLOSE_COMMENT = "*/ ";
+  private static final String CLOSE_COMMENT = "*/";
   private static final int INITIAL_CAPACITY = computeInitialCapacity();
 
-  public static String inject(final String sql, final String dbService) {
-    return inject(sql, dbService, null, false);
+  public static String append(final String sql, final String dbService) {
+    return inject(sql, dbService, null, false, true);
+  }
+
+  public static String prepend(final String sql, final String dbService) {
+    return inject(sql, dbService, null, false, false);
   }
 
   public static String inject(
       final String sql,
       final String dbService,
       final String traceParent,
-      final boolean injectTrace) {
+      final boolean injectTrace,
+      final boolean appendComment) {
     if (sql == null || sql.isEmpty()) {
       return sql;
     }
-    if (hasDDComment(sql)) {
+    if (hasDDComment(sql, appendComment)) {
       return sql;
     }
     final Config config = Config.get();
@@ -44,35 +50,51 @@ public static String inject(
     final String version = config.getVersion();
     final int commentSize = capacity(traceParent, parentService, dbService, env, version);
     StringBuilder sb = new StringBuilder(sql.length() + commentSize);
-    sb.append(OPEN_COMMENT);
-    toComment(sb, injectTrace, parentService, dbService, env, version, traceParent);
-    if (sb.length() == 2) {
+    boolean commentAdded = false;
+    if (appendComment) {
+      sb.append(sql);
+      sb.append(SPACE);
+      sb.append(OPEN_COMMENT);
+      commentAdded =
+          toComment(sb, injectTrace, parentService, dbService, env, version, traceParent);
+      sb.append(CLOSE_COMMENT);
+    } else {
+      sb.append(OPEN_COMMENT);
+      commentAdded =
+          toComment(sb, injectTrace, parentService, dbService, env, version, traceParent);
+      sb.append(CLOSE_COMMENT);
+      sb.append(SPACE);
+      sb.append(sql);
+    }
+    if (!commentAdded) {
       return sql;
     }
-    sb.append(CLOSE_COMMENT);
-    sb.append(sql);
     return sb.toString();
   }
 
-  private static boolean hasDDComment(String sql) {
-    // first check to see if sql starts with a comment
-    if (!(sql.startsWith("/*"))) {
+  private static boolean hasDDComment(String sql, final boolean appendComment) {
+    // first check to see if sql ends with a comment
+    if ((!(sql.endsWith(CLOSE_COMMENT)) && appendComment)
+        || ((!(sql.startsWith(OPEN_COMMENT))) && !appendComment)) {
       return false;
     }
     // else check to see if it's a DBM trace sql comment
-    int i = 2;
+    int startIdx = 2;
+    if (appendComment) {
+      startIdx = sql.lastIndexOf(OPEN_COMMENT) + 2;
+    }
+    int startComment = appendComment ? startIdx : sql.length();
     boolean found = false;
-    if (sql.length() > 2) {
-      // check if the next word starts with one of the specified keys
-      if (hasMatchingSubstring(sql, i, PARENT_SERVICE)) {
+    if (startComment > 2) {
+      if (hasMatchingSubstring(sql, startIdx, PARENT_SERVICE)) {
         found = true;
-      } else if (hasMatchingSubstring(sql, i, DATABASE_SERVICE)) {
+      } else if (hasMatchingSubstring(sql, startIdx, DATABASE_SERVICE)) {
         found = true;
-      } else if (hasMatchingSubstring(sql, i, DD_ENV)) {
+      } else if (hasMatchingSubstring(sql, startIdx, DD_ENV)) {
         found = true;
-      } else if (hasMatchingSubstring(sql, i, DD_VERSION)) {
+      } else if (hasMatchingSubstring(sql, startIdx, DD_VERSION)) {
         found = true;
-      } else if (hasMatchingSubstring(sql, i, TRACEPARENT)) {
+      } else if (hasMatchingSubstring(sql, startIdx, TRACEPARENT)) {
         found = true;
       }
     }
@@ -98,7 +120,7 @@ private static String encode(final String val) {
     return val;
   }
 
-  protected static void toComment(
+  protected static boolean toComment(
       StringBuilder sb,
       final boolean injectTrace,
       final String parentService,
@@ -114,6 +136,7 @@ protected static void toComment(
     if (injectTrace) {
       append(sb, TRACEPARENT, traceparent, sb.length() > emptySize);
     }
+    return sb.length() > emptySize;
   }
 
   private static void append(StringBuilder sb, String key, String value, boolean prependComma) {
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLServerConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLServerConnectionInstrumentation.java
new file mode 100644
index 00000000000..edefa428c21
--- /dev/null
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLServerConnectionInstrumentation.java
@@ -0,0 +1,116 @@
+package datadog.trace.instrumentation.jdbc;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.hasInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DECORATE;
+import static datadog.trace.instrumentation.jdbc.JDBCDecorator.INJECT_COMMENT;
+import static datadog.trace.instrumentation.jdbc.JDBCDecorator.logQueryInfoInjection;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import datadog.trace.bootstrap.ContextStore;
+import datadog.trace.bootstrap.InstrumentationContext;
+import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
+import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class SQLServerConnectionInstrumentation extends AbstractConnectionInstrumentation
+    implements Instrumenter.ForKnownTypes {
+
+  /**
+   * Instrumentation class for connections for SQL Server, which is a Database Monitoring supported
+   * DB *
+   */
+  public SQLServerConnectionInstrumentation() {
+    super("jdbc", "dbm-sqlserver");
+  }
+
+  // Classes to cover all currently supported
+  // db types for the Database Monitoring product
+  static final String[] CONCRETE_TYPES = {
+    "com.microsoft.sqlserver.jdbc.SQLServerConnection",
+    // jtds (for SQL Server and Sybase)
+    "net.sourceforge.jtds.jdbc.ConnectionJDBC2", // 1.2
+    "net.sourceforge.jtds.jdbc.JtdsConnection", // 1.3
+  };
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".JDBCDecorator", packageName + ".SQLCommenter",
+    };
+  }
+
+  @Override
+  public String[] knownMatchingTypes() {
+    return CONCRETE_TYPES;
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        nameStartsWith("prepare")
+            .and(takesArgument(0, String.class))
+            // Also include CallableStatement, which is a subtype of PreparedStatement
+            .and(returns(hasInterface(named("java.sql.PreparedStatement")))),
+        SQLServerConnectionInstrumentation.class.getName() + "$ConnectionAdvice");
+  }
+
+  @Override
+  public Map<String, String> contextStore() {
+    Map<String, String> contextStore = new HashMap<>(4);
+    contextStore.put("java.sql.Statement", DBQueryInfo.class.getName());
+    contextStore.put("java.sql.Connection", DBInfo.class.getName());
+    return contextStore;
+  }
+
+  public static class ConnectionAdvice {
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static String onEnter(
+        @Advice.This Connection connection,
+        @Advice.Argument(value = 0, readOnly = false) String sql) {
+      if (INJECT_COMMENT) {
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Connection.class);
+        if (callDepth > 0) {
+          return null;
+        }
+        final String inputSql = sql;
+        final DBInfo dbInfo =
+            JDBCDecorator.parseDBInfo(
+                connection, InstrumentationContext.get(Connection.class, DBInfo.class));
+        sql = SQLCommenter.append(sql, DECORATE.getDbService(dbInfo));
+        return inputSql;
+      }
+      return sql;
+    }
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void addDBInfo(
+        @Advice.This Connection connection,
+        @Advice.Enter final String inputSql,
+        @Advice.Return final PreparedStatement statement) {
+      if (null == inputSql) {
+        return;
+      }
+      ContextStore<Statement, DBQueryInfo> contextStore =
+          InstrumentationContext.get(Statement.class, DBQueryInfo.class);
+      if (null == contextStore.get(statement)) {
+        DBQueryInfo info = DBQueryInfo.ofPreparedStatement(inputSql);
+        contextStore.put(statement, info);
+        logQueryInfoInjection(connection, statement, info);
+      }
+      CallDepthThreadLocalMap.reset(Connection.class);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
index d645601ee75..1b213921912 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
@@ -9,7 +9,6 @@
 import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DATABASE_QUERY;
 import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DECORATE;
 import static datadog.trace.instrumentation.jdbc.JDBCDecorator.INJECT_COMMENT;
-import static datadog.trace.instrumentation.jdbc.JDBCDecorator.INJECT_TRACE_CONTEXT;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -60,6 +59,9 @@ public String[] helperClassNames() {
     };
   }
 
+  // prepend mode will prepend the SQL comment to the raw sql query
+  private static final boolean appendComment = false;
+
   @Override
   public void adviceTransformations(AdviceTransformation transformation) {
     transformation.applyAdvice(
@@ -81,12 +83,16 @@ public static AgentScope onEnter(
         final Connection connection = statement.getConnection();
         final AgentSpan span = startSpan(DATABASE_QUERY);
         DECORATE.afterStart(span);
-        DECORATE.onConnection(
-            span, connection, InstrumentationContext.get(Connection.class, DBInfo.class));
+        final DBInfo dbInfo =
+            JDBCDecorator.parseDBInfo(
+                connection, InstrumentationContext.get(Connection.class, DBInfo.class));
+        DECORATE.onConnection(span, dbInfo);
         final String copy = sql;
         if (span != null && INJECT_COMMENT) {
           String traceParent = null;
-          if (INJECT_TRACE_CONTEXT) {
+
+          boolean injectTraceContext = DECORATE.shouldInjectTraceContext(dbInfo);
+          if (injectTraceContext) {
             Integer priority = span.forceSamplingDecision();
             if (priority != null) {
               traceParent = DECORATE.traceParent(span, priority);
@@ -94,7 +100,9 @@ public static AgentScope onEnter(
               span.setTag(DBM_TRACE_INJECTED, true);
             }
           }
-          sql = SQLCommenter.inject(sql, span.getServiceName(), traceParent, INJECT_TRACE_CONTEXT);
+          sql =
+              SQLCommenter.inject(
+                  sql, span.getServiceName(), traceParent, injectTraceContext, appendComment);
         }
         DECORATE.onStatement(span, DBQueryInfo.ofStatement(copy));
         return activateSpan(span);
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/IastJDBCTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/IastJDBCTest.groovy
index 4907b9a690d..bf2631f4939 100644
--- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/IastJDBCTest.groovy
+++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/IastJDBCTest.groovy
@@ -1,3 +1,4 @@
+import com.datadog.iast.taint.Ranges
 import com.datadog.iast.test.IastAgentTestRunner
 import com.datadog.iast.model.VulnerabilityBatch
 import datadog.trace.core.DDSpan
@@ -46,7 +47,7 @@ class IastJDBCTest extends IastAgentTestRunner {
     def valueRead
     DDSpan span = runUnderIastTrace {
       String taintedString = 'SELECT id FROM TEST LIMIT 1'
-      localTaintedObjects.taintInputString(taintedString, EMPTY_SOURCE)
+      localTaintedObjects.taint(taintedString, Ranges.forCharSequence(taintedString, EMPTY_SOURCE))
       Connection constWrapper = new IastInstrumentedConnection(conn: connection)
 
       constWrapper.prepareStatement(taintedString).withCloseable { stmt ->
@@ -99,7 +100,7 @@ class IastJDBCTest extends IastAgentTestRunner {
     def valueRead
     DDSpan span = runUnderIastTrace {
       String taintedString = 'SELECT id FROM TEST LIMIT 1'
-      localTaintedObjects.taintInputString(taintedString, EMPTY_SOURCE)
+      localTaintedObjects.taint(taintedString, Ranges.forCharSequence(taintedString, EMPTY_SOURCE))
 
       connection.createStatement().withCloseable { stmt ->
         Statement stmtWrapper = new IastInstrumentedStatement(stmt: stmt)
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCDecoratorTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCDecoratorTest.groovy
new file mode 100644
index 00000000000..d883c5b5b48
--- /dev/null
+++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCDecoratorTest.groovy
@@ -0,0 +1,72 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo
+import spock.lang.Unroll
+
+import static datadog.trace.api.config.TraceInstrumentationConfig.DB_DBM_PROPAGATION_MODE_MODE
+import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DECORATE
+
+abstract class JDBCDecoratorTest extends AgentTestRunner {
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    setupPropagationMode()
+  }
+
+  @Unroll
+  def "Full integration disabled for unsupported DB types (#dbType)"() {
+    setup:
+    DBInfo dbInfo = new DBInfo.Builder().type(dbType).build()
+    expect:
+    // check that we get the signal to inject iff both the type and the config say yes
+    DECORATE.shouldInjectTraceContext(dbInfo) == (expectedByType && expectedFromConfig())
+
+    where:
+    dbType       | expectedByType
+    "oracle"     | false
+    "sqlserver"  | false
+    "mysql"      | true
+    "postgresql" | true
+  }
+
+  protected abstract void setupPropagationMode()
+
+  protected abstract boolean expectedFromConfig()
+}
+
+
+class JDBCDecoratorFullPropagationForkedTest extends JDBCDecoratorTest {
+  @Override
+  protected void setupPropagationMode() {
+    injectSysConfig(DB_DBM_PROPAGATION_MODE_MODE, "full")
+  }
+
+  @Override
+  protected boolean expectedFromConfig() {
+    // trace context should be injected only in full mode, this is the only "true".
+    return true
+  }
+}
+
+class JDBCDecoratorServicePropagationForkedTest extends JDBCDecoratorTest {
+  @Override
+  protected void setupPropagationMode() {
+    injectSysConfig(DB_DBM_PROPAGATION_MODE_MODE, "service")
+  }
+
+  @Override
+  protected boolean expectedFromConfig() {
+    return false
+  }
+}
+
+class JDBCDecoratorNoPropagationForkedTest extends JDBCDecoratorTest {
+  @Override
+  protected void setupPropagationMode() {
+    injectSysConfig(DB_DBM_PROPAGATION_MODE_MODE, "disabled")
+  }
+
+  @Override
+  protected boolean expectedFromConfig() {
+    return false
+  }
+}
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy
index 686880c5317..8e9eb9dab56 100644
--- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy
+++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy
@@ -12,9 +12,13 @@ class SQLCommenterTest extends AgentTestRunner {
     when:
     String sqlWithComment = ""
     if (injectTrace) {
-      sqlWithComment = SQLCommenter.inject(query, dbService, traceParent, true)
+      sqlWithComment = SQLCommenter.inject(query, dbService, traceParent, true, appendComment)
     } else {
-      sqlWithComment = SQLCommenter.inject(query, dbService)
+      if (appendComment) {
+        sqlWithComment = SQLCommenter.append(query, dbService)
+      } else {
+        sqlWithComment = SQLCommenter.prepend(query, dbService)
+      }
     }
 
     sqlWithComment == expected
@@ -23,26 +27,47 @@ class SQLCommenterTest extends AgentTestRunner {
     sqlWithComment == expected
 
     where:
-    query                                                                                         | ddService      | ddEnv  | dbService    | ddVersion     | injectTrace | traceParent                                               | expected
-    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
-    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
-    "SELECT * FROM foo"                                                                           | ""             | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
-    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | ""            | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
-    "SELECT * FROM foo"                                                                           | ""             | ""     | ""           | ""            | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
-    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query"
-    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo"
-    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT * FROM foo"
-    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT /* customer-comment */ * FROM foo"
-    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT * from FOO -- test query"
-    ""                                                                                            | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | ""
-    "   "                                                                                         | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/    "
-    "/*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
-    "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"                     | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
-    "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"                                | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
-    "/*ddpv='TestVersion'*/ SELECT * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddpv='TestVersion'*/ SELECT * FROM foo"
-    "/*ddjk its a customer */ SELECT * FROM foo"                                                  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*ddjk its a customer */ SELECT * FROM foo"
-    "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo"
-    "/*customer-comment*/ SELECT * FROM foo"                                                      | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*customer-comment*/ SELECT * FROM foo"
-    "/*traceparent"                                                                               | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*traceparent"
+    query                                                                                         | ddService      | ddEnv  | dbService    | ddVersion     | injectTrace | appendComment                             | traceParent                                               | expected
+    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "{call dogshelterProc(?, ?)}"                                                                 | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | ""            | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dde='Test',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "SELECT * FROM foo"                                                                           | ""             | ""     | ""           | ""            | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"
+    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "SELECT * from FOO -- test query /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"
+    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"
+    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * from FOO -- test query /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    ""                                                                                            | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | ""
+    "   "                                                                                         | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | true  | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "    /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"
+    "SELECT * FROM foo /*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"
+    "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"                     | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"
+    "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/"                                | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/"
+    "SELECT * FROM foo /*ddpv='TestVersion'*/"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*ddpv='TestVersion'*/"
+    "/*ddjk its a customer */ SELECT * FROM foo"                                                  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "/*ddjk its a customer */ SELECT * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"
+    "/*customer-comment*/ SELECT * FROM foo"                                                      | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "/*customer-comment*/ SELECT * FROM foo /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    "/*traceparent"                                                                               | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | true  | null                                                      | "/*traceparent /*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/"
+    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
+    "SELECT * FROM foo"                                                                           | ""             | "Test" | ""           | ""            | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
+    "SELECT * FROM foo"                                                                           | ""             | ""     | ""           | ""            | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"
+    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query"
+    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo"
+    "SELECT * FROM foo"                                                                           | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT * FROM foo"
+    "SELECT /* customer-comment */ * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT /* customer-comment */ * FROM foo"
+    "SELECT * from FOO -- test query"                                                             | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ SELECT * from FOO -- test query"
+    ""                                                                                            | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | ""
+    "   "                                                                                         | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | true        | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/    "
+    "/*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*dddbs='my-service',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
+    "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"                     | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
+    "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"                                | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"
+    "/*ddpv='TestVersion'*/ SELECT * FROM foo"                                                    | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddpv='TestVersion'*/ SELECT * FROM foo"
+    "/*ddjk its a customer */ SELECT * FROM foo"                                                  | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*ddjk its a customer */ SELECT * FROM foo"
+    "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo"
+    "/*customer-comment*/ SELECT * FROM foo"                                                      | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*customer-comment*/ SELECT * FROM foo"
+    "/*traceparent"                                                                               | "SqlCommenter" | "Test" | "my-service" | "TestVersion" | false       | false | null                                                      | "/*ddps='SqlCommenter',dddbs='my-service',dde='Test',ddpv='TestVersion'*/ /*traceparent"
   }
 }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractFormProviderInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractFormProviderInstrumentation.java
index 3257396e61c..891a3c5969f 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractFormProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractFormProviderInstrumentation.java
@@ -6,11 +6,11 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.List;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -39,14 +39,16 @@ public static class InstrumenterAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void onExit(@Advice.Return Map<String, List<String>> result) {
-      final WebModule module = InstrumentationBridge.WEB;
       final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (module != null && prop != null) {
-        module.onParameterNames(result.keySet());
-        for (Map.Entry<String, List<String>> entry : result.entrySet()) {
-          for (String value : entry.getValue()) {
-            prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, entry.getKey(), value);
-          }
+      if (prop == null || result == null || result.isEmpty()) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (Map.Entry<String, List<String>> entry : result.entrySet()) {
+        final String name = entry.getKey();
+        prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+        for (String value : entry.getValue()) {
+          prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractParamValueExtractorInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractParamValueExtractorInstrumentation.java
index 7f41647e1d5..f3fc78e2136 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractParamValueExtractorInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractParamValueExtractorInstrumentation.java
@@ -44,7 +44,7 @@ public static void onExit(
       if (result instanceof String) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          module.taint(ThreadLocalSourceType.get(), parameterName, (String) result);
+          module.taint(result, ThreadLocalSourceType.get(), parameterName);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderAdvice.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderAdvice.java
index e0aae9e3b7f..a90dd72004e 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderAdvice.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderAdvice.java
@@ -9,11 +9,11 @@
 public class AbstractStringReaderAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  public static void onExit(@Advice.Return(readOnly = true) Object result) {
+  public static void onExit(@Advice.Return Object result) {
     if (result instanceof String) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, null, (String) result);
+        module.taint(result, SourceTypes.REQUEST_PARAMETER_VALUE);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
index 586a882a2ae..45d88c77e96 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
@@ -41,7 +41,7 @@ public static class InstrumenterAdviceGetName {
     public static void onExit(@Advice.Return String cookieName, @Advice.This Object self) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, cookieName, cookieName, self);
+        module.taintIfTainted(cookieName, self, SourceTypes.REQUEST_COOKIE_NAME, cookieName);
       }
     }
   }
@@ -55,7 +55,7 @@ public static void onExit(
         @Advice.This Object self) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_VALUE, name, cookieValue, self);
+        module.taintIfTainted(cookieValue, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
index fb2eb5f8dcb..e75c53e222e 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
@@ -6,11 +6,11 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.List;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -45,12 +45,13 @@ public static class InstrumenterAdviceGetHeaders {
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void onExit(@Advice.Return Map<String, List<String>> headers) {
       final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      final WebModule web = InstrumentationBridge.WEB;
-      if (prop != null && web != null) {
-        web.onHeaderNames(headers.keySet());
+      if (prop != null && headers != null && !headers.isEmpty()) {
+        final IastContext ctx = IastContext.Provider.get();
         for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+          final String name = entry.getKey();
+          prop.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
           for (String value : entry.getValue()) {
-            prop.taint(SourceTypes.REQUEST_HEADER_VALUE, entry.getKey(), value);
+            prop.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
           }
         }
       }
@@ -62,9 +63,12 @@ public static class InstrumenterAdviceGetRequestCookies {
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     public static void onExit(@Advice.Return Map<String, Object> cookies) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        for (Object cookie : cookies.values()) {
-          module.taintObject(SourceTypes.REQUEST_COOKIE_VALUE, cookie);
+      if (module != null && cookies != null && !cookies.isEmpty()) {
+        final IastContext ctx = IastContext.Provider.get();
+        for (Map.Entry<String, Object> entry : cookies.entrySet()) {
+          final String name = entry.getKey();
+          module.taint(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+          module.taint(ctx, entry.getValue(), SourceTypes.REQUEST_COOKIE_VALUE, name);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
index 47a10d32bf3..5b52459bee5 100644
--- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
@@ -36,7 +36,7 @@ public static class InstrumenterAdvice {
     static void after(@Advice.Return final InputStream inputStream) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintObject(SourceTypes.REQUEST_BODY, inputStream);
+        module.taint(inputStream, SourceTypes.REQUEST_BODY);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
index 96c9fb8fa56..40005d5e18a 100644
--- a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
+++ b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
@@ -41,11 +41,13 @@ public static void onEnter(@Advice.Return Map<String, Object> map) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
 
       if (module != null) {
-        for (Map.Entry entry : map.entrySet()) {
-          if (entry.getValue() instanceof String) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+          final String name = entry.getKey();
+          final Object value = entry.getValue();
+          if (value instanceof String) {
             // TODO: We could represent this source more accurately, perhaps tracking the original
             // source, or using a special name.
-            module.taint(SourceTypes.REQUEST_HEADER_VALUE, null, (String) entry.getValue());
+            module.taint(value, SourceTypes.REQUEST_HEADER_VALUE, name);
           }
         }
       }
diff --git a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
index 3cfe4e42887..932857c7902 100644
--- a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
@@ -42,7 +42,7 @@ public static void onEnter(@Advice.Argument(0) String json) {
       if (module != null) {
         // TODO: We could represent this source more accurately, perhaps tracking the original
         // source, or using a special name.
-        module.taint(SourceTypes.REQUEST_HEADER_VALUE, null, json);
+        module.taint(json, SourceTypes.REQUEST_HEADER_VALUE);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/jose-jwt/src/test/groovy/JWTParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jose-jwt/src/test/groovy/JWTParserInstrumentationTest.groovy
index c54039d2dd8..c18c77ca48b 100644
--- a/dd-java-agent/instrumentation/jose-jwt/src/test/groovy/JWTParserInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jose-jwt/src/test/groovy/JWTParserInstrumentationTest.groovy
@@ -19,7 +19,7 @@ class JWTParserInstrumentationTest  extends AgentTestRunner {
     new com.auth0.jwt.impl.JWTParser().parsePayload(payload)
 
     then:
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, payload)
+    1 * propagationModule.taint(payload, SourceTypes.REQUEST_HEADER_VALUE)
     0 * _
   }
 
@@ -33,11 +33,11 @@ class JWTParserInstrumentationTest  extends AgentTestRunner {
     com.nimbusds.jose.util.JSONObjectUtils.parse(json)
 
     then:
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, "http://foobar.com")
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, "foo")
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, "foobar")
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, "Mr Foo Bar")
-    1 * propagationModule.taint(SourceTypes.REQUEST_HEADER_VALUE, null, "read")
+    1 * propagationModule.taint('http://foobar.com', SourceTypes.REQUEST_HEADER_VALUE, 'iss')
+    1 * propagationModule.taint('foo', SourceTypes.REQUEST_HEADER_VALUE, 'sub')
+    1 * propagationModule.taint('foobar', SourceTypes.REQUEST_HEADER_VALUE, 'aud')
+    1 * propagationModule.taint('Mr Foo Bar', SourceTypes.REQUEST_HEADER_VALUE, 'name')
+    1 * propagationModule.taint('read', SourceTypes.REQUEST_HEADER_VALUE, 'scope')
     0 * _
   }
 }
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/build.gradle b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/build.gradle
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
similarity index 69%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
index d9657dd2a12..e7e780d2139 100644
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.junit4;
 
+import datadog.trace.api.civisibility.InstrumentationBridge;
 import datadog.trace.util.MethodHandles;
 import datadog.trace.util.Strings;
 import io.cucumber.core.gherkin.Feature;
@@ -7,6 +8,7 @@
 import io.cucumber.core.resource.ClassLoaders;
 import java.io.InputStream;
 import java.lang.invoke.MethodHandle;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -18,17 +20,21 @@
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 import org.junit.runners.ParentRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunListener.ThreadSafe
 public class CucumberTracingListener extends TracingListener {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(CucumberTracingListener.class);
+
+  private static final ClassLoader CUCUMBER_CLASS_LOADER = ClassLoaders.getDefaultClassLoader();
   public static final String FRAMEWORK_NAME = "cucumber";
   public static final String FRAMEWORK_VERSION = getVersion();
 
   private static String getVersion() {
-    ClassLoader cucumberClassLoader = ClassLoaders.getDefaultClassLoader();
     try (InputStream cucumberPropsStream =
-        cucumberClassLoader.getResourceAsStream(
+        CUCUMBER_CLASS_LOADER.getResourceAsStream(
             "META-INF/maven/io.cucumber/cucumber-junit/pom.properties")) {
       Properties cucumberProps = new Properties();
       cucumberProps.load(cucumberPropsStream);
@@ -42,11 +48,11 @@ private static String getVersion() {
     return "unknown";
   }
 
-  private static final MethodHandles REFLECTION =
-      new MethodHandles(ClassLoaders.getDefaultClassLoader());
+  private static final MethodHandles REFLECTION = new MethodHandles(CUCUMBER_CLASS_LOADER);
   private static final MethodHandle PICKLE_ID_CONSTRUCTOR =
       REFLECTION.constructor("io.cucumber.junit.PickleRunners$PickleId", Pickle.class);
-
+  private static final MethodHandle PICKLE_ID_URI_GETTER =
+      REFLECTION.privateFieldGetter("io.cucumber.junit.PickleRunners$PickleId", "uri");
   private static final MethodHandle FEATURE_GETTER =
       REFLECTION.privateFieldGetter("io.cucumber.junit.FeatureRunner", "feature");
 
@@ -65,7 +71,7 @@ public CucumberTracingListener(List<ParentRunner<?>> featureRunners) {
   @Override
   public void testSuiteStarted(final Description description) {
     if (isFeature(description)) {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForFeature(description);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
           testSuiteName, FRAMEWORK_NAME, FRAMEWORK_VERSION, null, Collections.emptyList(), false);
     }
@@ -74,14 +80,14 @@ public void testSuiteStarted(final Description description) {
   @Override
   public void testSuiteFinished(final Description description) {
     if (isFeature(description)) {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForFeature(description);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(testSuiteName, null);
     }
   }
 
   @Override
   public void testStarted(final Description description) {
-    String testSuiteName = description.getClassName();
+    String testSuiteName = getTestSuiteNameForScenario(description);
     String testName = description.getMethodName();
     List<String> categories = getCategories(description);
 
@@ -96,11 +102,45 @@ public void testStarted(final Description description) {
         null,
         null,
         null);
+
+    recordFeatureFileCodeCoverage(description);
+  }
+
+  private static String getTestSuiteNameForFeature(Description featureDescription) {
+    Object uniqueId = JUnit4Utils.getUniqueId(featureDescription);
+    return (uniqueId != null ? uniqueId + ":" : "") + featureDescription.getClassName();
+  }
+
+  private static String getTestSuiteNameForScenario(Description scenarioDescription) {
+    URI featureUri = getFeatureUri(scenarioDescription);
+    return (featureUri != null ? featureUri + ":" : "") + scenarioDescription.getClassName();
+  }
+
+  private static URI getFeatureUri(Description scenarioDescription) {
+    try {
+      Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
+      return REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
+    } catch (Exception e) {
+      LOGGER.error(
+          "Could not retrieve unique ID from scenario description {}", scenarioDescription, e);
+      return null;
+    }
+  }
+
+  private static void recordFeatureFileCodeCoverage(Description scenarioDescription) {
+    try {
+      Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
+      URI pickleUri = REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
+      String featureRelativePath = pickleUri.getSchemeSpecificPart();
+      InstrumentationBridge.currentCoverageProbeStoreRecordNonCode(featureRelativePath);
+    } catch (Exception e) {
+      LOGGER.error("Could not record feature file coverage for {}", scenarioDescription, e);
+    }
   }
 
   @Override
   public void testFinished(final Description description) {
-    String testSuiteName = description.getClassName();
+    String testSuiteName = getTestSuiteNameForScenario(description);
     String testName = description.getMethodName();
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(
         testSuiteName, null, testName, null, null);
@@ -111,12 +151,12 @@ public void testFinished(final Description description) {
   public void testFailure(final Failure failure) {
     Description description = failure.getDescription();
     if (isFeature(description)) {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForFeature(description);
       Throwable throwable = failure.getException();
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(
           testSuiteName, null, throwable);
     } else {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForScenario(description);
       String testName = description.getMethodName();
       Throwable throwable = failure.getException();
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(
@@ -136,10 +176,10 @@ public void testAssumptionFailure(final Failure failure) {
 
     Description description = failure.getDescription();
     if (isFeature(description)) {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForFeature(description);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(testSuiteName, null, reason);
     } else {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForScenario(description);
       String testName = description.getMethodName();
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(
           testSuiteName, null, testName, null, null, reason);
@@ -152,13 +192,13 @@ public void testIgnored(final Description description) {
     String reason = ignore != null ? ignore.value() : null;
 
     if (isFeature(description)) {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForFeature(description);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
           testSuiteName, FRAMEWORK_NAME, FRAMEWORK_VERSION, null, Collections.emptyList(), false);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(testSuiteName, null, reason);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(testSuiteName, null);
     } else {
-      String testSuiteName = description.getClassName();
+      String testSuiteName = getTestSuiteNameForScenario(description);
       String testName = description.getMethodName();
       List<String> categories = getCategories(description);
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy
new file mode 100644
index 00000000000..49c2df24389
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy
@@ -0,0 +1,65 @@
+import datadog.trace.api.DisableTestTrace
+import datadog.trace.api.civisibility.config.SkippableTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
+import datadog.trace.instrumentation.junit4.CucumberTracingListener
+import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder
+import io.cucumber.core.options.Constants
+import org.example.cucumber.TestSucceedCucumber
+import org.junit.runner.JUnitCore
+
+import java.util.stream.Collectors
+
+@DisableTestTrace(reason = "avoid self-tracing")
+class CucumberTest extends CiVisibilityInstrumentationTest {
+
+  def runner = new JUnitCore()
+
+  def "test #testcaseName"() {
+    setup:
+    givenSkippableTests(skippedTests)
+
+    runFeatures(features)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                          | features                                                                                                                        | expectedTracesCount | skippedTests
+    "test-succeed"                        | ["org/example/cucumber/calculator/basic_arithmetic.feature"]                                                                    | 2                   | []
+    "test-scenario-outline-${version()}"  | ["org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"]                                                      | 5                   | []
+    "test-failure"                        | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"]                                                             | 2                   | []
+    "test-itr-skipping"                   | ["org/example/cucumber/calculator/basic_arithmetic.feature"]                                                                    | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-itr-unskippable"                | ["org/example/cucumber/calculator/basic_arithmetic_unskippable.feature"]                                                        | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-itr-unskippable-suite"          | ["org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature"]                                                  | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-multiple-features-${version()}" | [
+      "org/example/cucumber/calculator/basic_arithmetic.feature",
+      "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
+    ] | 3                   | []
+  }
+
+  private String version() {
+    return CucumberTracingListener.FRAMEWORK_VERSION < "7" ? CucumberTracingListener.FRAMEWORK_VERSION : "latest"
+  }
+
+  private void runFeatures(List<String> classpathFeatures) {
+    System.setProperty(Constants.GLUE_PROPERTY_NAME, "org.example.cucumber.calculator")
+    System.setProperty(Constants.FILTER_TAGS_PROPERTY_NAME, "not @Disabled")
+    System.setProperty(Constants.FEATURES_PROPERTY_NAME, classpathFeatures.stream()
+    .map(f -> "classpath:" + f).
+    collect(Collectors.joining(",")))
+
+    TestEventsHandlerHolder.start()
+    runner.run(TestSucceedCucumber)
+    TestEventsHandlerHolder.stop()
+  }
+
+  @Override
+  String instrumentedLibraryName() {
+    CucumberTracingListener.FRAMEWORK_NAME
+  }
+
+  @Override
+  String instrumentedLibraryVersion() {
+    CucumberTracingListener.FRAMEWORK_VERSION
+  }
+}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java
new file mode 100644
index 00000000000..1786ab102f4
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java
@@ -0,0 +1,7 @@
+package org.example.cucumber;
+
+import io.cucumber.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+public class TestSucceedCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
rename to dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl
new file mode 100644
index 00000000000..03cd4237460
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl
new file mode 100644
index 00000000000..e8f219a9612
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl
@@ -0,0 +1,161 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..874bae33a26
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..914ff21aebf
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,162 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl
new file mode 100644
index 00000000000..6fec5542b9d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl
new file mode 100644
index 00000000000..f701f8b0194
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl
@@ -0,0 +1,159 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..c8492b3d13b
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..cf2542cc20d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,159 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl
new file mode 100644
index 00000000000..1a153d82648
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl
@@ -0,0 +1,17 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl
new file mode 100644
index 00000000000..344f29121e5
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl
@@ -0,0 +1,241 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl
new file mode 100644
index 00000000000..1a153d82648
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl
@@ -0,0 +1,17 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl
new file mode 100644
index 00000000000..c2b2093c2a3
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl
@@ -0,0 +1,241 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2.Addition",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl
new file mode 100644
index 00000000000..2f8436e79a3
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl
@@ -0,0 +1,33 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_3},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_4},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl
new file mode 100644
index 00000000000..1ca2164d767
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl
@@ -0,0 +1,296 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl
new file mode 100644
index 00000000000..2f8436e79a3
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl
@@ -0,0 +1,33 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_3},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_4},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl
new file mode 100644
index 00000000000..1de2dcfc650
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl
@@ -0,0 +1,296 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions #1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions #2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #3",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions #3",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #4",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions #4",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..874bae33a26
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..0d048a6cbb2
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,158 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-4",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/groovy/CucumberTest.groovy
deleted file mode 100644
index 237dfac86a3..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/groovy/CucumberTest.groovy
+++ /dev/null
@@ -1,244 +0,0 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.api.DDTags
-import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
-import datadog.trace.instrumentation.junit4.CucumberTracingListener
-import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder
-import org.example.cucumber.TestFailedCucumber
-import org.example.cucumber.TestSucceedCucumber
-import org.example.cucumber.TestSucceedCucumberUnskippable
-import org.example.cucumber.TestSucceedCucumberUnskippableSuite
-import org.example.cucumber.TestSucceedExamplesCucumber
-import org.junit.runner.JUnitCore
-
-@DisableTestTrace(reason = "avoid self-tracing")
-class CucumberTest extends CiVisibilityTest {
-
-  def runner = new JUnitCore()
-
-  def "test success generates spans"() {
-    setup:
-    runTestClasses(TestSucceedCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS,
-          null, null, false, ["foo"])
-      }
-    })
-  }
-
-  def "test scenario outline generates spans"() {
-    setup:
-    runTestClasses(TestSucceedExamplesCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic With Examples", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions" + getOutlineTestNameSuffix(1), CIConstants.TEST_PASS,
-          null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions" + getOutlineTestNameSuffix(2), CIConstants.TEST_PASS,
-          null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions" + getOutlineTestNameSuffix(3), CIConstants.TEST_PASS,
-          null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions" + getOutlineTestNameSuffix(4), CIConstants.TEST_PASS,
-          null, null, false, ["foo"])
-      }
-    })
-  }
-
-  /**
-   * Later Cucumber versions add a suffix to outline test execution names
-   */
-  private String getOutlineTestNameSuffix(int idx) {
-    return expectedTestFrameworkVersion() > "7" ? " #${idx}" : ""
-  }
-
-  def "test failure generates spans"() {
-    setup:
-    runTestClasses(TestFailedCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_FAIL,
-          null, exception, false, ["foo"])
-      }
-    })
-
-    where:
-    exception = new AssertionError("expected:<42.0> but was:<9.0>")
-  }
-
-  def "test ITR test skipping"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumber)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_SKIP,
-          testTags, null, false , ["foo"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true]
-  }
-
-  def "test ITR test unskippable"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumberUnskippable)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS, testTags, null, false, ["datadog_itr_unskippable"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test ITR test unskippable suite"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumberUnskippableSuite)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS, testTags, null, false, ["datadog_itr_unskippable"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  private void runTestClasses(Class<?>... tests) {
-    TestEventsHandlerHolder.start()
-    runner.run(tests)
-    TestEventsHandlerHolder.stop()
-  }
-
-  Long testFeatureSpan(final TraceAssert trace,
-    final int index,
-    final Long testSessionId,
-    final Long testModuleId,
-    final String testSuite,
-    final String testStatus,
-    final Map<String, Object> testTags = null,
-    final Throwable exception = null,
-    final boolean emptyDuration = false,
-    final Collection<String> categories = null) {
-    return testSuiteSpan(trace, index, testSessionId, testModuleId, testSuite, testStatus, testTags, exception, emptyDuration, categories, false)
-  }
-
-  void testScenarioSpan(final TraceAssert trace,
-    final int index,
-    final Long testSessionId,
-    final Long testModuleId,
-    final Long testSuiteId,
-    final String testSuite,
-    final String testName,
-    final String testStatus,
-    final Map<String, Object> testTags = null,
-    final Throwable exception = null,
-    final boolean emptyDuration = false,
-    final Collection<String> categories = null) {
-    testSpan(trace, index, testSessionId, testModuleId, testSuiteId, testSuite, testName, null, testStatus, testTags, exception, emptyDuration, categories, false, false)
-  }
-
-  @Override
-  String expectedOperationPrefix() {
-    "junit"
-  }
-
-  @Override
-  String expectedTestFramework() {
-    CucumberTracingListener.FRAMEWORK_NAME
-  }
-
-  @Override
-  String expectedTestFrameworkVersion() {
-    CucumberTracingListener.FRAMEWORK_VERSION
-  }
-
-  @Override
-  String component() {
-    "junit"
-  }
-}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestFailedCucumber.java b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestFailedCucumber.java
deleted file mode 100644
index 3896dab9143..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestFailedCucumber.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.example.cucumber;
-
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features = "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature",
-    glue = "org.example.cucumber.calculator")
-public class TestFailedCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumber.java b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumber.java
deleted file mode 100644
index d24b0b3059b..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumber.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.example.cucumber;
-
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features = "classpath:org/example/cucumber/calculator/basic_arithmetic.feature",
-    glue = "org.example.cucumber.calculator")
-public class TestSucceedCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippable.java b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippable.java
deleted file mode 100644
index ac7953c9641..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.example.cucumber;
-
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features = "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature",
-    glue = "org.example.cucumber.calculator")
-public class TestSucceedCucumberUnskippable {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippableSuite.java b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippableSuite.java
deleted file mode 100644
index 6fcb8b318ed..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedCucumberUnskippableSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.example.cucumber;
-
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features =
-        "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature",
-    glue = "org.example.cucumber.calculator")
-public class TestSucceedCucumberUnskippableSuite {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedExamplesCucumber.java b/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedExamplesCucumber.java
deleted file mode 100644
index 96cebe5431d..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber/src/test/java/org/example/cucumber/TestSucceedExamplesCucumber.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.example.cucumber;
-
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features = "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
-    glue = "org.example.cucumber.calculator")
-public class TestSucceedExamplesCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/build.gradle b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/build.gradle
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy
new file mode 100644
index 00000000000..1c4e5d4cc50
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy
@@ -0,0 +1,55 @@
+import datadog.trace.api.DisableTestTrace
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
+import datadog.trace.instrumentation.junit4.MUnitTracingListener
+import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder
+import org.example.TestFailedAssumptionMUnit
+import org.example.TestSkippedMUnit
+import org.example.TestSkippedSuiteMUnit
+import org.example.TestSucceedMUnit
+import org.junit.runner.JUnitCore
+
+@DisableTestTrace(reason = "avoid self-tracing")
+class MUnitTest extends CiVisibilityInstrumentationTest {
+
+  def runner = new JUnitCore()
+
+  def "test #testcaseName"() {
+    setup:
+    runTests(tests)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                          | tests                       | expectedTracesCount
+    "test-succeed"                        | [TestSucceedMUnit]          | 2
+    "test-skipped"                        | [TestSkippedMUnit]          | 2
+    "test-skipped-suite"                  | [TestSkippedSuiteMUnit]     | 3
+    "test-failed-assumption-${version()}" | [TestFailedAssumptionMUnit] | 2
+  }
+
+  private void runTests(Collection<Class<?>> tests) {
+    TestEventsHandlerHolder.start()
+    try {
+      Class[] array = tests.toArray(new Class[0])
+      runner.run(array)
+    } catch (Throwable ignored) {
+      // Ignored
+    }
+    TestEventsHandlerHolder.stop()
+  }
+
+  String version() {
+    MUnitTracingListener.FRAMEWORK_VERSION < "1" ? MUnitTracingListener.FRAMEWORK_VERSION : "latest"
+  }
+
+  @Override
+  String instrumentedLibraryName() {
+    MUnitTracingListener.FRAMEWORK_NAME
+  }
+
+  @Override
+  String instrumentedLibraryVersion() {
+    MUnitTracingListener.FRAMEWORK_VERSION
+  }
+}
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl
new file mode 100644
index 00000000000..c403a154af1
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl
@@ -0,0 +1,153 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "munit-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAssumptionMUnit",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAssumptionMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.add",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAssumptionMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl
new file mode 100644
index 00000000000..8f339fb7acc
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl
@@ -0,0 +1,154 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "munit-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAssumptionMUnit",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAssumptionMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.add",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAssumptionMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "this test always assumes the wrong thing",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl
new file mode 100644
index 00000000000..441713b5892
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl
@@ -0,0 +1,202 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "munit-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedSuiteMUnit",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedSuiteMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.add",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.add",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedSuiteMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"Ignore\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.subtract",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.subtract",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedSuiteMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"Ignore\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..d92c09b893e
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,154 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "munit-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedMUnit",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedMUnit.Calculator.add",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.add",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"Ignore\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..1a161917297
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,154 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "munit-junit-4",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "munit-junit-4",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedMUnit",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedMUnit.Calculator.add",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "munit-junit-4",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Calculator.add",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMUnit",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"myTag\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "munit"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestFailedAssumptionMUnit.scala b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestFailedAssumptionMUnit.scala
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSkippedMUnit.scala b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSkippedMUnit.scala
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSkippedSuiteMUnit.scala b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSkippedSuiteMUnit.scala
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSucceedMUnit.scala b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala
similarity index 100%
rename from dd-java-agent/instrumentation/junit-4.10/munit/src/test/scala/org/example/TestSucceedMUnit.scala
rename to dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit/src/test/groovy/MUnitTest.groovy
deleted file mode 100644
index db172a3e9bc..00000000000
--- a/dd-java-agent/instrumentation/junit-4.10/munit/src/test/groovy/MUnitTest.groovy
+++ /dev/null
@@ -1,138 +0,0 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
-import datadog.trace.instrumentation.junit4.MUnitTracingListener
-import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder
-import org.example.TestFailedAssumptionMUnit
-import org.example.TestSkippedMUnit
-import org.example.TestSkippedSuiteMUnit
-import org.example.TestSucceedMUnit
-import org.junit.runner.JUnitCore
-
-@DisableTestTrace(reason = "avoid self-tracing")
-class MUnitTest extends CiVisibilityTest {
-
-  def runner = new JUnitCore()
-
-  def "test success generates spans"() {
-    setup:
-    runTests(TestSucceedMUnit)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedMUnit", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedMUnit", "Calculator.add", null, CIConstants.TEST_PASS, null, null, false, ["myTag"], true, false)
-      }
-    })
-  }
-
-  def "test skipped generates spans"() {
-    setup:
-    runTests(TestSkippedMUnit)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedMUnit", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedMUnit", "Calculator.add", null, CIConstants.TEST_SKIP, null, null, false, ["Ignore"], true, false)
-      }
-    })
-  }
-
-  def "test skipped suite generates spans"() {
-    setup:
-    runTests(TestSkippedSuiteMUnit)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedSuiteMUnit", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedSuiteMUnit", "Calculator.add", null, CIConstants.TEST_SKIP, null, null, false, ["Ignore"], true, false)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedSuiteMUnit", "Calculator.subtract", null, CIConstants.TEST_SKIP, null, null, false, ["Ignore"], true, false)
-      }
-    })
-  }
-
-  def "test failed assumption generates spans"() {
-    setup:
-    runTests(TestFailedAssumptionMUnit)
-
-    def expectedStatus
-    def testTags
-    // earlier versions of MUnit (e.g. 0.7.28) do not trigger "testAssumptionFailure" event, while newer versions do
-    if (expectedTestFrameworkVersion() > "1") {
-      expectedStatus = CIConstants.TEST_SKIP
-      testTags = [(Tags.TEST_SKIP_REASON): "this test always assumes the wrong thing"]
-    } else {
-      expectedStatus = CIConstants.TEST_PASS
-      testTags = [:]
-    }
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, expectedStatus)
-        testModuleId = testModuleSpan(it, 0, testSessionId, expectedStatus)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAssumptionMUnit", expectedStatus)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAssumptionMUnit", "Calculator.add", null, expectedStatus, testTags, null, false, null, true, false)
-      }
-    })
-  }
-
-  private void runTests(Class<?>... tests) {
-    TestEventsHandlerHolder.start()
-    runner.run(tests)
-    TestEventsHandlerHolder.stop()
-  }
-
-  @Override
-  String expectedOperationPrefix() {
-    "junit"
-  }
-
-  @Override
-  String expectedTestFramework() {
-    MUnitTracingListener.FRAMEWORK_NAME
-  }
-
-  @Override
-  String expectedTestFrameworkVersion() {
-    MUnitTracingListener.FRAMEWORK_VERSION
-  }
-
-  @Override
-  String component() {
-    "junit"
-  }
-}
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
index a604d1ab3b7..b57edd44406 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
+++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
@@ -64,7 +64,8 @@ public static void addTracingListener(
         @Advice.This final Runner runner, @Advice.Argument(0) final RunNotifier runNotifier) {
       String runnerClassName = runner.getClass().getName();
       if ("datadog.trace.agent.test.SpockRunner".equals(runnerClassName)
-          || "com.intuit.karate.junit4.Karate".equals(runnerClassName)) {
+          || runnerClassName.startsWith("com.intuit.karate")
+          || runnerClassName.startsWith("io.cucumber")) {
         // checking class names in hierarchyMatcher alone is not enough:
         // for example, Karate calls #run method of its super class,
         // that was transformed
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
index 23dec8dba88..445068b2f0d 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
+++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
@@ -293,6 +293,9 @@ public static boolean isTestSuiteDescription(final Description description) {
 
   public static boolean isSuiteContainingChildren(final Description description) {
     Class<?> testClass = description.getTestClass();
+    if (testClass == null) {
+      return false;
+    }
     for (Method method : testClass.getMethods()) {
       if (method.getAnnotation(Test.class) != null) {
         return true;
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy
index 951987863c9..c174d90e4fb 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy
@@ -1,10 +1,6 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.api.DDTags
 import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
 import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder
 import junit.runner.Version
 import org.example.TestAssumption
@@ -28,652 +24,68 @@ import org.example.TestSucceedWithCategories
 import org.junit.runner.JUnitCore
 
 @DisableTestTrace(reason = "avoid self-tracing")
-class JUnit4Test extends CiVisibilityTest {
+class JUnit4Test extends CiVisibilityInstrumentationTest {
 
   def runner = new JUnitCore()
 
-  def "test success generates spans"() {
-    setup:
-    runTests(TestSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test inheritance generates spans"() {
-    setup:
-    runTests(TestInheritance)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestInheritance", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestInheritance", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test failed generates spans"() {
-    setup:
-    try {
-      runTests(TestFailed)
-    } catch (Throwable ignored) {
-      // Ignored
-    }
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new AssertionError()
+  def "test #testcaseName"() {
+    setup:
+    givenSkippableTests(skippedTests)
+    runTests(tests)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                                         | tests                                | expectedTracesCount | skippedTests
+    "test-succeed"                                       | [TestSucceed]                        | 2                   | []
+    "test-inheritance"                                   | [TestInheritance]                    | 2                   | []
+    "test-failed"                                        | [TestFailed]                         | 2                   | []
+    "test-error"                                         | [TestError]                          | 2                   | []
+    "test-skipped"                                       | [TestSkipped]                        | 2                   | []
+    "test-class-skipped"                                 | [TestSkippedClass]                   | 3                   | []
+    "test-success-and-skipped"                           | [TestSucceedAndSkipped]              | 3                   | []
+    "test-success-and-failure"                           | [TestFailedAndSucceed]               | 4                   | []
+    "test-suite-teardown-failure"                        | [TestFailedSuiteTearDown]            | 1                   | []
+    "test-suite-setup-failure"                           | [TestFailedSuiteSetup]               | 1                   | []
+    "test-assumption-failure"                            | [TestAssumption]                     | 2                   | []
+    "test-categories-are-included-in-spans"              | [TestSucceedWithCategories]          | 2                   | []
+    "test-assumption-failure-during-suite-setup"         | [TestFailedSuiteSetUpAssumption]     | 2                   | []
+    "test-assumption-failure-in-a-milti-test-case-suite" | [TestAssumptionAndSucceed]           | 3                   | []
+    "test-multiple-successful-suites"                    | [TestSucceed, TestSucceedAndSkipped] | 4                   | []
+    "test-successful-suite-and-failing-suite"            | [TestSucceed, TestFailedAndSucceed]  | 5                   | []
+    "test-parameterized"                                 | [TestParameterized]                  | 3                   | []
+    "test-suite-runner"                                  | [TestSucceedSuite]                   | 3                   | []
+    "test-itr-skipping"                                  | [TestFailedAndSucceed]               | 4                   | [
+      new SkippableTest("org.example.TestFailedAndSucceed", "test_another_succeed", null, null),
+      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null)
+    ]
+    "test-itr-skipping-parameterized"                    | [TestParameterized]                  | 3                   | [
+      new SkippableTest("org.example.TestParameterized", "parameterized_test_succeed", '{"metadata":{"test_name":"parameterized_test_succeed[str1]"}}', null)
+    ]
+    "test-itr-unskippable"                               | [TestSucceedUnskippable]             | 2                   | [new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null)]
+    "test-itr-unskippable-suite"                         | [TestSucceedUnskippableSuite]        | 2                   | [new SkippableTest("org.example.TestSucceedUnskippableSuite", "test_succeed", null, null)]
+    "test-itr-unskippable-not-skipped"                   | [TestSucceedUnskippable]             | 2                   | []
   }
 
-  def "test error generates spans"() {
-    setup:
+  private void runTests(Collection<Class<?>> tests) {
+    TestEventsHandlerHolder.start()
     try {
-      runTests(TestError)
+      Class[] array = tests.toArray(new Class[0])
+      runner.run(array)
     } catch (Throwable ignored) {
       // Ignored
     }
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestError", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestError", "test_error", "test_error()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new IllegalArgumentException("This exception is an example")
-  }
-
-  def "test skipped generates spans"() {
-    setup:
-    runTests(TestSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkipped", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test class skipped generated spans"() {
-    setup:
-    runTests(TestSkippedClass)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedClass", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_class_another_skipped", "test_class_another_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_class_skipped", "test_class_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in class"]
-  }
-
-  def "test success and skipped generates spans"() {
-    setup:
-    runTests(TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test success and failure generates spans"() {
-    setup:
-    runTests(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionError()
-  }
-
-  def "test suite teardown failure generates spans"() {
-    setup:
-    runTests(TestFailedSuiteTearDown)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteTearDown", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite tear down failed")
-  }
-
-  def "test suite setup failure generates spans"() {
-    setup:
-    runTests(TestFailedSuiteSetup)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 1, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      trace(3, true) {
-        long testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        long testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteSetup", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite set up failed")
-  }
-
-  def "test with failing assumptions generated spans"() {
-    setup:
-    runTests(TestAssumption)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestAssumption", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumption", "test_fail_assumption", "test_fail_assumption()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "got: <false>, expected: is <true>"]
-  }
-
-  def "test categories are included in spans"() {
-    setup:
-    runTests(TestSucceedWithCategories)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedWithCategories",
-          CIConstants.TEST_PASS, null, null, false,
-          ["org.example.Slow", "org.example.Flaky"])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedWithCategories", "test_succeed", "test_succeed()V",
-          CIConstants.TEST_PASS, null, null, false,
-          ["org.example.Slow", "org.example.Flaky", "org.example.End2End", "org.example.Browser"])
-      }
-    })
-  }
-
-  def "test assumption failure during suite setup"() {
-    setup:
-    runTests(TestFailedSuiteSetUpAssumption)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteSetUpAssumption", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteSetUpAssumption", "test_succeed", "test_succeed()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "got: <false>, expected: is <true>"]
-  }
-
-  def "test assumption failure in a multi-test-case suite"() {
-    setup:
-    runTests(TestAssumptionAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestAssumptionAndSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumptionAndSucceed", "test_fail_assumption", "test_fail_assumption()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumptionAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "got: <false>, expected: is <true>"]
-  }
-
-  def "test multiple successful suites"() {
-    setup:
-    runTests(TestSucceed, TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        firstSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test successful suite and failing suite"() {
-    setup:
-    runTests(TestSucceed, TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        firstSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionError()
-  }
-
-  def "test parameterized"() {
-    setup:
-    runTests(TestParameterized)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed()V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed()V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"parameterized_test_succeed[0]"}}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"parameterized_test_succeed[1]"}}']
-  }
-
-  def "test ITR skipping"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestFailedAndSucceed", "test_another_succeed", null, null),
-      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null),
-    ])
-    runTests(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 2,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true ]
-  }
-
-  def "test ITR skipping for parameterized"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestParameterized", "parameterized_test_succeed", testTags_0[Tags.TEST_PARAMETERS], null),
-    ])
-    runTests(TestParameterized)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed()V", CIConstants.TEST_SKIP, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed()V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"parameterized_test_succeed[0]"}}',
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
-    ]
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"parameterized_test_succeed[1]"}}']
-  }
-
-  def "test ITR unskippable"() {
-    setup:
-    givenSkippableTests([new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null),])
-    runTests(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [TestSucceedUnskippable.datadog_itr_unskippable.name])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test ITR unskippable suite"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestSucceedUnskippableSuite", "test_succeed", null, null),
-    ])
-    runTests(TestSucceedUnskippableSuite)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippableSuite", CIConstants.TEST_PASS,
-          null, null, false, [TestSucceedUnskippableSuite.datadog_itr_unskippable.name])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippableSuite", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [TestSucceedUnskippableSuite.datadog_itr_unskippable.name])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test unskippable ITR test that is not supposed to be skipped"() {
-    setup:
-    givenSkippableTests([])
-    runTests(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [TestSucceedUnskippable.datadog_itr_unskippable.name])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true]
-  }
-
-  def "test suite runner"() {
-    setup:
-    runTests(TestSucceedSuite)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        firstSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedSuite\$FirstTest", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceedSuite\$SecondTest", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceedSuite\$FirstTest", "testAddition", "testAddition()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedSuite\$SecondTest", "testSubtraction", "testSubtraction()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  private void runTests(Class<?>... tests) {
-    TestEventsHandlerHolder.start()
-    runner.run(tests)
     TestEventsHandlerHolder.stop()
   }
 
   @Override
-  String expectedOperationPrefix() {
-    return "junit"
-  }
-
-  @Override
-  String expectedTestFramework() {
+  String instrumentedLibraryName() {
     return "junit4"
   }
 
   @Override
-  String expectedTestFrameworkVersion() {
+  String instrumentedLibraryVersion() {
     return Version.id()
   }
-
-  @Override
-  String component() {
-    return "junit"
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java
index 8548bed51b7..4ddfbab870e 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java
@@ -11,7 +11,7 @@
 @RunWith(Parameterized.class)
 public class TestParameterized {
 
-  @Parameterized.Parameters
+  @Parameterized.Parameters(name = "{1}")
   public static Collection<Object[]> data() {
     return Arrays.asList(
         new Object[][] {{new ParamObject(), "str1", 0}, {new ParamObject(), "\"str2\"", 1}});
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl
new file mode 100644
index 00000000000..eedec73453d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedSuiteSetUpAssumption",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "test.skip_reason" : "got: <false>, expected: is <true>",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedSuiteSetUpAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteSetUpAssumption.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteSetUpAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "got: <false>, expected: is <true>",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/events.ftl
new file mode 100644
index 00000000000..72497ff055f
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-milti-test-case-suite/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestAssumptionAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumptionAndSucceed.test_fail_assumption",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_fail_assumption()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_fail_assumption",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "got: <false>, expected: is <true>",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumptionAndSucceed.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl
new file mode 100644
index 00000000000..24e9391093d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestAssumption",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumption.test_fail_assumption",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_fail_assumption()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_fail_assumption",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "got: <false>, expected: is <true>",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl
new file mode 100644
index 00000000000..2f504613b70
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedWithCategories",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"org.example.Slow\",\"org.example.Flaky\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedWithCategories",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedWithCategories.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedWithCategories",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"org.example.Slow\",\"org.example.Flaky\",\"org.example.End2End\",\"org.example.Browser\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl
new file mode 100644
index 00000000000..51d386da571
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedClass",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_class_another_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_another_skipped()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_another_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_class_skipped",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_skipped()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl
new file mode 100644
index 00000000000..effc8093839
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestError",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestError.test_error",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_error()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_error",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.IllegalArgumentException",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl
new file mode 100644
index 00000000000..093e582b71c
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailed.test_failed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl
new file mode 100644
index 00000000000..05e8fa334b5
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestInheritance",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestInheritance.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl
new file mode 100644
index 00000000000..2cf227368aa
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -0,0 +1,219 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..af705901701
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,269 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 2,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 2
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
new file mode 100644
index 00000000000..2adf10e995a
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippable$datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl
new file mode 100644
index 00000000000..0dbf4e028b6
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippableSuite",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippableSuite$datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippableSuite.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippableSuite$datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..e5f6d0abbb1
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippable$datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl
new file mode 100644
index 00000000000..248a15c8920
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl
@@ -0,0 +1,299 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl
new file mode 100644
index 00000000000..e2e998c8c57
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..ca98a40c597
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..c7b92c63c2e
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl
new file mode 100644
index 00000000000..65bc739edd5
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl
@@ -0,0 +1,265 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl
new file mode 100644
index 00000000000..d5a757f2f6a
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl
new file mode 100644
index 00000000000..25af5f6329e
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl
@@ -0,0 +1,350 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl
new file mode 100644
index 00000000000..482024c6e6c
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl
@@ -0,0 +1,248 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSuite$FirstTest",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSuite$FirstTest",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSuite$FirstTest.testAddition",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testAddition()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testAddition",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSuite$FirstTest",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSuite$SecondTest",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSuite$SecondTest",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSuite$SecondTest.testSubtraction",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testSubtraction()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testSubtraction",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSuite$SecondTest",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl
new file mode 100644
index 00000000000..155dce9d8a4
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl
@@ -0,0 +1,116 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedSuiteSetup",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl
new file mode 100644
index 00000000000..3c6b6b484f6
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-4.10",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-4.10",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-4.10",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedSuiteTearDown",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-4.10",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-4.10",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/build.gradle b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/build.gradle
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
similarity index 93%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
index 6a8602efc49..6a503018c02 100644
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
@@ -1,6 +1,7 @@
 package datadog.trace.instrumentation.junit5;
 
 import datadog.trace.api.Pair;
+import datadog.trace.api.civisibility.InstrumentationBridge;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.platform.engine.EngineExecutionListener;
@@ -9,6 +10,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
 
@@ -52,11 +54,12 @@ public void executionFinished(
   }
 
   private void containerExecutionStarted(final TestDescriptor testDescriptor) {
-    if (!CucumberUtils.isFeature(testDescriptor.getUniqueId())) {
+    UniqueId uniqueId = testDescriptor.getUniqueId();
+    if (!CucumberUtils.isFeature(uniqueId)) {
       return;
     }
 
-    String testSuiteName = testDescriptor.getLegacyReportingName();
+    String testSuiteName = CucumberUtils.getFeatureName(testDescriptor);
     List<String> tags =
         testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
@@ -69,7 +72,7 @@ private void containerExecutionFinished(
       return;
     }
 
-    String testSuiteName = testDescriptor.getLegacyReportingName();
+    String testSuiteName = CucumberUtils.getFeatureName(testDescriptor);
     Throwable throwable = testExecutionResult.getThrowable().orElse(null);
     if (throwable != null) {
       if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
@@ -120,6 +123,8 @@ private void testResourceExecutionStarted(
         null,
         null,
         null);
+
+    InstrumentationBridge.currentCoverageProbeStoreRecordNonCode(classpathResourceName);
   }
 
   private void testCaseExecutionFinished(
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
similarity index 82%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
index ea3ea5c7ce3..8650a008a6e 100644
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
@@ -6,6 +6,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Optional;
 import java.util.Properties;
 import javax.annotation.Nullable;
@@ -53,7 +54,7 @@ public static Pair<String, String> getFeatureAndScenarioNames(
       current = parent.get();
       UniqueId currentId = current.getUniqueId();
       if (isFeature(currentId)) {
-        featureName = current.getDisplayName();
+        featureName = currentId.getLastSegment().getValue() + ":" + current.getDisplayName();
         break;
 
       } else {
@@ -73,9 +74,21 @@ public static Pair<String, String> getFeatureAndScenarioNames(
     return Pair.of(featureName, scenarioName.toString());
   }
 
-  public static boolean isFeature(UniqueId uniqueId) {
+  public static String getFeatureName(TestDescriptor testDescriptor) {
+    UniqueId uniqueId = testDescriptor.getUniqueId();
     List<UniqueId.Segment> segments = uniqueId.getSegments();
-    UniqueId.Segment lastSegment = segments.listIterator(segments.size()).previous();
+    ListIterator<UniqueId.Segment> it = segments.listIterator(segments.size());
+    while (it.hasPrevious()) {
+      UniqueId.Segment segment = it.previous();
+      if ("feature".equals(segment.getType())) {
+        return segment.getValue() + ":" + testDescriptor.getLegacyReportingName();
+      }
+    }
+    return testDescriptor.getLegacyReportingName();
+  }
+
+  public static boolean isFeature(UniqueId uniqueId) {
+    UniqueId.Segment lastSegment = uniqueId.getLastSegment();
     return "feature".equals(lastSegment.getType());
   }
 
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy
new file mode 100644
index 00000000000..afe41f4db80
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy
@@ -0,0 +1,80 @@
+import datadog.trace.api.DisableTestTrace
+import datadog.trace.api.civisibility.config.SkippableTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
+import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
+import io.cucumber.core.api.TypeRegistry
+import io.cucumber.core.options.Constants
+import org.junit.platform.engine.DiscoverySelector
+import org.junit.platform.launcher.EngineFilter
+import org.junit.platform.launcher.Launcher
+import org.junit.platform.launcher.LauncherDiscoveryRequest
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
+import org.junit.platform.launcher.core.LauncherFactory
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource
+
+@DisableTestTrace(reason = "avoid self-tracing")
+class CucumberTest extends CiVisibilityInstrumentationTest {
+
+  def "test #testcaseName"() {
+    setup:
+    givenSkippableTests(skippedTests)
+    runFeatures(features, parallel)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                                 | features                                                                                                                         | parallel | expectedTracesCount | skippedTests
+    "test-succeed"                               | ["org/example/cucumber/calculator/basic_arithmetic.feature"]                                                                     | false    | 2                   | []
+    "test-scenario-outline-${version()}"         | ["org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"]                                                       | false    | 5                   | []
+    "test-skipped"                               | ["org/example/cucumber/calculator/basic_arithmetic_skipped.feature"]                                                             | false    | 3                   | []
+    "test-skipped-feature"                       | ["org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature"]                                                     | false    | 3                   | []
+    "test-skipped-scenario-outline-${version()}" | ["org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature"]                                               | false    | 5                   | []
+    "test-itr-skipping"                          | ["org/example/cucumber/calculator/basic_arithmetic.feature"]                                                                     | false    | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-itr-unskippable"                       | ["org/example/cucumber/calculator/basic_arithmetic_unskippable.feature"]                                                         | false    | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-itr-unskippable-suite"                 | ["org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature"]                                                   | false    | 2                   | [new SkippableTest("Basic Arithmetic", "Addition", null, null)]
+    "test-parallel"                              | [
+      "org/example/cucumber/calculator/basic_arithmetic.feature",
+      "org/example/cucumber/calculator/basic_arithmetic_skipped.feature"
+    ] | true     | 4                   | []
+  }
+
+  private String version() {
+    def version = TypeRegistry.package.getImplementationVersion()
+    return version != null ? "latest" : "5.4.0" // older releases do not have package version populated
+  }
+
+  protected void runFeatures(List<String> classpathFeatures, boolean parallel) {
+    TestEventsHandlerHolder.start()
+
+    DiscoverySelector[] selectors = new DiscoverySelector[classpathFeatures.size()]
+    for (i in 0..<classpathFeatures.size()) {
+      selectors[i] = selectClasspathResource(classpathFeatures[i])
+    }
+
+    LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+      .filters(EngineFilter.includeEngines("cucumber"))
+      .configurationParameter(Constants.GLUE_PROPERTY_NAME, "org.example.cucumber.calculator")
+      .configurationParameter(Constants.FILTER_TAGS_PROPERTY_NAME, "not @Disabled")
+      .configurationParameter(io.cucumber.junit.platform.engine.Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "$parallel")
+      .selectors(selectors)
+      .build()
+
+    Launcher launcher = LauncherFactory.create()
+    launcher.execute(request)
+
+    TestEventsHandlerHolder.stop()
+  }
+
+  @Override
+  String instrumentedLibraryName() {
+    return "cucumber"
+  }
+
+  @Override
+  String instrumentedLibraryVersion() {
+    def version = TypeRegistry.package.getImplementationVersion()
+    return version != null ? version : "5.4.0" // older releases do not have package version populated
+  }
+}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature
rename to dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..874bae33a26
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..12d86179ecb
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,158 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl
new file mode 100644
index 00000000000..6fec5542b9d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl
new file mode 100644
index 00000000000..8692074d283
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl
@@ -0,0 +1,159 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..c8492b3d13b
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..e123405e9bf
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,159 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl
new file mode 100644
index 00000000000..514c844a436
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl
@@ -0,0 +1,17 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_3},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl
new file mode 100644
index 00000000000..5548d6d8a70
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl
@@ -0,0 +1,285 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Subtraction",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Subtraction",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl
new file mode 100644
index 00000000000..aba08d64725
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl
@@ -0,0 +1,33 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_3},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_4},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl
new file mode 100644
index 00000000000..03ff2a50453
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl
@@ -0,0 +1,296 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #1",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl
new file mode 100644
index 00000000000..aba08d64725
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl
@@ -0,0 +1,33 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_3},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_4},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl
new file mode 100644
index 00000000000..9e779340683
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl
@@ -0,0 +1,296 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2.1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2.2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1.1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1.2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl
new file mode 100644
index 00000000000..b638c232689
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl
@@ -0,0 +1,206 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic.Subtraction",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Subtraction",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl
new file mode 100644
index 00000000000..c1adedf98f7
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl
@@ -0,0 +1,300 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #1",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl
new file mode 100644
index 00000000000..c95627e2ae3
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl
@@ -0,0 +1,300 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2.1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Double digits.Example #2.2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1.1",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Many additions.Single digits.Example #1.2",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..fe5f10cd27d
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..3da94258d91
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,205 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}",
+      "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Subtraction",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Subtraction",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..874bae33a26
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..12d86179ecb
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,158 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "cucumber-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "cucumber-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "cucumber-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "cucumber",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/groovy/CucumberTest.groovy
deleted file mode 100644
index e95fe626ddd..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/groovy/CucumberTest.groovy
+++ /dev/null
@@ -1,315 +0,0 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.api.DDTags
-import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
-import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
-import io.cucumber.core.api.TypeRegistry
-import io.cucumber.junit.platform.engine.CucumberTestEngine
-import org.example.TestSkippedCucumber
-import org.example.TestSkippedExamplesCucumber
-import org.example.TestSkippedFeatureCucumber
-import org.example.TestSucceedCucumber
-import org.example.TestSucceedCucumberUnskippable
-import org.example.TestSucceedCucumberUnskippableSuite
-import org.example.TestSucceedExamplesCucumber
-import org.junit.platform.engine.DiscoverySelector
-import org.junit.platform.launcher.core.LauncherConfig
-import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
-import org.junit.platform.launcher.core.LauncherFactory
-import org.junit.platform.suite.engine.SuiteTestEngine
-
-import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
-
-@DisableTestTrace(reason = "avoid self-tracing")
-class CucumberTest extends CiVisibilityTest {
-
-  def "test success generates spans"() {
-    setup:
-    runTestClasses(TestSucceedCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-    })
-  }
-
-  def "test scenario outline generates spans"() {
-    setup:
-    runTestClasses(TestSucceedExamplesCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic With Examples", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Double digits.Example" + getOutlineTestNameSuffix(2, 1), CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Double digits.Example" + getOutlineTestNameSuffix(2, 2), CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Single digits.Example" + getOutlineTestNameSuffix(1, 1), CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Single digits.Example" + getOutlineTestNameSuffix(1, 2), CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-    })
-  }
-
-  /**
-   * Later Cucumber versions report different example execution names
-   */
-  private String getOutlineTestNameSuffix(int exampleIdx, int rowIdx) {
-    return expectedTestFrameworkVersion() > "7" ? " #${exampleIdx}.${rowIdx}" : " #${rowIdx}"
-  }
-
-  def "test skipped generates spans"() {
-    setup:
-    runTestClasses(TestSkippedCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Subtraction", CIConstants.TEST_PASS, null, null, false, ["foo"])
-      }
-    })
-  }
-
-  def "test skipped feature generates spans"() {
-    setup:
-    runTestClasses(TestSkippedFeatureCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Subtraction", CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-    })
-  }
-
-  def "test skipped scenario outline generates spans"() {
-    setup:
-    runTestClasses(TestSkippedExamplesCucumber)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic With Examples", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Double digits.Example" + getOutlineTestNameSuffix(2, 1), CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Double digits.Example" + getOutlineTestNameSuffix(2, 2), CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Single digits.Example" + getOutlineTestNameSuffix(1, 1), CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic With Examples", "Many additions.Single digits.Example" + getOutlineTestNameSuffix(1, 2), CIConstants.TEST_SKIP, [(Tags.TEST_SKIP_REASON): "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario"], null, false, ["foo", "Disabled"])
-      }
-    })
-  }
-
-  def "test ITR test skipping"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumber)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_SKIP, testTags, null, false, ["foo"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true]
-  }
-
-  def "test ITR test unskippable"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumberUnskippable)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS, testTags, null, false, ["datadog_itr_unskippable"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test ITR test unskippable suite"() {
-    setup:
-    givenSkippableTests([new SkippableTest("Basic Arithmetic", "Addition", null, null),])
-    runTestClasses(TestSucceedCucumberUnskippableSuite)
-
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testFeatureSpan(it, 2, testSessionId, testModuleId, "Basic Arithmetic", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testScenarioSpan(it, 0, testSessionId, testModuleId, testSuiteId, "Basic Arithmetic", "Addition", CIConstants.TEST_PASS, testTags, null, false, ["datadog_itr_unskippable"])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  private static void runTestClasses(Class<?>... classes) {
-    TestEventsHandlerHolder.start()
-
-    DiscoverySelector[] selectors = new DiscoverySelector[classes.length]
-    for (i in 0..<classes.length) {
-      selectors[i] = selectClass(classes[i])
-    }
-
-    def launcherReq = LauncherDiscoveryRequestBuilder.request()
-      .selectors(selectors)
-      .build()
-
-    def launcherConfig = LauncherConfig
-      .builder()
-      .enableTestEngineAutoRegistration(false)
-      .addTestEngines(new SuiteTestEngine(), new CucumberTestEngine())
-      .build()
-
-    def launcher = LauncherFactory.create(launcherConfig)
-    launcher.execute(launcherReq)
-
-    TestEventsHandlerHolder.stop()
-  }
-
-  Long testFeatureSpan(final TraceAssert trace,
-    final int index,
-    final Long testSessionId,
-    final Long testModuleId,
-    final String testSuite,
-    final String testStatus,
-    final Map<String, Object> testTags = null,
-    final Throwable exception = null,
-    final boolean emptyDuration = false,
-    final Collection<String> categories = null) {
-    return testSuiteSpan(trace, index, testSessionId, testModuleId, testSuite, testStatus, testTags, exception, emptyDuration, categories, false)
-  }
-
-  void testScenarioSpan(final TraceAssert trace,
-    final int index,
-    final Long testSessionId,
-    final Long testModuleId,
-    final Long testSuiteId,
-    final String testSuite,
-    final String testName,
-    final String testStatus,
-    final Map<String, Object> testTags = null,
-    final Throwable exception = null,
-    final boolean emptyDuration = false,
-    final Collection<String> categories = null) {
-    testSpan(trace, index, testSessionId, testModuleId, testSuiteId, testSuite, testName, null, testStatus, testTags, exception, emptyDuration, categories, false, false)
-  }
-
-  @Override
-  String expectedOperationPrefix() {
-    return "junit"
-  }
-
-  @Override
-  String expectedTestFramework() {
-    return "cucumber"
-  }
-
-  @Override
-  String expectedTestFrameworkVersion() {
-    def version = TypeRegistry.package.getImplementationVersion()
-    return version != null ? version : "5.4.0" // older releases do not have package version populated
-  }
-
-  @Override
-  String component() {
-    return "junit"
-  }
-}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedCucumber.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedCucumber.java
deleted file mode 100644
index c47a4ed32bb..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedCucumber.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic_skipped.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-@ConfigurationParameter(key = Constants.FILTER_TAGS_PROPERTY_NAME, value = "not @Disabled")
-public class TestSkippedCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedExamplesCucumber.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedExamplesCucumber.java
deleted file mode 100644
index 107bb0e7e0d..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedExamplesCucumber.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource(
-    "org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-@ConfigurationParameter(key = Constants.FILTER_TAGS_PROPERTY_NAME, value = "not @Disabled")
-public class TestSkippedExamplesCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedFeatureCucumber.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedFeatureCucumber.java
deleted file mode 100644
index 15cdcbc61da..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSkippedFeatureCucumber.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-@ConfigurationParameter(key = Constants.FILTER_TAGS_PROPERTY_NAME, value = "not @Disabled")
-public class TestSkippedFeatureCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumber.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumber.java
deleted file mode 100644
index 7a6453fe427..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumber.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-public class TestSucceedCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippable.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippable.java
deleted file mode 100644
index f5da5b7f28f..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippable.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic_unskippable.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-public class TestSucceedCucumberUnskippable {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippableSuite.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippableSuite.java
deleted file mode 100644
index 6ac3d9140a2..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedCucumberUnskippableSuite.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource(
-    "org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-public class TestSucceedCucumberUnskippableSuite {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedExamplesCucumber.java b/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedExamplesCucumber.java
deleted file mode 100644
index 1a34de1636e..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber/src/test/java/org/example/TestSucceedExamplesCucumber.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.example;
-
-import io.cucumber.core.options.Constants;
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@IncludeEngines("cucumber")
-@SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic_with_examples.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
-public class TestSucceedExamplesCucumber {}
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/build.gradle b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/build.gradle
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy
new file mode 100644
index 00000000000..c4c7480bb80
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy
@@ -0,0 +1,74 @@
+import datadog.trace.api.DisableTestTrace
+import datadog.trace.api.civisibility.config.SkippableTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
+import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
+import org.example.TestParameterizedSpock
+import org.example.TestSucceedSpock
+import org.example.TestSucceedSpockUnskippable
+import org.example.TestSucceedSpockUnskippableSuite
+import org.junit.platform.engine.DiscoverySelector
+import org.junit.platform.launcher.core.LauncherConfig
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
+import org.junit.platform.launcher.core.LauncherFactory
+import org.spockframework.runtime.SpockEngine
+import org.spockframework.util.SpockReleaseInfo
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
+
+@DisableTestTrace(reason = "avoid self-tracing")
+class SpockTest extends CiVisibilityInstrumentationTest {
+
+  def "test #testcaseName"() {
+    setup:
+    givenSkippableTests(skippedTests)
+    runTests(tests)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                      | tests                              | expectedTracesCount | skippedTests
+    "test-succeed"                    | [TestSucceedSpock]                 | 2                   | []
+    "test-succeed-parameterized"      | [TestParameterizedSpock]           | 3                   | []
+    "test-itr-skipping"               | [TestSucceedSpock]                 | 2                   | [new SkippableTest("org.example.TestSucceedSpock", "test success", null, null)]
+    "test-itr-skipping-parameterized" | [TestParameterizedSpock]           | 3                   | [
+      new SkippableTest("org.example.TestParameterizedSpock", "test add 1 and 2", '{"metadata":{"test_name":"test add 1 and 2"}}', null)
+    ]
+    "test-itr-unskippable"            | [TestSucceedSpockUnskippable]      | 2                   | [new SkippableTest("org.example.TestSucceedSpockUnskippable", "test success", null, null)]
+    "test-itr-unskippable-suite"      | [TestSucceedSpockUnskippableSuite] | 2                   | [new SkippableTest("org.example.TestSucceedSpockUnskippableSuite", "test success", null, null)]
+  }
+
+  private static void runTests(List<Class<?>> classes) {
+    TestEventsHandlerHolder.start()
+
+    DiscoverySelector[] selectors = new DiscoverySelector[classes.size()]
+    for (i in 0..<classes.size()) {
+      selectors[i] = selectClass(classes[i])
+    }
+
+    def launcherReq = LauncherDiscoveryRequestBuilder.request()
+      .selectors(selectors)
+      .build()
+
+    def launcherConfig = LauncherConfig
+      .builder()
+      .enableTestEngineAutoRegistration(false)
+      .addTestEngines(new SpockEngine())
+      .build()
+
+    def launcher = LauncherFactory.create(launcherConfig)
+    launcher.execute(launcherReq)
+
+    TestEventsHandlerHolder.stop()
+  }
+
+  @Override
+  String instrumentedLibraryName() {
+    return "spock"
+  }
+
+  @Override
+  String instrumentedLibraryVersion() {
+    return SpockReleaseInfo.version
+  }
+}
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestParameterizedSpock.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestParameterizedSpock.groovy
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpock.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpock.groovy
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy
rename to dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl
new file mode 100644
index 00000000000..e323558a2a5
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -0,0 +1,219 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterizedSpock",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterizedSpock.test add 1 and 2",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test add 1 and 2",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterizedSpock.test add 4 and 4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test add 4 and 4",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..dcd3160d1fc
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSpock",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSpock.test success",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test success()V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test success",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl
new file mode 100644
index 00000000000..0391f5fd90c
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSpockUnskippableSuite",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSpockUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSpockUnskippableSuite.test success",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test success()V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test success",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSpockUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..1f5cacfd56a
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSpockUnskippable",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSpockUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSpockUnskippable.test success",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test success()V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test success",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSpockUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl
new file mode 100644
index 00000000000..a8b3061879f
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterizedSpock",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterizedSpock.test add 1 and 2",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test add 1 and 2",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterizedSpock.test add 4 and 4",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test add 4 and 4",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterizedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..70bbefc3af5
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedSpock",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedSpock.test success",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test success()V",
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test success",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedSpock",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "spock-junit-5",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "spock-junit-5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "spock-junit-5",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "spock",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/SpockTest.groovy
deleted file mode 100644
index a6286692fd9..00000000000
--- a/dd-java-agent/instrumentation/junit-5.3/spock/src/test/groovy/SpockTest.groovy
+++ /dev/null
@@ -1,242 +0,0 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.api.DDTags
-import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.InstrumentationBridge
-import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
-import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
-import org.example.TestParameterizedSpock
-import org.example.TestSucceedSpock
-import org.example.TestSucceedSpockUnskippable
-import org.example.TestSucceedSpockUnskippableSuite
-import org.junit.platform.engine.DiscoverySelector
-import org.junit.platform.launcher.core.LauncherConfig
-import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
-import org.junit.platform.launcher.core.LauncherFactory
-import org.spockframework.runtime.SpockEngine
-import org.spockframework.util.SpockReleaseInfo
-
-import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
-
-@DisableTestTrace(reason = "avoid self-tracing")
-class SpockTest extends CiVisibilityTest {
-
-  def "test success generate spans"() {
-    setup:
-    runTestClasses(TestSucceedSpock)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedSpock", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedSpock", "test success", "test success()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test parameterized generate spans"() {
-    setup:
-    runTestClasses(TestParameterizedSpock)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterizedSpock", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterizedSpock", "test add 1 and 2", "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterizedSpock", "test add 4 and 4", "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"test add 1 and 2"}}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"test add 4 and 4"}}']
-  }
-
-  def "test ITR test skipping"() {
-    setup:
-    givenSkippableTests([new SkippableTest("org.example.TestSucceedSpock", "test success", null, null),])
-    runTestClasses(TestSucceedSpock)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedSpock", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedSpock", "test success", "test success()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true]
-  }
-
-  def "test ITR skipping for parameterized tests"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestParameterizedSpock", "test add 1 and 2", testTags_0[Tags.TEST_PARAMETERS], null),
-    ])
-    runTestClasses(TestParameterizedSpock)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterizedSpock", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterizedSpock", "test add 1 and 2", "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", CIConstants.TEST_SKIP, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterizedSpock", "test add 4 and 4", "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"test add 1 and 2"}}',
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
-    ]
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"test add 4 and 4"}}']
-  }
-
-  def "test ITR unskippable"() {
-    setup:
-    givenSkippableTests([new SkippableTest("org.example.TestSucceedSpockUnskippable", "test success", null, null),])
-    runTestClasses(TestSucceedSpockUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedSpockUnskippable", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedSpockUnskippable", "test success", "test success()V", CIConstants.TEST_PASS,
-          testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test ITR unskippable suite"() {
-    setup:
-    givenSkippableTests([new SkippableTest("org.example.TestSucceedSpockUnskippableSuite", "test success", null, null),])
-    runTestClasses(TestSucceedSpockUnskippableSuite)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedSpockUnskippableSuite", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedSpockUnskippableSuite", "test success", "test success()V", CIConstants.TEST_PASS,
-          testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  private static void runTestClasses(Class<?>... classes) {
-    TestEventsHandlerHolder.start()
-
-    DiscoverySelector[] selectors = new DiscoverySelector[classes.length]
-    for (i in 0..<classes.length) {
-      selectors[i] = selectClass(classes[i])
-    }
-
-    def launcherReq = LauncherDiscoveryRequestBuilder.request()
-      .selectors(selectors)
-      .build()
-
-    def launcherConfig = LauncherConfig
-      .builder()
-      .enableTestEngineAutoRegistration(false)
-      .addTestEngines(new SpockEngine())
-      .build()
-
-    def launcher = LauncherFactory.create(launcherConfig)
-    launcher.execute(launcherReq)
-
-    TestEventsHandlerHolder.stop()
-  }
-
-  @Override
-  String expectedOperationPrefix() {
-    return "junit"
-  }
-
-  @Override
-  String expectedTestFramework() {
-    return "spock"
-  }
-
-  @Override
-  String expectedTestFrameworkVersion() {
-    return SpockReleaseInfo.version
-  }
-
-  @Override
-  String component() {
-    return "junit"
-  }
-}
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
index 9b04a54a8a5..2a270a414dd 100644
--- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
+++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
@@ -107,7 +107,19 @@ private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
   }
 
   private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSource testSource) {
-    String testSuitName = testSource.getClassName();
+    TestDescriptor suiteDescriptor = getSuiteDescriptor(testDescriptor);
+
+    Class<?> testClass;
+    String testSuiteName;
+    if (suiteDescriptor != null) {
+      testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+      testSuiteName =
+          testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+    } else {
+      testClass = JUnitPlatformUtils.getTestClass(testSource);
+      testSuiteName = testSource.getClassName();
+    }
+
     String displayName = testDescriptor.getDisplayName();
     String testName = testSource.getMethodName();
 
@@ -115,12 +127,11 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou
     List<String> tags =
         testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
 
-    Class<?> testClass = JUnitPlatformUtils.getTestClass(testSource);
     Method testMethod = JUnitPlatformUtils.getTestMethod(testSource);
     String testMethodName = testSource.getMethodName();
 
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
-        testSuitName,
+        testSuiteName,
         testName,
         null,
         testFramework,
@@ -144,8 +155,19 @@ private static void testMethodExecutionFinished(
       TestDescriptor testDescriptor,
       TestExecutionResult testExecutionResult,
       MethodSource testSource) {
-    String testSuiteName = testSource.getClassName();
-    Class<?> testClass = JUnitPlatformUtils.getTestClass(testSource);
+    TestDescriptor suiteDescriptor = getSuiteDescriptor(testDescriptor);
+
+    Class<?> testClass;
+    String testSuiteName;
+    if (suiteDescriptor != null) {
+      testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+      testSuiteName =
+          testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+    } else {
+      testClass = JUnitPlatformUtils.getTestClass(testSource);
+      testSuiteName = testSource.getClassName();
+    }
+
     String displayName = testDescriptor.getDisplayName();
     String testName = testSource.getMethodName();
     String testParameters = JUnitPlatformUtils.getParameters(testSource, displayName);
@@ -203,18 +225,29 @@ private void containerExecutionSkipped(final TestDescriptor testDescriptor, fina
   }
 
   private void testMethodExecutionSkipped(
-      final TestDescriptor testDescriptor, final MethodSource methodSource, final String reason) {
-    String testSuiteName = methodSource.getClassName();
+      final TestDescriptor testDescriptor, final MethodSource testSource, final String reason) {
+    TestDescriptor suiteDescriptor = getSuiteDescriptor(testDescriptor);
+
+    Class<?> testClass;
+    String testSuiteName;
+    if (suiteDescriptor != null) {
+      testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+      testSuiteName =
+          testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+    } else {
+      testClass = JUnitPlatformUtils.getTestClass(testSource);
+      testSuiteName = testSource.getClassName();
+    }
+
     String displayName = testDescriptor.getDisplayName();
-    String testName = methodSource.getMethodName();
+    String testName = testSource.getMethodName();
 
-    String testParameters = JUnitPlatformUtils.getParameters(methodSource, displayName);
+    String testParameters = JUnitPlatformUtils.getParameters(testSource, displayName);
     List<String> tags =
         testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
 
-    Class<?> testClass = JUnitPlatformUtils.getTestClass(methodSource);
-    Method testMethod = JUnitPlatformUtils.getTestMethod(methodSource);
-    String testMethodName = methodSource.getMethodName();
+    Method testMethod = JUnitPlatformUtils.getTestMethod(testSource);
+    String testMethodName = testSource.getMethodName();
 
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
         testSuiteName,
@@ -229,4 +262,11 @@ private void testMethodExecutionSkipped(
         testMethod,
         reason);
   }
+
+  private static TestDescriptor getSuiteDescriptor(TestDescriptor testDescriptor) {
+    while (testDescriptor != null && !JUnitPlatformUtils.isSuite(testDescriptor)) {
+      testDescriptor = testDescriptor.getParent().orElse(null);
+    }
+    return testDescriptor;
+  }
 }
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy
index 571de80bb98..d3b744d2f91 100644
--- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy
@@ -1,11 +1,6 @@
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.api.DDTags
 import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.InstrumentationBridge
 import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
 import org.example.TestAssumption
 import org.example.TestAssumptionAndSucceed
@@ -14,7 +9,6 @@ import org.example.TestError
 import org.example.TestFactory
 import org.example.TestFailed
 import org.example.TestFailedAndSucceed
-import org.example.TestFailedSuiteSetup
 import org.example.TestFailedSuiteTearDown
 import org.example.TestInheritance
 import org.example.TestParameterized
@@ -35,763 +29,63 @@ import org.junit.platform.engine.DiscoverySelector
 import org.junit.platform.launcher.core.LauncherConfig
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
 import org.junit.platform.launcher.core.LauncherFactory
-import org.opentest4j.AssertionFailedError
 
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
 
 @DisableTestTrace(reason = "avoid self-tracing")
-class JUnit5Test extends CiVisibilityTest {
-
-  def "test success generate spans"() {
-    setup:
-    runTestClasses(TestSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test inheritance generates spans"() {
-    setup:
-    runTestClasses(TestInheritance)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestInheritance", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestInheritance", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test parameterized generates spans"() {
-    setup:
-    runTestClasses(TestParameterized)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "test_parameterized", "test_parameterized(IIILjava/lang/String;)V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "test_parameterized", "test_parameterized(IIILjava/lang/String;)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"[1] 0, 0, 0, some:\\\"parameter\\\""}}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"[2] 1, 1, 2, some:\\\"parameter\\\""}}']
-  }
-
-  def "test repeated generates spans"() {
-    setup:
-    runTestClasses(TestRepeated)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestRepeated", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestRepeated", "test_repeated", "test_repeated()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestRepeated", "test_repeated", "test_repeated()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test template generates spans"() {
-    setup:
-    runTestClasses(TestTemplate)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestTemplate", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestTemplate", "test_template", "test_template(Lorg/example/TestTemplate\$SampleTestCase;)V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestTemplate", "test_template", "test_template(Lorg/example/TestTemplate\$SampleTestCase;)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): "{\"metadata\":{\"test_name\":\"test_template_1\"}}"]
-    testTags_1 = [(Tags.TEST_PARAMETERS): "{\"metadata\":{\"test_name\":\"test_template_2\"}}"]
-  }
-
-  def "test factory generates spans"() {
-    setup:
-    runTestClasses(TestFactory)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFactory", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFactory", "test_factory", "test_factory()Ljava/lang/Iterable;", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFactory", "test_factory", "test_factory()Ljava/lang/Iterable;", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test failed generates spans"() {
-    setup:
-    runTestClassesSuppressingExceptions(TestFailed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new AssertionFailedError("expected: <true> but was: <false>")
-  }
-
-  def "test error generates spans"() {
-    setup:
-    runTestClassesSuppressingExceptions(TestError)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestError", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestError", "test_error", "test_error()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new IllegalArgumentException("This exception is an example")
-  }
-
-  def "test skipped generates spans"() {
-    setup:
-    runTestClasses(TestSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkipped", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test class skipped generated spans"() {
-    setup:
-    runTestClasses(TestSkippedClass)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedClass", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_case_skipped", "test_case_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_factory_skipped", "test_factory_skipped()Ljava/lang/Iterable;", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_parameterized_skipped", "test_parameterized_skipped(IIILjava/lang/String;)V", CIConstants.TEST_SKIP, parameterizedTestTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_repeated_skipped", "test_repeated_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in class"]
-    parameterizedTestTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in class", (Tags.TEST_PARAMETERS): "{\"metadata\":{\"test_name\":\"test_parameterized_skipped(int, int, int, String)\"}}"]
-  }
-
-  def "test with failing assumptions generated spans"() {
-    setup:
-    runTestClasses(TestAssumption)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestAssumption", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumption", "test_fail_assumption", "test_fail_assumption()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Assumption failed: assumption is not true"]
-  }
-
-  def "test with failing legacy assumptions generated spans"() {
-    setup:
-    runTestClasses(TestAssumptionLegacy)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestAssumptionLegacy", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumptionLegacy", "test_fail_assumption_legacy", "test_fail_assumption_legacy()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "assumption is not fulfilled"]
-  }
-
-  def "test success and skipped generates spans"() {
-    setup:
-    runTestClasses(TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test success and failure generates spans"() {
-    setup:
-    runTestClasses(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionFailedError("expected: <true> but was: <false>")
-  }
-
-  def "test suite teardown failure generates spans"() {
-    setup:
-    runTestClasses(TestFailedSuiteTearDown)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteTearDown", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite tear down failed")
-  }
-
-  def "test suite setup failure generates spans"() {
-    setup:
-    runTestClasses(TestFailedSuiteSetup)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 1, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      trace(3, true) {
-        long testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        long testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteSetup", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite set up failed")
-  }
-
-  def "test categories are included in spans"() {
-    setup:
-    runTestClasses(TestSucceedWithCategories)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedWithCategories",
-          CIConstants.TEST_PASS, null, null, false,
-          ["Slow", "Flaky"])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedWithCategories", "test_succeed", "test_succeed()V",
-          CIConstants.TEST_PASS, null, null, false,
-          ["End2end", "Browser", "Slow", "Flaky"])
-      }
-    })
-  }
-
-  def "test assumption failure during suite setup"() {
-    setup:
-    runTestClasses(TestSuiteSetUpAssumption)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSuiteSetUpAssumption", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSuiteSetUpAssumption", "test_succeed", "test_succeed()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Assumption failed: assumption is not true"]
-  }
-
-  def "test assumption failure in a multi-test-case suite"() {
-    setup:
-    runTestClasses(TestAssumptionAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestAssumptionAndSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumptionAndSucceed", "test_fail_assumption", "test_fail_assumption()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestAssumptionAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Assumption failed: assumption is not true"]
-  }
-
-  def "test multiple successful suites"() {
-    setup:
-    runTestClasses(TestSucceed, TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        firstSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test successful suite and failing suite"() {
-    setup:
-    runTestClasses(TestSucceed, TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        firstSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionFailedError("expected: <true> but was: <false>")
-  }
-
-  def "test nested successful suites"() {
-    setup:
-    runTestClasses(TestSucceedNested)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long topLevelSuiteId
-      long nestedSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        topLevelSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedNested", CIConstants.TEST_PASS)
-        nestedSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, 'org.example.TestSucceedNested$NestedSuite', CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, nestedSuiteId, 'org.example.TestSucceedNested$NestedSuite', "test_succeed_nested", "test_succeed_nested()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, topLevelSuiteId, "org.example.TestSucceedNested", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test nested skipped suites"() {
-    setup:
-    runTestClasses(TestSkippedNested)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long topLevelSuiteId
-      long nestedSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        topLevelSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedNested", CIConstants.TEST_SKIP, testTags)
-        nestedSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, 'org.example.TestSkippedNested$NestedSuite', CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, nestedSuiteId, 'org.example.TestSkippedNested$NestedSuite', "test_succeed_nested", "test_succeed_nested()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, topLevelSuiteId, "org.example.TestSkippedNested", "test_succeed", "test_succeed()V", CIConstants.TEST_SKIP, testTags, null)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in class"]
-  }
-
-  def "test ITR skipping"() {
-    setup:
-    givenSkippableTests([
+class JUnit5Test extends CiVisibilityInstrumentationTest {
+
+  def "test #testcaseName"() {
+    setup:
+    givenSkippableTests(skippedTests)
+    runTests(tests)
+
+    expect:
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                                         | tests                                | expectedTracesCount | skippedTests
+    "test-succeed"                                       | [TestSucceed]                        | 2                   | []
+    "test-inheritance"                                   | [TestInheritance]                    | 2                   | []
+    "test-parameterized"                                 | [TestParameterized]                  | 3                   | []
+    "test-repeated"                                      | [TestRepeated]                       | 3                   | []
+    "test-template"                                      | [TestTemplate]                       | 3                   | []
+    "test-factory"                                       | [TestFactory]                        | 3                   | []
+    "test-failed"                                        | [TestFailed]                         | 2                   | []
+    "test-error"                                         | [TestError]                          | 2                   | []
+    "test-skipped"                                       | [TestSkipped]                        | 2                   | []
+    "test-skipped-class"                                 | [TestSkippedClass]                   | 5                   | []
+    "test-assumption-failed"                             | [TestAssumption]                     | 2                   | []
+    "test-assumption-failed-legacy"                      | [TestAssumptionLegacy]               | 2                   | []
+    "test-succeed-and-skipped"                           | [TestSucceedAndSkipped]              | 3                   | []
+    "test-succeed-and-failed"                            | [TestFailedAndSucceed]               | 4                   | []
+    "test-suite-teardown-failed"                         | [TestFailedSuiteTearDown]            | 3                   | []
+    "test-suite-setup-failed"                            | [TestFailedSuiteTearDown]            | 1                   | []
+    "test-categories"                                    | [TestSucceedWithCategories]          | 2                   | []
+    "test-suite-setup-assumption-failed"                 | [TestSuiteSetUpAssumption]           | 2                   | []
+    "test-suite-setup-assumption-failed-multi-test-case" | [TestAssumptionAndSucceed]           | 3                   | []
+    "test-succeed-multiple-suites"                       | [TestSucceed, TestSucceedAndSkipped] | 4                   | []
+    "test-succeed-and-failed-multiple-suites"            | [TestSucceed, TestFailedAndSucceed]  | 5                   | []
+    "test-succeed-nested-suites"                         | [TestSucceedNested]                  | 3                   | []
+    "test-skipped-nested-suites"                         | [TestSkippedNested]                  | 3                   | []
+    "test-itr-skipping"                                  | [TestFailedAndSucceed]               | 4                   | [
       new SkippableTest("org.example.TestFailedAndSucceed", "test_another_succeed", null, null),
-      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null),
-    ])
-    runTestClasses(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 2,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true]
-  }
-
-  def "test ITR skipping for parameterized tests"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestParameterized", "test_parameterized", testTags_0[Tags.TEST_PARAMETERS], null),
-    ])
-    runTestClasses(TestParameterized)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "test_parameterized", "test_parameterized(IIILjava/lang/String;)V", CIConstants.TEST_SKIP, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "test_parameterized", "test_parameterized(IIILjava/lang/String;)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"[1] 0, 0, 0, some:\\\"parameter\\\""}}',
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
+      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null)
     ]
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"metadata":{"test_name":"[2] 1, 1, 2, some:\\\"parameter\\\""}}']
-  }
-
-  def "test ITR unskippable"() {
-    setup:
-    givenSkippableTests([new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null),])
-    runTestClasses(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test ITR unskippable suite"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestSucceedUnskippableSuite", "test_succeed", null, null),
-    ])
-    runTestClasses(TestSucceedUnskippableSuite)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippableSuite", CIConstants.TEST_PASS,
-          null, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippableSuite", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test unskippable ITR test that is not supposed to be skipped"() {
-    setup:
-    givenSkippableTests([])
-    runTestClasses(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-          testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true]
+    "test-itr-skipping-parametrized"                     | [TestParameterized]                  | 3                   | [
+      new SkippableTest("org.example.TestParameterized", "test_parameterized", '{"metadata":{"test_name":"[1] 0, 0, 0, some:\\\"parameter\\\""}}', null)
+    ]
+    "test-itr-unskippable"                               | [TestSucceedUnskippable]             | 2                   | [new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null)]
+    "test-itr-unskippable-suite"                         | [TestSucceedUnskippableSuite]        | 2                   | [new SkippableTest("org.example.TestSucceedUnskippableSuite", "test_succeed", null, null)]
+    "test-itr-unskippable-not-skipped"                   | [TestSucceedUnskippable]             | 2                   | []
   }
 
-  private static void runTestClasses(Class<?>... classes) {
+  private static void runTests(List<Class<?>> tests) {
     TestEventsHandlerHolder.start()
 
-    DiscoverySelector[] selectors = new DiscoverySelector[classes.length]
-    for (i in 0..<classes.length) {
-      selectors[i] = selectClass(classes[i])
+    DiscoverySelector[] selectors = new DiscoverySelector[tests.size()]
+    for (i in 0..<tests.size()) {
+      selectors[i] = selectClass(tests[i])
     }
 
     def launcherReq = LauncherDiscoveryRequestBuilder.request()
@@ -805,35 +99,21 @@ class JUnit5Test extends CiVisibilityTest {
       .build()
 
     def launcher = LauncherFactory.create(launcherConfig)
-    launcher.execute(launcherReq)
-
-    TestEventsHandlerHolder.stop()
-  }
-
-  private static void runTestClassesSuppressingExceptions(Class<?>... classes) {
     try {
-      runTestClasses(classes)
+      launcher.execute(launcherReq)
     } catch (Throwable ignored) {
     }
-  }
 
-  @Override
-  String expectedOperationPrefix() {
-    return "junit"
+    TestEventsHandlerHolder.stop()
   }
 
   @Override
-  String expectedTestFramework() {
+  String instrumentedLibraryName() {
     return "junit5"
   }
 
   @Override
-  String expectedTestFrameworkVersion() {
+  String instrumentedLibraryVersion() {
     return JupiterTestEngine.getPackage().getImplementationVersion()
   }
-
-  @Override
-  String component() {
-    return "junit"
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl
new file mode 100644
index 00000000000..3525ac7c0c8
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestAssumptionLegacy",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestAssumptionLegacy",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumptionLegacy.test_fail_assumption_legacy",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_fail_assumption_legacy()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_fail_assumption_legacy",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumptionLegacy",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "assumption is not fulfilled",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl
new file mode 100644
index 00000000000..99aee418407
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestAssumption",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumption.test_fail_assumption",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_fail_assumption()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_fail_assumption",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Assumption failed: assumption is not true",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl
new file mode 100644
index 00000000000..f45bdf1c82e
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedWithCategories",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"Slow\",\"Flaky\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedWithCategories",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedWithCategories.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedWithCategories",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"End2end\",\"Browser\",\"Slow\",\"Flaky\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl
new file mode 100644
index 00000000000..f1150766b52
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestError",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestError.test_error",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_error()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_error",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "java.lang.IllegalArgumentException",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl
new file mode 100644
index 00000000000..eba1a337418
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFactory",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFactory",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFactory.test_factory",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_factory()Ljava/lang/Iterable;",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_factory",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFactory",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFactory.test_factory",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_factory()Ljava/lang/Iterable;",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_factory",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFactory",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl
new file mode 100644
index 00000000000..5539bea09da
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailed.test_failed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "org.opentest4j.AssertionFailedError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl
new file mode 100644
index 00000000000..e79c1fcb979
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestInheritance",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestInheritance.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl
new file mode 100644
index 00000000000..264cacf4794
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl
@@ -0,0 +1,219 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.test_parameterized",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_parameterized(IIILjava/lang/String;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_parameterized",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.test_parameterized",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_parameterized(IIILjava/lang/String;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_parameterized",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..9a118d9e467
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,269 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 2,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 2
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
new file mode 100644
index 00000000000..85c3ff1c956
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl
new file mode 100644
index 00000000000..e3fd522db05
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippableSuite",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippableSuite.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippableSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..c8142b36c7f
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl
new file mode 100644
index 00000000000..782e76695c8
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.test_parameterized",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_parameterized(IIILjava/lang/String;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_parameterized",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestParameterized.test_parameterized",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_parameterized(IIILjava/lang/String;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_parameterized",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl
new file mode 100644
index 00000000000..a62dc95b149
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestRepeated",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestRepeated",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestRepeated.test_repeated",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_repeated()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_repeated",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestRepeated",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestRepeated.test_repeated",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_repeated()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_repeated",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestRepeated",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl
new file mode 100644
index 00000000000..4e425e05a2b
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl
@@ -0,0 +1,319 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedClass",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_case_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_case_skipped()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_case_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_factory_skipped",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_factory_skipped()Ljava/lang/Iterable;",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_factory_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_parameterized_skipped",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_parameterized_skipped(IIILjava/lang/String;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_parameterized_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test_parameterized_skipped(int, int, int, String)\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedClass.test_repeated_skipped",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_repeated_skipped()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_repeated_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl
new file mode 100644
index 00000000000..d0d921eb21c
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl
@@ -0,0 +1,252 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedNested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkippedNested$NestedSuite",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkippedNested.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..be7776fb05b
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl
new file mode 100644
index 00000000000..0a5c933eb9a
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl
@@ -0,0 +1,351 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "org.opentest4j.AssertionFailedError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl
new file mode 100644
index 00000000000..a4754b501e8
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl
@@ -0,0 +1,266 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "error.type" : "org.opentest4j.AssertionFailedError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl
new file mode 100644
index 00000000000..16ed5a09bcb
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl
new file mode 100644
index 00000000000..125f3c05eeb
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl
@@ -0,0 +1,299 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl
new file mode 100644
index 00000000000..cceb678b4f0
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl
@@ -0,0 +1,248 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedNested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceedNested$NestedSuite",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceedNested.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..ebe49aecae0
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl
new file mode 100644
index 00000000000..3b998885745
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestAssumptionAndSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumptionAndSucceed.test_fail_assumption",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_fail_assumption()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_fail_assumption",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Assumption failed: assumption is not true",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestAssumptionAndSucceed.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestAssumptionAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl
new file mode 100644
index 00000000000..ff050eb516f
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestSuiteSetUpAssumption",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "test.skip_reason" : "Assumption failed: assumption is not true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSuiteSetUpAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestSuiteSetUpAssumption.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSuiteSetUpAssumption",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Assumption failed: assumption is not true",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl
new file mode 100644
index 00000000000..60c89b784bf
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedSuiteTearDown",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl
new file mode 100644
index 00000000000..60c89b784bf
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestFailedSuiteTearDown",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl
new file mode 100644
index 00000000000..e1dc2657b82
--- /dev/null
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_session",
+    "resource" : "junit-5.3",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "junit-5.3",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_module",
+    "resource" : "junit-5.3",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test_suite",
+    "resource" : "org.example.TestTemplate",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestTemplate",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestTemplate.test_template",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_template(Lorg/example/TestTemplate$SampleTestCase;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_template",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestTemplate",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_1\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "junit.test",
+    "resource" : "org.example.TestTemplate.test_template",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_template(Lorg/example/TestTemplate$SampleTestCase;)V",
+      "test.module" : "junit-5.3",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_template",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestTemplate",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_2\"}}",
+      "component" : "junit",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle
index b58ffa7563b..2ecc381d892 100644
--- a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle
+++ b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle
@@ -13,6 +13,7 @@ addTestSuite('latestDepTest')
 
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
+  implementation project(':dd-java-agent:instrumentation:kafka-common')
 
   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'
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
index bfbbfd39278..b5a497c0d56 100644
--- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
@@ -47,7 +47,10 @@ public String[] helperClassNames() {
       packageName + ".TracingIterable",
       packageName + ".TracingIterator",
       packageName + ".TracingList",
-      packageName + ".TracingListIterator"
+      packageName + ".TracingListIterator",
+      packageName + ".TextMapInjectAdapter",
+      "datadog.trace.instrumentation.kafka_common.Utils",
+      "datadog.trace.instrumentation.kafka_common.StreamingContext",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
index 62c74489201..60c26b0599e 100644
--- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
@@ -13,6 +13,7 @@
 import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.PRODUCER_DECORATE;
 import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.TIME_IN_QUEUE_ENABLED;
 import static datadog.trace.instrumentation.kafka_clients.TextMapInjectAdapter.SETTER;
+import static datadog.trace.instrumentation.kafka_common.StreamingContext.STREAMING_CONTEXT;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -50,6 +51,7 @@ public String[] helperClassNames() {
       packageName + ".KafkaDecorator",
       packageName + ".TextMapInjectAdapter",
       packageName + ".KafkaProducerCallback",
+      "datadog.trace.instrumentation.kafka_common.StreamingContext",
     };
   }
 
@@ -99,7 +101,9 @@ public static AgentScope onEnter(
         sortedTags.put(TYPE_TAG, "kafka");
         try {
           propagate().inject(span, record.headers(), SETTER);
-          propagate().injectPathwayContext(span, record.headers(), SETTER, sortedTags);
+          if (STREAMING_CONTEXT.empty() || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+            propagate().injectPathwayContext(span, record.headers(), SETTER, sortedTags);
+          }
         } catch (final IllegalStateException e) {
           // headers must be read-only from reused record. try again with new one.
           record =
@@ -112,7 +116,9 @@ record =
                   record.headers());
 
           propagate().inject(span, record.headers(), SETTER);
-          propagate().injectPathwayContext(span, record.headers(), SETTER, sortedTags);
+          if (STREAMING_CONTEXT.empty() || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+            propagate().injectPathwayContext(span, record.headers(), SETTER, sortedTags);
+          }
         }
         if (TIME_IN_QUEUE_ENABLED) {
           SETTER.injectTimeInQueue(record.headers());
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
index 57449cfbe05..397a1ce25c4 100644
--- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
+++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
@@ -13,6 +13,9 @@
 import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.KAFKA_DELIVER;
 import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.TIME_IN_QUEUE_ENABLED;
 import static datadog.trace.instrumentation.kafka_clients.TextMapExtractAdapter.GETTER;
+import static datadog.trace.instrumentation.kafka_clients.TextMapInjectAdapter.SETTER;
+import static datadog.trace.instrumentation.kafka_common.StreamingContext.STREAMING_CONTEXT;
+import static datadog.trace.instrumentation.kafka_common.Utils.computePayloadSizeBytes;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import datadog.trace.api.Config;
@@ -90,9 +93,24 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
           sortedTags.put(TOPIC_TAG, val.topic());
           sortedTags.put(TYPE_TAG, "kafka");
 
-          AgentTracer.get()
-              .getDataStreamsMonitoring()
-              .setCheckpoint(span, sortedTags, val.timestamp());
+          final long payloadSize =
+              span.traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(val) : 0;
+          if (STREAMING_CONTEXT.empty()) {
+            AgentTracer.get()
+                .getDataStreamsMonitoring()
+                .setCheckpoint(span, sortedTags, val.timestamp(), payloadSize);
+          } else {
+            // when we're in a streaming context we want to consume only from source topics
+            if (STREAMING_CONTEXT.isSourceTopic(val.topic())) {
+              // We have to inject the context to headers here,
+              // since the data received from the source may leave the topology on
+              // some other instance of the application, breaking the context propagation
+              // for DSM users
+              propagate()
+                  .injectPathwayContext(
+                      span, val.headers(), SETTER, sortedTags, val.timestamp(), payloadSize);
+            }
+          }
         } else {
           span = startSpan(operationName, null);
         }
diff --git a/dd-java-agent/instrumentation/kafka-common/build.gradle b/dd-java-agent/instrumentation/kafka-common/build.gradle
new file mode 100644
index 00000000000..bde1c600781
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-common/build.gradle
@@ -0,0 +1,5 @@
+apply from: "$rootDir/gradle/java.gradle"
+
+dependencies {
+  compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
+}
diff --git a/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java b/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java
new file mode 100644
index 00000000000..69ef6e97806
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java
@@ -0,0 +1,78 @@
+package datadog.trace.instrumentation.kafka_common;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/// StreamingContext holds the KStreams topology information
+public class StreamingContext {
+  private static final Integer UNKNOWN_TOPIC = 0;
+  private static final Integer SOURCE_TOPIC = 1;
+  private static final Integer INTERNAL_TOPIC = 2;
+  private static final Integer SINK_TOPIC = 3;
+  // at max we store each topic 2 times, there are 3 types of topics.
+  // each topic may be up to 256bytes in size, which results in:
+  // 2 * 3 * 500 * 256 = 750KB in the worst case.
+  private static final Integer MAX_TOPICS_PER_TYPE = 500;
+
+  public static final StreamingContext STREAMING_CONTEXT = new StreamingContext();
+
+  private void addAllLimit(Set<String> from, Set<String> to) {
+    for (String item : from) {
+      if (to.size() > StreamingContext.MAX_TOPICS_PER_TYPE) {
+        return;
+      }
+      to.add(item);
+    }
+  }
+
+  public void registerTopics(
+      Set<String> sourceTopics, Set<String> sinkTopics, Set<String> internalTopics) {
+    addAllLimit(sourceTopics, allSourceTopics);
+    addAllLimit(sinkTopics, allSinkTopics);
+    addAllLimit(internalTopics, allInternalTopics);
+
+    // remap source/sink between sub topologies
+    ConcurrentHashMap<String, Integer> newTopics = new ConcurrentHashMap<>();
+    for (String sourceTopic : allSourceTopics) {
+      if (allSinkTopics.contains(sourceTopic)) {
+        newTopics.put(sourceTopic, INTERNAL_TOPIC);
+      } else {
+        newTopics.put(sourceTopic, SOURCE_TOPIC);
+      }
+    }
+
+    for (String sinkTopic : allSinkTopics) {
+      if (!allSourceTopics.contains(sinkTopic)) {
+        newTopics.put(sinkTopic, SINK_TOPIC);
+      }
+    }
+
+    // add internal topics
+    for (String internalTopic : allInternalTopics) {
+      newTopics.put(internalTopic, INTERNAL_TOPIC);
+    }
+
+    topics = newTopics;
+  }
+
+  public boolean isSinkTopic(final String topic) {
+    return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SINK_TOPIC);
+  }
+
+  public boolean isSourceTopic(final String topic) {
+    return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SOURCE_TOPIC);
+  }
+
+  public boolean empty() {
+    return topics.isEmpty();
+  }
+
+  private final Set<String> allSourceTopics = ConcurrentHashMap.newKeySet();
+
+  private final Set<String> allSinkTopics = ConcurrentHashMap.newKeySet();
+
+  private final Set<String> allInternalTopics = ConcurrentHashMap.newKeySet();
+
+  private ConcurrentHashMap<String, Integer> topics = new ConcurrentHashMap<>();
+}
diff --git a/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java b/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
new file mode 100644
index 00000000000..61ec23b6c59
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
@@ -0,0 +1,21 @@
+package datadog.trace.instrumentation.kafka_common;
+
+import java.nio.charset.StandardCharsets;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+
+public final class Utils {
+  private Utils() {} // prevent instantiation
+
+  // this method is used in kafka-clients and kafka-streams instrumentations
+  public static long computePayloadSizeBytes(ConsumerRecord<?, ?> val) {
+    long headersSize = 0;
+    Headers headers = val.headers();
+    if (headers != null)
+      for (Header h : headers) {
+        headersSize += h.value().length + h.key().getBytes(StandardCharsets.UTF_8).length;
+      }
+    return headersSize + val.serializedKeySize() + val.serializedValueSize();
+  }
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/build.gradle b/dd-java-agent/instrumentation/kafka-streams-0.11/build.gradle
index b8d067e2b89..469a79b17d6 100644
--- a/dd-java-agent/instrumentation/kafka-streams-0.11/build.gradle
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/build.gradle
@@ -14,6 +14,7 @@ addTestSuite('latestDepTest')
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
 
+  implementation project(':dd-java-agent:instrumentation:kafka-common')
   implementation project(':dd-java-agent:instrumentation:kafka-clients-0.11')
 
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
index c01a54328d5..17d16d086d2 100644
--- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
@@ -9,12 +9,16 @@
 import static datadog.trace.core.datastreams.TagsProcessor.GROUP_TAG;
 import static datadog.trace.core.datastreams.TagsProcessor.TOPIC_TAG;
 import static datadog.trace.core.datastreams.TagsProcessor.TYPE_TAG;
+import static datadog.trace.instrumentation.kafka_common.StreamingContext.STREAMING_CONTEXT;
+import static datadog.trace.instrumentation.kafka_common.Utils.computePayloadSizeBytes;
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.BROKER_DECORATE;
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.CONSUMER_DECORATE;
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.KAFKA_CONSUME;
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.KAFKA_DELIVER;
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.TIME_IN_QUEUE_ENABLED;
+import static datadog.trace.instrumentation.kafka_streams.ProcessorRecordContextSetter.PR_SETTER;
 import static datadog.trace.instrumentation.kafka_streams.ProcessorRecordContextVisitor.PR_GETTER;
+import static datadog.trace.instrumentation.kafka_streams.StampedRecordContextSetter.SR_SETTER;
 import static datadog.trace.instrumentation.kafka_streams.StampedRecordContextVisitor.SR_GETTER;
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -36,6 +40,7 @@
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.processor.internals.ProcessorNode;
 import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
@@ -59,9 +64,14 @@ public String instrumentedType() {
   public String[] helperClassNames() {
     return new String[] {
       "datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator",
+      "datadog.trace.instrumentation.kafka_common.Utils",
+      "datadog.trace.instrumentation.kafka_common.StreamingContext",
       packageName + ".KafkaStreamsDecorator",
+      packageName + ".ProcessorRecordContextHeadersAccess",
       packageName + ".ProcessorRecordContextVisitor",
+      packageName + ".ProcessorRecordContextSetter",
       packageName + ".StampedRecordContextVisitor",
+      packageName + ".StampedRecordContextSetter",
       packageName + ".StreamTaskContext",
     };
   }
@@ -230,7 +240,6 @@ public static void start(
           // The queueSpan will be finished after inner span has been activated to ensure that
           // spans are written out together by TraceStructureWriter when running in strict mode
         }
-
         LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>();
         sortedTags.put(DIRECTION_TAG, DIRECTION_IN);
         if (streamTaskContext != null) {
@@ -242,9 +251,20 @@ public static void start(
         }
         sortedTags.put(TOPIC_TAG, record.topic());
         sortedTags.put(TYPE_TAG, "kafka");
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .setCheckpoint(span, sortedTags, record.timestamp);
+
+        final long payloadSize =
+            span.traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(record.value) : 0;
+        if (STREAMING_CONTEXT.empty()) {
+          AgentTracer.get()
+              .getDataStreamsMonitoring()
+              .setCheckpoint(span, sortedTags, record.timestamp, payloadSize);
+        } else {
+          if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
+            propagate()
+                .injectPathwayContext(
+                    span, record, SR_SETTER, sortedTags, record.timestamp, payloadSize);
+          }
+        }
       } else {
         span = startSpan(KAFKA_CONSUME, null);
       }
@@ -307,9 +327,26 @@ public static void start(
         }
         sortedTags.put(TOPIC_TAG, record.topic());
         sortedTags.put(TYPE_TAG, "kafka");
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .setCheckpoint(span, sortedTags, record.timestamp());
+
+        long payloadSize = 0;
+        // we have to go through Object to get the RecordMetadata here because the class of `record`
+        // only implements it after 2.7 (and this class is only used if v >= 2.7)
+        if ((Object) record instanceof RecordMetadata) { // should always be true
+          RecordMetadata metadata = (RecordMetadata) (Object) record;
+          payloadSize = metadata.serializedKeySize() + metadata.serializedValueSize();
+        }
+
+        if (STREAMING_CONTEXT.empty()) {
+          AgentTracer.get()
+              .getDataStreamsMonitoring()
+              .setCheckpoint(span, sortedTags, record.timestamp(), payloadSize);
+        } else {
+          if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
+            propagate()
+                .injectPathwayContext(
+                    span, record, PR_SETTER, sortedTags, record.timestamp(), payloadSize);
+          }
+        }
       } else {
         span = startSpan(KAFKA_CONSUME, null);
       }
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java
new file mode 100644
index 00000000000..8cde81d5775
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java
@@ -0,0 +1,30 @@
+package datadog.trace.instrumentation.kafka_streams;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProcessorRecordContextHeadersAccess {
+  private static final Logger log =
+      LoggerFactory.getLogger(ProcessorRecordContextHeadersAccess.class);
+
+  public static final MethodHandle HEADERS_METHOD;
+
+  static {
+    MethodHandle method;
+    try {
+      method =
+          MethodHandles.publicLookup()
+              .findVirtual(
+                  ProcessorRecordContext.class, "headers", MethodType.methodType(Headers.class));
+    } catch (Throwable e) {
+      log.debug("Exception loading MethodHandle", e);
+      method = null;
+    }
+    HEADERS_METHOD = method;
+  }
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java
new file mode 100644
index 00000000000..59bb4b5f591
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java
@@ -0,0 +1,35 @@
+package datadog.trace.instrumentation.kafka_streams;
+
+import static datadog.trace.instrumentation.kafka_streams.ProcessorRecordContextHeadersAccess.HEADERS_METHOD;
+
+import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import java.nio.charset.StandardCharsets;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProcessorRecordContextSetter
+    implements AgentPropagation.BinarySetter<ProcessorRecordContext> {
+  private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextSetter.class);
+
+  public static final ProcessorRecordContextSetter PR_SETTER = new ProcessorRecordContextSetter();
+
+  @Override
+  public void set(ProcessorRecordContext carrier, String key, String value) {
+    set(carrier, key, value.getBytes(StandardCharsets.UTF_8));
+  }
+
+  @Override
+  public void set(ProcessorRecordContext carrier, String key, byte[] value) {
+    if (HEADERS_METHOD == null) {
+      return;
+    }
+    try {
+      Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
+      headers.remove(key).add(key, value);
+    } catch (Throwable e) {
+      log.debug("Unable to set value", e);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
index 148d32c0779..07794210763 100644
--- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
@@ -1,11 +1,9 @@
 package datadog.trace.instrumentation.kafka_streams;
 
 import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.KAFKA_PRODUCED_KEY;
+import static datadog.trace.instrumentation.kafka_streams.ProcessorRecordContextHeadersAccess.HEADERS_METHOD;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import org.apache.kafka.common.header.Header;
@@ -20,23 +18,6 @@ public class ProcessorRecordContextVisitor
 
   private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextVisitor.class);
 
-  // Using a method handle here to avoid forking the instrumentation for versions 2.7+
-  private static final MethodHandle HEADERS_METHOD;
-
-  static {
-    MethodHandle method;
-    try {
-      method =
-          MethodHandles.publicLookup()
-              .findVirtual(
-                  ProcessorRecordContext.class, "headers", MethodType.methodType(Headers.class));
-    } catch (Throwable e) {
-      log.debug("Exception loading MethodHandle", e);
-      method = null;
-    }
-    HEADERS_METHOD = method;
-  }
-
   public static final ProcessorRecordContextVisitor PR_GETTER = new ProcessorRecordContextVisitor();
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java
new file mode 100644
index 00000000000..a18a7a67771
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java
@@ -0,0 +1,24 @@
+package datadog.trace.instrumentation.kafka_streams;
+
+import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import java.nio.charset.StandardCharsets;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.streams.processor.internals.StampedRecord;
+
+public class StampedRecordContextSetter implements AgentPropagation.BinarySetter<StampedRecord> {
+
+  public static final StampedRecordContextSetter SR_SETTER = new StampedRecordContextSetter();
+
+  @Override
+  public void set(StampedRecord carrier, String key, String value) {
+    set(carrier, key, value.getBytes(StandardCharsets.UTF_8));
+  }
+
+  @Override
+  public void set(StampedRecord carrier, String key, byte[] value) {
+    Headers headers = carrier.value.headers();
+    if (headers != null) {
+      headers.remove(key).add(key, value);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-1.0/build.gradle b/dd-java-agent/instrumentation/kafka-streams-1.0/build.gradle
new file mode 100644
index 00000000000..55b9a46fb5b
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-1.0/build.gradle
@@ -0,0 +1,17 @@
+muzzle {
+  pass {
+    group = "org.apache.kafka"
+    module = "kafka-streams"
+    versions = "[1.0.0.0,3)"
+  }
+}
+
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuite('latestDepTest')
+
+dependencies {
+  compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '1.0.0'
+  implementation project(':dd-java-agent:instrumentation:kafka-common')
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java
new file mode 100644
index 00000000000..7a0f0f62703
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java
@@ -0,0 +1,47 @@
+package datadog.trace.instrumentation.kafka_streams10;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import net.bytebuddy.asm.Advice;
+import org.apache.kafka.streams.processor.internals.ProcessorTopology;
+
+@AutoService(Instrumenter.class)
+public class InternalTopologyBuilderInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+
+  public InternalTopologyBuilderInstrumentation() {
+    super("kafka", "kafka-streams");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.apache.kafka.streams.processor.internals.InternalTopologyBuilder";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".StreamingContextUpdater",
+      "datadog.trace.instrumentation.kafka_common.StreamingContext"
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod().and(named("build")).and(isPrivate()).and(takesArguments(1)),
+        InternalTopologyBuilderInstrumentation.class.getName() + "$BuildAdvice");
+  }
+
+  public static class BuildAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void exit(@Advice.Return final ProcessorTopology topology) {
+      StreamingContextUpdater.updateWithTopology(topology);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java
new file mode 100644
index 00000000000..6dc766cdf5c
--- /dev/null
+++ b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java
@@ -0,0 +1,26 @@
+package datadog.trace.instrumentation.kafka_streams10;
+
+import static datadog.trace.instrumentation.kafka_common.StreamingContext.STREAMING_CONTEXT;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.internals.ProcessorTopology;
+
+public class StreamingContextUpdater {
+
+  public static void updateWithTopology(ProcessorTopology topology) {
+    Set<String> internalTopics = ConcurrentHashMap.newKeySet();
+    Map<String, String> storeToChanglogMap = topology.storeToChangelogTopic();
+
+    for (StateStore store : topology.stateStores()) {
+      if (storeToChanglogMap.containsKey(store.name())) {
+        internalTopics.add(storeToChanglogMap.get(store.name()));
+      }
+    }
+
+    STREAMING_CONTEXT.registerTopics(
+        topology.sourceTopics(), topology.sinkTopics(), internalTopics);
+  }
+}
diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
index d5ceb88c976..396988a170c 100644
--- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
+++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
@@ -20,14 +20,17 @@
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import java.util.Collection;
 
-// FIXME nikita: do not trace Karate tests in JUnit 4 / JUnit 5 instrumentations
 public class KarateTracingHook implements RuntimeHook {
 
   private static final String FRAMEWORK_NAME = "karate";
   private static final String FRAMEWORK_VERSION = FileUtils.KARATE_VERSION;
+  private static final String KARATE_STEP_SPAN_NAME = "karate.step";
 
   @Override
   public boolean beforeFeature(FeatureRuntime fr) {
+    if (skipTracking(fr)) {
+      return true;
+    }
     Feature feature = KarateUtils.getFeature(fr);
     Suite suite = fr.suite;
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
@@ -42,6 +45,9 @@ public boolean beforeFeature(FeatureRuntime fr) {
 
   @Override
   public void afterFeature(FeatureRuntime fr) {
+    if (skipTracking(fr)) {
+      return;
+    }
     String featureName = KarateUtils.getFeature(fr).getNameForReport();
     FeatureResult result = fr.result;
     if (result.isFailed()) {
@@ -55,6 +61,9 @@ public void afterFeature(FeatureRuntime fr) {
 
   @Override
   public boolean beforeScenario(ScenarioRuntime sr) {
+    if (skipTracking(sr)) {
+      return true;
+    }
     Scenario scenario = sr.scenario;
     Feature feature = scenario.getFeature();
 
@@ -70,7 +79,7 @@ public boolean beforeScenario(ScenarioRuntime sr) {
         TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
             featureName,
             scenarioName,
-            scenario.getRefId(),
+            sr,
             FRAMEWORK_NAME,
             FRAMEWORK_VERSION,
             parameters,
@@ -86,7 +95,7 @@ public boolean beforeScenario(ScenarioRuntime sr) {
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
         featureName,
         scenarioName,
-        scenario.getRefId(),
+        sr,
         FRAMEWORK_NAME,
         FRAMEWORK_VERSION,
         parameters,
@@ -99,6 +108,9 @@ public boolean beforeScenario(ScenarioRuntime sr) {
 
   @Override
   public void afterScenario(ScenarioRuntime sr) {
+    if (skipTracking(sr)) {
+      return;
+    }
     Scenario scenario = sr.scenario;
     Feature feature = scenario.getFeature();
 
@@ -111,25 +123,23 @@ public void afterScenario(ScenarioRuntime sr) {
           featureName,
           null,
           scenarioName,
-          scenario.getRefId(),
+          sr,
           KarateUtils.getParameters(scenario),
           result.getError());
     } else if (result.getStepResults().isEmpty()) {
       TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(
-          featureName,
-          null,
-          scenarioName,
-          scenario.getRefId(),
-          KarateUtils.getParameters(scenario),
-          null);
+          featureName, null, scenarioName, sr, KarateUtils.getParameters(scenario), null);
     }
     TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(
-        featureName, null, scenarioName, scenario.getRefId(), KarateUtils.getParameters(scenario));
+        featureName, null, scenarioName, sr, KarateUtils.getParameters(scenario));
   }
 
   @Override
   public boolean beforeStep(Step step, ScenarioRuntime sr) {
-    AgentSpan span = AgentTracer.startSpan("karate", "karate.step");
+    if (skipTracking(step)) {
+      return true;
+    }
+    AgentSpan span = AgentTracer.startSpan("karate", KARATE_STEP_SPAN_NAME);
     AgentScope scope = AgentTracer.activateSpan(span);
     String stepName = step.getPrefix() + " " + step.getText();
     span.setResourceName(stepName);
@@ -143,6 +153,10 @@ public boolean beforeStep(Step step, ScenarioRuntime sr) {
 
   @Override
   public void afterStep(StepResult result, ScenarioRuntime sr) {
+    if (skipTracking(result.getStep())) {
+      return;
+    }
+
     AgentSpan span = AgentTracer.activeSpan();
     if (span == null) {
       return;
@@ -155,4 +169,22 @@ public void afterStep(StepResult result, ScenarioRuntime sr) {
 
     span.finish();
   }
+
+  private static boolean skipTracking(FeatureRuntime fr) {
+    // do not track nested feature calls
+    return !fr.caller.isNone();
+  }
+
+  private static boolean skipTracking(ScenarioRuntime sr) {
+    // do not track nested scenario calls and setup scenarios
+    return !sr.caller.isNone() || sr.tags.getTagKeys().contains("setup");
+  }
+
+  private static boolean skipTracking(Step step) {
+    // do not track steps that are not children of a tracked scenario or another tracked step
+    AgentSpan activeSpan = AgentTracer.activeSpan();
+    return activeSpan == null
+        || (!KARATE_STEP_SPAN_NAME.contentEquals(activeSpan.getSpanName())
+            && !Tags.SPAN_KIND_TEST.contentEquals(activeSpan.getSpanType()));
+  }
 }
diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy
index 9b50d3a501d..e2865c30a5c 100644
--- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy
+++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy
@@ -1,18 +1,13 @@
 import com.intuit.karate.FileUtils
-import com.intuit.karate.KarateException
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.api.DDTags
 import datadog.trace.api.DisableTestTrace
-import datadog.trace.api.civisibility.CIConstants
 import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import datadog.trace.instrumentation.karate.TestEventsHandlerHolder
 import org.example.TestFailedKarate
 import org.example.TestParameterizedKarate
 import org.example.TestSucceedKarate
 import org.example.TestUnskippableKarate
+import org.example.TestWithSetupKarate
 import org.junit.jupiter.api.Assumptions
 import org.junit.jupiter.engine.JupiterTestEngine
 import org.junit.platform.engine.DiscoverySelector
@@ -23,245 +18,37 @@ import org.junit.platform.launcher.core.LauncherFactory
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
 
 @DisableTestTrace(reason = "avoid self-tracing")
-class KarateTest extends CiVisibilityTest {
+class KarateTest extends CiVisibilityInstrumentationTest {
 
-  def "test success generates spans"() {
+  def "test #testcaseName"() {
     setup:
-    runTests(TestSucceedKarate)
+    Assumptions.assumeTrue(assumption)
 
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_succeed] test succeed", CIConstants.TEST_PASS, null, null, false, ['foo'], false)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_succeed] test succeed", "first scenario", null, CIConstants.TEST_PASS, null, null, false, ['bar', 'foo'], false, false)
-        karateStepSpan(it, 0, testId, "* print 'first'", 6, 6)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_succeed] test succeed", "second scenario", null, CIConstants.TEST_PASS, null, null, false, ['foo'], false, false)
-        karateStepSpan(it, 0, testId, "* print 'second'", 9, 9)
-      }
-    })
-  }
-
-  def "test parameterized generates spans"() {
-    setup:
-    runTests(TestParameterizedKarate)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_START, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_parameterized] test parameterized", CIConstants.TEST_PASS, null, null, false, null, false)
-      }
-      trace(4, true) {
-        long testId = testSpan(it, 3, testSessionId, testModuleId, testSuiteId, "[org/example/test_parameterized] test parameterized", "first scenario as an outline", null, CIConstants.TEST_PASS, testTags_0, null, false, null, false, false)
-        karateStepSpan(it, 0, testId, "Given def p = 'a'", 6, 6)
-        karateStepSpan(it, 2, testId, "When def response = p + p", 7, 7)
-        karateStepSpan(it, 1, testId, "Then match response == value", 8, 8)
-      }
-      trace(4, true) {
-        long testId = testSpan(it, 3, testSessionId, testModuleId, testSuiteId, "[org/example/test_parameterized] test parameterized", "first scenario as an outline", null, CIConstants.TEST_PASS, testTags_1, null, false, null, false, false)
-        karateStepSpan(it, 0, testId, "Given def p = 'b'", 6, 6)
-        karateStepSpan(it, 2, testId, "When def response = p + p", 7, 7)
-        karateStepSpan(it, 1, testId, "Then match response == value", 8, 8)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"param":"\\\'a\\\'","value":"aa"}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"param":"\\\'b\\\'","value":"bb"}']
-  }
-
-  def "test failed generates spans"() {
-    setup:
-    runTests(TestFailedKarate)
-
-    expect:
-    def exception = new KarateException("did not evaluate to 'true': false\nclasspath:org/example/test_failed.feature:7")
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_failed] test failed", CIConstants.TEST_FAIL, null, exception, false, null, false)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_failed] test failed", "first scenario", null, CIConstants.TEST_PASS, null, null, false, null, false, false)
-        karateStepSpan(it, 0, testId, "* print 'first'", 4, 4)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_failed] test failed", "second scenario", null, CIConstants.TEST_FAIL, null, exception, false, null, false, false)
-        karateStepSpan(it, 0, testId, "* assert false", 7, 7)
-      }
-    })
-  }
-
-  def "test ITR skipping"() {
-    setup:
-    Assumptions.assumeTrue(isSkippingSupported(FileUtils.KARATE_VERSION), "Current Karate version $FileUtils.KARATE_VERSION does not support testSkipping")
-
-    givenSkippableTests([
-      new SkippableTest("[org/example/test_succeed] test succeed", "first scenario", null, null),
-    ])
-    runTests(TestSucceedKarate)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_START, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_succeed] test succeed", CIConstants.TEST_PASS, null, null, false, ['foo'], false)
-      }
-      trace(1, true) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "[org/example/test_succeed] test succeed", "first scenario", null, CIConstants.TEST_SKIP, testTags, null, false, ['bar', 'foo'], false, false)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_succeed] test succeed", "second scenario", null, CIConstants.TEST_PASS, null, null, false, ['foo'], false, false)
-        karateStepSpan(it, 0, testId, "* print 'second'", 9, 9)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true ]
-  }
-
-  def "test parameterized ITR skipping"() {
-    setup:
-    Assumptions.assumeTrue(isSkippingSupported(FileUtils.KARATE_VERSION), "Current Karate version $FileUtils.KARATE_VERSION does not support testSkipping")
+    givenSkippableTests(skippedTests)
 
-    givenSkippableTests([
-      new SkippableTest("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\\\'a\\\'","value":"aa"}', null),
-    ])
-
-    runTests(TestParameterizedKarate)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_START, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_parameterized] test parameterized", CIConstants.TEST_PASS, null, null, false, null, false)
-      }
-      trace(1, true) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "[org/example/test_parameterized] test parameterized", "first scenario as an outline", null, CIConstants.TEST_SKIP, testTags_0, null, false, null, false, false)
-      }
-      trace(4, true) {
-        long testId = testSpan(it, 3, testSessionId, testModuleId, testSuiteId, "[org/example/test_parameterized] test parameterized", "first scenario as an outline", null, CIConstants.TEST_PASS, testTags_1, null, false, null, false, false)
-        karateStepSpan(it, 0, testId, "Given def p = 'b'", 6, 6)
-        karateStepSpan(it, 2, testId, "When def response = p + p", 7, 7)
-        karateStepSpan(it, 1, testId, "Then match response == value", 8, 8)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_PARAMETERS): '{"param":"\\\'a\\\'","value":"aa"}',
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
-    ]
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"param":"\\\'b\\\'","value":"bb"}']
-  }
-
-  def "test ITR unskippable"() {
-    setup:
-    Assumptions.assumeTrue(isSkippingSupported(FileUtils.KARATE_VERSION), "Current Karate version $FileUtils.KARATE_VERSION does not support testSkipping")
-
-    givenSkippableTests([
-      new SkippableTest("[org/example/test_unskippable] test unskippable", "first scenario", null, null),
-    ])
-    runTests(TestUnskippableKarate)
+    runTests(tests)
 
     expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_START, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "[org/example/test_unskippable] test unskippable", CIConstants.TEST_PASS, null, null, false, ['foo'], false)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_unskippable] test unskippable", "first scenario", null, CIConstants.TEST_PASS, testTags, null, false, ['bar', 'datadog_itr_unskippable', 'foo'], false, false)
-        karateStepSpan(it, 0, testId, "* print 'first'", 7, 7)
-      }
-      trace(2, true) {
-        long testId = testSpan(it, 1, testSessionId, testModuleId, testSuiteId, "[org/example/test_unskippable] test unskippable", "second scenario", null, CIConstants.TEST_PASS, null, null, false, ['foo'], false, false)
-        karateStepSpan(it, 0, testId, "* print 'second'", 10, 10)
-      }
-    })
+    assertSpansData(testcaseName, expectedTracesCount)
 
     where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  private static void karateStepSpan(TraceAssert trace,
-    int index,
-    long testId,
-    String stepName,
-    int startLine,
-    int endLine,
-    String docString = null) {
-    trace.span(index, {
-      parentSpanId(BigInteger.valueOf(testId))
-      operationName "karate.step"
-      resourceName stepName
-      tags {
-        "$Tags.COMPONENT" "karate"
-        "step.name" stepName
-        "step.startLine" startLine
-        "step.endLine" endLine
-
-        if (docString != null) {
-          "step.docString" docString
-        }
-
-        "$Tags.ENV" String
-        "$DDTags.LIBRARY_VERSION_TAG_KEY" String
-
-        defaultTags()
-      }
-    })
+    testcaseName                      | tests                     | expectedTracesCount | skippedTests                                                                                                                                           | assumption
+    "test-succeed"                    | [TestSucceedKarate]       | 3                   | []                                                                                                                                                     | true
+    "test-with-setup"                 | [TestWithSetupKarate]     | 3                   | []                                                                                                                                                     | isSetupTagSupported(FileUtils.KARATE_VERSION)
+    "test-parameterized"              | [TestParameterizedKarate] | 3                   | []                                                                                                                                                     | true
+    "test-failed"                     | [TestFailedKarate]        | 3                   | []                                                                                                                                                     | true
+    "test-itr-skipping"               | [TestSucceedKarate]       | 3                   | [new SkippableTest("[org/example/test_succeed] test succeed", "first scenario", null, null)]                                                           | isSkippingSupported(FileUtils.KARATE_VERSION)
+    "test-itr-skipping-parameterized" | [TestParameterizedKarate] | 3                   | [
+      new SkippableTest("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\\\'a\\\'","value":"aa"}', null)
+    ] | isSkippingSupported(FileUtils.KARATE_VERSION)
+    "test-itr-unskippable"            | [TestUnskippableKarate]   | 3                   | [new SkippableTest("[org/example/test_unskippable] test unskippable", "first scenario", null, null)]                                                   | isSkippingSupported(FileUtils.KARATE_VERSION)
   }
 
-  private void runTests(Class<?>... tests) {
+  private void runTests(List<Class<?>> tests) {
     TestEventsHandlerHolder.start()
 
-    DiscoverySelector[] selectors = new DiscoverySelector[tests.length]
-    for (i in 0..<tests.length) {
+    DiscoverySelector[] selectors = new DiscoverySelector[tests.size()]
+    for (i in 0..<tests.size()) {
       selectors[i] = selectClass(tests[i])
     }
 
@@ -282,27 +69,21 @@ class KarateTest extends CiVisibilityTest {
   }
 
   @Override
-  String expectedOperationPrefix() {
-    return "karate"
-  }
-
-  @Override
-  String expectedTestFramework() {
+  String instrumentedLibraryName() {
     return "karate"
   }
 
   @Override
-  String expectedTestFrameworkVersion() {
+  String instrumentedLibraryVersion() {
     return FileUtils.KARATE_VERSION
   }
 
-  @Override
-  String component() {
-    return "karate"
-  }
-
   boolean isSkippingSupported(String frameworkVersion) {
     // earlier Karate version contain a bug that does not allow skipping scenarios
     frameworkVersion >= "1.2.0"
   }
+
+  boolean isSetupTagSupported(String frameworkVersion) {
+    frameworkVersion >= "1.3.0"
+  }
 }
diff --git a/dd-java-agent/instrumentation/karate/src/test/java/org/example/TestWithSetupKarate.java b/dd-java-agent/instrumentation/karate/src/test/java/org/example/TestWithSetupKarate.java
new file mode 100644
index 00000000000..4bea15c32f8
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/java/org/example/TestWithSetupKarate.java
@@ -0,0 +1,11 @@
+package org.example;
+
+import com.intuit.karate.junit5.Karate;
+
+public class TestWithSetupKarate {
+
+  @Karate.Test
+  public Karate testSucceed() {
+    return Karate.run("classpath:org/example/test_with_setup.feature");
+  }
+}
diff --git a/dd-java-agent/instrumentation/karate/src/test/java/org/example/karate-config.js b/dd-java-agent/instrumentation/karate/src/test/java/org/example/karate-config.js
new file mode 100644
index 00000000000..7e70e8ac51b
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/java/org/example/karate-config.js
@@ -0,0 +1,2 @@
+function fn() {
+}
diff --git a/dd-java-agent/instrumentation/karate/src/test/java/org/example/test_with_setup.feature b/dd-java-agent/instrumentation/karate/src/test/java/org/example/test_with_setup.feature
new file mode 100644
index 00000000000..abccf348ebd
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/java/org/example/test_with_setup.feature
@@ -0,0 +1,27 @@
+Feature: test with setup
+
+  @setup
+  Scenario: setup scenario
+    * call read('@setupStep')
+    * def data =
+    """
+    [
+     {foo: "bar"}
+    ]
+    """
+
+  @withSetup
+  Scenario Outline: first scenario
+    * print foo
+    Examples:
+      | karate.setup().data |
+
+  @withSetupOnce
+  Scenario Outline: second scenario
+    * print foo
+    Examples:
+      | karate.setupOnce().data |
+
+  @ignore @setupStep
+  Scenario: setup step
+    * print 'test'
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl
new file mode 100644
index 00000000000..9ebfda2b3ae
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl
@@ -0,0 +1,256 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* assert false",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 7,
+      "step.startLine" : 7
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* assert false",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'first'",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 4,
+      "step.startLine" : 4
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'first'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_failed] test failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "error.type" : "com.intuit.karate.KarateException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "[org/example/test_failed] test failed",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_parent_id_2},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_failed] test failed.first scenario",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_failed] test failed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_failed] test failed.second scenario",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "second scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_failed] test failed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "error.type" : "com.intuit.karate.KarateException",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack_2},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl
new file mode 100644
index 00000000000..210dfd3f48a
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -0,0 +1,280 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Given def p = 'b'",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 6,
+      "step.startLine" : 6
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Given def p = 'b'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Then match response == value",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 8,
+      "step.startLine" : 8
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Then match response == value",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "When def response = p + p",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 7,
+      "step.startLine" : 7
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "When def response = p + p",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_parameterized] test parameterized",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id_2},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario as an outline",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_2},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario as an outline",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..c3dce6ca5b9
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,233 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'second'",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 9,
+      "step.startLine" : 9
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'second'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_succeed] test succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_succeed] test succeed.first scenario",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"bar\",\"foo\"]}",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_2},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_succeed] test succeed.second scenario",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "second scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..04c749a1c8d
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,255 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'first'",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 7,
+      "step.startLine" : 7
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'first'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'second'",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 10,
+      "step.startLine" : 10
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'second'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_unskippable] test unskippable",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_unskippable] test unskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_unskippable] test unskippable.first scenario",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "first scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_unskippable] test unskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"bar\",\"datadog_itr_unskippable\",\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_parent_id_2},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_unskippable] test unskippable.second scenario",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "second scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_unskippable] test unskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl
new file mode 100644
index 00000000000..746c3de461c
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl
@@ -0,0 +1,348 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Given def p = 'a'",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 6,
+      "step.startLine" : 6
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Given def p = 'a'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Given def p = 'b'",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 6,
+      "step.startLine" : 6
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Given def p = 'b'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Then match response == value",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 8,
+      "step.startLine" : 8
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Then match response == value",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "Then match response == value",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 8,
+      "step.startLine" : 8
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "Then match response == value",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_5},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "When def response = p + p",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 7,
+      "step.startLine" : 7
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "When def response = p + p",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_6},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "When def response = p + p",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 7,
+      "step.startLine" : 7
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "When def response = p + p",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_parameterized] test parameterized",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario as an outline",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_parent_id_2},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline",
+    "start" : ${content_start_9},
+    "duration" : ${content_duration_9},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario as an outline",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_parameterized] test parameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_10},
+    "duration" : ${content_duration_10},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_11},
+    "duration" : ${content_duration_11},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..2d6c7159d38
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,253 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'first'",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 6,
+      "step.startLine" : 6
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'first'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print 'second'",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 9,
+      "step.startLine" : 9
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print 'second'",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_succeed] test succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_succeed] test succeed.first scenario",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"bar\",\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_parent_id_2},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_succeed] test succeed.second scenario",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "second scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_succeed] test succeed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"foo\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/coverages.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl
new file mode 100644
index 00000000000..68e5d57c581
--- /dev/null
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl
@@ -0,0 +1,254 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print foo",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 15,
+      "step.startLine" : 15
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print foo",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.step",
+    "resource" : "* print foo",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "step.endLine" : 21,
+      "step.startLine" : 21
+    },
+    "meta" : {
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "step.name" : "* print foo",
+      "env" : "none"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_suite",
+    "resource" : "[org/example/test_with_setup] test with setup",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "[org/example/test_with_setup] test with setup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_with_setup] test with setup.first scenario",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "first scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_with_setup] test with setup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"withSetup\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"foo\":\"bar\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_parent_id_2},
+    "parent_id" : ${content_parent_id_3},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test",
+    "resource" : "[org/example/test_with_setup] test with setup.second scenario",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "second scenario",
+      "span.kind" : "test",
+      "test.suite" : "[org/example/test_with_setup] test with setup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"withSetupOnce\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"foo\":\"bar\"}",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_session",
+    "resource" : "karate",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "karate",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "karate",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "karate.test_module",
+    "resource" : "karate",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "karate",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "karate",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "karate",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/build.gradle b/dd-java-agent/instrumentation/maven-3.2.1/build.gradle
index 488c0c64e49..69a0df3b0f3 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/build.gradle
+++ b/dd-java-agent/instrumentation/maven-3.2.1/build.gradle
@@ -23,7 +23,7 @@ dependencies {
   testImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-transport-http', version: '1.0.3'
 
   latestDepTestImplementation group: 'org.apache.maven', name: 'maven-embedder', version: '+'
-  latestDepTestImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-connector-basic', version: '+'
-  latestDepTestImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-transport-http', version: '+'
+  latestDepTestImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-connector-basic', version: '1.+'
+  latestDepTestImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-transport-http', version: '1.+'
   latestDepTestImplementation group: 'org.fusesource.jansi', name: 'jansi', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
index 657ed2cd706..4e46b90746e 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
@@ -94,7 +94,7 @@ public void afterProjectsRead(MavenSession session) {
     String startCommand = MavenUtils.getCommandLine(session);
     String mavenVersion = MavenUtils.getMavenVersion(session);
     buildEventsHandler.onTestSessionStart(
-        request, projectName, projectRoot, startCommand, "maven", mavenVersion);
+        request, projectName, projectRoot, startCommand, "maven", mavenVersion, null);
 
     if (!config.isCiVisibilityAutoConfigurationEnabled()) {
       return;
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenTest.groovy b/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenTest.groovy
index 95ef82ef280..494b1edf981 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenTest.groovy
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenTest.groovy
@@ -1,17 +1,13 @@
-import datadog.trace.api.civisibility.CIConstants
 import datadog.trace.api.config.CiVisibilityConfig
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import org.apache.maven.cli.MavenCli
-import org.apache.maven.lifecycle.LifecycleExecutionException
-import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException
 import org.codehaus.plexus.util.FileUtils
 import spock.lang.TempDir
 
 import java.nio.file.Path
 import java.nio.file.Paths
 
-class MavenTest extends CiVisibilityTest {
+class MavenTest extends CiVisibilityInstrumentationTest {
 
   private static final int DEPENDENCIES_DOWNLOAD_RETRIES = 3
 
@@ -21,7 +17,7 @@ class MavenTest extends CiVisibilityTest {
   @Override
   void setup() {
     System.setProperty("maven.multiModuleProjectDirectory", projectFolder.toAbsolutePath().toString())
-    givenMavenProjectFiles(specificationContext.currentIteration.name)
+    givenMavenProjectFiles((String) specificationContext.currentIteration.dataVariables.testcaseName)
     givenMavenDependenciesAreLoaded()
     TEST_WRITER.clear() // loading dependencies will generate a test-session span
   }
@@ -32,252 +28,27 @@ class MavenTest extends CiVisibilityTest {
     injectSysConfig(CiVisibilityConfig.CIVISIBILITY_AUTO_CONFIGURATION_ENABLED, "false")
   }
 
-  def "test_maven_build_with_no_tests_generates_spans"() {
+  def "test #testcaseName"() {
     given:
-    String[] args = ["-B", "verify"]
     String workingDirectory = projectFolder.toString()
 
     when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
+    def exitCode = new MavenCli().doMain(args.toArray(new String[0]), workingDirectory, null, null)
 
     then:
-    exitCode == 0
+    exitCode == expectedExitCode
+    assertSpansData(testcaseName, expectedTracesCount)
 
-    assertTraces(1) {
-      trace(1, true) {
-        testSessionSpan(it, 0, CIConstants.TEST_SKIP, [:],
-        "Maven Integration Tests Project",
-        "mvn -B verify",
-        "maven:${expectedToolchainVersion()}"
-        )
-      }
-    }
-  }
-
-  def "test_maven_build_with_incorrect_command_generates_spans"() {
-    given:
-    String[] args = ["-B", "unknownPhase"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 1
-
-    assertTraces(1) {
-      trace(1, true) {
-        testSessionSpan(it, 0, CIConstants.TEST_FAIL, null,
-          "Maven Integration Tests Project",
-          "mvn -B unknownPhase",
-          "maven:${expectedToolchainVersion()}",
-          new LifecyclePhaseNotFoundException("", ""),
-          false
-          )
-      }
-    }
-  }
-
-  def "test_maven_build_with_tests_generates_spans"() {
-    given:
-    String[] args = ["-B", "clean", "test"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 0
-
-    assertTraces(1) {
-      trace(2, true) {
-        def testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS, [:],
-        "Maven Integration Tests Project",
-        "mvn -B clean test",
-        "maven:${expectedToolchainVersion()}"
-        )
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "Maven Integration Tests Project maven-surefire-plugin default-test")
-      }
-    }
-  }
-
-  def "test_maven_build_with_failed_tests_generates_spans"() {
-    given:
-    String[] args = ["-B", "clean", "test"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 1
-
-    assertTraces(1) {
-      trace(2, true) {
-        def testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL, null,
-          "Maven Integration Tests Project",
-          "mvn -B clean test",
-          "maven:${expectedToolchainVersion()}",
-          new LifecycleExecutionException(""),
-          false)
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_FAIL,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          new LifecycleExecutionException(""),
-          "Maven Integration Tests Project maven-surefire-plugin default-test",
-          false)
-      }
-    }
-  }
-
-  def "test_maven_build_with_tests_in_multiple_modules_generates_spans"() {
-    given:
-    String[] args = ["-B", "clean", "test"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 1
-
-    assertTraces(1) {
-      trace(3, true) {
-        def testSessionId = testSessionSpan(it, 2, CIConstants.TEST_FAIL, null,
-          "Maven Integration Tests Project",
-          "mvn -B clean test",
-          "maven:${expectedToolchainVersion()}",
-          new LifecycleExecutionException(""),
-          false)
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "module-a maven-surefire-plugin default-test")
-        testModuleSpan(it, 1, testSessionId,
-          CIConstants.TEST_FAIL,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          new LifecycleExecutionException(""),
-          "module-b maven-surefire-plugin default-test",
-          false)
-      }
-    }
-  }
-
-  def "test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans"() {
-    given:
-    String[] args = ["-B", "-T4", "clean", "test"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 0
-
-    assertTraces(1) {
-      trace(3, true) {
-        def testSessionId = testSessionSpan(it, 2, CIConstants.TEST_PASS, [:],
-        "Maven Integration Tests Project",
-        "mvn -B -T4 clean test",
-        "maven:${expectedToolchainVersion()}"
-        )
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B -T4 clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "module-a maven-surefire-plugin default-test")
-        testModuleSpan(it, 1, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B -T4 clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "module-b maven-surefire-plugin default-test")
-      }
-    }
-  }
-
-  def "test_maven_build_with_unit_and_integration_tests_generates_spans"() {
-    given:
-    String[] args = ["-B", "verify"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 0
-
-    assertTraces(1) {
-      trace(3, true) {
-        def testSessionId = testSessionSpan(it, 2, CIConstants.TEST_PASS, [:],
-        "Maven Integration Tests Project",
-        "mvn -B verify",
-        "maven:${expectedToolchainVersion()}"
-        )
-        testModuleSpan(it, 1, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B verify",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "Maven Integration Tests Project maven-surefire-plugin default-test")
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B verify",
-            (Tags.TEST_EXECUTION): "maven-failsafe-plugin:integration-test:default",
-          ],
-          null, "Maven Integration Tests Project maven-failsafe-plugin default")
-      }
-    }
-  }
-
-  def "test_maven_build_with_no_fork_generates_spans"() {
-    given:
-    String[] args = ["-B", "clean", "test"]
-    String workingDirectory = projectFolder.toString()
-
-    when:
-    def exitCode = new MavenCli().doMain(args, workingDirectory, null, null)
-
-    then:
-    exitCode == 0
-
-    // test suite and test case spans are not generated since JUnit instrumentation is not applied
-    assertTraces(1) {
-      trace(2, true) {
-        def testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS, [:],
-        "Maven Integration Tests Project",
-        "mvn -B clean test",
-        "maven:${expectedToolchainVersion()}"
-        )
-        testModuleSpan(it, 0, testSessionId,
-          CIConstants.TEST_PASS,
-          [
-            (Tags.TEST_COMMAND)  : "mvn -B clean test",
-            (Tags.TEST_EXECUTION): "maven-surefire-plugin:test:default-test",
-          ],
-          null, "Maven Integration Tests Project maven-surefire-plugin default-test")
-      }
-    }
+    where:
+    testcaseName                                                                      | args                           | expectedExitCode | expectedTracesCount
+    "test_maven_build_with_no_tests_generates_spans"                                  | ["-B", "verify"]               | 0                | 1
+    "test_maven_build_with_incorrect_command_generates_spans"                         | ["-B", "unknownPhase"]         | 1                | 1
+    "test_maven_build_with_tests_generates_spans"                                     | ["-B", "clean", "test"]        | 0                | 1
+    "test_maven_build_with_failed_tests_generates_spans"                              | ["-B", "clean", "test"]        | 1                | 1
+    "test_maven_build_with_tests_in_multiple_modules_generates_spans"                 | ["-B", "clean", "test"]        | 1                | 1
+    "test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0                | 1
+    "test_maven_build_with_unit_and_integration_tests_generates_spans"                | ["-B", "verify"]               | 0                | 1
+    "test_maven_build_with_no_fork_generates_spans"                                   | ["-B", "clean", "test"]        | 0                | 1
   }
 
   private void givenMavenProjectFiles(String projectFilesSources) {
@@ -303,31 +74,13 @@ class MavenTest extends CiVisibilityTest {
     throw new AssertionError((Object) "Tried to download dependencies $DEPENDENCIES_DOWNLOAD_RETRIES times and failed")
   }
 
-  String expectedToolchainVersion() {
-    return MavenCli.getPackage().getImplementationVersion()
-  }
-
   @Override
-  String expectedOperationPrefix() {
+  String instrumentedLibraryName() {
     return "maven"
   }
 
   @Override
-  String expectedTestFramework() {
-    // Test framework data is supplied by test framework instrumentations,
-    // that are not available in the context of this test
-    return null
-  }
-
-  @Override
-  String expectedTestFrameworkVersion() {
-    // Test framework version data is supplied by test framework instrumentations,
-    // that are not available in the context of this test
-    return null
-  }
-
-  @Override
-  String component() {
-    return "maven"
+  String instrumentedLibraryVersion() {
+    return MavenCli.getPackage().getImplementationVersion()
   }
 }
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl
new file mode 100644
index 00000000000..c2d4db2d50a
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl
@@ -0,0 +1,76 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "maven",
+      "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl
new file mode 100644
index 00000000000..9d2a18a9d32
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl
@@ -0,0 +1,41 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "maven",
+      "error.type" : "org.apache.maven.lifecycle.LifecyclePhaseNotFoundException",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.command" : "mvn -B unknownPhase"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl
new file mode 100644
index 00000000000..d671977a2c4
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl
@@ -0,0 +1,70 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl
new file mode 100644
index 00000000000..96fddd5d768
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl
@@ -0,0 +1,38 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "mvn -B verify"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl
new file mode 100644
index 00000000000..d671977a2c4
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl
@@ -0,0 +1,70 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl
new file mode 100644
index 00000000000..9d517fc10e8
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl
@@ -0,0 +1,108 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "maven",
+      "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "module-a maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "module-a maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "module-b maven-surefire-plugin default-test",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "module-b maven-surefire-plugin default-test",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B clean test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl
new file mode 100644
index 00000000000..c15951a251a
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl
@@ -0,0 +1,102 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "mvn -B -T4 clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "module-a maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "module-a maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B -T4 clean test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "module-b maven-surefire-plugin default-test",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "module-b maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B -T4 clean test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl
new file mode 100644
index 00000000000..eb4cdc663a5
--- /dev/null
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl
@@ -0,0 +1,102 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_session",
+    "resource" : "Maven Integration Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "_dd.profiling.ctx" : "test",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "mvn -B verify"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "Maven Integration Tests Project maven-failsafe-plugin default",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Integration Tests Project maven-failsafe-plugin default",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-failsafe-plugin:integration-test:default",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B verify"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "maven.test_module",
+    "resource" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "maven",
+      "span.kind" : "test_module_end",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "mvn -B verify"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/netty-4.1/build.gradle b/dd-java-agent/instrumentation/netty-4.1/build.gradle
index 5e6e9cc4a37..1e458fca682 100644
--- a/dd-java-agent/instrumentation/netty-4.1/build.gradle
+++ b/dd-java-agent/instrumentation/netty-4.1/build.gradle
@@ -7,6 +7,12 @@ muzzle {
     versions = "[4.1.0.Final,)"
     assertInverse = true
   }
+  pass {
+    group = "io.netty"
+    module = "netty-codec-http2"
+    versions = "[4.1.0.Final,)"
+    assertInverse = true
+  }
   pass {
     group = "io.netty"
     module = "netty-all"
@@ -31,6 +37,8 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
+  compileOnly group: 'io.netty', name: 'netty-codec-http2', version: '4.1.0.Final'
+
   api project(':dd-java-agent:instrumentation:netty-4.1-shared')
 
   testImplementation project(':dd-java-agent:instrumentation:netty-promise-4')
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java
new file mode 100644
index 00000000000..0a2319d2f33
--- /dev/null
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java
@@ -0,0 +1,46 @@
+package datadog.trace.instrumentation.netty41;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import io.netty.channel.Channel;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.matcher.ElementMatchers;
+
+@AutoService(Instrumenter.class)
+public class Http2MultiplexHandlerStreamChannelInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+
+  public Http2MultiplexHandlerStreamChannelInstrumentation() {
+    super("netty", "netty-4.1", "netty-4.1-http2");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "io.netty.handler.codec.http2.Http2MultiplexHandler$Http2MultiplexHandlerStreamChannel";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".AttributeKeys",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        ElementMatchers.isConstructor(), getClass().getName() + "$PropagateContextAdvice");
+  }
+
+  public static class PropagateContextAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreate(@Advice.This Channel self) {
+      if (self.parent() != null
+          && self.parent().hasAttr(AttributeKeys.SPAN_ATTRIBUTE_KEY)
+          && !self.hasAttr(AttributeKeys.SPAN_ATTRIBUTE_KEY)) {
+        self.attr(AttributeKeys.SPAN_ATTRIBUTE_KEY)
+            .set(self.parent().attr(AttributeKeys.SPAN_ATTRIBUTE_KEY).getAndRemove());
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
index ed87823cc8f..60b1ab67d8a 100644
--- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
@@ -75,6 +75,7 @@ public String[] helperClassNames() {
       packageName + ".server.HttpServerResponseTracingHandler",
       packageName + ".server.HttpServerTracingHandler",
       packageName + ".server.MaybeBlockResponseHandler",
+      packageName + ".NettyHttp2Helper",
     };
   }
 
@@ -153,6 +154,13 @@ public static void addHandler(
           toAdd = HttpClientRequestTracingHandler.INSTANCE;
         } else if (handler instanceof HttpResponseDecoder) {
           toAdd = HttpClientResponseTracingHandler.INSTANCE;
+        } else if (NettyHttp2Helper.isHttp2FrameCodec(handler)) {
+          if (NettyHttp2Helper.isServer(handler)) {
+            toAdd = new HttpServerTracingHandler();
+            toAdd2 = MaybeBlockResponseHandler.INSTANCE;
+          } else {
+            toAdd = new HttpClientTracingHandler();
+          }
         }
         if (toAdd != null) {
           // Get the name so we can add immediately following
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java
new file mode 100644
index 00000000000..327a48b02a6
--- /dev/null
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java
@@ -0,0 +1,56 @@
+package datadog.trace.instrumentation.netty41;
+
+import io.netty.channel.ChannelHandler;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NettyHttp2Helper {
+  private static final Class HTTP2_CODEC_CLS;
+  private static final MethodHandle IS_SERVER_FIELD;
+  private static final Logger LOGGER = LoggerFactory.getLogger(NettyHttp2Helper.class);
+
+  static {
+    Class codecClass;
+    MethodHandle isServerField;
+    try {
+      codecClass =
+          Class.forName(
+              "io.netty.handler.codec.http2.Http2StreamFrameToHttpObjectCodec",
+              false,
+              NettyHttp2Helper.class.getClassLoader());
+      Field f = codecClass.getDeclaredField("isServer");
+      f.setAccessible(true);
+      isServerField =
+          MethodHandles.lookup()
+              .unreflectGetter(f)
+              .asType(MethodType.methodType(boolean.class, ChannelHandler.class));
+    } catch (final ClassNotFoundException cnfe) {
+      // can be expected
+      codecClass = null;
+      isServerField = null;
+    } catch (Throwable t) {
+      // unexpected
+      codecClass = null;
+      isServerField = null;
+      LOGGER.debug("Unable to setup netty http2 instrumentation", t);
+    }
+    HTTP2_CODEC_CLS = codecClass;
+    IS_SERVER_FIELD = isServerField;
+  }
+
+  public static boolean isHttp2FrameCodec(final ChannelHandler handler) {
+    return HTTP2_CODEC_CLS != null && HTTP2_CODEC_CLS.isInstance(handler);
+  }
+
+  public static boolean isServer(final ChannelHandler handler) {
+    try {
+      return IS_SERVER_FIELD != null && (boolean) IS_SERVER_FIELD.invokeExact(handler);
+    } catch (Throwable t) {
+      return false;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
index daf25af69fc..ba101cab463 100644
--- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
@@ -72,8 +72,9 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann
         }
       }
     }
-
-    ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
+    if (ctx.channel().parent() == null) {
+      ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
+    }
     boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null;
     NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
 
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
index 175514da0d7..67676391ad4 100644
--- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
@@ -11,7 +11,9 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.Attribute;
 
 @ChannelHandler.Sharable
@@ -26,13 +28,20 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
     final AgentSpan parent = parentAttr.get();
     final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndSet(parent);
 
-    final boolean finishSpan = msg instanceof HttpResponse;
-
-    if (span != null && finishSpan) {
-      try (final AgentScope scope = activateSpan(span)) {
-        DECORATE.onResponse(span, (HttpResponse) msg);
-        DECORATE.beforeFinish(span);
-        span.finish();
+    if (span != null) {
+      final boolean finishSpan =
+          msg instanceof HttpResponse
+              && (!HttpResponseStatus.SWITCHING_PROTOCOLS.equals(((HttpResponse) msg).status())
+                  || "websocket"
+                      .equals(((HttpResponse) msg).headers().get(HttpHeaderNames.UPGRADE)));
+      if (finishSpan) {
+        try (final AgentScope scope = activateSpan(span)) {
+          DECORATE.onResponse(span, (HttpResponse) msg);
+          DECORATE.beforeFinish(span);
+          span.finish();
+        }
+      } else {
+        ctx.channel().attr(SPAN_ATTRIBUTE_KEY).set(span);
       }
     }
 
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
index 166586c7a2f..04035114f52 100644
--- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
@@ -10,6 +10,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
@@ -20,6 +21,7 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap
   @Override
   public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
     final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).get();
+
     if (span == null || !(msg instanceof HttpResponse)) {
       ctx.write(msg, prm);
       return;
@@ -36,7 +38,9 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann
         span.finish(); // Finish the span manually since finishSpanOnClose was false
         throw throwable;
       }
-      if (response.status() != HttpResponseStatus.CONTINUE) {
+      if (response.status() != HttpResponseStatus.CONTINUE
+          && (response.status() != HttpResponseStatus.SWITCHING_PROTOCOLS
+              || "websocket".equals(response.headers().get(HttpHeaderNames.UPGRADE)))) {
         DECORATE.onResponse(span, response);
         DECORATE.beforeFinish(span);
         span.finish(); // Finish the span manually since finishSpanOnClose was false
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy
index 0665fa65109..0cdc7d5f2de 100644
--- a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy
+++ b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy
@@ -1,138 +1,84 @@
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.api.DDSpanTypes
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.core.DDSpan
-import io.netty.handler.timeout.ReadTimeoutException
+import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+
+import datadog.trace.agent.test.base.HttpClientTest
+import datadog.trace.agent.test.naming.TestingNettyHttpNamingConventions
+import io.netty.handler.codec.http.HttpMethod
 import io.netty.handler.timeout.ReadTimeoutHandler
+import reactor.core.publisher.Mono
+import reactor.netty.ByteBufFlux
 import reactor.netty.http.client.HttpClient
 import reactor.netty.http.client.HttpClientResponse
-import spock.lang.AutoCleanup
-import spock.lang.Shared
 
+import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 
-import static datadog.trace.agent.test.base.HttpClientTest.READ_TIMEOUT_MS
-import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
-import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
-import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-
-class ReactorNettyTest extends AgentTestRunner {
+class ReactorNettyTest extends HttpClientTest implements TestingNettyHttpNamingConventions.ClientV0 {
   @Override
   boolean useStrictTraceWrites() {
     // TODO fix this by making sure that spans get closed properly
     return false
   }
 
-  @AutoCleanup
-  @Shared
-  def server = httpServer {
-    handlers {
-      prefix("success") {
-        response.status(200).send("Hello.")
-      }
-      prefix("timeout") {
-        Thread.sleep(READ_TIMEOUT_MS + 1000)
-        response.status(200).send("Timeout.")
-      }
-    }
+  @Override
+  boolean testCircularRedirects() {
+    false
   }
 
-  private int doRequest() {
-    HttpClientResponse resp = HttpClient.create()
-      .baseUrl(server.address.toString())
-      .get()
-      .uri("/success")
-      .response()
-      .block()
-    return resp.status().code()
+  @Override
+  boolean testRedirects() {
+    false
   }
 
-  private doTimeoutRequest() {
-    HttpClient client = HttpClient.create()
-      // This could be replaced with responseTimeout(Duration.ofMillis(READ_TIMEOUT_MS)) in newer releases of reactor-netty
-      .doAfterRequest({ r, c -> c.addHandler("TimeoutHandler", new ReadTimeoutHandler(READ_TIMEOUT_MS, TimeUnit.MILLISECONDS)) })
-      .baseUrl(server.address.toString())
-
-    try {
-      client.get()
-        .uri("/timeout")
-        .response()
-        .block()
-        .status()
-        .code()
-      throw new RuntimeException("This should not get executed")
-    } catch (ReadTimeoutException ignore) {
-      // this test expects this exception
-    } catch (Throwable t) {
-      throw t
-    }
+  @Override
+  boolean testConnectionFailure() {
+    false
   }
 
-  def "two basic GET requests #url"() {
-    when:
-    runUnderTrace("parent") {
-      doRequest()
-    }
-    runUnderTrace("parent") {
-      doRequest()
-    }
-
-    then:
-    assertTraces(2) {
-      trace(2) {
-        basicSpan(it, "parent")
-        clientSpan(it, 1, span(0))
-      }
-      trace(2) {
-        basicSpan(it, "parent")
-        clientSpan(it, 1, span(0))
-      }
-    }
+  @Override
+  boolean testRemoteConnection() {
+    false
   }
 
   def "test timeout"() {
     when:
     runUnderTrace("parent") {
-      doTimeoutRequest()
+      doRequest("GET", server.address.resolve("/timeout"))
     }
 
     then:
+    def ex = thrown(Exception)
+    def thrownException = ex instanceof ExecutionException ? ex.cause : ex
+
     assertTraces(1) {
       trace(2) {
-        basicSpan(it, "parent")
-        clientSpan(it, 1, span(0), "GET", server.address.resolve("/timeout"), null, true, ReadTimeoutException)
+        basicSpan(it, "parent", null, thrownException)
+        clientSpan(it, span(0), "GET", false, false, server.address.resolve("/timeout"), null, true, thrownException)
       }
     }
   }
 
-  void clientSpan(TraceAssert trace, int index, Object parentSpan, String method = "GET", URI uri = server.address.resolve("/success"), Integer status = 200, boolean error = false, Class errorType = null) {
-    trace.span {
-      if (parentSpan == null) {
-        parent()
-      } else {
-        childOf((DDSpan) parentSpan)
-      }
-      operationName "netty.client.request"
-      resourceName "$method $uri.path"
-      spanType DDSpanTypes.HTTP_CLIENT
-      errored error
-      tags {
-        "$Tags.COMPONENT" "netty-client"
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
-        "$Tags.PEER_HOSTNAME" uri.host
-
-        "$Tags.PEER_HOST_IPV4" "127.0.0.1"
-        "$Tags.PEER_PORT" uri.port
-        "$Tags.HTTP_URL" "${uri.resolve(uri.path)}"
-        "$Tags.HTTP_METHOD" method
-        "$Tags.HTTP_STATUS" status
-        if (error) {
-          "error.type" errorType.name
-          "error.stack" String
+  @Override
+  int doRequest(String method, URI uri, Map<String, String> headers, String body, Closure callback) {
+    HttpClientResponse resp = HttpClient.create()
+      .doAfterRequest({ r, c -> c.addHandler("TimeoutHandler", new ReadTimeoutHandler(READ_TIMEOUT_MS, TimeUnit.MILLISECONDS)) })
+      .baseUrl(server.address.toString())
+      .headers {
+        headers.each { h ->
+          it.set(h.key, h.value)
         }
-        defaultTags()
       }
-    }
+      .request(HttpMethod.valueOf(method))
+      .uri(uri.toString())
+      .send(ByteBufFlux.fromString(Mono.just(body)))
+      .response()
+      .doOnNext { callback?.call() }
+      .block()
+    return resp.status().code()
+  }
+
+  @Override
+  CharSequence component() {
+    return "netty-client"
   }
 }
diff --git a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
index d8d4165a3e0..08deafb2bf9 100644
--- a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
@@ -53,7 +53,7 @@ public static void onExit(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       try {
         if (module != null) {
-          module.taintIfInputIsTainted(self, buffer);
+          module.taintIfTainted(self, buffer);
         }
       } catch (final Throwable e) {
         module.onUnexpectedException("ByteBufInputStream ctor threw", e);
diff --git a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
index f24dbc711f2..8cd47d7ed01 100644
--- a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
@@ -76,20 +76,20 @@ public static void onParse(
         @Advice.Argument(0) final Object argument, @Advice.Return final Object result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, argument);
+        module.taintIfTainted(result, argument);
       }
     }
   }
 
   public static class PropagationAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Propagation
     public static void onPropagation(
         @Advice.This final Object self, @Advice.Return final Object result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, self);
+        module.taintIfTainted(result, self);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/IastOkHttp2InstrumentationTest.groovy b/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/IastOkHttp2InstrumentationTest.groovy
index 530c5ac59f4..e54d88b1505 100644
--- a/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/IastOkHttp2InstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/IastOkHttp2InstrumentationTest.groovy
@@ -62,12 +62,12 @@ class IastOkHttp2InstrumentationTest extends AgentTestRunner {
 
   private void mockPropagation() {
     final propagation = Mock(PropagationModule) {
-      taintIfAnyInputIsTainted(_, _) >> {
+      taintIfAnyTainted(_, _) >> {
         if ((it[1] as List).any { input -> tainteds.containsKey(input) }) {
           tainteds.put(it[0], null)
         }
       }
-      taintIfInputIsTainted(_, _) >> {
+      taintIfTainted(_, _) >> {
         if (tainteds.containsKey(it[1])) {
           tainteds.put(it[0], null)
         }
diff --git a/dd-java-agent/instrumentation/okhttp-3/build.gradle b/dd-java-agent/instrumentation/okhttp-3/build.gradle
index 0395aa5a67a..faf845ae7d8 100644
--- a/dd-java-agent/instrumentation/okhttp-3/build.gradle
+++ b/dd-java-agent/instrumentation/okhttp-3/build.gradle
@@ -26,6 +26,13 @@ dependencies {
       prefer '1.6.0'
     }
   }
+  // Downgrade moshi to a previous version as moshi 1.2.0+ requires okio 1.8.0+
+  testImplementation('com.squareup.moshi:moshi') {
+    version {
+      strictly '1.1.0'
+    }
+  }
+
   latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4)'
   latestDepTestImplementation group: 'com.squareup.okio', name: 'okio', version: '1.+'
 
diff --git a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
index 4511f5b99e9..3ab884d93a2 100644
--- a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
@@ -76,7 +76,7 @@ public static void onParse(
         @Advice.Argument(0) final Object arg, @Advice.Return final Object result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, arg);
+        module.taintIfTainted(result, arg);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/IastOkHttp3InstrumentationTest.groovy b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/IastOkHttp3InstrumentationTest.groovy
index 253f9e665eb..c96dcc3fbb0 100644
--- a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/IastOkHttp3InstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/IastOkHttp3InstrumentationTest.groovy
@@ -67,7 +67,7 @@ class IastOkHttp3InstrumentationTest extends AgentTestRunner {
 
   private void mockPropagation() {
     final propagation = Mock(PropagationModule) {
-      taintIfInputIsTainted(_, _) >> {
+      taintIfTainted(_, _) >> {
         if (tainteds.containsKey(it[1])) {
           tainteds.put(it[0], null)
         }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy
index 74d25cb2475..fa10dd5bd6f 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy
@@ -1,8 +1,11 @@
 import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.interceptor.MutableSpan
 import datadog.trace.core.propagation.PropagationTags
+
+import static datadog.trace.api.TracePropagationStyle.NONE
 import static datadog.trace.api.sampling.PrioritySampling.*
 import static datadog.trace.api.sampling.SamplingMechanism.*
 import datadog.trace.context.TraceScope
@@ -135,11 +138,11 @@ class OpenTelemetryTest extends AgentTestRunner {
     setup:
     def builder = tracer.spanBuilder("some name")
     if (parentId) {
-      def ctx = new ExtractedContext(DDTraceId.ONE, parentId, SAMPLER_DROP, null, PropagationTags.factory().empty())
+      def ctx = new ExtractedContext(DDTraceId.ONE, parentId, SAMPLER_DROP, null, PropagationTags.factory().empty(), NONE)
       builder.setParent(tracer.converter.toSpanContext(ctx))
     }
     if (linkId) {
-      def ctx = new ExtractedContext(DDTraceId.ONE, linkId, SAMPLER_DROP, null, PropagationTags.factory().empty())
+      def ctx = new ExtractedContext(DDTraceId.ONE, linkId, SAMPLER_DROP, null, PropagationTags.factory().empty(), NONE)
       builder.addLink(tracer.converter.toSpanContext(ctx))
     }
     def result = builder.startSpan()
@@ -270,13 +273,24 @@ class OpenTelemetryTest extends AgentTestRunner {
     httpPropagator.inject(context, textMap, new TextMapSetter())
 
     then:
+    def expectedTraceparent = "00-${span.delegate.traceId.toHexStringPadded(32)}" +
+      "-${DDSpanId.toHexStringPadded(span.delegate.spanId)}" +
+      "-" + (propagatedPriority > 0 ? "01" : "00")
+    def expectedTracestate = "dd=s:${propagatedPriority}"
+    def expectedDatadogTags = null
+    if (propagatedMechanism != UNKNOWN) {
+      expectedDatadogTags = "_dd.p.dm=-" + propagatedMechanism
+      expectedTracestate+= ";t.dm:-" + propagatedMechanism
+    }
     def expectedTextMap = [
       "x-datadog-trace-id"         : "$span.delegate.traceId",
       "x-datadog-parent-id"        : "$span.delegate.spanId",
       "x-datadog-sampling-priority": propagatedPriority.toString(),
+      "traceparent"                : expectedTraceparent,
+      "tracestate"                 : expectedTracestate,
     ]
-    if (propagatedMechanism != UNKNOWN) {
-      expectedTextMap.put("x-datadog-tags", "_dd.p.dm=-" + propagatedMechanism)
+    if (expectedDatadogTags != null) {
+      expectedTextMap.put("x-datadog-tags", expectedDatadogTags)
     }
     textMap == expectedTextMap
 
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy
index f026a803cf4..64b6cdc16a5 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy
@@ -23,8 +23,8 @@ class TypeConverterTest extends AgentTestRunner {
 
   def "should avoid extra allocation for a span wrapper"() {
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     expect:
     // return the same wrapper for the same span
     typeConverter.toSpan(span1) is typeConverter.toSpan(span1)
@@ -47,8 +47,8 @@ class TypeConverterTest extends AgentTestRunner {
   def "should avoid extra allocation for a scope wrapper"() {
     def scopeManager = new ContinuableScopeManager(0, false, true)
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     def scope1 = scopeManager.activate(span1, ScopeSource.MANUAL)
     def scope2 = scopeManager.activate(span2, ScopeSource.MANUAL)
     expect:
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle
index 79da23c2d19..3c689b66333 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle
@@ -17,5 +17,6 @@ dependencies {
   compileOnly group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.6.6'
 
   testImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: openTelemetryVersion
+  testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
   latestDepTestImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: '1+'
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
index 35f0425cb90..09cb8bc26b6 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
@@ -64,6 +64,8 @@ public String[] helperClassNames() {
       packageName + ".context.propagation.AgentTextMapPropagator",
       packageName + ".context.propagation.OtelContextPropagators",
       packageName + ".trace.OtelExtractedContext",
+      packageName + ".trace.OtelConventions",
+      packageName + ".trace.OtelConventions$1",
       packageName + ".trace.OtelSpan",
       packageName + ".trace.OtelSpan$1",
       packageName + ".trace.OtelSpan$NoopSpan",
@@ -71,6 +73,8 @@ public String[] helperClassNames() {
       packageName + ".trace.OtelSpanBuilder",
       packageName + ".trace.OtelSpanBuilder$1",
       packageName + ".trace.OtelSpanContext",
+      packageName + ".trace.OtelSpanLink",
+      packageName + ".trace.OtelSpanLink$1",
       packageName + ".trace.OtelTracer",
       packageName + ".trace.OtelTracerBuilder",
       packageName + ".trace.OtelTracerProvider",
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
index df0676a5d6d..9e420e855ff 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
@@ -56,6 +56,8 @@ public String[] helperClassNames() {
       packageName + ".OtelContext",
       packageName + ".OtelScope",
       ROOT_PACKAGE_NAME + ".trace.OtelExtractedContext",
+      ROOT_PACKAGE_NAME + ".trace.OtelConventions",
+      ROOT_PACKAGE_NAME + ".trace.OtelConventions$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan$NoopSpan",
@@ -63,6 +65,8 @@ public String[] helperClassNames() {
       ROOT_PACKAGE_NAME + ".trace.OtelSpanBuilder",
       ROOT_PACKAGE_NAME + ".trace.OtelSpanBuilder$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpanContext",
+      ROOT_PACKAGE_NAME + ".trace.OtelSpanLink",
+      ROOT_PACKAGE_NAME + ".trace.OtelSpanLink$1",
       ROOT_PACKAGE_NAME + ".trace.OtelTracer",
       ROOT_PACKAGE_NAME + ".trace.OtelTracerBuilder",
       ROOT_PACKAGE_NAME + ".trace.OtelTracerProvider",
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
index b7130cd55a3..0f7e6db5b0a 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
@@ -62,6 +62,8 @@ public String[] helperClassNames() {
       packageName + ".OtelContext",
       packageName + ".OtelScope",
       ROOT_PACKAGE_NAME + ".trace.OtelExtractedContext",
+      ROOT_PACKAGE_NAME + ".trace.OtelConventions",
+      ROOT_PACKAGE_NAME + ".trace.OtelConventions$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpan$NoopSpan",
@@ -69,6 +71,8 @@ public String[] helperClassNames() {
       ROOT_PACKAGE_NAME + ".trace.OtelSpanBuilder",
       ROOT_PACKAGE_NAME + ".trace.OtelSpanBuilder$1",
       ROOT_PACKAGE_NAME + ".trace.OtelSpanContext",
+      ROOT_PACKAGE_NAME + ".trace.OtelSpanLink",
+      ROOT_PACKAGE_NAME + ".trace.OtelSpanLink$1",
       ROOT_PACKAGE_NAME + ".trace.OtelTracer",
       ROOT_PACKAGE_NAME + ".trace.OtelTracerBuilder",
       ROOT_PACKAGE_NAME + ".trace.OtelTracerProvider",
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelConventions.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelConventions.java
new file mode 100644
index 00000000000..306763cf49e
--- /dev/null
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelConventions.java
@@ -0,0 +1,220 @@
+package datadog.trace.instrumentation.opentelemetry14.trace;
+
+import static datadog.trace.api.DDTags.ANALYTICS_SAMPLE_RATE;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CLIENT;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CONSUMER;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_PRODUCER;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_SERVER;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
+import static io.opentelemetry.api.trace.SpanKind.SERVER;
+import static java.lang.Boolean.parseBoolean;
+import static java.util.Locale.ROOT;
+
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.trace.SpanKind;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class OtelConventions {
+  static final String SPAN_KIND_INTERNAL = "internal";
+  static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
+  static final String ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES = "analytics.event";
+  private static final Logger LOGGER = LoggerFactory.getLogger(OtelConventions.class);
+
+  private OtelConventions() {}
+
+  /**
+   * Convert OpenTelemetry {@link SpanKind} to {@link Tags#SPAN_KIND} value.
+   *
+   * @param spanKind The OpenTelemetry span kind to convert.
+   * @return The {@link Tags#SPAN_KIND} value.
+   */
+  public static String toSpanKindTagValue(SpanKind spanKind) {
+    switch (spanKind) {
+      case CLIENT:
+        return SPAN_KIND_CLIENT;
+      case SERVER:
+        return SPAN_KIND_SERVER;
+      case PRODUCER:
+        return SPAN_KIND_PRODUCER;
+      case CONSUMER:
+        return SPAN_KIND_CONSUMER;
+      case INTERNAL:
+        return SPAN_KIND_INTERNAL;
+      default:
+        return spanKind.toString().toLowerCase(ROOT);
+    }
+  }
+
+  /**
+   * Convert {@link Tags#SPAN_KIND} value to OpenTelemetry {@link SpanKind}.
+   *
+   * @param spanKind The {@link Tags#SPAN_KIND} value to convert.
+   * @return The related OpenTelemetry {@link SpanKind}.
+   */
+  public static SpanKind toOtelSpanKind(String spanKind) {
+    if (spanKind == null) {
+      return INTERNAL;
+    }
+    switch (spanKind) {
+      case SPAN_KIND_CLIENT:
+        return CLIENT;
+      case SPAN_KIND_SERVER:
+        return SERVER;
+      case SPAN_KIND_PRODUCER:
+        return PRODUCER;
+      case SPAN_KIND_CONSUMER:
+        return CONSUMER;
+      default:
+        return INTERNAL;
+    }
+  }
+
+  /**
+   * Applies the reserved span attributes. Only OpenTelemetry specific span attributes are handled
+   * here, the default ones are handled by tag interceptor while setting span attributes.
+   *
+   * @param span The span to apply the attributes.
+   * @param key The attribute key.
+   * @param value The attribute value.
+   * @param <T> The attribute type.
+   * @return {@code true} if the attributes is a reserved attribute applied to the span, {@code
+   *     false} otherwise.
+   */
+  public static <T> boolean applyReservedAttribute(AgentSpan span, AttributeKey<T> key, T value) {
+    String name = key.getKey();
+    switch (key.getType()) {
+      case STRING:
+        if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(name) && value instanceof String) {
+          span.setOperationName(((String) value).toLowerCase(ROOT));
+          return true;
+        } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof String) {
+          span.setMetric(ANALYTICS_SAMPLE_RATE, parseBoolean((String) value) ? 1 : 0);
+          return true;
+        }
+      case BOOLEAN:
+        if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof Boolean) {
+          span.setMetric(ANALYTICS_SAMPLE_RATE, ((Boolean) value) ? 1 : 0);
+          return true;
+        }
+    }
+    return false;
+  }
+
+  public static void applyNamingConvention(AgentSpan span) {
+    // Check if span operation name is unchanged from its default value
+    if (span.getOperationName() == SPAN_KIND_INTERNAL) {
+      span.setOperationName(computeOperationName(span).toLowerCase(ROOT));
+    }
+  }
+
+  private static String computeOperationName(AgentSpan span) {
+    Object spanKingTag = span.getTag(SPAN_KIND);
+    SpanKind spanKind =
+        spanKingTag instanceof String ? toOtelSpanKind((String) spanKingTag) : INTERNAL;
+    /*
+     * HTTP convention: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/http/
+     */
+    String httpRequestMethod = getStringAttribute(span, "http.request.method");
+    if (spanKind == SERVER && httpRequestMethod != null) {
+      return "http.server.request";
+    }
+    if (spanKind == CLIENT && httpRequestMethod != null) {
+      return "http.client.request";
+    }
+    /*
+     * Database convention: https://opentelemetry.io/docs/specs/semconv/database/database-spans/
+     */
+    String dbSystem = getStringAttribute(span, "db.system");
+    if (spanKind == CLIENT && dbSystem != null) {
+      return dbSystem + ".query";
+    }
+    /*
+     * Messaging: https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/
+     */
+    String messagingSystem = getStringAttribute(span, "messaging.system");
+    String messagingOperation = getStringAttribute(span, "messaging.operation");
+    if ((spanKind == CONSUMER || spanKind == PRODUCER || spanKind == CLIENT || spanKind == SERVER)
+        && messagingSystem != null
+        && messagingOperation != null) {
+      return messagingSystem + "." + messagingOperation;
+    }
+    /*
+     * AWS: https://opentelemetry.io/docs/specs/semconv/cloud-providers/aws-sdk/
+     */
+    String rpcSystem = getStringAttribute(span, "rpc.system");
+    if (spanKind == CLIENT && "aws-api".equals(rpcSystem)) {
+      String service = getStringAttribute(span, "rpc.service");
+      if (service == null) {
+        return "aws.client.request";
+      } else {
+        return "aws." + service + ".request";
+      }
+    }
+    /*
+     * RPC: https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/
+     */
+    if (spanKind == CLIENT && rpcSystem != null) {
+      return rpcSystem + ".client.request";
+    }
+    if (spanKind == SERVER && rpcSystem != null) {
+      return rpcSystem + ".server.request";
+    }
+    /*
+     * FaaS:
+     * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#incoming-faas-span-attributes
+     * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#outgoing-invocations
+     */
+    String faasInvokedProvider = getStringAttribute(span, "faas.invoked_provider");
+    String faasInvokedName = getStringAttribute(span, "faas.invoked_name");
+    if (spanKind == CLIENT && faasInvokedProvider != null && faasInvokedName != null) {
+      return faasInvokedProvider + "." + faasInvokedName + ".invoke";
+    }
+    String faasTrigger = getStringAttribute(span, "faas.trigger");
+    if (spanKind == SERVER && faasTrigger != null) {
+      return faasTrigger + ".invoke";
+    }
+    /*
+     * GraphQL: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/instrumentation/graphql/
+     */
+    String graphqlOperationType = getStringAttribute(span, "graphql.operation.type");
+    if (graphqlOperationType != null) {
+      return "graphql.server.request";
+    }
+    /*
+     * Generic server / client: https://opentelemetry.io/docs/specs/semconv/http/http-spans/
+     */
+    String networkProtocolName = getStringAttribute(span, "network.protocol.name");
+    if (spanKind == SERVER) {
+      return networkProtocolName == null
+          ? "server.request"
+          : networkProtocolName + ".server.request";
+    }
+    if (spanKind == CLIENT) {
+      return networkProtocolName == null
+          ? "client.request"
+          : networkProtocolName + ".client.request";
+    }
+    // Fallback if no convention match
+    return spanKind.name();
+  }
+
+  @Nullable
+  private static String getStringAttribute(AgentSpan span, String key) {
+    Object tag = span.getTag(key);
+    if (tag == null) {
+      return null;
+    } else if (!(tag instanceof String)) {
+      LOGGER.debug("Span attributes {} is not a string", key);
+      return key;
+    }
+    return (String) tag;
+  }
+}
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpan.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpan.java
index 1d4cb72aa16..d70cd00ff74 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpan.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpan.java
@@ -1,6 +1,8 @@
 package datadog.trace.instrumentation.opentelemetry14.trace;
 
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.applyNamingConvention;
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.applyReservedAttribute;
 import static io.opentelemetry.api.trace.StatusCode.ERROR;
 import static io.opentelemetry.api.trace.StatusCode.OK;
 import static io.opentelemetry.api.trace.StatusCode.UNSET;
@@ -41,7 +43,7 @@ public static Span invalid() {
 
   @Override
   public <T> Span setAttribute(AttributeKey<T> key, T value) {
-    if (this.recording) {
+    if (this.recording && !applyReservedAttribute(this.delegate, key, value)) {
       switch (key.getType()) {
         case STRING_ARRAY:
         case BOOLEAN_ARRAY:
@@ -106,7 +108,7 @@ public Span recordException(Throwable exception, Attributes additionalAttributes
   @Override
   public Span updateName(String name) {
     if (this.recording) {
-      this.delegate.setOperationName(name);
+      this.delegate.setResourceName(name);
     }
     return this;
   }
@@ -114,12 +116,14 @@ public Span updateName(String name) {
   @Override
   public void end() {
     this.recording = false;
+    applyNamingConvention(this.delegate);
     this.delegate.finish();
   }
 
   @Override
   public void end(long timestamp, TimeUnit unit) {
     this.recording = false;
+    applyNamingConvention(this.delegate);
     this.delegate.finish(unit.toMicros(timestamp));
   }
 
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanBuilder.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanBuilder.java
index b39118edcc9..6ab7f81f0ed 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanBuilder.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanBuilder.java
@@ -1,10 +1,17 @@
 package datadog.trace.instrumentation.opentelemetry14.trace;
 
+import static datadog.trace.api.DDTags.ANALYTICS_SAMPLE_RATE;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND;
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES;
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.OPERATION_NAME_SPECIFIC_ATTRIBUTE;
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.toSpanKindTagValue;
 import static datadog.trace.instrumentation.opentelemetry14.trace.OtelExtractedContext.extract;
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
+import static java.lang.Boolean.parseBoolean;
+import static java.util.Locale.ROOT;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
-import datadog.trace.bootstrap.instrumentation.api.Tags;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
@@ -13,16 +20,30 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
 public class OtelSpanBuilder implements SpanBuilder {
   private final AgentTracer.SpanBuilder delegate;
+  private boolean spanKindSet;
+  /**
+   * Operation name overridden value by {@link OtelConventions#OPERATION_NAME_SPECIFIC_ATTRIBUTE}
+   * reserved attribute ({@code null} if not set).
+   */
+  private String overriddenOperationName;
+  /**
+   * Analytics sample rate metric value from {@link
+   * OtelConventions#ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES} reserved attribute ({@code -1} if not
+   * set).
+   */
+  private int overriddenAnalyticsSampleRate;
 
   public OtelSpanBuilder(AgentTracer.SpanBuilder delegate) {
     this.delegate = delegate;
+    this.spanKindSet = false;
+    this.overriddenOperationName = null;
+    this.overriddenAnalyticsSampleRate = -1;
   }
 
   @Override
@@ -43,18 +64,30 @@ public SpanBuilder setNoParent() {
 
   @Override
   public SpanBuilder addLink(SpanContext spanContext) {
-    // Not supported
+    if (spanContext.isValid()) {
+      this.delegate.withLink(new OtelSpanLink(spanContext));
+    }
     return this;
   }
 
   @Override
   public SpanBuilder addLink(SpanContext spanContext, Attributes attributes) {
-    // Not supported
+    if (spanContext.isValid()) {
+      this.delegate.withLink(new OtelSpanLink(spanContext, attributes));
+    }
     return this;
   }
 
   @Override
   public SpanBuilder setAttribute(String key, String value) {
+    // Check reserved attributes
+    if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key) && value != null) {
+      this.overriddenOperationName = value.toLowerCase(ROOT);
+      return this;
+    } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key) && value != null) {
+      this.overriddenAnalyticsSampleRate = parseBoolean(value) ? 1 : 0;
+      return this;
+    }
     // Store as object to prevent delegate to remove tag when value is empty
     this.delegate.withTag(key, (Object) value);
     return this;
@@ -74,6 +107,11 @@ public SpanBuilder setAttribute(String key, double value) {
 
   @Override
   public SpanBuilder setAttribute(String key, boolean value) {
+    // Check reserved attributes
+    if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key)) {
+      this.overriddenAnalyticsSampleRate = value ? 1 : 0;
+      return this;
+    }
     this.delegate.withTag(key, value);
     return this;
   }
@@ -106,24 +144,11 @@ public <T> SpanBuilder setAttribute(AttributeKey<T> key, T value) {
 
   @Override
   public SpanBuilder setSpanKind(SpanKind spanKind) {
-    this.delegate.withSpanType(toSpanType(spanKind));
-    return this;
-  }
-
-  private static String toSpanType(SpanKind spanKind) {
-    switch (spanKind) {
-      case CLIENT:
-        return Tags.SPAN_KIND_CLIENT;
-      case SERVER:
-        return Tags.SPAN_KIND_SERVER;
-      case PRODUCER:
-        return Tags.SPAN_KIND_PRODUCER;
-      case CONSUMER:
-        return Tags.SPAN_KIND_CONSUMER;
-      default:
-      case INTERNAL:
-        return spanKind.toString().toLowerCase(Locale.ROOT);
+    if (spanKind != null) {
+      this.delegate.withTag(SPAN_KIND, toSpanKindTagValue(spanKind));
+      this.spanKindSet = true;
     }
+    return this;
   }
 
   @Override
@@ -134,7 +159,18 @@ public SpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) {
 
   @Override
   public Span startSpan() {
+    // Ensure the span kind is set
+    if (!this.spanKindSet) {
+      setSpanKind(INTERNAL);
+    }
     AgentSpan delegate = this.delegate.start();
+    // Apply overrides
+    if (this.overriddenOperationName != null) {
+      delegate.setOperationName(this.overriddenOperationName);
+    }
+    if (this.overriddenAnalyticsSampleRate != -1) {
+      delegate.setMetric(ANALYTICS_SAMPLE_RATE, this.overriddenAnalyticsSampleRate);
+    }
     return new OtelSpan(delegate);
   }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanLink.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanLink.java
new file mode 100644
index 00000000000..6e46938be13
--- /dev/null
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelSpanLink.java
@@ -0,0 +1,86 @@
+package datadog.trace.instrumentation.opentelemetry14.trace;
+
+import datadog.trace.api.DDSpanId;
+import datadog.trace.api.DDTraceId;
+import datadog.trace.bootstrap.instrumentation.api.SpanLink;
+import datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceState;
+import java.util.List;
+
+public class OtelSpanLink extends SpanLink {
+  private static final int TRACESTATE_MAX_SIZE = 512;
+  private static final char TRACESTATE_ENTRY_DELIMITER = ',';
+  private static final char TRACESTATE_KEY_VALUE_DELIMITER = '=';
+
+  public OtelSpanLink(SpanContext spanContext) {
+    this(spanContext, io.opentelemetry.api.common.Attributes.empty());
+  }
+
+  public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
+    super(
+        DDTraceId.fromHex(spanContext.getTraceId()),
+        DDSpanId.fromHex(spanContext.getSpanId()),
+        spanContext.isSampled() ? SAMPLED_FLAG : DEFAULT_FLAGS,
+        encodeTraceState(spanContext.getTraceState()),
+        convertAttributes(attributes));
+  }
+
+  // Inspired from W3CTraceContextEncoding.encodeTraceState only available in API later versions.
+  private static String encodeTraceState(TraceState traceState) {
+    if (traceState.isEmpty()) {
+      return "";
+    }
+    StringBuilder builder = new StringBuilder(TRACESTATE_MAX_SIZE);
+    traceState.forEach(
+        (key, value) -> {
+          if (builder.length() != 0) {
+            builder.append(TRACESTATE_ENTRY_DELIMITER);
+          }
+          builder.append(key).append(TRACESTATE_KEY_VALUE_DELIMITER).append(value);
+        });
+    return builder.toString();
+  }
+
+  private static Attributes convertAttributes(io.opentelemetry.api.common.Attributes attributes) {
+    if (attributes.isEmpty()) {
+      return SpanLinkAttributes.EMPTY;
+    }
+    SpanLinkAttributes.Builder builder = SpanLinkAttributes.builder();
+    attributes.forEach(
+        (attributeKey, value) -> {
+          String key = attributeKey.getKey();
+          switch (attributeKey.getType()) {
+            case STRING:
+              builder.put(key, (String) value);
+              break;
+            case BOOLEAN:
+              builder.put(key, (boolean) value);
+              break;
+            case LONG:
+              builder.put(key, (long) value);
+              break;
+            case DOUBLE:
+              builder.put(key, (double) value);
+              break;
+            case STRING_ARRAY:
+              //noinspection unchecked
+              builder.putStringArray(key, (List<String>) value);
+              break;
+            case BOOLEAN_ARRAY:
+              //noinspection unchecked
+              builder.putBooleanArray(key, (List<Boolean>) value);
+              break;
+            case LONG_ARRAY:
+              //noinspection unchecked
+              builder.putLongArray(key, (List<Long>) value);
+              break;
+            case DOUBLE_ARRAY:
+              //noinspection unchecked
+              builder.putDoubleArray(key, (List<Double>) value);
+              break;
+          }
+        });
+    return builder.build();
+  }
+}
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelTracer.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelTracer.java
index 0ce1f69bbd9..65980b38a9d 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelTracer.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/trace/OtelTracer.java
@@ -1,5 +1,7 @@
 package datadog.trace.instrumentation.opentelemetry14.trace;
 
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.SPAN_KIND_INTERNAL;
+
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
@@ -19,7 +21,7 @@ public OtelTracer(String instrumentationScopeName) {
   @Override
   public SpanBuilder spanBuilder(String spanName) {
     AgentTracer.SpanBuilder delegate =
-        this.tracer.buildSpan(INSTRUMENTATION_NAME, spanName).withResourceName(spanName);
+        this.tracer.buildSpan(INSTRUMENTATION_NAME, SPAN_KIND_INTERNAL).withResourceName(spanName);
     return new OtelSpanBuilder(delegate);
   }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ConventionsTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ConventionsTest.groovy
new file mode 100644
index 00000000000..7f865d19a1b
--- /dev/null
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ConventionsTest.groovy
@@ -0,0 +1,201 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.DDTags
+import io.opentelemetry.api.GlobalOpenTelemetry
+import io.opentelemetry.context.Context
+import io.opentelemetry.context.ThreadLocalContextStorage
+import spock.lang.Subject
+
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.OPERATION_NAME_SPECIFIC_ATTRIBUTE
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.SPAN_KIND_INTERNAL
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.toSpanKindTagValue
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
+
+class OpenTelemetry14ConventionsTest extends AgentTestRunner {
+  @Subject
+  def tracer = GlobalOpenTelemetry.get().tracerProvider.get("conventions")
+
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+
+    injectSysConfig("dd.integration.opentelemetry.experimental.enabled", "true")
+  }
+
+  def "test span name conventions"() {
+    when:
+    def builder = tracer.spanBuilder("some-name")
+      .setSpanKind(kind)
+    attributes.forEach { key, value -> builder.setAttribute(key, value) }
+    builder.startSpan()
+      .end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          parent()
+          operationName "$expectedOperationName"
+          resourceName "some-name"
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "${toSpanKindTagValue(kind == null ? INTERNAL : kind)}"
+            attributes.forEach { key, value ->
+              if (!OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key)) {
+                tag(key, value)
+              }
+            }
+          }
+        }
+      }
+    }
+
+    where:
+    kind     | attributes                                                                     | expectedOperationName
+    // Fallback behavior
+    null     | [:]                                                                            | "internal"
+    // Internal spans
+    INTERNAL | [:]                                                                            | "internal"
+    // Server spans
+    SERVER   | [:]                                                                            | "server.request"
+    SERVER   | ["http.request.method": "GET"]                                                 | "http.server.request"
+    SERVER   | ["http.request.method": "GET"]                                                 | "http.server.request"
+    SERVER   | ["network.protocol.name": "amqp"]                                              | "amqp.server.request"
+    // Client spans
+    CLIENT   | [:]                                                                            | "client.request"
+    CLIENT   | ["http.request.method": "GET"]                                                 | "http.client.request"
+    CLIENT   | ["db.system": "mysql"]                                                         | "mysql.query"
+    CLIENT   | ["network.protocol.name": "amqp"]                                              | "amqp.client.request"
+    CLIENT   | ["network.protocol.name": "AMQP"]                                              | "amqp.client.request"
+    // Messaging spans
+    PRODUCER | [:]                                                                            | "producer"
+    CONSUMER | [:]                                                                            | "consumer"
+    CONSUMER | ["messaging.system": "rabbitmq", "messaging.operation": "publish"]             | "rabbitmq.publish"
+    PRODUCER | ["messaging.system": "rabbitmq", "messaging.operation": "publish"]             | "rabbitmq.publish"
+    CLIENT   | ["messaging.system": "rabbitmq", "messaging.operation": "publish"]             | "rabbitmq.publish"
+    SERVER   | ["messaging.system": "rabbitmq", "messaging.operation": "publish"]             | "rabbitmq.publish"
+    // RPC spans
+    CLIENT   | ["rpc.system": "grpc"]                                                         | "grpc.client.request"
+    SERVER   | ["rpc.system": "grpc"]                                                         | "grpc.server.request"
+    CLIENT   | ["rpc.system": "aws-api"]                                                      | "aws.client.request"
+    CLIENT   | ["rpc.system": "aws-api", "rpc.service": "helloworld"]                         | "aws.helloworld.request"
+    SERVER   | ["rpc.system": "aws-api"]                                                      | "aws-api.server.request"
+    // FAAS spans
+    CLIENT   | ["faas.invoked_provider": "alibaba_cloud", "faas.invoked_name": "my-function"] | "alibaba_cloud.my-function.invoke"
+    SERVER   | ["faas.trigger": "datasource"]                                                 | "datasource.invoke"
+    // GraphQL spans
+    INTERNAL | ["graphql.operation.type": "query"]                                            | "graphql.server.request"
+    null     | ["graphql.operation.type": "query"]                                            | "graphql.server.request"
+    // User override
+    CLIENT   | ["db.system": "mysql", "operation.name": "db.query"]                           | "db.query"
+    CLIENT   | ["db.system": "mysql", "operation.name": "DB.query"]                           | "db.query"
+  }
+
+  def "test span specific tags"() {
+    setup:
+    def builder = tracer.spanBuilder("some-name")
+
+    when:
+    if (setInBuilder) {
+      builder.setAttribute("operation.name", "my-operation")
+        .setAttribute("service.name", "my-service")
+        .setAttribute("resource.name", "/my-resource")
+        .setAttribute("span.type", "http")
+    }
+    def result = builder.startSpan()
+    if (!setInBuilder) {
+      result.setAttribute("operation.name", "my-operation")
+        .setAttribute("service.name", "my-service")
+        .setAttribute("resource.name", "/my-resource")
+        .setAttribute("span.type", "http")
+    }
+    result.end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          parent()
+          operationName "my-operation"
+          resourceName "/my-resource"
+          serviceName "my-service"
+          spanType "http"
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+          }
+        }
+      }
+    }
+
+    where:
+    setInBuilder << [true, false]
+  }
+
+  def "test span analytics.event specific tag"() {
+    setup:
+    def builder = tracer.spanBuilder("some-name")
+
+    when:
+    if (setInBuilder) {
+      builder.setAttribute("analytics.event", value)
+    }
+    def result = builder.startSpan()
+    if (!setInBuilder) {
+      result.setAttribute("analytics.event", value)
+    }
+    result.end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          parent()
+          operationName "internal"
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            if (value != null) {
+              "$DDTags.ANALYTICS_SAMPLE_RATE" expectedMetric
+            }
+          }
+        }
+      }
+    }
+
+    where:
+    setInBuilder | value            | expectedMetric
+    true         | true             | 1
+    true         | Boolean.TRUE     | 1
+    true         | false            | 0
+    true         | Boolean.FALSE    | 0
+    true         | null             | 0 // Not used
+    true         | "true"           | 1
+    true         | "false"          | 0
+    true         | "TRUE"           | 1
+    true         | "something-else" | 0
+    true         | ""               | 0
+    false        | true             | 1
+    false        | Boolean.TRUE     | 1
+    false        | false            | 0
+    false        | Boolean.FALSE    | 0
+    false        | null             | 0 // Not used
+    false        | "true"           | 1
+    false        | "false"          | 0
+    false        | "TRUE"           | 1
+    false        | "something-else" | 0
+    false        | ""               | 0
+  }
+
+  @Override
+  void cleanup() {
+    // Test for context leak
+    assert Context.current() == Context.root()
+    // Safely reset OTel context storage
+    ThreadLocalContextStorage.THREAD_LOCAL_STORAGE.remove()
+  }
+}
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy
index ca0952048e5..d43863693e8 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy
@@ -1,15 +1,30 @@
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDTags
-import datadog.trace.bootstrap.instrumentation.api.Tags
 import io.opentelemetry.api.GlobalOpenTelemetry
 import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.api.trace.SpanKind
+import io.opentelemetry.api.common.Attributes
+import io.opentelemetry.api.trace.SpanContext
+import io.opentelemetry.api.trace.TraceFlags
+import io.opentelemetry.api.trace.TraceState
 import io.opentelemetry.context.Context
 import io.opentelemetry.context.ThreadLocalContextStorage
+import org.skyscreamer.jsonassert.JSONAssert
 import spock.lang.Subject
 
 import java.security.InvalidParameterException
 
+import static datadog.trace.api.DDTags.ERROR_MSG
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CLIENT
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CONSUMER
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_PRODUCER
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_SERVER
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.SPAN_KIND_INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 import static io.opentelemetry.api.trace.StatusCode.ERROR
 import static io.opentelemetry.api.trace.StatusCode.OK
 import static io.opentelemetry.api.trace.StatusCode.UNSET
@@ -41,12 +56,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(2) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
           resourceName "some-name"
         }
         span {
           childOfPrevious()
-          operationName "other-name"
+          operationName "internal"
           resourceName "other-name"
         }
       }
@@ -69,11 +84,13 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(2) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
+          resourceName "some-name"
         }
         span {
           childOfPrevious()
-          operationName "other-name"
+          operationName "internal"
+          resourceName "other-name"
         }
       }
     }
@@ -90,7 +107,6 @@ class OpenTelemetry14Test extends AgentTestRunner {
     TEST_WRITER.waitForTraces(1)
     def trace = TEST_WRITER.firstTrace()
 
-
     then:
     trace.size() == 1
     trace[0].spanId != 0
@@ -114,13 +130,15 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
+          resourceName"some-name"
         }
       }
       trace(1) {
         span {
           parent()
-          operationName "other-name"
+          operationName "internal"
+          resourceName"other-name"
         }
       }
     }
@@ -133,8 +151,6 @@ class OpenTelemetry14Test extends AgentTestRunner {
     anotherSpan.end()
 
     when:
-    // Adding link is not supported
-    builder.addLink(anotherSpan.getSpanContext())
     // Adding event is not supported
     def result = builder.startSpan()
     result.addEvent("some-event")
@@ -151,6 +167,157 @@ class OpenTelemetry14Test extends AgentTestRunner {
     }
   }
 
+  def "test simple span links"() {
+    setup:
+    def traceId = "1234567890abcdef1234567890abcdef" as String
+    def spanId = "fedcba0987654321" as String
+    def traceState = TraceState.builder().put("string-key", "string-value").build()
+
+    def expectedLinksTag = """
+    [
+      { traceId: "${traceId}",
+        spanId: "${spanId}",
+        traceFlags: 1,
+        traceState: "string-key=string-value"}
+    ]"""
+
+    when:
+    def span1 =tracer.spanBuilder("some-name")
+      .addLink(SpanContext.getInvalid())  // Should not be added
+      .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
+      .startSpan()
+    span1.end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            tag("_dd.span_links", { JSONAssert.assertEquals(expectedLinksTag, it as String, true); return true })
+          }
+        }
+      }
+    }
+  }
+
+  def "test multiple span links"() {
+    setup:
+    def spanBuilder = tracer.spanBuilder("some-name")
+
+    when:
+    def links = []
+    0..9.each {
+      def traceId = "1234567890abcdef1234567890abcde$it" as String
+      def spanId = "fedcba098765432$it" as String
+      def traceState = TraceState.builder().put('string-key', 'string-value'+it).build()
+      links << """{ traceId: "${traceId}",
+        spanId: "${spanId}",
+        traceFlags: 1,
+        traceState: "string-key=string-value$it"}"""
+      spanBuilder.addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
+    }
+    def expectedLinksTag = "[${links.join(',')}]" as String
+
+    spanBuilder.startSpan().end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            tag("_dd.span_links", { JSONAssert.assertEquals(expectedLinksTag, it as String, true); return true })
+          }
+        }
+      }
+    }
+  }
+
+  def "test span link attributes"() {
+    setup:
+    def traceId = "1234567890abcdef1234567890abcdef" as String
+    def spanId = "fedcba0987654321" as String
+    def traceState = TraceState.builder().put("string-key", "string-value").build()
+
+    def expectedLinksTag = """
+    [
+      { traceId: "${traceId}",
+        spanId: "${spanId}",
+        traceFlags: 1,
+        traceState: "string-key=string-value"
+        ${ expectedAttributes == null ? "" : ", attributes: " + expectedAttributes }}
+    ]"""
+
+    when:
+    def span1 =tracer.spanBuilder("some-name")
+      .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState), attributes)
+      .startSpan()
+    span1.end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            tag("_dd.span_links", { JSONAssert.assertEquals(expectedLinksTag, it as String, true); return true })
+          }
+        }
+      }
+    }
+
+    where:
+    attributes | expectedAttributes
+    Attributes.empty() | null
+    Attributes.builder().put("string-key", "string-value").put("long-key", 123456789L).put("double-key", 1234.5678D).put("boolean-key-true", true).put("boolean-key-false", false).build() | '{ string-key: "string-value", long-key: "123456789", double-key: "1234.5678", boolean-key-true: "true", boolean-key-false: "false" }'
+    Attributes.builder().put("string-key-array", "string-value1", "string-value2", "string-value3").put("long-key-array", 123456L, 1234567L, 12345678L).put("double-key-array", 1234.5D, 1234.56D, 1234.567D).put("boolean-key-array", true, false, true).build() | '{ string-key-array.0: "string-value1", string-key-array.1: "string-value2", string-key-array.2: "string-value3", long-key-array.0: "123456", long-key-array.1: "1234567", long-key-array.2: "12345678", double-key-array.0: "1234.5", double-key-array.1: "1234.56", double-key-array.2: "1234.567", boolean-key-array.0: "true", boolean-key-array.1: "false", boolean-key-array.2: "true" }'
+  }
+
+  def "test span links trace state"() {
+    setup:
+    def traceId = "1234567890abcdef1234567890abcdef" as String
+    def spanId = "fedcba0987654321" as String
+
+    def expectedTraceStateJson = expectedTraceState == null ? '' : ", traceState: \"$expectedTraceState\""
+    def expectedLinksTag = """
+    [
+      { traceId: "${traceId}",
+        spanId: "${spanId}",
+        traceFlags: 1
+        $expectedTraceStateJson
+      }
+    ]"""
+
+    when:
+    def span1 =tracer.spanBuilder("some-name")
+      .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
+      .startSpan()
+    span1.end()
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            tag("_dd.span_links", { JSONAssert.assertEquals(expectedLinksTag, it as String, true); return true })
+          }
+        }
+      }
+    }
+
+    where:
+    traceState                                                                                                                                 | expectedTraceState
+    TraceState.getDefault()                                                                                                                    | null
+    TraceState.builder().put("key", "value").build()                                                                                           | 'key=value'
+    TraceState.builder().put("key1", "value1").put("key2", "value2").put("key3", "value3").put("key4", "value4").put("key5", "value5").build() | 'key5=value5,key4=value4,key3=value3,key2=value2,key1=value1'
+  }
+
   def "test span attributes"() {
     setup:
     def builder = tracer.spanBuilder("some-name")
@@ -195,7 +362,7 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
           if (tagSpan) {
             resourceName "other-resource"
           } else if (tagBuilder) {
@@ -205,6 +372,8 @@ class OpenTelemetry14Test extends AgentTestRunner {
           }
           errored false
           tags {
+            defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
             if (tagSpan) {
               "string" "b"
               "empty_string" ""
@@ -242,7 +411,6 @@ class OpenTelemetry14Test extends AgentTestRunner {
               "double-array.1" 4.56D
               "empty-array" ""
             }
-            defaultTags()
           }
         }
       }
@@ -258,9 +426,9 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
   def "test span kinds"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    builder.setSpanKind(otelSpanKind)
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name")
+      .setSpanKind(otelSpanKind)
+      .startSpan()
 
     when:
     result.end()
@@ -269,24 +437,26 @@ class OpenTelemetry14Test extends AgentTestRunner {
     assertTraces(1) {
       trace(1) {
         span {
-          spanType(tagSpanKind)
+          tags {
+            defaultTags()
+            "$SPAN_KIND" "$tagSpanKind"
+          }
         }
       }
     }
 
     where:
     otelSpanKind | tagSpanKind
-    SpanKind.CLIENT | Tags.SPAN_KIND_CLIENT
-    SpanKind.CONSUMER | Tags.SPAN_KIND_CONSUMER
-    SpanKind.INTERNAL | "internal"
-    SpanKind.PRODUCER | Tags.SPAN_KIND_PRODUCER
-    SpanKind.SERVER | Tags.SPAN_KIND_SERVER
+    INTERNAL     | SPAN_KIND_INTERNAL
+    SERVER       | SPAN_KIND_SERVER
+    CLIENT       | SPAN_KIND_CLIENT
+    PRODUCER     | SPAN_KIND_PRODUCER
+    CONSUMER     | SPAN_KIND_CONSUMER
   }
 
   def "test span error status"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name").startSpan()
 
     when:
     result.setStatus(ERROR, "some-error")
@@ -297,13 +467,13 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
           resourceName "some-name"
           errored true
-
           tags {
-            "$DDTags.ERROR_MSG" "some-error"
             defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
+            "$ERROR_MSG" "some-error"
           }
         }
       }
@@ -312,34 +482,35 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
   def "test span status transition"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name").startSpan()
+
+    when:
     result.setStatus(UNSET)
 
-    expect:
+    then:
     !result.delegate.isError()
-    result.delegate.getTag(DDTags.ERROR_MSG) == null
+    result.delegate.getTag(ERROR_MSG) == null
 
     when:
     result.setStatus(ERROR, "some error")
 
     then:
     result.delegate.isError()
-    result.delegate.getTag(DDTags.ERROR_MSG) == "some error"
+    result.delegate.getTag(ERROR_MSG) == "some error"
 
     when:
     result.setStatus(UNSET)
 
     then:
     result.delegate.isError()
-    result.delegate.getTag(DDTags.ERROR_MSG) == "some error"
+    result.delegate.getTag(ERROR_MSG) == "some error"
 
     when:
     result.setStatus(OK)
 
     then:
     !result.delegate.isError()
-    result.delegate.getTag(DDTags.ERROR_MSG) == null
+    result.delegate.getTag(ERROR_MSG) == null
 
     when:
     result.end()
@@ -349,11 +520,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
           resourceName "some-name"
           errored false
           tags {
             defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
           }
         }
       }
@@ -362,13 +534,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
   def "test span record exception"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name").startSpan()
     def message = "input can't be null"
     def exception = new InvalidParameterException(message)
 
     expect:
-    result.delegate.getTag(DDTags.ERROR_MSG) == null
+    result.delegate.getTag(ERROR_MSG) == null
     result.delegate.getTag(DDTags.ERROR_TYPE) == null
     result.delegate.getTag(DDTags.ERROR_STACK) == null
     !result.delegate.isError()
@@ -377,7 +548,7 @@ class OpenTelemetry14Test extends AgentTestRunner {
     result.recordException(exception)
 
     then:
-    result.delegate.getTag(DDTags.ERROR_MSG) == message
+    result.delegate.getTag(ERROR_MSG) == message
     result.delegate.getTag(DDTags.ERROR_TYPE) == InvalidParameterException.name
     result.delegate.getTag(DDTags.ERROR_STACK) != null
     !result.delegate.isError()
@@ -390,11 +561,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
           resourceName "some-name"
           errored false
           tags {
             defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
             errorTags(exception)
           }
         }
@@ -404,17 +576,20 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
   def "test span name update"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name")
+      .setSpanKind(SERVER)
+      .startSpan()
 
     expect:
-    result.delegate.operationName == "some-name"
+    result.delegate.operationName == SPAN_KIND_INTERNAL
+    result.delegate.resourceName == "some-name"
 
     when:
     result.updateName("other-name")
 
     then:
-    result.delegate.operationName == "other-name"
+    result.delegate.operationName == SPAN_KIND_INTERNAL
+    result.delegate.resourceName == "other-name"
 
     when:
     result.end()
@@ -424,8 +599,8 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "other-name"
-          resourceName "some-name"
+          operationName "server.request"
+          resourceName "other-name"
         }
       }
     }
@@ -433,8 +608,7 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
   def "test span update after end"() {
     setup:
-    def builder = tracer.spanBuilder("some-name")
-    def result = builder.startSpan()
+    def result = tracer.spanBuilder("some-name").startSpan()
 
     when:
     result.setAttribute("string", "value")
@@ -449,10 +623,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
       trace(1) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
+          resourceName"some-name"
           errored true
           tags {
             defaultTags()
+            "$SPAN_KIND" "$SPAN_KIND_INTERNAL"
             "string" "value"
           }
         }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/ContextTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/ContextTest.groovy
index 3c1805133a8..00c70e497ea 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/ContextTest.groovy
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/ContextTest.groovy
@@ -12,6 +12,7 @@ import spock.lang.Subject
 import static datadog.trace.bootstrap.instrumentation.api.ScopeSource.MANUAL
 import static datadog.trace.instrumentation.opentelemetry14.context.OtelContext.DATADOG_CONTEXT_ROOT_SPAN_KEY
 import static datadog.trace.instrumentation.opentelemetry14.context.OtelContext.OTEL_CONTEXT_SPAN_KEY
+import static datadog.trace.instrumentation.opentelemetry14.trace.OtelConventions.SPAN_KIND_INTERNAL
 
 class ContextTest extends AgentTestRunner {
   @Subject
@@ -188,7 +189,8 @@ class ContextTest extends AgentTestRunner {
     def activeSpan = TEST_TRACER.activeSpan()
 
     then:
-    activeSpan.operationName == "some-name"
+    activeSpan.operationName == SPAN_KIND_INTERNAL
+    activeSpan.resourceName == "some-name"
     DDSpanId.toHexStringPadded(activeSpan.spanId) == otelParentSpan.getSpanContext().spanId
 
     when:
@@ -205,7 +207,8 @@ class ContextTest extends AgentTestRunner {
     activeSpan = TEST_TRACER.activeSpan()
 
     then:
-    activeSpan.operationName == "another-name"
+    activeSpan.operationName == SPAN_KIND_INTERNAL
+    activeSpan.resourceName == "another-name"
     DDSpanId.toHexStringPadded(activeSpan.spanId) == otelGrandChildSpan.getSpanContext().spanId
 
     when:
@@ -221,7 +224,8 @@ class ContextTest extends AgentTestRunner {
       trace(3) {
         span {
           parent()
-          operationName "some-name"
+          operationName "internal"
+          resourceName "some-name"
         }
         span {
           childOfPrevious()
@@ -229,7 +233,8 @@ class ContextTest extends AgentTestRunner {
         }
         span {
           childOfPrevious()
-          operationName "another-name"
+          operationName "internal"
+          resourceName "another-name"
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/propagation/AbstractPropagatorTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/propagation/AbstractPropagatorTest.groovy
index 351ea547b24..b1e10eb86c7 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/propagation/AbstractPropagatorTest.groovy
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/propagation/AbstractPropagatorTest.groovy
@@ -86,7 +86,8 @@ abstract class AbstractPropagatorTest extends AgentTestRunner {
     assertTraces(1) {
       trace(1) {
         span {
-          operationName "some-name"
+          operationName "internal"
+          resourceName "some-name"
           traceDDId(DD128bTraceId.fromHex(traceId))
           parentSpanId(DDSpanId.fromHex(spanId).toLong() as BigInteger)
         }
diff --git a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy
index 47089453eef..b1bc139d3fd 100644
--- a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy
+++ b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy
@@ -10,6 +10,7 @@ import datadog.trace.instrumentation.opentracing31.OTTracer
 import datadog.trace.instrumentation.opentracing31.TypeConverter
 import spock.lang.Shared
 
+import static datadog.trace.api.TracePropagationStyle.NONE
 import static datadog.trace.api.sampling.PrioritySampling.*
 import static datadog.trace.api.sampling.SamplingMechanism.*
 import datadog.trace.context.TraceScope
@@ -45,7 +46,7 @@ class OpenTracing31Test extends AgentTestRunner {
         .withTag("boolean", true)
     }
     if (addReference) {
-      def ctx = new ExtractedContext(DDTraceId.ONE, 2, SAMPLER_DROP, null, PropagationTags.factory().empty())
+      def ctx = new ExtractedContext(DDTraceId.ONE, 2, SAMPLER_DROP, null, PropagationTags.factory().empty(), NONE)
       builder.addReference(addReference, tracer.tracer.converter.toSpanContext(ctx))
     }
     def result = builder.start()
@@ -278,14 +279,26 @@ class OpenTracing31Test extends AgentTestRunner {
     tracer.inject(context, Format.Builtin.TEXT_MAP, adapter)
 
     then:
+    def expectedTraceparent = "00-${context.delegate.traceId.toHexStringPadded(32)}" +
+      "-${DDSpanId.toHexStringPadded(context.delegate.spanId)}" +
+      "-" + (propagatedPriority > 0 ? "01" : "00")
+    def expectedTracestate = "dd=s:${propagatedPriority}"
+    def expectedDatadogTags = null
+    if (propagatedPriority > 0) {
+      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
+      expectedDatadogTags = "_dd.p.dm=-" + effectiveSamplingMechanism
+      expectedTracestate+= ";t.dm:-" + effectiveSamplingMechanism
+    }
+
     def expectedTextMap = [
       "x-datadog-trace-id"         : "$context.delegate.traceId",
       "x-datadog-parent-id"        : "$context.delegate.spanId",
       "x-datadog-sampling-priority": propagatedPriority.toString(),
+      "traceparent"                : expectedTraceparent,
+      "tracestate"                 : expectedTracestate,
     ]
-    if (propagatedPriority > 0) {
-      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
-      expectedTextMap.put("x-datadog-tags", "_dd.p.dm=-" + effectiveSamplingMechanism)
+    if (expectedDatadogTags != null) {
+      expectedTextMap.put("x-datadog-tags", expectedDatadogTags)
     }
     textMap == expectedTextMap
 
diff --git a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy
index e31825ee492..94755887230 100644
--- a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy
+++ b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy
@@ -24,8 +24,8 @@ class TypeConverterTest extends AgentTestRunner {
 
   def "should avoid extra allocation for a span wrapper"() {
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     expect:
     // return the same wrapper for the same span
     typeConverter.toSpan(span1) is typeConverter.toSpan(span1)
@@ -52,8 +52,8 @@ class TypeConverterTest extends AgentTestRunner {
   def "should avoid extra allocation for a scope wrapper"() {
     def scopeManager = new ContinuableScopeManager(0, false, true)
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     def scope1 = scopeManager.activate(span1, ScopeSource.MANUAL)
     def scope2 = scopeManager.activate(span2, ScopeSource.MANUAL)
     expect:
diff --git a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy
index d233a6b3225..5d0df28bf83 100644
--- a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy
+++ b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy
@@ -23,6 +23,7 @@ import spock.lang.Shared
 import spock.lang.Subject
 
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+import static datadog.trace.api.TracePropagationStyle.NONE
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP
 import static datadog.trace.api.sampling.PrioritySampling.UNSET
@@ -50,7 +51,7 @@ class OpenTracing32Test extends AgentTestRunner {
         .withTag("boolean", true)
     }
     if (addReference) {
-      def ctx = new ExtractedContext(DDTraceId.ONE, 2, SAMPLER_DROP, null, PropagationTags.factory().empty())
+      def ctx = new ExtractedContext(DDTraceId.ONE, 2, SAMPLER_DROP, null, PropagationTags.factory().empty(), NONE)
       builder.addReference(addReference, tracer.tracer.converter.toSpanContext(ctx))
     }
     def result = builder.start()
@@ -293,14 +294,25 @@ class OpenTracing32Test extends AgentTestRunner {
     tracer.inject(context, Format.Builtin.TEXT_MAP, adapter)
 
     then:
+    def expectedTraceparent = "00-${context.delegate.traceId.toHexStringPadded(32)}" +
+      "-${DDSpanId.toHexStringPadded(context.delegate.spanId)}" +
+      "-" + (propagatedPriority > 0 ? "01" : "00")
+    def expectedTracestate = "dd=s:${propagatedPriority}"
+    def expectedDatadogTags = null
+    if (propagatedPriority > 0) {
+      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
+      expectedDatadogTags = "_dd.p.dm=-" + effectiveSamplingMechanism
+      expectedTracestate+= ";t.dm:-" + effectiveSamplingMechanism
+    }
     def expectedTextMap = [
       "x-datadog-trace-id"         : "$context.delegate.traceId",
       "x-datadog-parent-id"        : "$context.delegate.spanId",
       "x-datadog-sampling-priority": propagatedPriority.toString(),
+      "traceparent"                : expectedTraceparent,
+      "tracestate"                 : expectedTracestate
     ]
-    if (propagatedPriority > 0) {
-      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
-      expectedTextMap.put("x-datadog-tags", "_dd.p.dm=-" + effectiveSamplingMechanism)
+    if (expectedDatadogTags != null) {
+      expectedTextMap.put("x-datadog-tags", expectedDatadogTags)
     }
     textMap == expectedTextMap
 
diff --git a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy
index 67f95da7c4b..ff20f635a9b 100644
--- a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy
+++ b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy
@@ -24,8 +24,8 @@ class TypeConverterTest extends AgentTestRunner {
 
   def "should avoid extra allocation for a span wrapper"() {
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     expect:
     // return the same wrapper for the same span
     typeConverter.toSpan(span1) is typeConverter.toSpan(span1)
@@ -52,8 +52,8 @@ class TypeConverterTest extends AgentTestRunner {
   def "should avoid extra allocation for a scope wrapper"() {
     def scopeManager = new ContinuableScopeManager(0, false, true)
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     def scope1 = scopeManager.activate(span1, ScopeSource.MANUAL)
     def scope2 = scopeManager.activate(span2, ScopeSource.MANUAL)
     expect:
diff --git a/dd-java-agent/instrumentation/org-json/build.gradle b/dd-java-agent/instrumentation/org-json/build.gradle
new file mode 100644
index 00000000000..ff630aa67dd
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/build.gradle
@@ -0,0 +1,21 @@
+muzzle {
+  pass {
+    group = 'org.json'
+    module = 'json'
+    versions = '[20070829, ]'
+    assertInverse = true
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'org.json', name: 'json', version: '20230227'
+  testImplementation group: 'org.json', name: 'json', version: '20230227'
+
+  testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
+
+  latestDepTestImplementation group: 'org.json', name: 'json', version: '+'
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java
new file mode 100644
index 00000000000..e80ca912811
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java
@@ -0,0 +1,91 @@
+package datadog.trace.instrumentation.json;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class JSONArrayInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public JSONArrayInstrumentation() {
+    super("org-json");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.json.JSONArray";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor().and(takesArguments(String.class)),
+        getClass().getName() + "$ConstructorAdvice");
+    transformation.applyAdvice(
+        isMethod()
+            .and(isPublic())
+            .and(returns(Object.class))
+            .and(named("get"))
+            .and(takesArguments(1)),
+        getClass().getName() + "$GetAdvice");
+    transformation.applyAdvice(
+        isMethod().and(isPublic()).and(returns(Object.class)).and(named("opt")),
+        getClass().getName() + "$OptAdvice");
+  }
+
+  public static class ConstructorAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && input != null) {
+        iastModule.taintIfTainted(self, input);
+      }
+    }
+  }
+
+  public static class GetAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
+      if (result instanceof Integer
+          || result instanceof Long
+          || result instanceof Double
+          || result instanceof Boolean) {
+        return;
+      }
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && result != null && result instanceof String) {
+        iastModule.taintIfTainted(result, self);
+      }
+    }
+  }
+
+  public static class OptAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
+      if (result instanceof Integer
+          || result instanceof Long
+          || result instanceof Double
+          || result instanceof Boolean) {
+        return;
+      }
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && result != null) {
+        iastModule.taintIfTainted(result, self);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java
new file mode 100644
index 00000000000..7ab262a3917
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java
@@ -0,0 +1,44 @@
+package datadog.trace.instrumentation.json;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class JSONCookieInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public JSONCookieInstrumentation() {
+    super("org-json");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.json.Cookie";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("toJSONObject").and(takesArguments(String.class)),
+        getClass().getName() + "$toJSONObjectAdvice");
+  }
+
+  public static class toJSONObjectAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void onExit(
+        @Advice.Return Object retValue, @Advice.Argument(0) final String input) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && input != null) {
+        iastModule.taintIfTainted(retValue, input);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java
new file mode 100644
index 00000000000..27eecb0212d
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java
@@ -0,0 +1,93 @@
+package datadog.trace.instrumentation.json;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class JSONObjectInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+  public JSONObjectInstrumentation() {
+    super("org-json");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.json.JSONObject";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor().and(takesArguments(1)), getClass().getName() + "$ConstructorAdvice");
+    transformation.applyAdvice(
+        isMethod()
+            .and(isPublic())
+            .and(returns(Object.class))
+            .and(named("get"))
+            .and(takesArguments(String.class)),
+        getClass().getName() + "$GetAdvice");
+    transformation.applyAdvice(
+        isMethod()
+            .and(isPublic())
+            .and(returns(Object.class))
+            .and(named("opt"))
+            .and(takesArguments(String.class)),
+        getClass().getName() + "$OptAdvice");
+  }
+
+  public static class ConstructorAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && input != null) {
+        iastModule.taintIfTainted(self, input);
+      }
+    }
+  }
+
+  public static class GetAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
+      if (result instanceof Integer
+          || result instanceof Long
+          || result instanceof Double
+          || result instanceof Boolean) {
+        return;
+      }
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && result != null) {
+        iastModule.taintIfTainted(result, self);
+      }
+    }
+  }
+
+  public static class OptAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
+      if (result instanceof Integer
+          || result instanceof Long
+          || result instanceof Double
+          || result instanceof Boolean) {
+        return;
+      }
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && result != null) {
+        iastModule.taintIfTainted(result, self);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java
new file mode 100644
index 00000000000..2f8cea94b52
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java
@@ -0,0 +1,43 @@
+package datadog.trace.instrumentation.json;
+
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public class JSONTokenerInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public JSONTokenerInstrumentation() {
+    super("org-json");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.json.JSONTokener";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor().and(takesArguments(String.class)),
+        getClass().getName() + "$ConstructorAdvice");
+  }
+
+  public static class ConstructorAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+      if (iastModule != null && input != null) {
+        iastModule.taintIfTainted(self, input);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONArrayInstrumentationTest.groovy b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONArrayInstrumentationTest.groovy
new file mode 100644
index 00000000000..9ab462b021b
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONArrayInstrumentationTest.groovy
@@ -0,0 +1,72 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import org.json.JSONArray
+import org.json.JSONObject
+import org.json.JSONTokener
+
+class JSONArrayInstrumentationTest extends AgentTestRunner {
+
+  @Override
+  void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test JSONObject returning an array'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = """{"menu": {
+      "name": "nameTest",
+      "value": "File",
+      "popup": "Popup",
+      "labels": [
+          "File",
+          "Edit"
+        ]
+    }}"""
+
+    when:
+    final jsonObject = new JSONObject(json)
+    final name = jsonObject.getJSONObject("menu").getJSONArray("labels").get(0)
+
+    then:
+    name == "File"
+    1 * module.taintIfTainted(_ as JSONObject, json)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONTokener)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONObject)
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    2 * module.taintIfTainted(_ as JSONArray, _ as JSONObject)
+    2 * module.taintIfTainted("File", _ as JSONArray)
+    0 * _
+  }
+
+  void 'test JSONObject returning an array and calling opt on it'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = """{"menu": {
+      "name": "nameTest",
+      "value": "File",
+      "popup": "Popup",
+      "labels": [
+          "File",
+          "Edit"
+        ]
+    }}"""
+
+    when:
+    final jsonObject = new JSONObject(json)
+    final name = jsonObject.getJSONObject("menu").getJSONArray("labels").optString(0, "defaultvalue")
+
+    then:
+    name == "File"
+    1 * module.taintIfTainted(_ as JSONObject, json)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONTokener)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONObject)
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    2 * module.taintIfTainted(_ as JSONArray, _ as JSONObject)
+    1 * module.taintIfTainted("File", _ as JSONArray)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONCookieInstrumentationTest.groovy b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONCookieInstrumentationTest.groovy
new file mode 100644
index 00000000000..3849b01e4aa
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONCookieInstrumentationTest.groovy
@@ -0,0 +1,29 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import org.json.Cookie
+import org.json.JSONObject
+import org.json.JSONTokener
+
+class JSONCookieInstrumentationTest extends AgentTestRunner {
+
+  @Override void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test JSon Cookie toJSONObject'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final cookie = "username = Datadog; expires = Thu, 15 Jun 2020 12:00:00 UTC; path = /"
+
+    when:
+    Cookie.toJSONObject(cookie)
+
+
+    then:
+    1 * module.taintIfTainted(_ as JSONObject, cookie)
+    1 * module.taintIfTainted(_ as JSONTokener, cookie)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONObjectInstrumentationTest.groovy b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONObjectInstrumentationTest.groovy
new file mode 100644
index 00000000000..e1befa3f682
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONObjectInstrumentationTest.groovy
@@ -0,0 +1,107 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import org.json.JSONObject
+import org.json.JSONTokener
+
+class JSONObjectInstrumentationTest extends AgentTestRunner {
+
+  @Override void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test JSONObject string constructor'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = """{"menu": {
+      "name": "nameTest",
+      "value": "File",
+      "popup": "Popup",
+          "labels": [
+          "File",
+          "Edit"
+        ]
+    }}"""
+
+    when:
+    final jsonObject = new JSONObject(json)
+    final name = jsonObject.getJSONObject("menu").get("name")
+
+    then:
+    name == "nameTest"
+    1 * module.taintIfTainted(_ as JSONObject, json)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONTokener)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONObject)
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    2 * module.taintIfTainted("nameTest", _ as JSONObject)
+    0 * _
+  }
+
+  void 'test JSONObject opt'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = """{"menu": {
+      "name": "nameTest",
+      "value": "File",
+      "popup": "Popup",
+          "labels": [
+          "File",
+          "Edit"
+        ]
+    }}"""
+
+    when:
+    final jsonObject = new JSONObject(json)
+    final name = jsonObject.getJSONObject("menu").optString("name")
+
+    then:
+    name == "nameTest"
+    1 * module.taintIfTainted(_ as JSONObject, json)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONTokener)
+    2 * module.taintIfTainted(_ as JSONObject, _ as JSONObject)
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    1 * module.taintIfTainted("nameTest", _ as JSONObject)
+    0 * _
+  }
+
+
+
+  void 'test JSONObject JSonTokenizer constructor'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = '{"name": "nameTest", "value" : "valueTest"}'
+
+    when:
+    final jsonObject = new JSONObject(new JSONTokener(json))
+    final name = jsonObject.get("name")
+
+    then:
+    name == "nameTest"
+    1 * module.taintIfTainted(_ as JSONObject, _ as JSONTokener)
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    2 * module.taintIfTainted("nameTest", _ as JSONObject)
+    0 * _
+  }
+
+  void 'test JSONObject map constructor'(){
+    given:
+    final Map<String, String> map = new HashMap<>()
+    map.put("name", "nameTest")
+    map.put("age", "22")
+    map.put("city", "chicago")
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+
+    when:
+    final jsonObject = new JSONObject(map)
+    jsonObject.get("name")
+
+    then:
+    1 * module.taintIfTainted(_ as JSONObject, map)
+    2 * module.taintIfTainted("nameTest", _ as JSONObject)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONTokenerInstrumentationTest.groovy b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONTokenerInstrumentationTest.groovy
new file mode 100644
index 00000000000..b995d34072a
--- /dev/null
+++ b/dd-java-agent/instrumentation/org-json/src/test/groovy/JSONTokenerInstrumentationTest.groovy
@@ -0,0 +1,25 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import org.json.JSONTokener
+
+class JSONTokenerInstrumentationTest extends AgentTestRunner {
+
+  @Override void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test JSONTokener string constructor'() {
+    given:
+    final module = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+    final json = '{"name": "nameTest", "value" : "valueTest"}'
+
+    when:
+    new JSONTokener(json)
+
+    then:
+    1 * module.taintIfTainted(_ as JSONTokener, json)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java b/dd-java-agent/instrumentation/owasp-esapi-2/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
index 3c9fef4c79c..5f711e0a191 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
+++ b/dd-java-agent/instrumentation/owasp-esapi-2/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
@@ -22,7 +22,7 @@ public static String afterEncodeForHTML(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEncodeForHTML threw", e);
       }
@@ -38,7 +38,7 @@ public static String afterCanonicalize1(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterCanonicalize1 threw", e);
       }
@@ -56,7 +56,7 @@ public static String afterCanonicalize2(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterCanonicalize2 threw", e);
       }
@@ -75,7 +75,7 @@ public static String afterCanonicalize3(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterCanonicalize3 threw", e);
       }
@@ -91,8 +91,7 @@ public static String afterEncodeForLDAP(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(
-            result, input, VulnerabilityMarks.LDAP_INJECTION_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.LDAP_INJECTION_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEncodeForLDAP threw", e);
       }
@@ -110,8 +109,7 @@ public static String afterEncodeForOS(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(
-            result, input, VulnerabilityMarks.COMMAND_INJECTION_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.COMMAND_INJECTION_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEncodeForOS threw", e);
       }
@@ -129,7 +127,7 @@ public static String afterEncodeForSQL(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.SQL_INJECTION_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEncodeForSQL threw", e);
       }
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/src/test/groovy/datadog/trace/instrumentation/owasp/esapi/EncoderCallSiteTest.groovy b/dd-java-agent/instrumentation/owasp-esapi-2/src/test/groovy/datadog/trace/instrumentation/owasp/esapi/EncoderCallSiteTest.groovy
index 6b9e267e0ed..e7bd272fd6d 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2/src/test/groovy/datadog/trace/instrumentation/owasp/esapi/EncoderCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/owasp-esapi-2/src/test/groovy/datadog/trace/instrumentation/owasp/esapi/EncoderCallSiteTest.groovy
@@ -25,7 +25,7 @@ class EncoderCallSiteTest extends AgentTestRunner {
     testSuite.&"$method".call(args)
 
     then:
-    1 * module.taintIfInputIsTaintedWithMarks(_, _, mark)
+    1 * module.taintIfTainted(_, _, false, mark)
     0 * module._
 
     where:
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
index c0d7cc587bd..26c50e2fde2 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
@@ -9,13 +9,11 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.ArrayList;
-import java.util.List;
 import net.bytebuddy.asm.Advice;
 import org.apache.pekko.http.javadsl.model.HttpHeader;
 import org.apache.pekko.http.scaladsl.model.headers.Cookie;
@@ -56,23 +54,22 @@ static class TaintAllCookiesAdvice {
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     static void after(
         @Advice.This HttpHeader cookie, @Advice.Return Seq<HttpCookiePair> cookiePairs) {
-      WebModule mod = InstrumentationBridge.WEB;
       PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (mod == null || prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
+      if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
         return;
       }
-      if (!prop.isTainted(cookie)) {
+      final IastContext ctx = IastContext.Provider.get();
+      if (!prop.isTainted(ctx, cookie)) {
         return;
       }
 
       Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
-      List<String> cookieNames = new ArrayList<>();
       while (iterator.hasNext()) {
         HttpCookiePair pair = iterator.next();
-        cookieNames.add(pair.name());
-        prop.taint(SourceTypes.REQUEST_COOKIE_VALUE, pair.name(), pair.value());
+        final String name = pair.name(), value = pair.value();
+        prop.taint(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        prop.taint(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
       }
-      mod.onCookieNames(cookieNames);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
index 17309b230c1..c6bdbd2871b 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
@@ -27,7 +27,7 @@ public static String after(@CallSite.This HttpHeader header, @CallSite.Return St
       return result;
     }
     try {
-      module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, result, result, header);
+      module.taintIfTainted(result, header, SourceTypes.REQUEST_HEADER_NAME, result);
     } catch (final Throwable e) {
       module.onUnexpectedException("onHeaderNames threw", e);
     }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
index b4d521b1da4..f8e5e45407f 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
@@ -62,7 +62,7 @@ static void onExit(@Advice.This HttpHeader h, @Advice.Return String retVal) {
         return;
       }
 
-      propagation.taintIfInputIsTainted(retVal, h);
+      propagation.taintIfTainted(retVal, h);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
index a30633d7fb8..147fc5e8da4 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
@@ -11,6 +11,7 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.Source;
@@ -70,6 +71,7 @@ static void onExit(
         return;
       }
 
+      final IastContext ctx = IastContext.Provider.get();
       Iterator<HttpHeader> iterator = headers.iterator();
       while (iterator.hasNext()) {
         HttpHeader h = iterator.next();
@@ -78,7 +80,7 @@ static void onExit(
         }
         // unfortunately, the call to h.value() is instrumented, but
         // because the call to taint() only happens after, the call is a noop
-        propagation.taintObject(SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value(), h);
+        propagation.taint(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
       }
     }
   }
@@ -98,7 +100,7 @@ static void onExit(
         return;
       }
 
-      propagation.taintIfInputIsTainted(entity, thiz);
+      propagation.taintIfTainted(entity, thiz);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
index a850598eaef..0f5bb1c15e3 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
@@ -69,10 +69,7 @@ static void onExit(
 
       if (value instanceof String) {
         module.taint(
-            reqCtx.getData(RequestContextSlot.IAST),
-            SourceTypes.REQUEST_PATH_PARAMETER,
-            null,
-            (String) value);
+            reqCtx.getData(RequestContextSlot.IAST), value, SourceTypes.REQUEST_PATH_PARAMETER);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
index 6fbac8c5e64..dfd43a8f0c7 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
@@ -53,7 +53,7 @@ static void onExit(
         return;
       }
 
-      propagation.taintIfInputIsTainted(request, requestContext);
+      propagation.taintIfTainted(request, requestContext);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
index 6fd6dbd0b87..5cdb355f0f1 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
@@ -10,13 +10,12 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.Collections;
 import net.bytebuddy.asm.Advice;
 import org.apache.pekko.http.scaladsl.model.Uri;
 import scala.Tuple2;
@@ -70,7 +69,7 @@ static void after(@Advice.This Uri uri, @Advice.Return scala.Option<String> ret)
       if (mod == null || ret.isEmpty()) {
         return;
       }
-      mod.taintIfInputIsTainted(ret.get(), uri);
+      mod.taintIfTainted(ret.get(), uri);
     }
   }
 
@@ -80,21 +79,22 @@ public static class TaintQueryAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     static void after(@Advice.This /*Uri*/ Object uri, @Advice.Return Uri.Query ret) {
-      WebModule web = InstrumentationBridge.WEB;
       PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || web == null || ret.isEmpty()) {
+      if (prop == null || ret.isEmpty()) {
         return;
       }
 
-      if (!prop.isTainted(uri)) {
+      final IastContext ctx = IastContext.Provider.get();
+      if (!prop.isTainted(ctx, uri)) {
         return;
       }
 
       Iterator<Tuple2<String, String>> iterator = ret.iterator();
       while (iterator.hasNext()) {
         Tuple2<String, String> pair = iterator.next();
-        web.onParameterNames(Collections.singleton(pair._1()));
-        prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, pair._1(), pair._2());
+        final String name = pair._1(), value = pair._2();
+        prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+        prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
index a4d3749ab16..715d506329d 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
@@ -16,10 +16,13 @@ public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
     HttpCookiePair httpCookiePair = v1._1();
 
     PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
+    if (mod == null || httpCookiePair == null) {
       return v1;
     }
-    mod.taint(SourceTypes.REQUEST_COOKIE_VALUE, httpCookiePair.name(), httpCookiePair.value());
+    final String name = httpCookiePair.name();
+    final String value = httpCookiePair.value();
+    mod.taint(name, SourceTypes.REQUEST_COOKIE_NAME, name);
+    mod.taint(value, SourceTypes.REQUEST_COOKIE_VALUE, name);
     return v1;
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
index 837bbe59b51..af17de13629 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
@@ -10,7 +10,7 @@ public static <T> Future<T> wrapFuture(
       Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
     JFunction1<T, T> mapf =
         t -> {
-          mod.taintIfInputIsTainted(t, input);
+          mod.taintIfTainted(t, input);
           return t;
         };
     return f.map(mapf, ec);
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
index 7061a4a0e7a..f2abc22ff9c 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.pekkohttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import scala.Tuple1;
 import scala.Tuple2;
 import scala.collection.Iterator;
@@ -19,18 +19,17 @@ public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
     Map<String, String> m = v1._1;
 
     PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    WebModule web = InstrumentationBridge.WEB;
-    if (web == null || prop == null || m == null) {
+    if (prop == null || m == null || m.isEmpty()) {
       return v1;
     }
 
-    java.util.List<String> keysAsCollection = ScalaToJava.keySetAsCollection(m);
-    web.onParameterNames(keysAsCollection);
-
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, String>> iterator = m.iterator();
     while (iterator.hasNext()) {
       Tuple2<String, String> e = iterator.next();
-      prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, e._1(), e._2());
+      final String name = e._1(), value = e._2();
+      prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+      prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
index 290e48388e0..574106812b0 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
@@ -1,7 +1,9 @@
 package datadog.trace.instrumentation.pekkohttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.source.WebModule;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
 import scala.Tuple1;
 import scala.Tuple2;
 import scala.collection.Iterator;
@@ -17,19 +19,21 @@ public class TaintMultiMapFunction
   public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
     Map<String, List<String>> m = v1._1;
 
-    WebModule mod = InstrumentationBridge.WEB;
-    if (mod == null || m == null) {
+    PropagationModule mod = InstrumentationBridge.PROPAGATION;
+    if (mod == null || m == null || m.isEmpty()) {
       return v1;
     }
 
-    java.util.List<String> keysAsCollection = ScalaToJava.keySetAsCollection(m);
-    mod.onParameterNames(keysAsCollection);
-
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
     while (entriesIterator.hasNext()) {
       Tuple2<String, List<String>> e = entriesIterator.next();
+      final String name = e._1();
+      mod.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
       List<String> values = e._2();
-      mod.onParameterValues(e._1(), ScalaToJava.listAsList(values));
+      for (final String value : ScalaToJava.listAsList(values)) {
+        mod.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+      }
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
index cfdd2a72353..cd8e9093926 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
@@ -20,10 +20,11 @@ public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
     if (mod == null || httpCookiePair.isEmpty()) {
       return v1;
     }
-    mod.taint(
-        SourceTypes.REQUEST_COOKIE_VALUE,
-        httpCookiePair.get().name(),
-        httpCookiePair.get().value());
+    final HttpCookiePair cookie = httpCookiePair.get();
+    final String name = cookie.name();
+    final String value = cookie.value();
+    mod.taint(name, SourceTypes.REQUEST_COOKIE_NAME, name);
+    mod.taint(value, SourceTypes.REQUEST_COOKIE_VALUE, name);
     return v1;
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
index f6686719cbb..25f17d951a1 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.pekkohttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -33,15 +34,16 @@ public Tuple1<T> apply(Tuple1<T> v1) {
     }
 
     if (value instanceof Iterable) {
-      Iterator iterator = ((Iterable) value).iterator();
+      final IastContext ctx = IastContext.Provider.get();
+      Iterator<?> iterator = ((Iterable<?>) value).iterator();
       while (iterator.hasNext()) {
         Object o = iterator.next();
         if (o instanceof String) {
-          mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+          mod.taint(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     } else if (value instanceof String) {
-      mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) value);
+      mod.taint((String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
index efea9fc9573..0d2c670deab 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
@@ -19,7 +19,7 @@ public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
     if (mod == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_BODY, reqCtx);
+    mod.taint(reqCtx, SourceTypes.REQUEST_BODY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
index 89ed7b4399a..ecae0d312b8 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
@@ -20,7 +20,7 @@ public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
     if (mod == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_BODY, httpRequest);
+    mod.taint(httpRequest, SourceTypes.REQUEST_BODY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
index cfc38b9fc2c..a407beba1d1 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.pekkohttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.Set;
@@ -22,22 +22,22 @@ public class TaintSeqFunction
   public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
     Seq<Tuple2<String, String>> seq = v1._1;
 
-    WebModule web = InstrumentationBridge.WEB;
     PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (web == null || prop == null || seq == null) {
+    if (prop == null || seq == null || seq.isEmpty()) {
       return v1;
     }
 
+    final IastContext ctx = IastContext.Provider.get();
     Iterator<Tuple2<String, String>> iterator = seq.iterator();
-    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<String, Boolean>());
+    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
     while (iterator.hasNext()) {
       Tuple2<String, String> t = iterator.next();
       String name = t._1();
       String value = t._2();
       if (seenKeys.add(name)) {
-        web.onParameterNames(Collections.singleton(name));
+        prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
       }
-      prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
+      prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
index 14c8d3e325d..42109050f98 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.pekkohttp.iast.helpers;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -40,15 +41,16 @@ public Tuple1<Object> apply(Tuple1<Object> v1) {
     }
 
     if (value instanceof Iterable) {
-      Iterator iterator = ((Iterable) value).iterator();
+      final IastContext ctx = IastContext.Provider.get();
+      Iterator<?> iterator = ((Iterable<?>) value).iterator();
       while (iterator.hasNext()) {
         Object o = iterator.next();
         if (o instanceof String) {
-          mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+          mod.taint(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     } else if (value instanceof String) {
-      mod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) value);
+      mod.taint((String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
     }
 
     return v1;
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
index 8966a26fb5b..6994b788fda 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
@@ -28,7 +28,7 @@ public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B>
 
   @Override
   public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
-    propagationModule.taintObject(SourceTypes.REQUEST_BODY, value);
+    propagationModule.taint(value, SourceTypes.REQUEST_BODY);
     return delegate.apply(value, ec, materializer);
   }
 
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
index b810b653e1c..471a65562b1 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
@@ -18,7 +18,7 @@ public Tuple1<Uri> apply(Tuple1<Uri> v1) {
     if (mod == null) {
       return v1;
     }
-    mod.taintObject(SourceTypes.REQUEST_QUERY, uri);
+    mod.taint(uri, SourceTypes.REQUEST_QUERY);
 
     return v1;
   }
diff --git a/dd-java-agent/instrumentation/play-2.4/build.gradle b/dd-java-agent/instrumentation/play-2.4/build.gradle
index d188127c139..52dac9aab00 100644
--- a/dd-java-agent/instrumentation/play-2.4/build.gradle
+++ b/dd-java-agent/instrumentation/play-2.4/build.gradle
@@ -5,17 +5,27 @@ ext {
 
 muzzle {
   pass {
+    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.11'
     versions = '[2.4.0,2.6)'
     assertInverse = true
   }
+  pass {
+    name = "play25only"
+    group = 'com.typesafe.play'
+    module = 'play_2.11'
+    versions = '[2.5.0,2.6)'
+    assertInverse = true
+  }
   fail {
+    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.12'
     versions = '[,]'
   }
   fail {
+    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.13'
     versions = '[,]'
@@ -23,6 +33,7 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
+apply plugin: 'scala'
 
 repositories {
   maven {
@@ -33,19 +44,45 @@ repositories {
   }
 }
 
+tasks.withType(org.gradle.api.tasks.scala.ScalaCompile) {
+  it.javaLauncher = getJavaLauncherFor(8)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
+sourceSets {
+  main_play25 {
+    java.srcDirs "${project.projectDir}/src/main/java_play25"
+  }
+}
+jar {
+  from sourceSets.main_play25.output
+}
+project.afterEvaluate { p ->
+  instrumentJava.dependsOn compileMain_play25Java
+  forbiddenApisMain_play25.dependsOn instrumentMain_play25Java
+}
+instrument {
+  additionalClasspath = [
+    instrumentJava: compileMain_play25Java.destinationDirectory
+  ]
+}
+
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
+  main_play25CompileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0'
+  main_play25CompileOnly project(':internal-api')
+  main_play25CompileOnly project(':dd-java-agent:agent-tooling')
+  main_play25CompileOnly project(':dd-java-agent:agent-bootstrap')
 
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:akka-http-10.0')
-  testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
-  testImplementation project(':dd-java-agent:instrumentation:akka-init')
-  testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-http-10.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-concurrent')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-init')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
 
   // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5
   testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
@@ -53,6 +90,7 @@ dependencies {
   testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
+  testRuntimeOnly sourceSets.main_play25.output
 
   latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
   latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
@@ -60,3 +98,98 @@ dependencies {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 }
+compileTestGroovy {
+  classpath = classpath + files(compileTestScala.destinationDirectory)
+  dependsOn 'compileTestScala'
+}
+compileLatestDepTestGroovy {
+  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
+  dependsOn 'compileLatestDepTestScala'
+}
+
+sourceSets {
+  routeGenerator {
+    scala {
+      srcDir "${project.projectDir}/src/routeGenerator/scala"
+    }
+  }
+  testGenerated {
+    scala {
+      srcDir layout.buildDirectory.dir('generated/sources/testRoutes/scala')
+    }
+  }
+  latestDepTestGenerated {
+    scala {
+      srcDir layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala')
+    }
+  }
+}
+dependencies {
+  routeGeneratorImplementation deps.scala211
+  routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0'
+}
+configurations {
+  testGeneratedCompileClasspath.extendsFrom testCompileClasspath
+  latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath
+}
+
+['buildTestRoutes', 'buildLatestDepTestRoutes'].each { taskName ->
+  tasks.register(taskName, JavaExec) {
+    String routesFile = "${project.projectDir}/src/test/routes/conf/routes"
+    def subdir = taskName == 'buildTestRoutes' ? 'testRoutes' : 'latestDepTestRoutes'
+    def outputDir =
+      layout.buildDirectory.dir("generated/sources/$subdir/scala")
+
+    it.inputs.file routesFile
+    it.outputs.dir outputDir
+
+    it.mainClass.set 'generator.CompileRoutes'
+    it.args routesFile, outputDir.get().asFile.absolutePath
+
+    it.classpath configurations.routeGeneratorRuntimeClasspath
+    it.classpath compileRouteGeneratorScala.destinationDirectory
+
+    if (taskName == 'buildTestRoutes') {
+      it.classpath compileTestScala.destinationDirectory
+      dependsOn compileTestScala
+    } else {
+      it.classpath compileLatestDepTestScala.destinationDirectory
+      dependsOn compileLatestDepTestScala
+    }
+
+    dependsOn compileRouteGeneratorScala
+  }
+}
+compileTestGeneratedScala {
+  classpath = classpath + files(compileTestScala.destinationDirectory)
+  dependsOn buildTestRoutes, compileLatestDepTestScala
+}
+compileLatestDepTestGeneratedScala {
+  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
+  dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala
+}
+compileTestGroovy {
+  classpath = classpath +
+    files(compileTestGeneratedScala.destinationDirectory)
+  dependsOn 'compileTestGeneratedScala'
+}
+compileLatestDepTestGroovy {
+  classpath = classpath +
+    files(compileLatestDepTestGeneratedScala.destinationDirectory)
+  dependsOn 'compileLatestDepTestGeneratedScala'
+}
+// do it this way rather than through dependencies {} because
+// latestDepTestImplementation extends testImplementation
+test {
+  classpath = classpath + files(compileTestGeneratedScala.destinationDirectory)
+}
+latestDepTest {
+  classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory)
+}
+
+forbiddenApisTestGenerated {
+  enabled = false
+}
+forbiddenApisLatestDepTestGenerated {
+  enabled = false
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
index 80e571afaf9..b18260de59d 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
@@ -18,6 +18,11 @@ public PlayInstrumentation() {
     super("play");
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "play24and25";
+  }
+
   @Override
   public String hierarchyMarkerType() {
     return "play.api.mvc.Action";
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
new file mode 100644
index 00000000000..e0cb3dcb60a
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
@@ -0,0 +1,50 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+@AutoService(Instrumenter.class)
+public class DelegatingBodyParserInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public DelegatingBodyParserInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$DelegatingBodyParser";
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".JavaMultipartFormDataRegisterExcF",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("apply")
+            .and(takesArguments(1))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(returns(named("play.libs.streams.Accumulator"))),
+        packageName + ".BodyParserDelegatingBodyParserApplyAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
new file mode 100644
index 00000000000..12e7925406f
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
@@ -0,0 +1,52 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import java.util.Map;
+
+@AutoService(Instrumenter.class)
+public class FormUrlEncodedInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public FormUrlEncodedInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$FormUrlEncoded";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(Map.class)),
+        packageName + ".BodyParserFormUrlEncodedParseAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
new file mode 100644
index 00000000000..3e1d71708b5
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
@@ -0,0 +1,87 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import play.api.http.HttpErrorHandler;
+import play.api.mvc.RequestHeader;
+
+/** @see HttpErrorHandler#onServerError(RequestHeader, Throwable) */
+@AutoService(Instrumenter.class)
+public class HttpErrorHandlerInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForTypeHierarchy {
+  public HttpErrorHandlerInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isPublic()
+            .and(named("onServerError"))
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
+            .and(takesArgument(1, Throwable.class))
+            .and(returns(named("scala.concurrent.Future"))),
+        HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
+  }
+
+  @Override
+  public String hierarchyMarkerType() {
+    return "play.api.http.HttpErrorHandler";
+  }
+
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named("play.api.http.HttpErrorHandler"));
+  }
+
+  static class OnServerErrorAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(1) Throwable t) {
+      int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
+      if (i > 0) {
+        return;
+      }
+
+      if (!(t instanceof BlockingException)) {
+        return;
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return;
+      }
+      agentSpan.addThrowable(t);
+    }
+
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after() {
+      CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
new file mode 100644
index 00000000000..b56b9ea27d5
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
@@ -0,0 +1,14 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+public class MuzzleReferences {
+
+  public static final Reference[] PLAY_25_PLUS = new Reference[] {};
+
+  public static final Reference[] PLAY_25_ONLY =
+      new Reference[] {
+        new Reference.Builder("play.libs.concurrent.Futures").build(),
+        new Reference.Builder("play.Routes").build()
+      };
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
new file mode 100644
index 00000000000..c9409d1d916
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
@@ -0,0 +1,54 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+/** @see play.core.routing.PathPattern#apply(String) */
+@AutoService(Instrumenter.class)
+public class PathPatternInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public PathPatternInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.core.routing.PathPattern";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("apply")
+            .and(not(isStatic()))
+            .and(takesArguments(1))
+            .and(takesArgument(0, String.class))
+            .and(returns(named("scala.Option"))),
+        packageName + ".PathPatternApplyAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
new file mode 100644
index 00000000000..10d6d49e143
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
@@ -0,0 +1,79 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+/** @see play.api.mvc.BodyParsers.parse$#tolerantText(long) */
+@AutoService(Instrumenter.class)
+public class PlayBodyParsersInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForKnownTypes {
+
+  public PlayBodyParsersInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String[] knownMatchingTypes() {
+    return new String[] {
+      "play.api.mvc.BodyParsers$parse$",
+    };
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("tolerantText")
+            .and(not(isStatic()))
+            .and(takesArguments(1))
+            .and(takesArgument(0, long.class))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        packageName + ".PlayBodyParsersTolerantTextAdvice");
+    transformation.applyAdvice(
+        named("tolerantJson")
+            .and(not(isStatic()))
+            .and(takesArguments(1))
+            .and(takesArgument(0, int.class))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        packageName + ".PlayBodyParsersTolerantJsonAdvice");
+    transformation.applyAdvice(
+        named("tolerantFormUrlEncoded")
+            .and(not(isStatic()))
+            .and(takesArguments(1))
+            .and(takesArgument(0, int.class))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        packageName + ".PlayBodyParsersTolerantFormUrlEncodedAdvice");
+    transformation.applyAdvice(
+        named("multipartFormData")
+            .and(not(isStatic()))
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("scala.Function1")))
+            .and(takesArgument(1, long.class))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        packageName + ".PlayBodyParsersMultipartFormDataAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
new file mode 100644
index 00000000000..1bb10bbea78
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
@@ -0,0 +1,54 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+/** @see play.routing.RoutingDsl.Route */
+@AutoService(Instrumenter.class)
+public class RoutingDslInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public RoutingDslInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.routing.RoutingDsl$Route";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".ArgumentCaptureWrappers",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor()
+            .and(takesArguments(5))
+            .and(takesArgument(3, Object.class))
+            .and(takesArgument(4, java.lang.reflect.Method.class)),
+        packageName + ".RoutingDslRouteConstructorAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
new file mode 100644
index 00000000000..ff73f218ff2
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
@@ -0,0 +1,52 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+/** @see play.api.routing.sird.PathExtractor */
+@AutoService(Instrumenter.class)
+public class SirdPathExtractorInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public SirdPathExtractorInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.api.routing.sird.PathExtractor";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        namedOneOf("extract", "play$api$routing$sird$PathExtractor$$extract")
+            .and(takesArguments(1))
+            .and(takesArgument(0, String.class))
+            .and(returns(named("scala.Option"))),
+        packageName + ".SirdPathExtractorExtractAdvice");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
new file mode 100644
index 00000000000..242acfe4107
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
@@ -0,0 +1,54 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import akka.util.ByteString;
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.TolerantJson#parse(Http.RequestHeader, ByteString) */
+@AutoService(Instrumenter.class)
+public class TolerantJsonInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public TolerantJsonInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$TolerantJson";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
+        packageName + ".BodyParserTolerantJsonParseAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
new file mode 100644
index 00000000000..01b21d5b49d
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
@@ -0,0 +1,51 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+@AutoService(Instrumenter.class)
+public class TolerantTextInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public TolerantTextInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play25only";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_25_ONLY;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$TolerantText";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(String.class)),
+        packageName + ".BodyParserTolerantTextParseAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
new file mode 100644
index 00000000000..2eb39277e5d
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
@@ -0,0 +1,130 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import play.libs.F;
+
+public class ArgumentCaptureWrappers {
+  public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
+    private final Function<Object, R> delegate;
+
+    public ArgumentCaptureFunction(Function<Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o) {
+      if (o == null) {
+        return delegate.apply(null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o);
+      }
+
+      Map<String, Object> conv = Collections.singletonMap("0", o);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o);
+    }
+  }
+
+  public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
+    private final BiFunction<Object, Object, R> delegate;
+
+    public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o1, Object o2) {
+      if (o1 == null && o2 == null) {
+        return delegate.apply(null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o1, o2);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o1, o2);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o1, o2);
+    }
+  }
+
+  public static class ArgumentCaptureFunction3<R>
+      implements F.Function3<Object, Object, Object, R> {
+    private final F.Function3<Object, Object, Object, R> delegate;
+
+    public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o1, Object o2, Object o3) throws Throwable {
+      if (o1 == null && o2 == null && o3 == null) {
+        return delegate.apply(null, null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o1, o2, o3);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o1, o2, o3);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+      conv.put("2", o3);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o1, o2, o3);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
new file mode 100644
index 00000000000..c74ca29dace
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
@@ -0,0 +1,25 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import net.bytebuddy.asm.Advice;
+import play.core.j.JavaParsers$;
+import play.libs.streams.Accumulator;
+import play.mvc.BodyParser;
+import play.mvc.Http;
+
+/** @see BodyParser.DelegatingBodyParser#apply(Http.RequestHeader) */
+public class BodyParserDelegatingBodyParserApplyAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class)
+  static void after(
+      @Advice.This BodyParser thiz,
+      @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
+    if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
+      return;
+    }
+    Accumulator<
+            akka.util.ByteString, play.libs.F.Either<play.mvc.Result, Http.MultipartFormData<?>>>
+        acc = ret;
+
+    ret =
+        acc.recover(JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
new file mode 100644
index 00000000000..a73eed6a3dc
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
@@ -0,0 +1,24 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import akka.util.ByteString;
+import datadog.appsec.api.blocking.BlockingException;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.FormUrlEncoded#parse(Http.RequestHeader, ByteString) */
+public class BodyParserFormUrlEncodedParseAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  static void after(
+      @Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
+    if (t != null) {
+      return;
+    }
+    try {
+      // error is reported as client error, which doesn't preserve the exception
+      BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
+    } catch (BlockingException be) {
+      t = be;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
new file mode 100644
index 00000000000..c745a460954
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
@@ -0,0 +1,303 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.api.gateway.Events.EVENTS;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.FloatNode;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.databind.node.NumericNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.BlockResponseFunction;
+import datadog.trace.api.gateway.CallbackProvider;
+import datadog.trace.api.gateway.Flow;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import play.api.libs.json.JsArray;
+import play.api.libs.json.JsBoolean;
+import play.api.libs.json.JsNumber;
+import play.api.libs.json.JsObject;
+import play.api.libs.json.JsString;
+import play.api.libs.json.JsValue;
+import play.api.mvc.MultipartFormData;
+import scala.Function1;
+import scala.Tuple2;
+import scala.collection.Iterable;
+import scala.collection.Iterator;
+import scala.collection.Seq;
+import scala.compat.java8.JFunction1;
+
+public class BodyParserHelpers {
+
+  public static final int MAX_CONVERSION_DEPTH = 10;
+  private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
+  public static final int MAX_RECURSION = 15;
+
+  private static JFunction1<
+          scala.collection.immutable.Map<String, Seq<String>>,
+          scala.collection.immutable.Map<String, Seq<String>>>
+      HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
+  private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
+  private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
+      BodyParserHelpers::handleMultipartFormData;
+  private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
+
+  private BodyParserHelpers() {}
+
+  public static Function1<
+          scala.collection.immutable.Map<String, Seq<String>>,
+          scala.collection.immutable.Map<String, Seq<String>>>
+      getHandleUrlEncodedMapF() {
+    return HANDLE_URL_ENCODED;
+  }
+
+  private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
+      scala.collection.immutable.Map<String, Seq<String>> data) {
+    if (data == null || data.isEmpty()) {
+      return data;
+    }
+
+    try {
+      Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
+      handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
+    }
+    return data;
+  }
+
+  public static Function1<String, String> getHandleStringMapF() {
+    return HANDLE_TEXT;
+  }
+
+  private static String handleText(String s) {
+    if (s == null || s.isEmpty()) {
+      return s;
+    }
+
+    try {
+      handleArbitraryPostData(s, "tolerantText");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of tolerantText BodyParser");
+    }
+
+    return s;
+  }
+
+  public static Function1<MultipartFormData<?>, MultipartFormData<?>>
+      getHandleMultipartFormDataF() {
+    return HANDLE_MULTIPART_FORM_DATA;
+  }
+
+  private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
+    scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
+
+    if (mpfd == null || mpfd.isEmpty()) {
+      return data;
+    }
+
+    try {
+      Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
+      handleArbitraryPostData(conv, "multipartFormData");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of multipartFormData BodyParser");
+    }
+    return data;
+  }
+
+  public static Function1<JsValue, JsValue> getHandleJsonF() {
+    return HANDLE_JSON;
+  }
+
+  private static JsValue handleJson(JsValue data) {
+    if (data == null) {
+      return null;
+    }
+
+    try {
+      Object conv = jsValueToJavaObject(data, MAX_RECURSION);
+      handleArbitraryPostData(conv, "json");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of json BodyParser");
+    }
+    return data;
+  }
+
+  private static void executeCallback(
+      RequestContext reqCtx,
+      BiFunction<RequestContext, Object, Flow<Void>> callback,
+      Object conv,
+      String details) {
+    Flow<Void> flow = callback.apply(reqCtx, conv);
+    Flow.Action action = flow.getAction();
+    if (action instanceof Flow.Action.RequestBlockingAction) {
+      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+      if (blockResponseFunction != null) {
+        boolean success =
+            blockResponseFunction.tryCommitBlockingResponse(
+                reqCtx.getTraceSegment(),
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders());
+        if (success) {
+          throw new BlockingException("Blocked request (for " + details + ")");
+        }
+      }
+    }
+  }
+
+  private static Object tryConvertingScalaContainers(Object obj, int depth) {
+    if (depth == 0) {
+      return obj;
+    }
+    if (obj instanceof scala.collection.Map) {
+      scala.collection.Map map = (scala.collection.Map) obj;
+      Map<Object, Object> ret = new HashMap<>();
+      Iterator<Tuple2> iterator = map.iterator();
+      while (iterator.hasNext()) {
+        Tuple2 next = iterator.next();
+        ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
+      }
+      return ret;
+    } else if (obj instanceof Iterable) {
+      List<Object> ret = new ArrayList<>();
+      Iterator iterator = ((Iterable) obj).iterator();
+      while (iterator.hasNext()) {
+        Object next = iterator.next();
+        ret.add(tryConvertingScalaContainers(next, depth - 1));
+      }
+      return ret;
+    }
+    return obj;
+  }
+
+  public static void handleJsonNode(JsonNode n, String source) {
+    Object o = jsNodeToJavaObject(n, MAX_RECURSION);
+    handleArbitraryPostDataWithSpanError(o, source);
+  }
+
+  public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
+    AgentSpan span = activeSpan();
+    try {
+      doHandleArbitraryPostData(span, o, source);
+    } catch (BlockingException be) {
+      span.addThrowable(be);
+      throw be;
+    }
+  }
+
+  public static void handleArbitraryPostData(Object o, String source) {
+    doHandleArbitraryPostData(activeSpan(), o, source);
+  }
+
+  public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
+    RequestContext reqCtx;
+    if (span == null
+        || (reqCtx = span.getRequestContext()) == null
+        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+      return;
+    }
+
+    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+    BiFunction<RequestContext, Object, Flow<Void>> callback =
+        cbp.getCallback(EVENTS.requestBodyProcessed());
+    if (callback == null) {
+      return;
+    }
+
+    // callback execution
+    executeCallback(reqCtx, callback, o, source);
+  }
+
+  private static void handleException(Exception e, String logMessage) {
+    if (e instanceof BlockingException) {
+      throw (BlockingException) e;
+    }
+
+    log.warn(logMessage, e);
+  }
+
+  private static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
+    if (value == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (value instanceof JsString) {
+      return ((JsString) value).value();
+    } else if (value instanceof JsNumber) {
+      return ((JsNumber) value).value();
+    } else if (value instanceof JsBoolean) {
+      return ((JsBoolean) value).value();
+    } else if (value instanceof JsObject) {
+      Map<String, Object> map = new HashMap<>();
+      JsObject jsonObject = (JsObject) value;
+      Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
+      while (iterator.hasNext()) {
+        Tuple2<String, JsValue> e = iterator.next();
+        map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
+      }
+      return map;
+    } else if (value instanceof JsArray) {
+      List<Object> list = new ArrayList<>();
+      JsArray jsArray = (JsArray) value;
+      Iterator<JsValue> iterator = jsArray.value().iterator();
+      while (iterator.hasNext()) {
+        JsValue next = iterator.next();
+        list.add(jsValueToJavaObject(next, maxRecursion - 1));
+      }
+      return list;
+    } else {
+      return null;
+    }
+  }
+
+  private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
+    if (value == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (value instanceof TextNode) {
+      return value.asText();
+    } else if (value instanceof FloatNode || value instanceof DoubleNode) {
+      return value.asDouble();
+    } else if (value instanceof NumericNode) {
+      return value.asLong();
+    } else if (value instanceof ObjectNode) {
+      Map<String, Object> map = new HashMap<>();
+      ObjectNode jsonObject = (ObjectNode) value;
+      java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
+      while (iterator.hasNext()) {
+        Map.Entry<String, JsonNode> e = iterator.next();
+        map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
+      }
+      return map;
+    } else if (value instanceof ArrayNode) {
+      List<Object> list = new ArrayList<>();
+      ArrayNode arrayNode = (ArrayNode) value;
+      java.util.Iterator<JsonNode> iterator = arrayNode.elements();
+      while (iterator.hasNext()) {
+        JsonNode next = iterator.next();
+        list.add(jsNodeToJavaObject(next, maxRecursion - 1));
+      }
+      return list;
+    } else if (value instanceof NullNode) {
+      return null;
+    } else {
+      return value.asText("");
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
new file mode 100644
index 00000000000..3648168a780
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import datadog.appsec.api.blocking.BlockingException;
+import net.bytebuddy.asm.Advice;
+
+public class BodyParserTolerantJsonParseAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
+    if (t != null) {
+      return;
+    }
+    try {
+      BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
+    } catch (BlockingException be) {
+      t = be;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
new file mode 100644
index 00000000000..43761f4f59b
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import datadog.appsec.api.blocking.BlockingException;
+import net.bytebuddy.asm.Advice;
+
+public class BodyParserTolerantTextParseAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
+    if (t != null) {
+      return;
+    }
+    try {
+      // error is reported as client error, which doesn't preserve the exception
+      BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
+    } catch (BlockingException be) {
+      t = be;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
new file mode 100644
index 00000000000..0c249d912cc
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
@@ -0,0 +1,38 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.concurrent.CompletionException;
+import java.util.function.Function;
+import play.libs.F;
+import play.mvc.Http;
+import play.mvc.Result;
+
+public class JavaMultipartFormDataRegisterExcF
+    implements Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> {
+  public static Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> INSTANCE =
+      new JavaMultipartFormDataRegisterExcF();
+
+  private JavaMultipartFormDataRegisterExcF() {}
+
+  @Override
+  public F.Either<Result, Http.MultipartFormData<?>> apply(Throwable exc) {
+    if (exc instanceof CompletionException) {
+      exc = exc.getCause();
+    }
+    if (exc instanceof BlockingException) {
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan != null) {
+        agentSpan.addThrowable(exc);
+      }
+    }
+    if (exc instanceof RuntimeException) {
+      throw (RuntimeException) exc;
+    } else {
+      throw new UndeclaredThrowableException(exc);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
new file mode 100644
index 00000000000..87fc8bff851
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
@@ -0,0 +1,62 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import static datadog.trace.api.gateway.Events.EVENTS;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.BlockResponseFunction;
+import datadog.trace.api.gateway.CallbackProvider;
+import datadog.trace.api.gateway.Flow;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import java.util.Map;
+import java.util.function.BiFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PathExtractionHelpers {
+  private static final Logger log = LoggerFactory.getLogger(PathExtractionHelpers.class);
+
+  private PathExtractionHelpers() {}
+
+  public static BlockingException callRequestPathParamsCallback(
+      RequestContext reqCtx, Map<String, Object> params, String origin) {
+    try {
+      return doCallRequestPathParamsCallback(reqCtx, params, origin);
+    } catch (Exception e) {
+      log.warn("Error calling " + origin, e);
+      return null;
+    }
+  }
+
+  private static BlockingException doCallRequestPathParamsCallback(
+      RequestContext reqCtx, Map<String, Object> params, String origin) {
+    if (params == null || params.isEmpty()) {
+      return null;
+    }
+
+    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+        cbp.getCallback(EVENTS.requestPathParams());
+    if (callback == null) {
+      return null;
+    }
+
+    Flow<Void> flow = callback.apply(reqCtx, params);
+    Flow.Action action = flow.getAction();
+    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+      return null;
+    }
+
+    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+    if (brf != null) {
+      brf.tryCommitBlockingResponse(
+          reqCtx.getTraceSegment(),
+          rba.getStatusCode(),
+          rba.getBlockingContentType(),
+          rba.getExtraHeaders());
+    }
+    return new BlockingException("Blocked request (for " + origin + ")");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
new file mode 100644
index 00000000000..7eab9542568
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
@@ -0,0 +1,45 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.advice.ActiveRequestContext;
+import datadog.trace.advice.RequiresRequestContext;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import net.bytebuddy.asm.Advice;
+import scala.Tuple2;
+import scala.collection.Iterator;
+import scala.util.Either;
+
+@RequiresRequestContext(RequestContextSlot.APPSEC)
+public class PathPatternApplyAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  static void after(
+      @Advice.Return(readOnly = false)
+          scala.Option<scala.collection.immutable.Map<String, Either<Throwable, String>>> ret,
+      @Advice.Thrown(readOnly = false) Throwable t,
+      @ActiveRequestContext RequestContext reqCtx) {
+    if (t != null) {
+      return;
+    }
+    if (ret.isEmpty()) {
+      return;
+    }
+
+    java.util.Map<String, Object> conv = new java.util.HashMap<>();
+
+    Iterator<Tuple2<String, Either<Throwable, String>>> iterator = ret.get().iterator();
+    while (iterator.hasNext()) {
+      Tuple2<String, Either<Throwable, String>> next = iterator.next();
+      Either<Throwable, String> value = next._2();
+      if (value.isLeft()) {
+        continue;
+      }
+
+      conv.put(next._1(), value.right().get());
+    }
+
+    BlockingException blockingException =
+        PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
+    t = blockingException;
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
new file mode 100644
index 00000000000..58c364e1675
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
@@ -0,0 +1,18 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import net.bytebuddy.asm.Advice;
+import play.api.mvc.BodyParser;
+import play.core.Execution;
+import scala.Function1;
+
+/** @see play.api.mvc.BodyParsers.parse$#multipartFormData(Function1, long) */
+public class PlayBodyParsersMultipartFormDataAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class)
+  static void after(
+      @Advice.Return(readOnly = false) BodyParser<play.api.mvc.MultipartFormData<?>> parser) {
+    parser =
+        parser.map(
+            BodyParserHelpers.getHandleMultipartFormDataF(),
+            Execution.Implicits$.MODULE$.internalContext());
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
new file mode 100644
index 00000000000..edeb7a2e014
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
@@ -0,0 +1,18 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import net.bytebuddy.asm.Advice;
+import play.api.mvc.BodyParser;
+import play.core.Execution;
+import scala.collection.Seq;
+
+public class PlayBodyParsersTolerantFormUrlEncodedAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class)
+  static void after(
+      @Advice.Return(readOnly = false)
+          BodyParser<scala.collection.immutable.Map<String, Seq<String>>> parser) {
+    parser =
+        parser.map(
+            BodyParserHelpers.getHandleUrlEncodedMapF(),
+            Execution.Implicits$.MODULE$.internalContext());
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
new file mode 100644
index 00000000000..ac72c6eadc9
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
@@ -0,0 +1,16 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import net.bytebuddy.asm.Advice;
+import play.api.libs.json.JsValue;
+import play.api.mvc.BodyParser;
+import play.core.Execution;
+
+/** @see play.api.mvc.BodyParsers.parse$#tolerantJson(int) */
+public class PlayBodyParsersTolerantJsonAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class)
+  static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
+    parser =
+        parser.map(
+            BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.internalContext());
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
new file mode 100644
index 00000000000..2c519597326
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
@@ -0,0 +1,15 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import net.bytebuddy.asm.Advice;
+import play.api.mvc.BodyParser;
+import play.core.Execution;
+
+public class PlayBodyParsersTolerantTextAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class)
+  static void after(@Advice.Return(readOnly = false) BodyParser<String> parser) {
+    parser =
+        parser.map(
+            BodyParserHelpers.getHandleStringMapF(),
+            Execution.Implicits$.MODULE$.internalContext());
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
new file mode 100644
index 00000000000..9ebc0a8bd6c
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import net.bytebuddy.asm.Advice;
+import play.libs.F;
+
+public class RoutingDslRouteConstructorAdvice {
+  @Advice.OnMethodEnter(suppress = Throwable.class)
+  static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+    if (action instanceof Function) {
+      action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
+    } else if (action instanceof BiFunction) {
+      action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
+    } else if (action instanceof F.Function3) {
+      action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
new file mode 100644
index 00000000000..2b42660650a
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
@@ -0,0 +1,34 @@
+package datadog.trace.instrumentation.play25.appsec;
+
+import datadog.trace.advice.ActiveRequestContext;
+import datadog.trace.advice.RequiresRequestContext;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import java.util.HashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import scala.collection.immutable.List;
+
+/** @see play.api.routing.sird.PathExtractor#extract(java.lang.String) */
+@RequiresRequestContext(RequestContextSlot.APPSEC)
+public class SirdPathExtractorExtractAdvice {
+  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  static void after(
+      @Advice.Return scala.Option<List<String>> ret,
+      @ActiveRequestContext RequestContext reqCtx,
+      @Advice.Thrown(readOnly = false) Throwable t) {
+    if (ret.isEmpty() || t != null) {
+      return;
+    }
+
+    Map<String, Object> conv = new HashMap<>();
+    List<String> stringList = ret.get();
+    for (int i = 0; i < stringList.size(); i++) {
+      conv.put(Integer.toString(i), stringList.apply(i));
+    }
+
+    t =
+        PathExtractionHelpers.callRequestPathParamsCallback(
+            reqCtx, conv, "sird.PathExtractor#extract");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala b/dd-java-agent/instrumentation/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala
new file mode 100644
index 00000000000..505135029a3
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala
@@ -0,0 +1,17 @@
+package generator
+
+import play.routes.compiler.{InjectedRoutesGenerator, RoutesCompiler}
+
+import java.io.File
+import scala.collection.immutable
+
+object CompileRoutes extends App {
+  val routesFile = args(0)
+  val destinationDir = args(1)
+
+  val routesCompilerTask = RoutesCompiler.RoutesCompilerTask(
+    new File(routesFile), immutable.Seq.empty,
+    true, true, false)
+  RoutesCompiler.compile(
+    routesCompilerTask, InjectedRoutesGenerator, new File(destinationDir))
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/client/PlayWSClientTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
similarity index 90%
rename from dd-java-agent/instrumentation/play-2.4/src/test/groovy/client/PlayWSClientTest.groovy
rename to dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
index 4f860671e34..2e500fe2f93 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/client/PlayWSClientTest.groovy
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
@@ -1,8 +1,7 @@
-package client
+package datadog.trace.instrumentation.play25.client
 
 import datadog.trace.agent.test.base.HttpClientTest
 import datadog.trace.agent.test.naming.TestingNettyHttpNamingConventions
-import datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator
 import play.libs.ws.WS
 import spock.lang.AutoCleanup
 import spock.lang.Shared
@@ -36,7 +35,7 @@ abstract class PlayWSClientTest extends HttpClientTest {
 
   @Override
   String component() {
-    return NettyHttpClientDecorator.DECORATE.component()
+    'netty-client'
   }
 
 
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy
new file mode 100644
index 00000000000..fec90b5ae72
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy
@@ -0,0 +1,14 @@
+package datadog.trace.instrumentation.play25.server
+
+import datadog.trace.agent.test.base.HttpServer
+import groovy.transform.CompileStatic
+import play.libs.concurrent.HttpExecution
+
+class PlayAsyncServerTest extends PlayServerTest {
+
+  @Override
+  @CompileStatic
+  HttpServer server() {
+    new PlayHttpServer(PlayRouters.async(HttpExecution.defaultContext()))
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy
new file mode 100644
index 00000000000..d21243146ba
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy
@@ -0,0 +1,77 @@
+package datadog.trace.instrumentation.play25.server
+
+import com.typesafe.config.ConfigFactory
+import datadog.trace.agent.test.base.HttpServer
+import groovy.transform.CompileStatic
+import play.api.Application
+import play.api.BuiltInComponentsFromContext
+import play.api.Environment
+import play.api.Mode
+import play.api.Play
+import play.api.http.HttpErrorHandler
+import play.core.server.NettyServerProvider
+import play.core.server.ServerConfig
+import play.routing.Router
+import scala.Option
+
+import java.util.concurrent.TimeoutException
+
+class PlayHttpServer implements HttpServer {
+  final Router router
+  def server
+  def port
+
+  PlayHttpServer(Router router) {
+    this.router = router
+  }
+
+  @Override
+  @CompileStatic
+  void start() throws TimeoutException {
+    play.api.routing.Router router = this.router.asScala()
+
+    play.api.ApplicationLoader.Context context = play.api.ApplicationLoader.Context$.MODULE$.apply(
+      Environment.simple(new File("."), Mode.Test()),
+      (scala.Option) scala.None$.MODULE$,
+      new play.core.DefaultWebCommands(),
+      play.api.Configuration$.MODULE$.apply(ConfigFactory.load())
+      )
+
+    BuiltInComponentsFromContext components = new BuiltInComponentsFromContext(context) {
+        @Override
+        play.api.routing.Router router() {
+          router
+        }
+
+        @Override
+        HttpErrorHandler httpErrorHandler() {
+          new play.core.j.JavaHttpErrorHandlerAdapter(TestHttpErrorHandler.INSTANCE)
+        }
+      }
+
+    Application application = components.application()
+    Play.start(application)
+    ServerConfig serverConfig = ServerConfig.apply(
+      getClass().getClassLoader(),
+      new File('.'),
+      (scala.Option) Option.apply(0),
+      Option.empty(),
+      '0.0.0.0',
+      Mode.Test(),
+      System.getProperties())
+    play.core.server.Server server = new NettyServerProvider().createServer(serverConfig, application)
+
+    this.server = server
+    this.port = server.httpPort().get()
+  }
+
+  @Override
+  void stop() {
+    server.stop()
+  }
+
+  @Override
+  URI address() {
+    return new URI("http://localhost:$port/")
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy
new file mode 100644
index 00000000000..f0b49a51bfe
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy
@@ -0,0 +1,300 @@
+package datadog.trace.instrumentation.play25.server
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import groovy.transform.CompileStatic
+import play.api.mvc.RequestHeader
+import play.mvc.Http
+import play.mvc.Result
+import play.mvc.Results
+import play.routing.Router
+import play.routing.RoutingDsl
+import scala.Option
+import scala.collection.Seq
+
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionStage
+import java.util.concurrent.Executor
+import java.util.function.Function
+import java.util.function.Supplier
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_HERE
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK
+import static datadog.trace.agent.test.base.HttpServerTest.controller
+
+class PlayRouters {
+  static Router sync() {
+    new RoutingDsl()
+      .GET(SUCCESS.path).routeTo({
+        controller(SUCCESS) {
+          Results.ok(SUCCESS.body)
+        }
+      } as Supplier)
+      .GET(FORWARDED.path).routeTo({
+        controller(FORWARDED) {
+          Option<String> headerValue = requestHeader.headers().get('x-forwarded-for')
+          Results.ok(headerValue.empty ? 'x-forwarded-for header not present' : headerValue.get())
+        }
+      } as Supplier)
+      .GET(QUERY_PARAM.path).routeTo({
+        controller(QUERY_PARAM) {
+          Option<Seq<String>> some = requestHeader.queryString().get('some')
+          Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}")
+        }
+      } as Supplier)
+      .GET(QUERY_ENCODED_QUERY.path).routeTo({
+        controller(QUERY_ENCODED_QUERY) {
+          Option<Seq<String>> some = requestHeader.queryString().get('some')
+          Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}")
+        }
+      } as Supplier)
+      .GET(QUERY_ENCODED_BOTH.rawPath).routeTo({
+        controller(QUERY_ENCODED_BOTH) {
+          Option<Seq<String>> some = requestHeader.queryString().get('some')
+          Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}").
+            withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE)
+        }
+      } as Supplier)
+      .GET(REDIRECT.path).routeTo({
+        controller(REDIRECT) {
+          Results.found(REDIRECT.body)
+        }
+      } as Supplier)
+      .GET(ERROR.path).routeTo({
+        controller(ERROR) {
+          Results.status(ERROR.status, ERROR.body)
+        }
+      } as Supplier)
+      .GET(EXCEPTION.path).routeTo({
+        controller(EXCEPTION) {
+          throw new RuntimeException(EXCEPTION.body)
+        }
+      } as Supplier)
+      .GET(CUSTOM_EXCEPTION.path).routeAsync({
+        controller(CUSTOM_EXCEPTION) {
+          throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+        }
+      } as Supplier)
+      .GET(NOT_HERE.path).routeTo({
+        controller(NOT_HERE) {
+          Results.notFound(NOT_HERE.body)
+        }
+      } as Supplier)
+      .GET("/path/:id/param").routeTo(PathParamSyncFunction.INSTANCE)
+      .GET(USER_BLOCK.path).routeTo({
+        controller(USER_BLOCK) {
+          controller(USER_BLOCK) {
+            Blocking.forUser('user-to-block').blockIfMatch()
+            Results.status(200, "should never be reached")
+          }
+        }
+      } as Supplier)
+      .POST(CREATED.path).routeTo({
+        ->
+        controller(CREATED) {
+          String body = body().asText()
+          Results.status(CREATED.status, "created: $body")
+        }
+      } as Supplier)
+      .POST(BODY_URLENCODED.path).routeTo({
+        ->
+        controller(BODY_URLENCODED) {
+          Map<String, String[]> body = body().asFormUrlEncoded()
+          Results.status(BODY_URLENCODED.status, body as String)
+        }
+      } as Supplier)
+      .POST(BODY_MULTIPART.path).routeTo({
+        ->
+        controller(BODY_MULTIPART) {
+          Map<String, String[]> body = body().asMultipartFormData().asFormUrlEncoded()
+          Results.status(BODY_MULTIPART.status, body as String)
+        }
+      } as Supplier)
+      .POST(BODY_JSON.path).routeTo({
+        ->
+        JsonNode json = body().asJson()
+        controller(BODY_JSON) {
+          Results.status(BODY_JSON.status, new ObjectMapper().writeValueAsString(json))
+        }
+      } as Supplier)
+      .build()
+  }
+
+  @CompileStatic
+  static Router async(Executor execContext) {
+    new RoutingDsl()
+      .GET(SUCCESS.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(SUCCESS) {
+            Results.ok(SUCCESS.body)
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(FORWARDED.getPath()).routeAsync({
+        Option<String> header = requestHeader.headers().get('x-forwarded-for')
+        CompletableFuture.supplyAsync({
+          controller(FORWARDED) {
+            Results.ok(header.empty ? '(null)' : header.get())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_PARAM.getPath()).routeAsync({
+        Option<Seq<String>> some = requestHeader.queryString().get('some')
+        CompletableFuture.supplyAsync({
+          controller(QUERY_PARAM) {
+            Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}")
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_ENCODED_QUERY.getPath()).routeAsync({
+        Option<Seq<String>> some = requestHeader.queryString().get('some')
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_QUERY) {
+            Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}")
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_ENCODED_BOTH.getRawPath()).routeAsync({
+        Option<Seq<String>> some = requestHeader.queryString().get('some')
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_BOTH) {
+            Results.ok("some=${some.empty ? '(null)' : some.get().apply(0)}").
+              withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE) // cheating
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(REDIRECT.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(REDIRECT) {
+            Results.found(REDIRECT.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(ERROR.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(ERROR) {
+            Results.status(ERROR.getStatus(), ERROR.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(EXCEPTION.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(EXCEPTION) {
+            throw new RuntimeException(EXCEPTION.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(CUSTOM_EXCEPTION.path).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(CUSTOM_EXCEPTION) {
+            throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+          }
+        }, execContext)
+      } as Supplier)
+      .GET("/path/:id/param").routeAsync(new PathParamAsyncFunction(execContext))
+      .GET(USER_BLOCK.path).routeAsync({
+        CompletableFuture.supplyAsync({
+          ->
+          controller(USER_BLOCK) {
+            Blocking.forUser('user-to-block').blockIfMatch()
+            Results.status(200, "should never be reached")
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(CREATED.path).routeAsync({
+        ->
+        String body = body().asText()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(CREATED) {
+            Results.status(CREATED.status, "created: $body")
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_URLENCODED.path).routeAsync({
+        ->
+        Map<String, String[]> body = body().asFormUrlEncoded()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_URLENCODED) {
+            Results.status(BODY_URLENCODED.status, body as String)
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_MULTIPART.path).routeAsync({
+        ->
+        Map<String, String[]> body = body().asMultipartFormData().asFormUrlEncoded()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_MULTIPART) {
+            Results.status(BODY_MULTIPART.status, body as String)
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_JSON.path).routeAsync({
+        ->
+        JsonNode json = body().asJson()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_JSON) {
+            Results.status(BODY_JSON.status, new ObjectMapper().writeValueAsString(json))
+          }
+        }, execContext)
+      } as Supplier)
+      .build()
+  }
+
+  @CompileStatic
+  static enum PathParamSyncFunction implements Function<Integer, Result> {
+    INSTANCE
+
+    @Override
+    Result apply(Integer i) {
+      controller(PATH_PARAM) {
+        Results.ok(i as String)
+      }
+    }
+  }
+
+  @CompileStatic
+  static class PathParamAsyncFunction implements Function<Integer, CompletionStage<Result>> {
+    private final Executor executor
+
+    PathParamAsyncFunction(Executor executor) {
+      this.executor = executor
+    }
+
+    @Override
+    CompletionStage<Result> apply(Integer i) {
+      CompletableFuture.supplyAsync({
+        controller(PATH_PARAM) {
+          Results.ok(i as String)
+        }
+      }, executor)
+    }
+  }
+
+  private static RequestHeader getRequestHeader() {
+    Http.Context.current()._requestHeader()
+  }
+
+  private static play.mvc.Http.RequestBody body() {
+    Http.Context.current()._requestHeader().body
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy
new file mode 100644
index 00000000000..378f911499b
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy
@@ -0,0 +1,30 @@
+package datadog.trace.instrumentation.play25.server
+
+import datadog.trace.agent.test.base.HttpServer
+import datadog.trace.instrumentation.play25.PlayRoutersScala
+import groovy.transform.CompileStatic
+import spock.lang.Shared
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+class PlayScalaAsyncServerTest extends PlayServerTest {
+  @Shared
+  ExecutorService executor
+
+  def cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @Override
+  @CompileStatic
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+    new PlayHttpServer(PlayRoutersScala.async(executor).asJava())
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    ['0': '123']
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy
new file mode 100644
index 00000000000..dc5b4317ae2
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy
@@ -0,0 +1,110 @@
+package datadog.trace.instrumentation.play25.server
+
+import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.agent.test.base.HttpServer
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
+import datadog.trace.api.config.TraceInstrumentationConfig
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.instrumentation.play25.PlayController
+import groovy.transform.CompileStatic
+import scala.concurrent.ExecutionContext$
+import spock.lang.Shared
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+
+class PlayScalaRoutesServerTest extends PlayServerTest {
+  @Shared
+  ExecutorService executor
+
+  def cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    injectSysConfig(TraceInstrumentationConfig.HTTP_SERVER_ROUTE_BASED_NAMING, 'false')
+  }
+
+  @Override
+  @CompileStatic
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+
+    def router = new router.Routes(
+      new play.core.j.JavaHttpErrorHandlerAdapter(TestHttpErrorHandler.INSTANCE),
+      new PlayController(ExecutionContext$.MODULE$.fromExecutor(executor))
+      )
+    new PlayHttpServer(router.asJava())
+  }
+
+  @Override
+  String testPathParam() {
+    '/path/?/param'
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    [path: '123']
+  }
+
+  private String routeFor(HttpServerTest.ServerEndpoint endpoint) {
+    switch (endpoint) {
+      case PATH_PARAM:
+        return '/path/$path<[^/]+>/param'
+      case NOT_FOUND:
+        return null
+      default:
+        endpoint.rawPath
+    }
+  }
+
+  @Override
+  Map<String, Serializable> expectedExtraServerTags(HttpServerTest.ServerEndpoint endpoint) {
+    [(Tags.HTTP_ROUTE): routeFor(endpoint)]
+  }
+
+  @Override
+  boolean hasHandlerSpan() {
+    true
+  }
+
+  @Override
+  void handlerSpan(TraceAssert trace, HttpServerTest.ServerEndpoint endpoint = SUCCESS) {
+    def expectedQueryTag = expectedQueryTag(endpoint)
+    trace.span {
+      serviceName expectedServiceName()
+      operationName 'play.request'
+      spanType DDSpanTypes.HTTP_SERVER
+      errored endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION
+      childOfPrevious()
+      tags {
+        "$Tags.COMPONENT" 'play-action'
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+        "$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : '127.0.0.1') }
+        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : '127.0.0.1') }
+        "$Tags.HTTP_URL" String
+        "$Tags.HTTP_HOSTNAME" address.host
+        "$Tags.HTTP_METHOD" String
+        "$Tags.HTTP_ROUTE" this.routeFor(endpoint)
+        if (endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION) {
+          errorTags(endpoint == CUSTOM_EXCEPTION ? TestHttpErrorHandler.CustomRuntimeException : RuntimeException, endpoint.body)
+        }
+        if (endpoint.query) {
+          "$DDTags.HTTP_QUERY" expectedQueryTag
+        }
+        defaultTags()
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy
new file mode 100644
index 00000000000..dab1f327069
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy
@@ -0,0 +1,145 @@
+package datadog.trace.instrumentation.play25.server
+
+import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.agent.test.base.HttpServer
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.instrumentation.play24.PlayHttpServerDecorator
+import groovy.transform.CompileStatic
+import play.server.Server
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+
+class PlayServerTest extends HttpServerTest<Server> {
+
+  @Override
+  @CompileStatic
+  HttpServer server() {
+    new PlayHttpServer(PlayRouters.sync())
+  }
+
+  @Override
+  void stopServer(Server server) {
+    server.stop()
+  }
+
+  @Override
+  String component() {
+    'netty'
+  }
+
+  @Override
+  String expectedOperationName() {
+    'netty.request'
+  }
+
+  @Override
+  boolean hasHandlerSpan() {
+    true
+  }
+
+  @Override
+  boolean hasExtraErrorInformation() {
+    true
+  }
+
+  @Override
+  boolean changesAll404s() {
+    true
+  }
+
+  boolean testExceptionBody() {
+    // I can't figure out how to set a proper exception handler to customize the response body.
+    false
+  }
+
+  @Override
+  boolean testRequestBody() {
+    true
+  }
+
+  @Override
+  boolean isRequestBodyNoStreaming() {
+    true
+  }
+
+  @Override
+  boolean testBodyUrlencoded() {
+    true
+  }
+
+  @Override
+  boolean testBodyMultipart() {
+    true
+  }
+
+  @Override
+  boolean testBodyJson() {
+    true
+  }
+
+  @Override
+  boolean testBlocking() {
+    true
+  }
+
+  @Override
+  boolean testBlockingOnResponse() {
+    true
+  }
+
+  @Override
+  String testPathParam() {
+    '/path/?/param'
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    ['0': 123]
+  }
+
+  @Override
+  Class<? extends Exception> expectedExceptionType() {
+    RuntimeException
+  }
+
+  @Override
+  Class<? extends Exception> expectedCustomExceptionType() {
+    TestHttpErrorHandler.CustomRuntimeException
+  }
+
+  @Override
+  void handlerSpan(TraceAssert trace, ServerEndpoint endpoint = SUCCESS) {
+    def expectedQueryTag = expectedQueryTag(endpoint)
+    trace.span {
+      serviceName expectedServiceName()
+      operationName "play.request"
+      spanType DDSpanTypes.HTTP_SERVER
+      errored endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION
+      childOfPrevious()
+      tags {
+        "$Tags.COMPONENT" PlayHttpServerDecorator.DECORATE.component()
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+        "$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
+        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
+        "$Tags.HTTP_URL" String
+        "$Tags.HTTP_HOSTNAME" address.host
+        "$Tags.HTTP_METHOD" String
+        // BUG
+        //        "$Tags.HTTP_ROUTE" String
+        if (endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION) {
+          errorTags(endpoint == CUSTOM_EXCEPTION ? TestHttpErrorHandler.CustomRuntimeException : RuntimeException, endpoint.body)
+        }
+        if (endpoint.query) {
+          "$DDTags.HTTP_QUERY" expectedQueryTag
+        }
+        defaultTags()
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy
new file mode 100644
index 00000000000..1ae8f075361
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy
@@ -0,0 +1,45 @@
+package datadog.trace.instrumentation.play25.server
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import play.http.HttpErrorHandler
+import play.mvc.Http.RequestHeader
+import play.mvc.Result
+import play.mvc.Results
+
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionStage
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+
+enum TestHttpErrorHandler implements HttpErrorHandler {
+  INSTANCE
+
+  private static final Logger LOG = LoggerFactory.getLogger(TestHttpErrorHandler)
+
+  static class CustomRuntimeException extends RuntimeException {
+    CustomRuntimeException(String message) {
+      super(message)
+    }
+  }
+
+  CompletionStage<Result> onClientError(
+    RequestHeader request, int statusCode, String message) {
+    return CompletableFuture.completedFuture(Results.status(statusCode, message))
+  }
+
+  CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
+    LOG.warn('server error', exception)
+
+    Throwable cause = exception.getCause()
+    if (cause) {
+      exception = cause
+    }
+    if (exception instanceof CustomRuntimeException) {
+      return CompletableFuture.completedFuture(
+        Results.status(CUSTOM_EXCEPTION.status, exception.message))
+    }
+
+    CompletableFuture.completedFuture(Results.internalServerError(exception.message))
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayAsyncServerTest.groovy
deleted file mode 100644
index 20809d198a4..00000000000
--- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayAsyncServerTest.groovy
+++ /dev/null
@@ -1,86 +0,0 @@
-package server
-
-import datadog.trace.agent.test.base.HttpServer
-import play.libs.concurrent.HttpExecution
-import play.mvc.Results
-import play.routing.RoutingDsl
-
-import java.util.concurrent.CompletableFuture
-import java.util.function.Supplier
-
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
-
-class PlayAsyncServerTest extends PlayServerTest {
-
-  @Override
-  HttpServer server() {
-    def router =
-      new RoutingDsl()
-      .GET(SUCCESS.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(SUCCESS) {
-            Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(FORWARDED.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(FORWARDED) {
-            Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(QUERY_PARAM.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(QUERY_PARAM) {
-            Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(QUERY_ENCODED_QUERY.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(QUERY_ENCODED_QUERY) {
-            Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(QUERY_ENCODED_BOTH.getRawPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(QUERY_ENCODED_BOTH) {
-            Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-              withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(REDIRECT.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(REDIRECT) {
-            Results.found(REDIRECT.getBody())
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(ERROR.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(ERROR) {
-            Results.status(ERROR.getStatus(), ERROR.getBody())
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-      .GET(EXCEPTION.getPath()).routeAsync({
-        CompletableFuture.supplyAsync({
-          controller(EXCEPTION) {
-            throw new Exception(EXCEPTION.getBody())
-          }
-        }, HttpExecution.defaultContext())
-      } as Supplier)
-
-    return new PlayHttpServer(router.build())
-  }
-}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayHttpServer.groovy
deleted file mode 100644
index efc2948baea..00000000000
--- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayHttpServer.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-package server
-
-import datadog.trace.agent.test.base.HttpServer
-import play.routing.Router
-import play.server.Server
-
-import java.util.concurrent.TimeoutException
-
-class PlayHttpServer implements HttpServer {
-  final Router router
-  def server
-  def port
-
-  PlayHttpServer(Router router) {
-    this.router = router
-  }
-
-  @Override
-  void start() throws TimeoutException {
-    server = Server.forRouter(router, 0)
-    port = server.httpPort()
-  }
-
-  @Override
-  void stop() {
-    server.stop()
-  }
-
-  @Override
-  URI address() {
-    return new URI("http://localhost:$port/")
-  }
-}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
deleted file mode 100644
index e28300dabec..00000000000
--- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
+++ /dev/null
@@ -1,125 +0,0 @@
-package server
-
-import datadog.trace.agent.test.asserts.TraceAssert
-import datadog.trace.agent.test.base.HttpServer
-import datadog.trace.agent.test.base.HttpServerTest
-import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.DDTags
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.instrumentation.netty40.server.NettyHttpServerDecorator
-import datadog.trace.instrumentation.play24.PlayHttpServerDecorator
-import play.mvc.Results
-import play.routing.RoutingDsl
-import play.server.Server
-
-import java.util.function.Supplier
-
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
-
-class PlayServerTest extends HttpServerTest<Server> {
-
-  @Override
-  HttpServer server() {
-    def router =
-      new RoutingDsl()
-      .GET(SUCCESS.getPath()).routeTo({
-        controller(SUCCESS) {
-          Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-        }
-      } as Supplier)
-      .GET(FORWARDED.getPath()).routeTo({
-        controller(FORWARDED) {
-          Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-        }
-      } as Supplier)
-      .GET(QUERY_PARAM.getPath()).routeTo({
-        controller(QUERY_PARAM) {
-          Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-        }
-      } as Supplier)
-      .GET(QUERY_ENCODED_QUERY.getPath()).routeTo({
-        controller(QUERY_ENCODED_QUERY) {
-          Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-        }
-      } as Supplier)
-      .GET(QUERY_ENCODED_BOTH.getRawPath()).routeTo({
-        controller(QUERY_ENCODED_BOTH) {
-          Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-            withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-        }
-      } as Supplier)
-      .GET(REDIRECT.getPath()).routeTo({
-        controller(REDIRECT) {
-          Results.found(REDIRECT.getBody())
-        }
-      } as Supplier)
-      .GET(ERROR.getPath()).routeTo({
-        controller(ERROR) {
-          Results.status(ERROR.getStatus(), ERROR.getBody())
-        }
-      } as Supplier)
-      .GET(EXCEPTION.getPath()).routeTo({
-        controller(EXCEPTION) {
-          throw new Exception(EXCEPTION.getBody())
-        }
-      } as Supplier)
-    return new PlayHttpServer(router.build())
-  }
-
-  @Override
-  String component() {
-    return NettyHttpServerDecorator.DECORATE.component()
-  }
-
-  @Override
-  String expectedOperationName() {
-    return "netty.request"
-  }
-
-  @Override
-  boolean hasHandlerSpan() {
-    true
-  }
-
-  boolean testExceptionBody() {
-    // I can't figure out how to set a proper exception handler to customize the response body.
-    false
-  }
-
-  @Override
-  void handlerSpan(TraceAssert trace, ServerEndpoint endpoint = SUCCESS) {
-    def expectedQueryTag = expectedQueryTag(endpoint)
-    trace.span {
-      serviceName expectedServiceName()
-      operationName "play.request"
-      spanType DDSpanTypes.HTTP_SERVER
-      errored endpoint == EXCEPTION
-      childOfPrevious()
-      tags {
-        "$Tags.COMPONENT" PlayHttpServerDecorator.DECORATE.component()
-        "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-        "$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
-        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
-        "$Tags.HTTP_URL" String
-        "$Tags.HTTP_HOSTNAME" address.host
-        "$Tags.HTTP_METHOD" String
-        // BUG
-        //        "$Tags.HTTP_ROUTE" String
-        if (endpoint == EXCEPTION) {
-          errorTags(Exception, EXCEPTION.body)
-        }
-        if (endpoint.query) {
-          "$DDTags.HTTP_QUERY" expectedQueryTag
-        }
-        defaultTags()
-      }
-    }
-  }
-}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/routes/conf/routes b/dd-java-agent/instrumentation/play-2.4/src/test/routes/conf/routes
new file mode 100644
index 00000000000..83cbf85dd11
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/routes/conf/routes
@@ -0,0 +1,16 @@
+GET   /success                      datadog.trace.instrumentation.play25.PlayController.success()
+GET   /redirect                     datadog.trace.instrumentation.play25.PlayController.redirect()
+GET   /forwarded                    datadog.trace.instrumentation.play25.PlayController.forwarded()
+GET   /error-status                 datadog.trace.instrumentation.play25.PlayController.errorStatus()
+GET   /exception                    datadog.trace.instrumentation.play25.PlayController.exception()
+GET   /custom-exception             datadog.trace.instrumentation.play25.PlayController.customException()
+GET   /not-here                     datadog.trace.instrumentation.play25.PlayController.notHere()
+GET   /user-block                   datadog.trace.instrumentation.play25.PlayController.userBlock()
+GET   /query                        datadog.trace.instrumentation.play25.PlayController.query(some: String)
+GET   /encoded_query                datadog.trace.instrumentation.play25.PlayController.encodedQuery(some: String)
+GET   /encoded%20path%20query       datadog.trace.instrumentation.play25.PlayController.encodedPathQuery(some: String)
+GET   /path/:path/param             datadog.trace.instrumentation.play25.PlayController.pathParam(path: Integer)
+POST /created                       datadog.trace.instrumentation.play25.PlayController.created()
+POST /body-urlencoded               datadog.trace.instrumentation.play25.PlayController.bodyUrlencoded()
+POST /body-multipart                datadog.trace.instrumentation.play25.PlayController.bodyMultipart()
+POST /body-json                     datadog.trace.instrumentation.play25.PlayController.bodyJson()
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala
new file mode 100644
index 00000000000..ff00fa780a9
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala
@@ -0,0 +1,93 @@
+package datadog.trace.instrumentation.play25
+
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.agent.test.base.HttpServerTest.{ServerEndpoint, getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE}
+import datadog.trace.instrumentation.play25.Util.MapExtensions
+import groovy.lang.Closure
+import play.api.libs.json.{JsNull, JsValue, Json}
+import play.api.mvc._
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class PlayController(implicit ec: ExecutionContext) extends Controller {
+  def success() = controller(ServerEndpoint.SUCCESS) { _ =>
+    Results.Ok(ServerEndpoint.SUCCESS.getBody)
+  }
+
+  def redirect = controller(ServerEndpoint.REDIRECT) { _ =>
+    Results.Redirect(ServerEndpoint.REDIRECT.getBody, 302)
+  }
+
+  def forwarded = controller(ServerEndpoint.FORWARDED) { request =>
+    Results.Status(ServerEndpoint.FORWARDED.getStatus)(request.headers.get("X-Forwarded-For").getOrElse("(no header)"))
+  }
+
+  def errorStatus = controller(ServerEndpoint.ERROR) { _ =>
+    Results.Status(ServerEndpoint.ERROR.getStatus)(ServerEndpoint.ERROR.getBody)
+  }
+
+  def exception = controller(ServerEndpoint.EXCEPTION) { _ =>
+    throw new RuntimeException(ServerEndpoint.EXCEPTION.getBody)
+  }
+
+  def customException = controller(ServerEndpoint.CUSTOM_EXCEPTION) { _ =>
+    throw Util.createCustomException(ServerEndpoint.CUSTOM_EXCEPTION.getBody)
+  }
+
+  def userBlock = controller(ServerEndpoint.USER_BLOCK) { _ =>
+    Blocking.forUser("user-to-block").blockIfMatch()
+    Results.Ok("should never be reached")
+  }
+
+  def query(some: String) = controller(ServerEndpoint.QUERY_PARAM) { _ =>
+    Results.Status(ServerEndpoint.QUERY_PARAM.getStatus)(s"some=$some")
+  }
+
+  def encodedQuery(some: String) = controller(ServerEndpoint.QUERY_ENCODED_QUERY) { _ =>
+    Results.Status(ServerEndpoint.QUERY_ENCODED_QUERY.getStatus)(s"some=$some")
+  }
+
+  def encodedPathQuery(some: String) = controller(ServerEndpoint.QUERY_ENCODED_BOTH) { _ =>
+    Results.Status(ServerEndpoint.QUERY_ENCODED_BOTH.getStatus)(s"some=$some")
+  }
+
+  def notHere = controller(ServerEndpoint.NOT_HERE) { _ =>
+    Results.NotFound(ServerEndpoint.NOT_HERE.getBody)
+  }
+
+  def pathParam(id: Integer) = controller(ServerEndpoint.PATH_PARAM) { _ =>
+    Results.Ok(id.toString)
+  }
+
+  def created = controller(ServerEndpoint.CREATED) { request =>
+    val body: String = request.body.asText.getOrElse("")
+    Results.Created(s"created: $body")
+  }
+
+  def bodyUrlencoded = controller(ServerEndpoint.BODY_URLENCODED) { request =>
+    val body: Map[String, Seq[String]] = request.body.asFormUrlEncoded.getOrElse(Map.empty)
+    Results.Ok(body.toStringAsGroovy)
+  }
+
+  def bodyMultipart = controller(ServerEndpoint.BODY_MULTIPART) { request =>
+    val body: Map[String, Seq[String]] = request.body.asMultipartFormData.map(_.asFormUrlEncoded).getOrElse(Map.empty)
+    Results.Ok(body.toStringAsGroovy)
+  }
+
+  def bodyJson = controller(ServerEndpoint.BODY_JSON) { request =>
+    val body: JsValue = request.body.asJson.getOrElse(JsNull)
+    Results.Ok(Json.stringify(body))
+  }
+
+  private def controller(endpoint: ServerEndpoint)(block: Request[AnyContent] => Result) : Action[AnyContent] = {
+    Action.async { request =>
+      Future {
+        HttpServerTest.controller(endpoint, new Closure[Result](this) {
+          def doCall() = block(request).withHeaders(
+            (getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE))
+        })
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala
new file mode 100644
index 00000000000..5f6b313fd7b
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala
@@ -0,0 +1,151 @@
+package datadog.trace.instrumentation.play25
+
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint._
+import datadog.trace.agent.test.base.HttpServerTest.{ServerEndpoint, getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE}
+import datadog.trace.instrumentation.play25.Util.MapExtensions
+import groovy.lang.Closure
+import play.api.BuiltInComponents
+import play.api.libs.json._
+import play.api.mvc._
+import play.api.routing.Router
+import play.api.routing.sird._
+
+import java.util.concurrent.{Executor, ExecutorService}
+import scala.concurrent.{ExecutionContext, Future}
+
+object PlayRoutersScala {
+
+  def async(executor: Executor): Router = {
+    val ec: ExecutionContext = ExecutionContext.fromExecutor(executor)
+    val parser = BodyParsers.parse.default
+
+    def controller(endpoint: ServerEndpoint)(block: => Result): Future[Result] = {
+      Future {
+        HttpServerTest.controller(endpoint, new Closure[Result](this) {
+          def doCall(): Result = block.withHeaders(
+            (getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE))
+        })
+      }(ec)
+    }
+
+    Router.from {
+      case GET(p"/success") =>
+        Action.async {
+          controller(SUCCESS) {
+            Results.Ok(SUCCESS.getBody)
+          }
+        }
+
+      case GET(p"/redirect") =>
+        Action.async {
+          controller(REDIRECT) {
+            Results.Redirect(REDIRECT.getBody, 302)
+          }
+        }
+
+      case GET(p"/forwarded") =>
+        Action.async { request =>
+          controller(FORWARDED) {
+            Results.Status(FORWARDED.getStatus)(request.headers.get("X-Forwarded-For").getOrElse("(no header)"))
+          }
+        }
+
+      // endpoint is not special; error results are returned the same way
+      case GET(p"/error-status") =>
+        Action.async {
+          controller(ERROR) {
+            Results.Status(ERROR.getStatus)(ERROR.getBody)
+          }
+        }
+
+      case GET(p"/exception") =>
+        Action.async {
+          controller(EXCEPTION) {
+            throw new RuntimeException(EXCEPTION.getBody)
+          }
+        }
+
+      case GET(p"/custom-exception") =>
+        Action.async {
+          controller(CUSTOM_EXCEPTION) {
+            throw Util.createCustomException(CUSTOM_EXCEPTION.getBody)
+          }
+        }
+
+      case GET(p"/not-here") =>
+        Action.async {
+          controller(NOT_HERE) {
+            Results.NotFound
+          }
+        }
+
+      case GET(p"/user-block") =>
+        Action.async {
+          controller(USER_BLOCK) {
+            Blocking.forUser("user-to-block").blockIfMatch()
+            Results.Ok("should never be reached")
+          }
+        }
+
+      case GET(p"/query" ? q"some=$some") =>
+        Action.async {
+          controller(QUERY_PARAM) {
+            Results.Status(QUERY_PARAM.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/encoded_query" ? q"some=$some") =>
+        Action.async {
+          controller(QUERY_ENCODED_QUERY) {
+            Results.Status(QUERY_ENCODED_QUERY.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/encoded%20path%20query" ? q"some=$some") =>
+        Action.async {
+          controller(QUERY_ENCODED_BOTH) {
+            Results.Status(QUERY_ENCODED_BOTH.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/path/$path/param") =>
+        Action.async {
+          controller(PATH_PARAM) {
+            Results.Status(PATH_PARAM.getStatus)(path)
+          }
+        }
+
+      case POST(p"/created") => Action.async(parser) { request =>
+        controller(CREATED) {
+          val body: String = request.body.asText.getOrElse("")
+          Results.Created(s"created: $body")
+        }
+      }
+
+      case POST(p"/body-urlencoded") => Action.async(parser) { request =>
+        controller(BODY_URLENCODED) {
+          val body: Map[String, Seq[String]] = request.body.asFormUrlEncoded.getOrElse(Map.empty)
+          Results.Ok(body.toStringAsGroovy)
+        }
+      }
+
+      case POST(p"/body-multipart") => Action.async(parser) { request =>
+        controller(BODY_MULTIPART) {
+          val body: Map[String, scala.Seq[String]] = request.body.asMultipartFormData.getOrElse(
+            MultipartFormData(Map.empty, scala.Seq.empty, scala.Seq.empty)
+          ).asFormUrlEncoded
+          Results.Ok(body.toStringAsGroovy)
+        }
+      }
+
+      case POST(p"/body-json") => Action.async(parser) { request =>
+        controller(BODY_JSON) {
+          val body: JsValue = request.body.asJson.getOrElse(JsNull)
+          Results.Ok(Json.stringify(body))
+        }
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala
new file mode 100644
index 00000000000..076d6efca13
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala
@@ -0,0 +1,21 @@
+package datadog.trace.instrumentation.play25
+
+object Util {
+  implicit class MapExtensions[A](m: Iterable[(String, A)]) {
+    def toStringAsGroovy: String = {
+      def valueToString(value: Object) : String = value match {
+        case seq: Seq[_] => seq.map(x => valueToString(x.asInstanceOf[Object])).mkString("[", ",", "]")
+        case other => other.toString
+      }
+
+      m.map { case (key, value) => s"$key:${valueToString(value.asInstanceOf[Object])}" }
+        .mkString("[", ",", "]")
+    }
+  }
+
+  def createCustomException(msg: String): Exception = {
+    val clazz = Class.forName("datadog.trace.instrumentation.play25.server.TestHttpErrorHandler$CustomRuntimeException")
+    val constructor = clazz.getConstructor(classOf[String])
+    constructor.newInstance(msg).asInstanceOf[Exception]
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/build.gradle b/dd-java-agent/instrumentation/play-2.6/build.gradle
index 551dbaa114f..3a0f2f419df 100644
--- a/dd-java-agent/instrumentation/play-2.6/build.gradle
+++ b/dd-java-agent/instrumentation/play-2.6/build.gradle
@@ -8,26 +8,50 @@ def playVersion = '2.6.0'
 
 muzzle {
   pass {
+    name = 'play26Plus'
     group = 'com.typesafe.play'
     module = "play_$scalaVersion"
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
   }
   pass {
+    name = 'play26Plus'
     group = 'com.typesafe.play'
     module = 'play_2.12'
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
   }
   pass {
+    name = 'play26Plus'
     group = 'com.typesafe.play'
     module = 'play_2.13'
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
+  }
+
+  pass {
+    name = 'play26Only'
+    group = 'com.typesafe.play'
+    module = 'play-java_2.11'
+    versions = "[2.6.0,2.7.0)"
+    assertInverse = true
+  }
+
+  pass {
+    name = 'play27'
+    group = 'com.typesafe.play'
+    module = 'play-java_2.13'
+    versions = "[2.7.0,)"
+    assertInverse = true
+    javaVersion = 11
   }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
+apply plugin: 'scala'
 
 repositories {
   maven {
@@ -38,30 +62,144 @@ repositories {
   }
 }
 
-addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteForDir('baseTest', 'baseTest')
+addTestSuiteForDir('latestDepTest', 'latestDepTest')
+
+sourceSets {
+  main_play27 {
+    java.srcDirs "${project.projectDir}/src/main/java_play27"
+  }
+}
+jar {
+  from sourceSets.main_play27.output
+}
+compileMain_play27Java.dependsOn compileJava
+project.afterEvaluate { p ->
+  instrumentJava.dependsOn compileMain_play27Java
+  forbiddenApisMain_play27.dependsOn instrumentMain_play27Java
+}
+instrument {
+  additionalClasspath = [
+    instrumentJava: compileMain_play27Java.destinationDirectory
+  ]
+}
 
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play_$scalaVersion", version: playVersion
+  compileOnly group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
 
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:akka-http-10.0')
-  testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
-  testImplementation project(':dd-java-agent:instrumentation:akka-init')
-  testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
-  testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
-  testImplementation(project(path: ':dd-java-agent:instrumentation:akka-http-10.0', configuration: 'testArtifacts'))
-
-  testImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
+  main_play27CompileOnly group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.7.0'
+  main_play27CompileOnly project(':internal-api')
+  main_play27CompileOnly project(':dd-java-agent:agent-tooling')
+  main_play27CompileOnly project(':dd-java-agent:agent-bootstrap')
+  main_play27CompileOnly files("${project.buildDir}/classes/java/raw") {
+    builtBy = ['compileJava']
+  }
+
+  baseTestImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
   // TODO: Play WS is a separately versioned library starting with 2.6 and needs separate instrumentation.
-  testImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
+  baseTestImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 
-  // TODO: This should be changed to the latest in scala 2.13 instead of 2.11 since its ahead
-  latestDepTestImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.+'
-  latestDepTestImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: '2.+') {
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-http-10.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-concurrent')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka-init')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
+
+  latestDepTestRuntimeOnly sourceSets.baseTest.output
+  latestDepTestImplementation deps.scala213
+  latestDepTestImplementation group: 'com.typesafe.play', name: "play-java_2.13", version: '2.+'
+  latestDepTestImplementation(group: 'com.typesafe.play', name: "play-test_2.13", version: '2.+') {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-akka-http-server_2.13', version: '2.+'
+}
+configurations.matching({ it.name.startsWith('latestDepTest') }).each({
+  it.resolutionStrategy {
+    // logback-classic 1.4.11 doesn't like being loaded in the bootstrap classloader (NPE)
+    force group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5'
+  }
+})
+tasks.named("compileLatestDepTestJava").configure {
+  it.sourceCompatibility = JavaVersion.VERSION_11
+  it.targetCompatibility = JavaVersion.VERSION_11
+  setJavaVersion(it, 11)
+}
+compileLatestDepTestScala {
+  javaLauncher = getJavaLauncherFor(11)
+  classpath = classpath + files(compileBaseTestJava.destinationDirectory)
+  dependsOn 'compileBaseTestJava'
+}
+latestDepTest {
+  javaLauncher = getJavaLauncherFor(11)
+  testClassesDirs = testClassesDirs + sourceSets.baseTest.output.classesDirs
+}
+
+final generatedRoutes = layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala')
+sourceSets {
+  routeGenerator {
+    scala {
+      srcDir "${project.projectDir}/src/routeGenerator/scala"
+    }
+  }
+  latestDepTestGenerated {
+    scala {
+      srcDir generatedRoutes
+    }
+  }
+}
+dependencies {
+  routeGeneratorImplementation deps.scala213
+  routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.13", version: '2.+'
+}
+configurations {
+  latestDepTestGeneratedCompileClasspath.extendsFrom(latestDepTestCompileClasspath)
+}
+
+tasks.register('buildLatestDepTestRoutes', JavaExec) {
+  String routesFile = "${project.projectDir}/src/latestDepTest/routes/conf/routes"
+  def outputDir = generatedRoutes
+
+  it.inputs.file routesFile
+  it.outputs.dir outputDir
+
+  it.mainClass.set 'generator.CompileRoutes'
+  it.args routesFile, outputDir.get().asFile.absolutePath
+
+  it.classpath configurations.routeGeneratorRuntimeClasspath
+  it.classpath compileRouteGeneratorScala.destinationDirectory
+  it.classpath compileLatestDepTestScala.destinationDirectory
+
+  it.javaLauncher.set getJavaLauncherFor(11)
+
+  dependsOn compileRouteGeneratorScala, compileLatestDepTestScala
+}
+compileLatestDepTestGeneratedScala {
+  javaLauncher = getJavaLauncherFor(11)
+  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
+  dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala
+}
+forbiddenApisLatestDepTestGenerated {
+  enabled = false
+}
+
+compileLatestDepTestGroovy {
+  javaLauncher = getJavaLauncherFor(11)
+  classpath = classpath +
+    files(compileLatestDepTestScala.destinationDirectory) +
+    files(compileBaseTestGroovy.destinationDirectory) +
+    files(compileBaseTestJava.destinationDirectory) +
+    files(compileLatestDepTestGeneratedScala.destinationDirectory)
+  dependsOn 'compileLatestDepTestScala'
+  dependsOn 'compileBaseTestGroovy'
+  dependsOn 'compileBaseTestJava'
+  dependsOn 'compileLatestDepTestGeneratedScala'
+}
+dependencies {
+  latestDepTestRuntimeOnly sourceSets.latestDepTestGenerated.output
 }
diff --git a/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerTest.groovy
new file mode 100644
index 00000000000..4d9e443369d
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerTest.groovy
@@ -0,0 +1,23 @@
+package datadog.trace.instrumentation.play26.server
+
+import datadog.trace.agent.test.base.HttpServer
+import groovy.transform.CompileStatic
+import spock.lang.Shared
+
+import java.util.concurrent.Executors
+
+class PlayAsyncServerTest extends PlayServerTest {
+  @Shared
+  def executor
+
+  def cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @CompileStatic
+  @Override
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+    return new PlayHttpServer(PlayRouters.&async.curry(executor))
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerWithErrorHandlerTest.groovy
new file mode 100644
index 00000000000..8e84b25e8cf
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayAsyncServerWithErrorHandlerTest.groovy
@@ -0,0 +1,21 @@
+package datadog.trace.instrumentation.play26.server
+
+import datadog.trace.agent.test.base.HttpServer
+import spock.lang.Shared
+
+import java.util.concurrent.Executors
+
+class PlayAsyncServerWithErrorHandlerTest extends PlayServerWithErrorHandlerTest {
+  @Shared
+  def executor
+
+  def cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @Override
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+    return new PlayHttpServer(PlayRouters.&async.curry(executor), new TestHttpErrorHandler())
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayHttpServer.groovy
similarity index 97%
rename from dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayHttpServer.groovy
rename to dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayHttpServer.groovy
index 5e41e9e7ca5..e4fac0aeb7b 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayHttpServer.groovy
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayHttpServer.groovy
@@ -1,4 +1,4 @@
-package server
+package datadog.trace.instrumentation.play26.server
 
 import datadog.trace.agent.test.base.HttpServer
 import play.ApplicationLoader
diff --git a/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayRouters.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayRouters.groovy
new file mode 100644
index 00000000000..2d3925a7f28
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayRouters.groovy
@@ -0,0 +1,339 @@
+package datadog.trace.instrumentation.play26.server
+
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import groovy.transform.CompileStatic
+import play.BuiltInComponents
+import play.api.libs.json.JsValue
+import play.api.libs.json.Json$
+import play.api.mvc.AnyContent
+import play.libs.concurrent.HttpExecution
+import play.mvc.Http
+import play.mvc.Result
+import play.mvc.Results
+import play.routing.Router
+import play.routing.RoutingDsl
+import scala.collection.JavaConverters
+import scala.concurrent.ExecutionContextExecutor
+import scala.xml.NodeSeq
+
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionStage
+import java.util.concurrent.Executor
+import java.util.concurrent.ExecutorService
+import java.util.function.Function
+import java.util.function.Supplier
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_XML
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK
+import static datadog.trace.agent.test.base.HttpServerTest.controller
+import static java.lang.Class.forName
+
+class PlayRouters {
+  static Router sync(BuiltInComponents components) {
+    try {
+      forName("datadog.trace.instrumentation.play26.server.latestdep.PlayRouters").sync components
+    } catch (ClassNotFoundException cnf) {
+      sync26(components)
+    }
+  }
+
+  static Router async(ExecutorService executor, BuiltInComponents components) {
+    try {
+      forName("datadog.trace.instrumentation.play26.server.latestdep.PlayRouters").async executor, components
+    } catch (ClassNotFoundException cnf) {
+      async26(executor, components)
+    }
+  }
+
+  private static Router sync26(BuiltInComponents components) {
+    RoutingDsl.fromComponents(components)
+      .GET(SUCCESS.path).routeTo({
+        controller(SUCCESS) {
+          Results.status(SUCCESS.status, SUCCESS.body)
+        }
+      } as Supplier)
+      .GET(FORWARDED.path).routeTo({
+        controller(FORWARDED) {
+          Results.status(FORWARDED.status, FORWARDED.body)
+        }
+      } as Supplier)
+      .GET(QUERY_PARAM.path).routeTo({
+        controller(QUERY_PARAM) {
+          Results.status(QUERY_PARAM.status, QUERY_PARAM.body)
+        }
+      } as Supplier)
+      .GET(QUERY_ENCODED_QUERY.path).routeTo({
+        controller(QUERY_ENCODED_QUERY) {
+          Results.status(QUERY_ENCODED_QUERY.status, QUERY_ENCODED_QUERY.body)
+        }
+      } as Supplier)
+      .GET(QUERY_ENCODED_BOTH.rawPath).routeTo({
+        controller(QUERY_ENCODED_BOTH) {
+          Results.status(QUERY_ENCODED_BOTH.status, QUERY_ENCODED_BOTH.body).
+            withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE)
+        }
+      } as Supplier)
+      .GET(REDIRECT.path).routeTo({
+        controller(REDIRECT) {
+          Results.found(REDIRECT.body)
+        }
+      } as Supplier)
+      .GET(ERROR.path).routeTo({
+        controller(ERROR) {
+          Results.status(ERROR.status, ERROR.body)
+        }
+      } as Supplier)
+      .GET(EXCEPTION.path).routeTo({
+        controller(EXCEPTION) {
+          throw new RuntimeException(EXCEPTION.body)
+        }
+      } as Supplier)
+      .GET(CUSTOM_EXCEPTION.path).routeAsync({
+        controller(CUSTOM_EXCEPTION) {
+          throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+        }
+      } as Supplier)
+      .GET("/path/:id/param").routeTo(PathParamSyncFunction.INSTANCE)
+      .GET(USER_BLOCK.path).routeTo({
+        controller(USER_BLOCK) {
+          controller(USER_BLOCK) {
+            Blocking.forUser('user-to-block').blockIfMatch()
+            Results.status(200, "should never be reached")
+          }
+        }
+      } as Supplier)
+      .POST(CREATED.path).routeTo({
+        ->
+        controller(CREATED) {
+          def body = body().asText().get()
+          Results.status(CREATED.status, "created: $body")
+        }
+      } as Supplier)
+      .POST(BODY_URLENCODED.path).routeTo({
+        ->
+        controller(BODY_URLENCODED) {
+          def body = body().asFormUrlEncoded().get()
+          def javaMap = JavaConverters.mapAsJavaMapConverter(body).asJava()
+          def res = javaMap.collectEntries {
+            [it.key, JavaConverters.asJavaCollectionConverter(it.value).asJavaCollection()]
+          }
+          Results.status(BODY_URLENCODED.status, res as String)
+        }
+      } as Supplier)
+      .POST(BODY_MULTIPART.path).routeTo({
+        ->
+        controller(BODY_MULTIPART) {
+          def body = body().asMultipartFormData().get().asFormUrlEncoded()
+          def javaMap = JavaConverters.mapAsJavaMapConverter(body).asJava()
+          def res = javaMap.collectEntries {
+            [it.key, JavaConverters.asJavaCollectionConverter(it.value).asJavaCollection()]
+          }
+          Results.status(BODY_MULTIPART.status, res as String)
+        }
+      } as Supplier)
+      .POST(BODY_JSON.path).routeTo({
+        ->
+        controller(BODY_JSON) {
+          JsValue json = body().asJson().get()
+          Results.status(BODY_JSON.status, Json$.MODULE$.stringify(json))
+        }
+      } as Supplier)
+      .POST(BODY_XML.path).routeTo({
+        ->
+        controller(BODY_XML) {
+          NodeSeq node = body().asXml().get()
+          Results.status(BODY_XML.status, node.toString())
+        }
+      } as Supplier)
+      .build()
+  }
+
+  static Router async26(ExecutorService executor, BuiltInComponents components) {
+    ExecutionContextExecutor execContext = HttpExecution.fromThread(executor)
+    RoutingDsl.fromComponents(components)
+      .GET(SUCCESS.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(SUCCESS) {
+            Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(FORWARDED.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(FORWARDED) {
+            Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_PARAM.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(QUERY_PARAM) {
+            Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_ENCODED_QUERY.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_QUERY) {
+            Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(QUERY_ENCODED_BOTH.getRawPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_BOTH) {
+            Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
+              withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE) // cheating
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(REDIRECT.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(REDIRECT) {
+            Results.found(REDIRECT.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(ERROR.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(ERROR) {
+            Results.status(ERROR.getStatus(), ERROR.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(EXCEPTION.getPath()).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(EXCEPTION) {
+            throw new RuntimeException(EXCEPTION.getBody())
+          }
+        }, execContext)
+      } as Supplier)
+      .GET(CUSTOM_EXCEPTION.path).routeAsync({
+        CompletableFuture.supplyAsync({
+          controller(CUSTOM_EXCEPTION) {
+            throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+          }
+        }, execContext)
+      } as Supplier)
+      .GET("/path/:id/param").routeAsync(new PathParamAsyncFunction(execContext))
+      .GET(USER_BLOCK.path).routeAsync({
+        CompletableFuture.supplyAsync({
+          ->
+          controller(USER_BLOCK) {
+            controller(USER_BLOCK) {
+              Blocking.forUser('user-to-block').blockIfMatch()
+              Results.status(200, "should never be reached")
+            }
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(CREATED.path).routeAsync({
+        ->
+        def body = body().asText().get()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(CREATED) {
+            Results.status(CREATED.status, "created: $body")
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_URLENCODED.path).routeAsync({
+        ->
+        def body = body().asFormUrlEncoded().get()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_URLENCODED) {
+            def javaMap = JavaConverters.mapAsJavaMapConverter(body).asJava()
+            def res = javaMap.collectEntries {
+              [it.key, JavaConverters.asJavaCollectionConverter(it.value).asJavaCollection()]
+            }
+            Results.status(BODY_URLENCODED.status, res as String)
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_MULTIPART.path).routeAsync({
+        ->
+        def body = body().asMultipartFormData().get().asFormUrlEncoded()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_MULTIPART) {
+            def javaMap = JavaConverters.mapAsJavaMapConverter(body).asJava()
+            def res = javaMap.collectEntries {
+              [it.key, JavaConverters.asJavaCollectionConverter(it.value).asJavaCollection()]
+            }
+            Results.status(BODY_MULTIPART.status, res as String)
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_JSON.path).routeAsync({
+        ->
+        JsValue json = body().asJson().get()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_JSON) {
+            Results.status(BODY_JSON.status, Json$.MODULE$.stringify(json))
+          }
+        }, execContext)
+      } as Supplier)
+      .POST(BODY_XML.path).routeAsync({
+        ->
+        NodeSeq node = body().asXml().get()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_XML) {
+            Results.status(BODY_XML.status, node.toString())
+          }
+        }, execContext)
+      } as Supplier)
+      .build()
+  }
+
+  private static AnyContent body() {
+    Http.Context.current()._requestHeader().body
+  }
+
+  @CompileStatic
+  static enum PathParamSyncFunction implements Function<Integer, Result> {
+    INSTANCE
+
+    @Override
+    Result apply(Integer i) {
+      controller(PATH_PARAM) {
+        Results.ok(i as String)
+      }
+    }
+  }
+
+  @CompileStatic
+  static class PathParamAsyncFunction implements Function<Integer, CompletionStage<Result>> {
+    private final Executor executor
+
+    PathParamAsyncFunction(Executor executor) {
+      this.executor = executor
+    }
+
+    @Override
+    CompletionStage<Result> apply(Integer i) {
+      CompletableFuture.supplyAsync({
+        controller(PATH_PARAM) {
+          Results.ok(i as String)
+        }
+      }, executor)
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerTest.groovy
similarity index 51%
rename from dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
rename to dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerTest.groovy
index 4a3273c7a6b..26ca37d551b 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerTest.groovy
@@ -1,4 +1,4 @@
-package server
+package datadog.trace.instrumentation.play26.server
 
 import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.base.HttpServer
@@ -6,74 +6,24 @@ import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator
 import datadog.trace.instrumentation.play26.PlayHttpServerDecorator
-import play.BuiltInComponents
-import play.mvc.Results
-import play.routing.RoutingDsl
+import groovy.transform.CompileStatic
+import okhttp3.MediaType
+import okhttp3.RequestBody
 import play.server.Server
 
-import java.util.function.Supplier
-
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_XML
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
 class PlayServerTest extends HttpServerTest<Server> {
 
   @Override
+  @CompileStatic
   HttpServer server() {
-    return new PlayHttpServer({ BuiltInComponents components ->
-      RoutingDsl.fromComponents(components)
-        .GET(SUCCESS.getPath()).routeTo({
-          controller(SUCCESS) {
-            Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-          }
-        } as Supplier)
-        .GET(FORWARDED.getPath()).routeTo({
-          controller(FORWARDED) {
-            Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_PARAM.getPath()).routeTo({
-          controller(QUERY_PARAM) {
-            Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_ENCODED_QUERY.getPath()).routeTo({
-          controller(QUERY_ENCODED_QUERY) {
-            Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_ENCODED_BOTH.getRawPath()).routeTo({
-          controller(QUERY_ENCODED_BOTH) {
-            Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-              withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-          }
-        } as Supplier)
-        .GET(REDIRECT.getPath()).routeTo({
-          controller(REDIRECT) {
-            Results.found(REDIRECT.getBody())
-          }
-        } as Supplier)
-        .GET(ERROR.getPath()).routeTo({
-          controller(ERROR) {
-            Results.status(ERROR.getStatus(), ERROR.getBody())
-          }
-        } as Supplier)
-        .GET(EXCEPTION.getPath()).routeTo({
-          controller(EXCEPTION) {
-            throw new RuntimeException(EXCEPTION.getBody())
-          }
-        } as Supplier)
-        .build()
-    })
+    new PlayHttpServer(PlayRouters.&sync)
   }
 
   @Override
@@ -83,12 +33,12 @@ class PlayServerTest extends HttpServerTest<Server> {
 
   @Override
   String component() {
-    return AkkaHttpServerDecorator.DECORATE.component()
+    'akka-http-server'
   }
 
   @Override
   String expectedOperationName() {
-    return "akka-http.request"
+    'akka-http.request'
   }
 
   @Override
@@ -111,6 +61,51 @@ class PlayServerTest extends HttpServerTest<Server> {
     false
   }
 
+  @Override
+  boolean testRequestBody() {
+    true
+  }
+
+  @Override
+  boolean isRequestBodyNoStreaming() {
+    true
+  }
+
+  @Override
+  boolean testBodyUrlencoded() {
+    true
+  }
+
+  @Override
+  boolean testBodyMultipart() {
+    true
+  }
+
+  @Override
+  boolean testBodyJson() {
+    true
+  }
+
+  @Override
+  boolean testBlocking() {
+    true
+  }
+
+  @Override
+  boolean testBlockingOnResponse() {
+    true
+  }
+
+  @Override
+  String testPathParam() {
+    '/path/?/param'
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    ['0': 123]
+  }
+
   @Override
   Class<? extends Exception> expectedExceptionType() {
     RuntimeException
@@ -133,8 +128,8 @@ class PlayServerTest extends HttpServerTest<Server> {
       tags {
         "$Tags.COMPONENT" PlayHttpServerDecorator.DECORATE.component()
         "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-        "$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
-        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
+        "$Tags.PEER_HOST_IPV4" '127.0.0.1'
+        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : '127.0.0.1') }
         "$Tags.HTTP_URL" String
         "$Tags.HTTP_HOSTNAME" address.host
         "$Tags.HTTP_METHOD" String
@@ -150,4 +145,29 @@ class PlayServerTest extends HttpServerTest<Server> {
       }
     }
   }
+
+  def 'test instrumentation gateway xml request body'() {
+    setup:
+    def request = request(
+      BODY_XML, 'POST',
+      RequestBody.create(MediaType.get('text/xml'), '<foo attr="attr_value">mytext<bar></bar></foo>'))
+      .build()
+    def response = client.newCall(request).execute()
+    if (isDataStreamsEnabled()) {
+      TEST_DATA_STREAMS_WRITER.waitForGroups(1)
+    }
+    String body = response.body().charStream().text
+
+
+    expect:
+    body == BODY_XML.body || body == '<?xml version="1.0" encoding="UTF-8"?><foo attr="attr_value">mytext<bar/></foo>'
+
+    when:
+    TEST_WRITER.waitForTraces(1)
+
+    then:
+    TEST_WRITER.get(0).any {
+      it.getTag('request.body.converted') == '[[children:[mytext, [:]], attributes:[attr:attr_value]]]'
+    }
+  }
 }
diff --git a/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerWithErrorHandlerTest.groovy
new file mode 100644
index 00000000000..9d9c1bd99db
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/groovy/datadog/trace/instrumentation/play26/server/PlayServerWithErrorHandlerTest.groovy
@@ -0,0 +1,46 @@
+package datadog.trace.instrumentation.play26.server
+
+import datadog.trace.agent.test.base.HttpServer
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static org.junit.Assume.assumeTrue
+
+class PlayServerWithErrorHandlerTest extends PlayServerTest {
+  @Override
+  HttpServer server() {
+    new PlayHttpServer(PlayRouters.&sync, new TestHttpErrorHandler())
+  }
+
+  @Override
+  boolean testExceptionBody() {
+    true
+  }
+
+  def "test exception with custom status"() {
+    setup:
+    assumeTrue(testException())
+    def request = request(CUSTOM_EXCEPTION, 'GET', null).build()
+    def response = client.newCall(request).execute()
+
+    expect:
+    response.code() == CUSTOM_EXCEPTION.status
+    if (testExceptionBody()) {
+      assert response.body().string() == CUSTOM_EXCEPTION.body
+    }
+
+    and:
+    assertTraces(1) {
+      trace(spanCount(CUSTOM_EXCEPTION)) {
+        sortSpansByStart()
+        serverSpan(it, null, null, 'GET', CUSTOM_EXCEPTION)
+        if (hasHandlerSpan()) {
+          handlerSpan(it, CUSTOM_EXCEPTION)
+        }
+        controllerSpan(it, CUSTOM_EXCEPTION)
+        if (hasResponseSpan(CUSTOM_EXCEPTION)) {
+          responseSpan(it, CUSTOM_EXCEPTION)
+        }
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/java/server/TestHttpErrorHandler.java b/dd-java-agent/instrumentation/play-2.6/src/baseTest/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
similarity index 58%
rename from dd-java-agent/instrumentation/play-2.6/src/test/java/server/TestHttpErrorHandler.java
rename to dd-java-agent/instrumentation/play-2.6/src/baseTest/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
index c42f046976b..f4a4055480c 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/test/java/server/TestHttpErrorHandler.java
+++ b/dd-java-agent/instrumentation/play-2.6/src/baseTest/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
@@ -1,16 +1,20 @@
-package server;
+package datadog.trace.instrumentation.play26.server;
 
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import play.http.HttpErrorHandler;
 import play.mvc.Http.RequestHeader;
 import play.mvc.Result;
 import play.mvc.Results;
 
 public class TestHttpErrorHandler implements HttpErrorHandler {
-  static class CustomRuntimeException extends RuntimeException {
+  private static final Logger log = LoggerFactory.getLogger(TestHttpErrorHandler.class);
+
+  public static class CustomRuntimeException extends RuntimeException {
     public CustomRuntimeException(String message) {
       super(message);
     }
@@ -22,12 +26,17 @@ public CompletionStage<Result> onClientError(
   }
 
   public CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
+    log.warn("server error", exception);
+
     Throwable cause = exception.getCause();
-    if (cause instanceof CustomRuntimeException) {
+    if (cause != null) {
+      exception = cause;
+    }
+    if (exception instanceof CustomRuntimeException) {
       return CompletableFuture.completedFuture(
-          Results.status(CUSTOM_EXCEPTION.getStatus(), cause.getMessage()));
+          Results.status(CUSTOM_EXCEPTION.getStatus(), exception.getMessage()));
     }
-    return CompletableFuture.completedFuture(
-        Results.internalServerError(exception.getCause().getMessage()));
+
+    return CompletableFuture.completedFuture(Results.internalServerError(exception.getMessage()));
   }
 }
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerRoutesScalaWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerRoutesScalaWithErrorHandlerTest.groovy
new file mode 100644
index 00000000000..1b90b01b764
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerRoutesScalaWithErrorHandlerTest.groovy
@@ -0,0 +1,106 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.agent.test.base.HttpServer
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
+import datadog.trace.api.config.TraceInstrumentationConfig
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.instrumentation.play26.PlayHttpServerDecorator
+import datadog.trace.instrumentation.play26.server.PlayServerWithErrorHandlerTest
+import datadog.trace.instrumentation.play26.server.TestHttpErrorHandler
+import play.api.BuiltInComponents
+import play.libs.concurrent.ClassLoaderExecution
+import play.routing.Router
+import spock.lang.Shared
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.function.Function
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+
+class PlayAsyncServerRoutesScalaWithErrorHandlerTest extends PlayServerWithErrorHandlerTest {
+  @Shared
+  ExecutorService executor
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // otherwise the resource name will be set from the raw path with higher priority.
+    // We expect non-raw (decoded) paths in resource names
+    // Bug in HttpResourceDecorator.withRoute(AgentSpan, CharSequence, CharSequence, boolean)
+    // by not checking value of http.server.raw.resource ?
+    injectSysConfig(TraceInstrumentationConfig.HTTP_SERVER_ROUTE_BASED_NAMING, 'false')
+  }
+
+  void cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @Override
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+
+    Function<BuiltInComponents, Router> f = { play.api.BuiltInComponentsFromContext it ->
+      new router.Routes(
+        it.httpErrorHandler(),
+        new PlayController(it.controllerComponents(), ClassLoaderExecution.fromThread(executor))
+        )
+    } as Function<BuiltInComponents, Router>
+    new PlayHttpServerScala(f, new TestHttpErrorHandler())
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    [path: '123']
+  }
+
+  private String routeFor(HttpServerTest.ServerEndpoint endpoint) {
+
+    switch (endpoint) {
+      case PATH_PARAM:
+        return '/path/$path<[^/]+>/param'
+      case NOT_FOUND:
+        return null
+      default:
+        endpoint.path
+    }
+  }
+
+  // we set Tags.HTTP_ROUTE with a routes file; override method for this
+  @Override
+  void handlerSpan(TraceAssert trace, HttpServerTest.ServerEndpoint endpoint = SUCCESS) {
+    def expectedQueryTag = expectedQueryTag(endpoint)
+    trace.span {
+      serviceName expectedServiceName()
+      operationName "play.request"
+      spanType DDSpanTypes.HTTP_SERVER
+      errored endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION
+      childOfPrevious()
+      tags {
+        "$Tags.COMPONENT" PlayHttpServerDecorator.DECORATE.component()
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+        "$Tags.PEER_HOST_IPV4" '127.0.0.1'
+        "$Tags.HTTP_CLIENT_IP" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
+        "$Tags.HTTP_URL" String
+        "$Tags.HTTP_HOSTNAME" address.host
+        "$Tags.HTTP_METHOD" String
+        "$Tags.HTTP_ROUTE" this.routeFor(endpoint)
+        if (endpoint == EXCEPTION || endpoint == CUSTOM_EXCEPTION) {
+          errorTags(endpoint == CUSTOM_EXCEPTION ? TestHttpErrorHandler.CustomRuntimeException : RuntimeException, endpoint.body)
+        }
+        if (endpoint.query) {
+          "$DDTags.HTTP_QUERY" expectedQueryTag
+        }
+        defaultTags()
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerScalaWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerScalaWithErrorHandlerTest.groovy
new file mode 100644
index 00000000000..f1efed6da8b
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayAsyncServerScalaWithErrorHandlerTest.groovy
@@ -0,0 +1,36 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import datadog.trace.agent.test.base.HttpServer
+import datadog.trace.instrumentation.play26.server.PlayServerWithErrorHandlerTest
+import datadog.trace.instrumentation.play26.server.TestHttpErrorHandler
+import play.api.BuiltInComponents
+import play.routing.Router
+import spock.lang.Shared
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.function.Function
+
+class PlayAsyncServerScalaWithErrorHandlerTest extends PlayServerWithErrorHandlerTest {
+  @Shared
+  ExecutorService executor
+
+  def cleanupSpec() {
+    executor.shutdown()
+  }
+
+  @Override
+  HttpServer server() {
+    executor = Executors.newCachedThreadPool()
+
+    Function<BuiltInComponents, Router> f = { play.api.BuiltInComponents it ->
+      PlayRoutersScala$.MODULE$.async(executor, it)
+    } as Function<BuiltInComponents, Router>
+    new PlayHttpServerScala(f, new TestHttpErrorHandler())
+  }
+
+  @Override
+  Map<String, ?> expectedIGPathParams() {
+    ['0': '123']
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayHttpServerScala.groovy b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayHttpServerScala.groovy
new file mode 100644
index 00000000000..2a75fca703f
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayHttpServerScala.groovy
@@ -0,0 +1,97 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import datadog.trace.agent.test.base.HttpServer
+import groovy.transform.CompileStatic
+import play.Mode
+import play.api.ApplicationLoader
+import play.api.BuiltInComponents
+import play.api.BuiltInComponentsFromContext
+import play.api.Configuration
+import play.api.Environment
+import play.api.Play
+import play.api.inject.DefaultApplicationLifecycle
+import play.api.routing.Router
+import play.core.j.JavaHttpErrorHandlerAdapter
+import play.core.server.AkkaHttpServerProvider
+import play.core.server.Server
+import play.core.server.ServerConfig
+import play.http.HttpErrorHandler
+import play.mvc.EssentialFilter
+import scala.None$
+import scala.Option
+import scala.collection.Map$
+import scala.collection.immutable.Map
+import scala.collection.immutable.Seq
+
+import java.util.concurrent.TimeoutException
+import java.util.function.Function
+
+@CompileStatic
+class PlayHttpServerScala implements HttpServer {
+  final Function<BuiltInComponents, Router> router
+  HttpErrorHandler httpErrorHandler
+  def application
+  def server
+  def port
+
+  PlayHttpServerScala(Function<BuiltInComponents, Router> router, HttpErrorHandler httpErrorHandler) {
+    this.router = router
+    this.httpErrorHandler = httpErrorHandler
+  }
+
+  @Override
+  void start() throws TimeoutException {
+    Environment environment = Environment.simple(new File('.'), play.api.Mode.Test$.MODULE$)
+    ApplicationLoader.Context context = ApplicationLoader.Context$.MODULE$.create(
+      environment,
+      Map$.MODULE$.empty() as Map,
+      new DefaultApplicationLifecycle(),
+      None$.empty()
+      )
+    application = new BuiltInComponentsFromContext(context) {
+        @Override
+        Router router() {
+          router.apply(this)
+        }
+
+        @Override
+        Seq<EssentialFilter> httpFilters() {
+          (Seq) scala.collection.immutable.Seq$.MODULE$.empty()
+        }
+
+        @Override
+        play.api.http.HttpErrorHandler httpErrorHandler() {
+          if (httpErrorHandler != null) {
+            return new JavaHttpErrorHandlerAdapter(httpErrorHandler)
+          }
+          super.httpErrorHandler()
+        }
+      }.application()
+    Play.start(this.application as play.api.Application)
+
+    def config = new ServerConfig(
+      new File('.'),
+      Option.apply(0) as Option,
+      Option.empty() as Option,
+      '0.0.0.0',
+      Mode.PROD.asScala(),
+      System.getProperties(),
+      Configuration.load(environment)
+      )
+
+    Server server = new AkkaHttpServerProvider().createServer(config,
+      application as play.api.Application)
+    this.server = server
+    port = server.httpPort().get()
+  }
+
+  @Override
+  void stop() {
+    (this.server as Server).stop()
+  }
+
+  @Override
+  URI address() {
+    new URI("http://localhost:$port/")
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayRouters.groovy b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayRouters.groovy
new file mode 100644
index 00000000000..4bf05bb12c5
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/groovy/datadog/trace/instrumentation/play26/server/latestdep/PlayRouters.groovy
@@ -0,0 +1,296 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.instrumentation.play26.server.TestHttpErrorHandler
+import groovy.transform.CompileStatic
+import org.w3c.dom.Document
+import play.BuiltInComponents
+import play.libs.concurrent.ClassLoaderExecution
+import play.mvc.Http
+import play.mvc.Result
+import play.mvc.Results
+import play.routing.RequestFunctions
+import play.routing.Router
+import play.routing.RoutingDsl
+import scala.concurrent.ExecutionContextExecutor
+
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionStage
+import java.util.concurrent.ExecutorService
+
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_XML
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK
+import static datadog.trace.agent.test.base.HttpServerTest.controller
+
+// TODO: a lot of this routes don't exercise query/parameter extraction, when they should
+class PlayRouters {
+  static Router sync(BuiltInComponents components) {
+    RoutingDsl.fromComponents(components)
+      .GET(SUCCESS.path).routingTo({
+        controller(SUCCESS) {
+          Results.ok(SUCCESS.body)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(FORWARDED.path).routingTo({ req ->
+        controller(FORWARDED) {
+          Results.status(FORWARDED.status, req.header('X-Forwarded-For').orElse('(no header)'))
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(QUERY_PARAM.path).routingTo({ req ->
+        controller(QUERY_PARAM) {
+          Results.status(QUERY_PARAM.status, "some=${req.queryString('some').orElse('(null)')}")
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(QUERY_ENCODED_QUERY.path).routingTo({ req ->
+        controller(QUERY_ENCODED_QUERY) {
+          Results.status(QUERY_ENCODED_QUERY.status, "some=${req.queryString('some').orElse('(null)')}")
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(QUERY_ENCODED_BOTH.rawPath).routingTo({ req ->
+        controller(QUERY_ENCODED_BOTH) {
+          Results.status(QUERY_ENCODED_BOTH.status, "some=${req.queryString('some').orElse('(null)')}").
+            withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(REDIRECT.path).routingTo({
+        controller(REDIRECT) {
+          Results.found(REDIRECT.body)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(ERROR.path).routingTo({
+        controller(ERROR) {
+          Results.status(ERROR.status, ERROR.body)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(EXCEPTION.path).routingTo({
+        controller(EXCEPTION) {
+          throw new RuntimeException(EXCEPTION.body)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET(CUSTOM_EXCEPTION.path).routingTo({
+        controller(CUSTOM_EXCEPTION) {
+          throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .GET('/path/:id/param').routingTo(PathParamHandlerSync.INSTANCE)
+      .GET(USER_BLOCK.path).routingTo({
+        controller(USER_BLOCK) {
+          Blocking.forUser('user-to-block').blockIfMatch()
+          Results.status(200, "should never be reached")
+        }
+      } as RequestFunctions.Params0<Result>)
+      .POST(CREATED.path).routingTo({ Http.Request req ->
+        controller(CREATED) {
+          String body = req.body().asText()
+          Results.created("created: $body")
+        }
+      } as RequestFunctions.Params0<Result>)
+      .POST(BODY_URLENCODED.path).routingTo({ Http.Request req ->
+        controller(BODY_URLENCODED) {
+          Map<String, String[]> body = req.body()asFormUrlEncoded()
+          Results.status(BODY_URLENCODED.status, body as String)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .POST(BODY_MULTIPART.path).routingTo({ Http.Request req ->
+        controller(BODY_MULTIPART) {
+          Map<String, String[]> body = req.body().asMultipartFormData().asFormUrlEncoded()
+          Results.status(BODY_MULTIPART.status, body as String)
+        }
+      } as RequestFunctions.Params0<Result>)
+      .POST(BODY_JSON.path).routingTo({ Http.Request req ->
+        controller(BODY_JSON) {
+          JsonNode json = req.body().asJson()
+          Results.status(BODY_JSON.status, new ObjectMapper().writeValueAsString(json))
+        }
+      } as RequestFunctions.Params0<Result>)
+      .POST(BODY_XML.path).routingTo({ Http.Request req ->
+        controller(BODY_XML) {
+          Document xml = req.body().asXml()
+          Results.status(BODY_XML.status, documentToString(xml))
+        }
+      } as RequestFunctions.Params0<Result>)
+      .build()
+  }
+
+  @CompileStatic
+  private static enum PathParamHandlerSync implements RequestFunctions.Params1<Integer, Result> {
+    INSTANCE
+
+    @Override
+    Result apply(Http.Request request, Integer id) {
+      controller(PATH_PARAM) {
+        Results.ok(id as String)
+      }
+    }
+  }
+
+  static Router async(ExecutorService executor, BuiltInComponents components) {
+    ExecutionContextExecutor execContext = ClassLoaderExecution.fromThread(executor)
+    RoutingDsl.fromComponents(components)
+      .GET(SUCCESS.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          controller(SUCCESS) {
+            Results.ok(SUCCESS.body)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(FORWARDED.path).routingAsync({ req ->
+        CompletableFuture.supplyAsync({
+          controller(FORWARDED) {
+            Results.status(FORWARDED.status, req.header('X-Forwarded-For').orElse('(no header)'))
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(QUERY_PARAM.path).routingAsync({ req ->
+        CompletableFuture.supplyAsync({
+          controller(QUERY_PARAM) {
+            Results.status(QUERY_PARAM.status, "some=${req.queryString('some').orElse('(null)')}")
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(QUERY_ENCODED_QUERY.path).routingAsync({ req ->
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_QUERY) {
+            Results.status(QUERY_ENCODED_QUERY.status, "some=${req.queryString('some').orElse('(null)')}")
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(QUERY_ENCODED_BOTH.getRawPath()).routingAsync({ req ->
+        CompletableFuture.supplyAsync({
+          controller(QUERY_ENCODED_BOTH) {
+            Results.status(QUERY_ENCODED_BOTH.status, "some=${req.queryString('some').orElse('(null)')}").
+              withHeader(HttpServerTest.IG_RESPONSE_HEADER, HttpServerTest.IG_RESPONSE_HEADER_VALUE) // cheating
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(REDIRECT.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          controller(REDIRECT) {
+            Results.found(REDIRECT.body)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(ERROR.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          controller(ERROR) {
+            Results.status(ERROR.status, ERROR.body)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(EXCEPTION.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          controller(EXCEPTION) {
+            throw new RuntimeException(EXCEPTION.body)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET(CUSTOM_EXCEPTION.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          controller(CUSTOM_EXCEPTION) {
+            throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.body)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .GET('/path/:id/param').routingAsync(PathParamHandlerAsync.INSTANCE)
+      .GET(USER_BLOCK.path).routingAsync({
+        CompletableFuture.supplyAsync({
+          ->
+          controller(USER_BLOCK) {
+            Blocking.forUser('user-to-block').blockIfMatch()
+            Results.status(200, "should never be reached")
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .POST(CREATED.path).routingAsync({ Http.Request req ->
+        def body = req.body().asText()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(CREATED) {
+            Results.created("created: $body")
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .POST(BODY_URLENCODED.path).routingAsync({ Http.Request req ->
+        CompletableFuture.supplyAsync({
+          ->
+          def body = req.body().asFormUrlEncoded()
+          controller(BODY_URLENCODED) {
+            Results.status(BODY_URLENCODED.status, body as String)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .POST(BODY_MULTIPART.path).routingAsync({
+        Map<String, String[]> body = it.body().asMultipartFormData().asFormUrlEncoded()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_MULTIPART) {
+            Results.status(BODY_MULTIPART.status, body as String)
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .POST(BODY_JSON.path).routingAsync({ Http.Request req ->
+        JsonNode json = req.body().asJson()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_JSON) {
+            Results.status(BODY_JSON.status, new ObjectMapper().writeValueAsString(json))
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .POST(BODY_XML.path).routingAsync({ Http.Request req ->
+        Document xml = req.body().asXml()
+        CompletableFuture.supplyAsync({
+          ->
+          controller(BODY_XML) {
+            Results.status(BODY_XML.status, documentToString(xml))
+          }
+        }, execContext)
+      } as RequestFunctions.Params0<? extends CompletionStage<Result>>)
+      .build()
+  }
+
+  @CompileStatic
+  private static enum PathParamHandlerAsync implements RequestFunctions.Params1<Integer, CompletionStage<Result>> {
+    INSTANCE
+
+    @Override
+    CompletionStage<Result> apply(Http.Request request, Integer id) {
+      CompletableFuture.supplyAsync({
+        ->
+        controller(PATH_PARAM) {
+          Results.ok(id as String)
+        }
+      })
+    }
+  }
+
+  private static String documentToString(Document doc) {
+    StringWriter writer = new StringWriter()
+    TransformerFactory.newInstance().newTransformer().with {
+      setOutputProperty(OutputKeys.INDENT, "no")
+      transform(new DOMSource(doc), new StreamResult(writer))
+    }
+    writer.toString()
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/routes/conf/routes b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/routes/conf/routes
new file mode 100644
index 00000000000..0ba1ae9cff2
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/routes/conf/routes
@@ -0,0 +1,17 @@
+GET   /success                      datadog.trace.instrumentation.play26.server.latestdep.PlayController.success()
+GET   /redirect                     datadog.trace.instrumentation.play26.server.latestdep.PlayController.redirect()
+GET   /forwarded                    datadog.trace.instrumentation.play26.server.latestdep.PlayController.forwarded()
+GET   /error-status                 datadog.trace.instrumentation.play26.server.latestdep.PlayController.errorStatus()
+GET   /exception                    datadog.trace.instrumentation.play26.server.latestdep.PlayController.exception()
+GET   /custom-exception             datadog.trace.instrumentation.play26.server.latestdep.PlayController.customException()
+GET   /not-here                     datadog.trace.instrumentation.play26.server.latestdep.PlayController.notHere()
+GET   /user-block                   datadog.trace.instrumentation.play26.server.latestdep.PlayController.userBlock()
+GET   /query                        datadog.trace.instrumentation.play26.server.latestdep.PlayController.query(some: String)
+GET   /encoded_query                datadog.trace.instrumentation.play26.server.latestdep.PlayController.encodedQuery(some: String)
+GET   /encoded%20path%20query       datadog.trace.instrumentation.play26.server.latestdep.PlayController.encodedPathQuery(some: String)
+GET   /path/:path/param             datadog.trace.instrumentation.play26.server.latestdep.PlayController.pathParam(path: Integer)
+POST /created                       datadog.trace.instrumentation.play26.server.latestdep.PlayController.created()
+POST /body-urlencoded               datadog.trace.instrumentation.play26.server.latestdep.PlayController.bodyUrlencoded()
+POST /body-multipart                datadog.trace.instrumentation.play26.server.latestdep.PlayController.bodyMultipart()
+POST /body-json                     datadog.trace.instrumentation.play26.server.latestdep.PlayController.bodyJson()
+POST /body-xml                      datadog.trace.instrumentation.play26.server.latestdep.PlayController.bodyXml()
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/ImplicitConversions.scala b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/ImplicitConversions.scala
new file mode 100644
index 00000000000..7896e2836ae
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/ImplicitConversions.scala
@@ -0,0 +1,15 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+object ImplicitConversions {
+  implicit class MapExtensions[A](m: Iterable[(String, A)]) {
+    def toStringAsGroovy: String = {
+      def valueToString(value: Object) : String = value match {
+        case seq: Seq[_] => seq.map(x => valueToString(x.asInstanceOf[Object])).mkString("[", ",", "]")
+        case other => other.toString
+      }
+
+      m.map { case (key, value) => s"$key:${valueToString(value.asInstanceOf[Object])}" }
+        .mkString("[", ",", "]")
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayController.scala b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayController.scala
new file mode 100644
index 00000000000..65a360ad27f
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayController.scala
@@ -0,0 +1,100 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.agent.test.base.HttpServerTest.{ServerEndpoint, getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE}
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.instrumentation.play26.server.TestHttpErrorHandler
+import datadog.trace.instrumentation.play26.server.latestdep.ImplicitConversions.MapExtensions
+import groovy.lang.Closure
+import play.api.libs.json.{JsNull, JsValue, Json}
+import play.api.mvc._
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.xml.NodeSeq
+
+class PlayController(cc: ControllerComponents)(implicit ec: ExecutionContext) extends AbstractController(cc) {
+  def success() = controller(ServerEndpoint.SUCCESS) { _ =>
+    Results.Ok(ServerEndpoint.SUCCESS.getBody)
+  }
+
+  def redirect = controller(ServerEndpoint.REDIRECT) { _ =>
+    Results.Redirect(ServerEndpoint.REDIRECT.getBody, 302)
+  }
+
+  def forwarded = controller(ServerEndpoint.FORWARDED) { request =>
+    Results.Status(ServerEndpoint.FORWARDED.getStatus)(request.headers.get("X-Forwarded-For").getOrElse("(no header)"))
+  }
+
+  def errorStatus = controller(ServerEndpoint.ERROR) { _ =>
+    Results.Status(ServerEndpoint.ERROR.getStatus)(ServerEndpoint.ERROR.getBody)
+  }
+
+  def exception = controller(ServerEndpoint.EXCEPTION) { _ =>
+    throw new RuntimeException(ServerEndpoint.EXCEPTION.getBody)
+  }
+
+  def customException = controller(ServerEndpoint.CUSTOM_EXCEPTION) { _ =>
+    throw new TestHttpErrorHandler.CustomRuntimeException(ServerEndpoint.CUSTOM_EXCEPTION.getBody)
+  }
+
+  def userBlock = controller(ServerEndpoint.USER_BLOCK) { _ =>
+    Blocking.forUser("user-to-block").blockIfMatch()
+    Results.Ok("should never be reached")
+  }
+
+  def query(some: String) = controller(ServerEndpoint.QUERY_PARAM) { _ =>
+    Results.Status(ServerEndpoint.QUERY_PARAM.getStatus)(s"some=$some")
+  }
+
+  def encodedQuery(some: String) = controller(ServerEndpoint.QUERY_ENCODED_QUERY) { _ =>
+    Results.Status(ServerEndpoint.QUERY_ENCODED_QUERY.getStatus)(s"some=$some")
+  }
+
+  def encodedPathQuery(some: String) = controller(ServerEndpoint.QUERY_ENCODED_BOTH) { _ =>
+    Results.Status(ServerEndpoint.QUERY_ENCODED_BOTH.getStatus)(s"some=$some")
+  }
+
+  def notHere = controller(ServerEndpoint.NOT_HERE) { _ =>
+    Results.NotFound(ServerEndpoint.NOT_HERE.getBody)
+  }
+
+  def pathParam(id: Integer) = controller(ServerEndpoint.PATH_PARAM) { _ =>
+    Results.Ok(id.toString)
+  }
+
+  def created = controller(ServerEndpoint.CREATED) { request =>
+    val body: String = request.body.asText.getOrElse("")
+    Results.Created(s"created: $body")
+  }
+
+  def bodyUrlencoded = controller(ServerEndpoint.BODY_URLENCODED) { request =>
+    val body: Map[String, Seq[String]] = request.body.asFormUrlEncoded.getOrElse(Map.empty)
+    Results.Ok(body.toStringAsGroovy)
+  }
+
+  def bodyMultipart = controller(ServerEndpoint.BODY_MULTIPART) { request =>
+    val body: Map[String, Seq[String]] = request.body.asMultipartFormData.map(_.asFormUrlEncoded).getOrElse(Map.empty)
+    Results.Ok(body.toStringAsGroovy)
+  }
+
+  def bodyJson = controller(ServerEndpoint.BODY_JSON) { request =>
+    val body: JsValue = request.body.asJson.getOrElse(JsNull)
+    Results.Ok(Json.stringify(body))
+  }
+
+  def bodyXml = controller(ServerEndpoint.BODY_XML) { request =>
+    val body : NodeSeq = request.body.asXml.getOrElse(NodeSeq.Empty)
+    Results.Ok(body.toString())
+  }
+
+  private def controller(endpoint: ServerEndpoint)(block: Request[AnyContent] => Result) : Action[AnyContent] = {
+    Action.async { request =>
+      Future {
+        HttpServerTest.controller(endpoint, new Closure[Result](this) {
+          def doCall() = block(request).withHeaders(
+            (getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE))
+        })
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayRoutersScala.scala b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayRoutersScala.scala
new file mode 100644
index 00000000000..aa3256e96ed
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/latestDepTest/scala/datadog/trace/instrumentation/play26/server/latestdep/PlayRoutersScala.scala
@@ -0,0 +1,163 @@
+package datadog.trace.instrumentation.play26.server.latestdep
+
+import datadog.appsec.api.blocking.Blocking
+import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.agent.test.base.HttpServerTest.{ServerEndpoint, getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE}
+import datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint._
+import datadog.trace.instrumentation.play26.server.TestHttpErrorHandler.CustomRuntimeException
+import datadog.trace.instrumentation.play26.server.latestdep.ImplicitConversions.MapExtensions
+import groovy.lang.Closure
+import play.api.BuiltInComponents
+import play.api.libs.json._
+import play.api.mvc._
+import play.api.routing.Router
+import play.api.routing.sird._
+
+import java.util.concurrent.ExecutorService
+import scala.concurrent.{ExecutionContext, Future}
+import scala.xml.NodeSeq
+
+object PlayRoutersScala {
+
+  def async(executor: ExecutorService)(components: BuiltInComponents): Router = {
+    val ec: ExecutionContext = ExecutionContext.fromExecutor(executor)
+    val parser = components.defaultBodyParser
+
+    import components._
+
+    def controller(endpoint: ServerEndpoint)(block: => Result): Future[Result] = {
+      Future {
+        HttpServerTest.controller(endpoint, new Closure[Result](this) {
+          def doCall(): Result = block.withHeaders(
+            (getIG_RESPONSE_HEADER, getIG_RESPONSE_HEADER_VALUE))
+        })
+      }(ec)
+    }
+
+    Router.from {
+      case GET(p"/success") =>
+        defaultActionBuilder.async {
+          controller(SUCCESS) {
+            Results.Ok(SUCCESS.getBody)
+          }
+        }
+
+      case GET(p"/redirect") =>
+        defaultActionBuilder.async {
+          controller(REDIRECT) {
+            Results.Redirect(REDIRECT.getBody, 302)
+          }
+        }
+
+      case GET(p"/forwarded") =>
+        defaultActionBuilder.async { request =>
+          controller(FORWARDED) {
+            Results.Status(FORWARDED.getStatus)(request.headers.get("X-Forwarded-For").getOrElse("(no header)"))
+          }
+        }
+
+      // endpoint is not special; error results are returned the same way
+      case GET(p"/error-status") =>
+        defaultActionBuilder.async {
+          controller(ERROR) {
+            Results.Status(ERROR.getStatus)(ERROR.getBody)
+          }
+        }
+
+      case GET(p"/exception") =>
+        defaultActionBuilder.async {
+          controller(EXCEPTION) {
+            throw new RuntimeException(EXCEPTION.getBody)
+          }
+        }
+
+      case GET(p"/custom-exception") =>
+        defaultActionBuilder.async {
+          controller(CUSTOM_EXCEPTION) {
+            throw new CustomRuntimeException(CUSTOM_EXCEPTION.getBody)
+          }
+        }
+
+      case GET(p"/not-here") =>
+        defaultActionBuilder.async {
+          controller(NOT_HERE) {
+            Results.NotFound
+          }
+        }
+
+      case GET(p"/user-block") =>
+        defaultActionBuilder.async {
+          controller(USER_BLOCK) {
+            Blocking.forUser("user-to-block").blockIfMatch()
+            Results.Ok("should never be reached")
+          }
+        }
+
+      case GET(p"/query" ? q"some=$some") =>
+        defaultActionBuilder.async {
+          controller(QUERY_PARAM) {
+            Results.Status(QUERY_PARAM.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/encoded_query" ? q"some=$some") =>
+        defaultActionBuilder.async {
+          controller(QUERY_ENCODED_QUERY) {
+            Results.Status(QUERY_ENCODED_QUERY.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/encoded%20path%20query" ? q"some=$some") =>
+        defaultActionBuilder.async {
+          controller(QUERY_ENCODED_BOTH) {
+            Results.Status(QUERY_ENCODED_BOTH.getStatus)(s"some=$some")
+          }
+        }
+
+      case GET(p"/path/$path/param") =>
+        defaultActionBuilder.async {
+          controller(PATH_PARAM) {
+            Results.Status(PATH_PARAM.getStatus)(path)
+          }
+        }
+
+      case POST(p"/created") => defaultActionBuilder.async(parser) { request =>
+        controller(CREATED) {
+          val body: String = request.body.asText.getOrElse("")
+          Results.Created(s"created: $body")
+        }
+      }
+
+      case POST(p"/body-urlencoded") => defaultActionBuilder.async(parser) { request =>
+        controller(BODY_URLENCODED) {
+          val body: Map[String, Seq[String]] = request.body.asFormUrlEncoded.getOrElse(Map.empty)
+          Results.Ok(body.toStringAsGroovy)
+        }
+      }
+
+      case POST(p"/body-multipart") => defaultActionBuilder.async(parser) { request =>
+        controller(BODY_MULTIPART) {
+          val body: Map[String, scala.Seq[String]] = request.body.asMultipartFormData.getOrElse(
+            MultipartFormData(Map.empty, scala.Seq.empty, scala.Seq.empty)
+          ).asFormUrlEncoded
+          Results.Ok(body.toStringAsGroovy)
+        }
+      }
+
+      case POST(p"/body-json") => defaultActionBuilder.async(parser) { request =>
+        controller(BODY_JSON) {
+          val body: JsValue = request.body.asJson.getOrElse(JsNull)
+          Results.Ok(Json.stringify(body))
+        }
+      }
+
+      case POST(p"/body-xml") => defaultActionBuilder.async(parser) { request =>
+        controller(BODY_XML) {
+          val body: NodeSeq = request.body.asXml.getOrElse(NodeSeq.Empty)
+          Results.Ok(body.toString())
+        }
+      }
+    }
+  }
+
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java
new file mode 100644
index 00000000000..227d1fdf3bc
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java
@@ -0,0 +1,16 @@
+package datadog.trace.instrumentation.play26;
+
+import datadog.trace.agent.tooling.muzzle.Reference;
+
+public class MuzzleReferences {
+  private MuzzleReferences() {}
+
+  public static final Reference[] PLAY_26_PLUS =
+      new Reference[] {new Reference.Builder("play.components.BodyParserComponents").build()};
+
+  public static final Reference[] PLAY_26_ONLY =
+      new Reference[] {
+        new Reference.Builder("play.components.BodyParserComponents").build(),
+        new Reference.Builder("play.Configuration").build()
+      };
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
index 9f3ab28cd02..51aaaef20ee 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
@@ -9,6 +9,7 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context;
+import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import net.bytebuddy.asm.Advice;
 import play.api.mvc.Action;
 import play.api.mvc.Headers;
@@ -18,7 +19,9 @@
 
 public class PlayAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static AgentScope onEnter(@Advice.Argument(value = 0, readOnly = false) Request req) {
+  public static AgentScope onEnter(
+      @Advice.Argument(value = 0, readOnly = false) Request req,
+      @Advice.Local("extractedContext") Context.Extracted extractedContext) {
     final AgentSpan span;
 
     // If we have already added a `play.request` span, then don't do it again
@@ -28,7 +31,7 @@ public static AgentScope onEnter(@Advice.Argument(value = 0, readOnly = false) R
 
     if (activeSpan() == null) {
       final Headers headers = req.headers();
-      final Context.Extracted extractedContext = DECORATE.extract(headers);
+      extractedContext = DECORATE.extract(headers);
       span = DECORATE.startSpan(headers, extractedContext);
     } else {
       // An upstream framework (e.g. akka-http, netty) has already started the span.
@@ -48,6 +51,7 @@ public static AgentScope onEnter(@Advice.Argument(value = 0, readOnly = false) R
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
   public static void stopTraceOnResponse(
       @Advice.Enter final AgentScope playControllerScope,
+      @Advice.Local("extractedContext") Context.Extracted extractedContext,
       @Advice.This final Object thisAction,
       @Advice.Thrown final Throwable throwable,
       @Advice.Argument(0) final Request req,
@@ -60,7 +64,7 @@ public static void stopTraceOnResponse(
     final AgentSpan playControllerSpan = playControllerScope.span();
 
     // Call onRequest on return after tags are populated.
-    DECORATE.onRequest(playControllerSpan, req, req, null);
+    DECORATE.onRequest(playControllerSpan, req, req, extractedContext);
 
     if (throwable == null) {
       responseFuture.onComplete(
@@ -76,8 +80,9 @@ public static void stopTraceOnResponse(
 
     final AgentSpan rootSpan = activeSpan();
     // set the resource name on the upstream akka/netty span if there is one
-    if (rootSpan != null) {
-      DECORATE.onRequest(rootSpan, req, req, null);
+    if (rootSpan != null && playControllerSpan.getResourceName() != null) {
+      rootSpan.setResourceName(
+          playControllerSpan.getResourceName(), ResourceNamePriorities.HTTP_PATH_NORMALIZER);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
index 4ff4bfd99f3..b5267fe7540 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
@@ -19,6 +19,7 @@
 import play.api.mvc.Headers;
 import play.api.mvc.Request;
 import play.api.mvc.Result;
+import play.api.mvc.request.RemoteConnection;
 import play.api.routing.HandlerDef;
 import play.libs.typedmap.TypedKey;
 import play.routing.Router;
@@ -95,7 +96,12 @@ protected URIDataAdapter url(final Request request) {
 
   @Override
   protected String peerHostIP(final Request request) {
-    return request.remoteAddress();
+    RemoteConnection connection = request.connection();
+    if (connection instanceof RemoteConnectionWithRawAddress) {
+      return ((RemoteConnectionWithRawAddress) connection).rawRemoteAddressString();
+    } else {
+      return request.remoteAddress();
+    }
   }
 
   @Override
@@ -134,7 +140,7 @@ public AgentSpan onRequest(
         CharSequence path =
             PATH_CACHE.computeIfAbsent(
                 defOption.get().path(), p -> addMissingSlash(p, request.path()));
-        HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path);
+        HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path, true);
       }
     }
     return span;
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
index 84f2f62c104..ffa1fcbbf8b 100644
--- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
@@ -18,6 +18,11 @@ public PlayInstrumentation() {
     super("play");
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
   @Override
   public String hierarchyMarkerType() {
     return "play.api.mvc.Action";
@@ -35,9 +40,10 @@ public String[] helperClassNames() {
       packageName + ".PlayHeaders$Request",
       packageName + ".PlayHeaders$Result",
       packageName + ".PlayHttpServerDecorator",
+      packageName + ".RemoteConnectionWithRawAddress",
       packageName + ".RequestCompleteCallback",
       packageName + ".RequestURIDataAdapter",
-      packageName + ".HasPlayRequestSpan"
+      packageName + ".HasPlayRequestSpan",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java
new file mode 100644
index 00000000000..8d1976a0e16
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java
@@ -0,0 +1,41 @@
+package datadog.trace.instrumentation.play26;
+
+import java.net.InetAddress;
+import java.security.cert.X509Certificate;
+import play.api.mvc.request.RemoteConnection;
+import scala.Option;
+import scala.collection.Seq;
+
+public class RemoteConnectionWithRawAddress implements RemoteConnection {
+  private final RemoteConnection rawConnection;
+  private final RemoteConnection delegate;
+
+  public RemoteConnectionWithRawAddress(RemoteConnection rawConnection, RemoteConnection delegate) {
+    this.rawConnection = rawConnection;
+    this.delegate = delegate;
+  }
+
+  @Override
+  public InetAddress remoteAddress() {
+    return delegate.remoteAddress();
+  }
+
+  @Override
+  public String remoteAddressString() {
+    return delegate.remoteAddressString();
+  }
+
+  public String rawRemoteAddressString() {
+    return rawConnection.remoteAddressString();
+  }
+
+  @Override
+  public boolean secure() {
+    return delegate.secure();
+  }
+
+  @Override
+  public Option<Seq<X509Certificate>> clientCertificateChain() {
+    return delegate.clientCertificateChain();
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java
new file mode 100644
index 00000000000..0ce2ecd28ec
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java
@@ -0,0 +1,59 @@
+package datadog.trace.instrumentation.play26;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import net.bytebuddy.asm.Advice;
+import play.api.mvc.request.RemoteConnection;
+
+@AutoService(Instrumenter.class)
+public class SaveRawRemoteConnectionInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+  public SaveRawRemoteConnectionInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".RemoteConnectionWithRawAddress"};
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.core.server.common.ForwardedHeaderHandler";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("forwardedConnection")
+            .and(not(isStatic()))
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.api.mvc.request.RemoteConnection")))
+            .and(takesArgument(1, named("play.api.mvc.Headers")))
+            .and(returns(named("play.api.mvc.request.RemoteConnection"))),
+        SaveRawRemoteConnectionInstrumentation.class.getName() + "$ForwardedConnectionAdvice");
+  }
+
+  static class ForwardedConnectionAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+        @Advice.Argument(0) RemoteConnection rawConnection,
+        @Advice.Return(readOnly = false) RemoteConnection retConnection) {
+      if (rawConnection != retConnection && rawConnection != null) {
+        retConnection = new RemoteConnectionWithRawAddress(rawConnection, retConnection);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java
new file mode 100644
index 00000000000..853fbb39f4a
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java
@@ -0,0 +1,130 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import play.libs.F;
+
+public class ArgumentCaptureWrappers {
+  public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
+    private final Function<Object, R> delegate;
+
+    public ArgumentCaptureFunction(Function<Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o) {
+      if (o == null) {
+        return delegate.apply(null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o);
+      }
+
+      Map<String, Object> conv = Collections.singletonMap("0", o);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o);
+    }
+  }
+
+  public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
+    private final BiFunction<Object, Object, R> delegate;
+
+    public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o1, Object o2) {
+      if (o1 == null && o2 == null) {
+        return delegate.apply(null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o1, o2);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o1, o2);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o1, o2);
+    }
+  }
+
+  public static class ArgumentCaptureFunction3<R>
+      implements F.Function3<Object, Object, Object, R> {
+    private final F.Function3<Object, Object, Object, R> delegate;
+
+    public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Object o1, Object o2, Object o3) throws Throwable {
+      if (o1 == null && o2 == null && o3 == null) {
+        return delegate.apply(null, null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(o1, o2, o3);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(o1, o2, o3);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+      conv.put("2", o3);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routeTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(o1, o2, o3);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java
new file mode 100644
index 00000000000..87afd198a69
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java
@@ -0,0 +1,450 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.api.gateway.Events.EVENTS;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.FloatNode;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.databind.node.NumericNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.BlockResponseFunction;
+import datadog.trace.api.gateway.CallbackProvider;
+import datadog.trace.api.gateway.Flow;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+import play.api.libs.json.JsArray;
+import play.api.libs.json.JsBoolean;
+import play.api.libs.json.JsNumber;
+import play.api.libs.json.JsObject;
+import play.api.libs.json.JsString;
+import play.api.libs.json.JsValue;
+import play.api.mvc.MultipartFormData;
+import scala.Function1;
+import scala.Tuple2;
+import scala.collection.Iterable;
+import scala.collection.Iterator;
+import scala.collection.Seq;
+import scala.compat.java8.JFunction1;
+import scala.xml.Elem;
+import scala.xml.Node;
+import scala.xml.NodeSeq;
+import scala.xml.Text;
+
+public class BodyParserHelpers {
+
+  public static final int MAX_CONVERSION_DEPTH = 10;
+  private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
+  public static final int MAX_RECURSION = 15;
+
+  private static JFunction1<
+          scala.collection.immutable.Map<String, Seq<String>>,
+          scala.collection.immutable.Map<String, Seq<String>>>
+      HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
+  private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
+  private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
+      BodyParserHelpers::handleMultipartFormData;
+  private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
+  private static JFunction1<NodeSeq, NodeSeq> HANDLE_XML = BodyParserHelpers::handleXml;
+
+  private BodyParserHelpers() {}
+
+  public static Function1<
+          scala.collection.immutable.Map<String, Seq<String>>,
+          scala.collection.immutable.Map<String, Seq<String>>>
+      getHandleUrlEncodedMapF() {
+    return HANDLE_URL_ENCODED;
+  }
+
+  private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
+      scala.collection.immutable.Map<String, Seq<String>> data) {
+    if (data == null || data.isEmpty()) {
+      return data;
+    }
+
+    try {
+      Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
+      handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
+    }
+    return data;
+  }
+
+  public static Function1<String, String> getHandleStringMapF() {
+    return HANDLE_TEXT;
+  }
+
+  private static String handleText(String s) {
+    if (s == null || s.isEmpty()) {
+      return s;
+    }
+
+    try {
+      handleArbitraryPostData(s, "tolerantText");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of tolerantText BodyParser");
+    }
+
+    return s;
+  }
+
+  public static Function1<MultipartFormData<?>, MultipartFormData<?>>
+      getHandleMultipartFormDataF() {
+    return HANDLE_MULTIPART_FORM_DATA;
+  }
+
+  private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
+    scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
+
+    if (mpfd == null || mpfd.isEmpty()) {
+      return data;
+    }
+
+    try {
+      Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
+      handleArbitraryPostData(conv, "multipartFormData");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of multipartFormData BodyParser");
+    }
+    return data;
+  }
+
+  public static Function1<JsValue, JsValue> getHandleJsonF() {
+    return HANDLE_JSON;
+  }
+
+  private static JsValue handleJson(JsValue data) {
+    if (data == null) {
+      return null;
+    }
+    if (!isAppsecActiveForRequest()) {
+      // skip potentially expensive transformation
+      return data;
+    }
+
+    try {
+      Object conv = jsValueToJavaObject(data, MAX_RECURSION);
+      handleArbitraryPostData(conv, "json");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of json BodyParser");
+    }
+    return data;
+  }
+
+  public static Function1<NodeSeq, NodeSeq> getHandleXmlF() {
+    return HANDLE_XML;
+  }
+
+  private static NodeSeq handleXml(NodeSeq data) {
+    if (data == null) {
+      return null;
+    }
+    if (!isAppsecActiveForRequest()) {
+      // skip potentially expensive transformation
+      return data;
+    }
+
+    try {
+      Object conv = nodeSeqToJavaObject(data, MAX_RECURSION);
+      handleArbitraryPostData(conv, "xml");
+    } catch (Exception e) {
+      handleException(e, "Error handling result of xml BodyParser");
+    }
+    return data;
+  }
+
+  private static void executeCallback(
+      RequestContext reqCtx,
+      BiFunction<RequestContext, Object, Flow<Void>> callback,
+      Object conv,
+      String details) {
+    Flow<Void> flow = callback.apply(reqCtx, conv);
+    Flow.Action action = flow.getAction();
+    if (action instanceof Flow.Action.RequestBlockingAction) {
+      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+      if (blockResponseFunction != null) {
+        boolean success =
+            blockResponseFunction.tryCommitBlockingResponse(
+                reqCtx.getTraceSegment(),
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders());
+        if (success) {
+          throw new BlockingException("Blocked request (for " + details + ")");
+        }
+      }
+    }
+  }
+
+  private static Object tryConvertingScalaContainers(Object obj, int depth) {
+    if (depth == 0) {
+      return obj;
+    }
+    if (obj instanceof scala.collection.Map) {
+      scala.collection.Map map = (scala.collection.Map) obj;
+      Map<Object, Object> ret = new HashMap<>();
+      Iterator<Tuple2> iterator = map.iterator();
+      while (iterator.hasNext()) {
+        Tuple2 next = iterator.next();
+        ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
+      }
+      return ret;
+    } else if (obj instanceof Iterable) {
+      List<Object> ret = new ArrayList<>();
+      Iterator iterator = ((Iterable) obj).iterator();
+      while (iterator.hasNext()) {
+        Object next = iterator.next();
+        ret.add(tryConvertingScalaContainers(next, depth - 1));
+      }
+      return ret;
+    }
+    return obj;
+  }
+
+  public static void handleJsonNode(JsonNode n, String source) {
+    Object o = jsNodeToJavaObject(n, MAX_RECURSION);
+    handleArbitraryPostDataWithSpanError(o, source);
+  }
+
+  private static boolean isAppsecActiveForRequest() {
+    AgentSpan span = activeSpan();
+    RequestContext reqCtx;
+
+    return span != null
+        && (reqCtx = span.getRequestContext()) != null
+        && reqCtx.getData(RequestContextSlot.APPSEC) != null;
+  }
+
+  public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
+    AgentSpan span = activeSpan();
+    try {
+      doHandleArbitraryPostData(span, o, source);
+    } catch (BlockingException be) {
+      span.addThrowable(be);
+      throw be;
+    }
+  }
+
+  public static void handleArbitraryPostData(Object o, String source) {
+    doHandleArbitraryPostData(activeSpan(), o, source);
+  }
+
+  public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
+    RequestContext reqCtx;
+    if (span == null
+        || (reqCtx = span.getRequestContext()) == null
+        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+      return;
+    }
+
+    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+    BiFunction<RequestContext, Object, Flow<Void>> callback =
+        cbp.getCallback(EVENTS.requestBodyProcessed());
+    if (callback == null) {
+      return;
+    }
+
+    // callback execution
+    executeCallback(reqCtx, callback, o, source);
+  }
+
+  private static void handleException(Exception e, String logMessage) {
+    if (e instanceof BlockingException) {
+      throw (BlockingException) e;
+    }
+
+    log.warn(logMessage, e);
+  }
+
+  private static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
+    if (value == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (value instanceof JsString) {
+      return ((JsString) value).value();
+    } else if (value instanceof JsNumber) {
+      return ((JsNumber) value).value();
+    } else if (value instanceof JsBoolean) {
+      return ((JsBoolean) value).value();
+    } else if (value instanceof JsObject) {
+      Map<String, Object> map = new HashMap<>();
+      JsObject jsonObject = (JsObject) value;
+      Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
+      while (iterator.hasNext()) {
+        Tuple2<String, JsValue> e = iterator.next();
+        map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
+      }
+      return map;
+    } else if (value instanceof JsArray) {
+      List<Object> list = new ArrayList<>();
+      JsArray jsArray = (JsArray) value;
+      Iterator<JsValue> iterator = jsArray.value().iterator();
+      while (iterator.hasNext()) {
+        JsValue next = iterator.next();
+        list.add(jsValueToJavaObject(next, maxRecursion - 1));
+      }
+      return list;
+    } else {
+      return null;
+    }
+  }
+
+  private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
+    if (value == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (value instanceof TextNode) {
+      return value.asText();
+    } else if (value instanceof FloatNode || value instanceof DoubleNode) {
+      return value.asDouble();
+    } else if (value instanceof NumericNode) {
+      return value.asLong();
+    } else if (value instanceof ObjectNode) {
+      Map<String, Object> map = new HashMap<>();
+      ObjectNode jsonObject = (ObjectNode) value;
+      java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
+      while (iterator.hasNext()) {
+        Map.Entry<String, JsonNode> e = iterator.next();
+        map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
+      }
+      return map;
+    } else if (value instanceof ArrayNode) {
+      List<Object> list = new ArrayList<>();
+      ArrayNode arrayNode = (ArrayNode) value;
+      java.util.Iterator<JsonNode> iterator = arrayNode.elements();
+      while (iterator.hasNext()) {
+        JsonNode next = iterator.next();
+        list.add(jsNodeToJavaObject(next, maxRecursion - 1));
+      }
+      return list;
+    } else if (value instanceof NullNode) {
+      return null;
+    } else {
+      return value.asText("");
+    }
+  }
+
+  private static Object nodeSeqToJavaObject(NodeSeq nodeSeq, int maxRecursion) {
+    if (nodeSeq.length() == 0 || maxRecursion <= 0) {
+      return null;
+    }
+
+    List<Object> ret = new ArrayList<>(nodeSeq.length());
+    Iterator<Node> iterator = nodeSeq.iterator();
+    while (iterator.hasNext()) {
+      Node node = iterator.next();
+      ret.add(nodeToJavaObject(node, maxRecursion));
+    }
+    return ret;
+  }
+
+  // we don't preserve element names
+  private static Object nodeToJavaObject(Node node, int maxRecursion) {
+    if (node == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (node instanceof Elem) {
+      scala.collection.immutable.Map<String, String> attributes = node.attributes().asAttrMap();
+
+      int size = node.child().size();
+      List<Object> childList = Collections.emptyList();
+      if (size > 0) {
+        childList = new ArrayList<>();
+        Iterator<Node> iterator = node.child().iterator();
+        while (iterator.hasNext()) {
+          Node childNode = iterator.next();
+          childList.add(nodeToJavaObject(childNode, maxRecursion - 1));
+        }
+      }
+
+      Map<String, Object> nodeRepr = new HashMap<>();
+      if (!attributes.isEmpty()) {
+        nodeRepr.put("attributes", tryConvertingScalaContainers(attributes, 1));
+      }
+      if (!childList.isEmpty()) {
+        nodeRepr.put("children", childList);
+      }
+      return nodeRepr;
+    } else if (node instanceof Text) {
+      return node.text().trim();
+    } else {
+      return null;
+    }
+  }
+
+  public static void handleXmlDocument(Document ret, String source) {
+    if (ret == null) {
+      return;
+    }
+
+    Element documentElement = ret.getDocumentElement();
+    Object obj = convertW3cNode(documentElement, MAX_RECURSION);
+
+    // pass wrapped in a list for consistency with NodeSeq (scala) variant
+    handleArbitraryPostDataWithSpanError(Collections.singletonList(obj), source);
+  }
+
+  private static Object convertW3cNode(org.w3c.dom.Node node, int maxRecursion) {
+    if (node == null || maxRecursion <= 0) {
+      return null;
+    }
+
+    if (node instanceof Element) {
+      Map<String, String> attributes = Collections.emptyMap();
+      if (node.hasAttributes()) {
+        attributes = new HashMap<>();
+        NamedNodeMap attrMap = node.getAttributes();
+        for (int i = 0; i < attrMap.getLength(); i++) {
+          org.w3c.dom.Attr item = (Attr) attrMap.item(i);
+          attributes.put(item.getName(), item.getValue());
+        }
+      }
+
+      List<Object> children = Collections.emptyList();
+      if (node.hasChildNodes()) {
+        NodeList childNodes = node.getChildNodes();
+        children = new ArrayList<>(childNodes.getLength());
+        for (int i = 0; i < childNodes.getLength(); i++) {
+          org.w3c.dom.Node item = childNodes.item(i);
+          children.add(convertW3cNode(item, maxRecursion - 1));
+        }
+      }
+
+      Map<String, Object> repr = new HashMap<>();
+      if (!attributes.isEmpty()) {
+        repr.put("attributes", attributes);
+      }
+      if (!children.isEmpty()) {
+        repr.put("children", children);
+      }
+      return repr;
+    } else if (node instanceof org.w3c.dom.Text) {
+      return node.getTextContent();
+    }
+    return null;
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java
new file mode 100644
index 00000000000..5672422c95c
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java
@@ -0,0 +1,76 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import play.core.j.JavaParsers$;
+import play.mvc.BodyParser;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.DelegatingBodyParser */
+@AutoService(Instrumenter.class)
+public class DelegatingBodyParserInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public DelegatingBodyParserInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$DelegatingBodyParser";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".JavaMultipartFormDataRegisterExcF",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("apply")
+            .and(takesArguments(1))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(returns(named("play.libs.streams.Accumulator"))),
+        DelegatingBodyParserInstrumentation.class.getName() + "$ApplyAdvice");
+  }
+
+  static class ApplyAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+        @Advice.This BodyParser.DelegatingBodyParser thiz,
+        @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
+      if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
+        return;
+      }
+      play.libs.streams.Accumulator<
+              akka.util.ByteString,
+              play.libs.F.Either<
+                  play.mvc.Result, Http.MultipartFormData<play.libs.Files.TemporaryFile>>>
+          acc = ret;
+
+      ret =
+          acc.recover(
+              JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java
new file mode 100644
index 00000000000..a97e6422d5a
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java
@@ -0,0 +1,67 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import akka.util.ByteString;
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.agent.tooling.Instrumenter;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.FormUrlEncoded#parse(Http.RequestHeader, ByteString) */
+@AutoService(Instrumenter.class)
+public class FormUrlEncodedInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public FormUrlEncodedInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$FormUrlEncoded";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(Map.class)),
+        FormUrlEncodedInstrumentation.class.getName() + "$ParseAdvice");
+  }
+
+  static class ParseAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(
+        @Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
+      if (t != null) {
+        return;
+      }
+      try {
+        // error is reported as client error, which doesn't preserve the exception
+        BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
+      } catch (BlockingException be) {
+        t = be;
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java
new file mode 100644
index 00000000000..844cc719dc5
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java
@@ -0,0 +1,88 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import play.api.http.HttpErrorHandler;
+import play.api.mvc.RequestHeader;
+
+/** @see HttpErrorHandler#onServerError(RequestHeader, Throwable) */
+@AutoService(Instrumenter.class)
+public class HttpErrorHandlerInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForTypeHierarchy {
+  public HttpErrorHandlerInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isPublic()
+            .and(named("onServerError"))
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
+            .and(takesArgument(1, Throwable.class))
+            .and(returns(named("scala.concurrent.Future"))),
+        HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
+  }
+
+  @Override
+  public String hierarchyMarkerType() {
+    return "play.api.http.HttpErrorHandler";
+  }
+
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named("play.api.http.HttpErrorHandler"));
+  }
+
+  static class OnServerErrorAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(1) Throwable t) {
+      int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
+      if (i > 0) {
+        return;
+      }
+
+      if (!(t instanceof BlockingException)) {
+        return;
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return;
+      }
+      agentSpan.addThrowable(t);
+    }
+
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after() {
+      CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java
new file mode 100644
index 00000000000..bc6199c89f0
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java
@@ -0,0 +1,39 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.concurrent.CompletionException;
+import java.util.function.Function;
+import play.libs.F;
+import play.libs.Files;
+import play.mvc.Http;
+import play.mvc.Result;
+
+public class JavaMultipartFormDataRegisterExcF
+    implements Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>> {
+  public static Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>>
+      INSTANCE = new JavaMultipartFormDataRegisterExcF();
+
+  private JavaMultipartFormDataRegisterExcF() {}
+
+  @Override
+  public F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>> apply(Throwable exc) {
+    if (exc instanceof CompletionException) {
+      exc = exc.getCause();
+    }
+    if (exc instanceof BlockingException) {
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan != null) {
+        agentSpan.addThrowable(exc);
+      }
+    }
+    if (exc instanceof RuntimeException) {
+      throw (RuntimeException) exc;
+    } else {
+      throw new UndeclaredThrowableException(exc);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java
new file mode 100644
index 00000000000..1075d1c34c7
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java
@@ -0,0 +1,23 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class NoDeclaredMethodMatcher implements ElementMatcher<MethodDescription> {
+  private final ElementMatcher<? super MethodDescription> methodMatcher;
+
+  public static ElementMatcher<MethodDescription> hasNoDeclaredMethod(
+      ElementMatcher<? super MethodDescription> em) {
+    return new NoDeclaredMethodMatcher(em);
+  }
+
+  private NoDeclaredMethodMatcher(ElementMatcher<? super MethodDescription> methodMatcher) {
+    this.methodMatcher = methodMatcher;
+  }
+
+  @Override
+  public boolean matches(MethodDescription target) {
+    return !target.getDeclaringType().getDeclaredMethods().stream()
+        .anyMatch(md -> this.methodMatcher.matches(md));
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathExtractionHelpers.java
new file mode 100644
index 00000000000..0ff075cbf3e
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathExtractionHelpers.java
@@ -0,0 +1,62 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.api.gateway.Events.EVENTS;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.BlockResponseFunction;
+import datadog.trace.api.gateway.CallbackProvider;
+import datadog.trace.api.gateway.Flow;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import java.util.Map;
+import java.util.function.BiFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PathExtractionHelpers {
+  private static final Logger log = LoggerFactory.getLogger(PathExtractionHelpers.class);
+
+  private PathExtractionHelpers() {}
+
+  public static BlockingException callRequestPathParamsCallback(
+      RequestContext reqCtx, Map<String, Object> params, String origin) {
+    try {
+      return doCallRequestPathParamsCallback(reqCtx, params, origin);
+    } catch (Exception e) {
+      log.warn("Error calling " + origin, e);
+      return null;
+    }
+  }
+
+  private static BlockingException doCallRequestPathParamsCallback(
+      RequestContext reqCtx, Map<String, Object> params, String origin) {
+    if (params == null || params.isEmpty()) {
+      return null;
+    }
+
+    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+        cbp.getCallback(EVENTS.requestPathParams());
+    if (callback == null) {
+      return null;
+    }
+
+    Flow<Void> flow = callback.apply(reqCtx, params);
+    Flow.Action action = flow.getAction();
+    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+      return null;
+    }
+
+    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+    if (brf != null) {
+      brf.tryCommitBlockingResponse(
+          reqCtx.getTraceSegment(),
+          rba.getStatusCode(),
+          rba.getBlockingContentType(),
+          rba.getExtraHeaders());
+    }
+    return new BlockingException("Blocked request (for " + origin + ")");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java
new file mode 100644
index 00000000000..feac036e405
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java
@@ -0,0 +1,100 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.advice.ActiveRequestContext;
+import datadog.trace.advice.RequiresRequestContext;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import scala.Tuple2;
+import scala.collection.Iterator;
+import scala.util.Either;
+
+/** @see play.core.routing.PathPattern#apply(String) */
+@AutoService(Instrumenter.class)
+public class PathPatternInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public PathPatternInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.core.routing.PathPattern";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("apply")
+            .and(not(isStatic()))
+            .and(takesArguments(1))
+            .and(takesArgument(0, String.class))
+            .and(returns(named("scala.Option"))),
+        PathPatternInstrumentation.class.getName() + "$ApplyAdvice");
+  }
+
+  @RequiresRequestContext(RequestContextSlot.APPSEC)
+  static class ApplyAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(
+        @Advice.Return(readOnly = false)
+            scala.Option<
+                    scala.collection.immutable.Map<String, scala.util.Either<Throwable, String>>>
+                ret,
+        @Advice.Thrown(readOnly = false) Throwable t,
+        @ActiveRequestContext RequestContext reqCtx) {
+      if (t != null) {
+        return;
+      }
+      if (ret.isEmpty()) {
+        return;
+      }
+
+      java.util.Map<String, Object> conv = new java.util.HashMap<>();
+
+      Iterator<Tuple2<String, Either<Throwable, String>>> iterator = ret.get().iterator();
+      while (iterator.hasNext()) {
+        Tuple2<String, Either<Throwable, String>> next = iterator.next();
+        Either<Throwable, String> value = next._2();
+        if (value.isLeft()) {
+          continue;
+        }
+
+        conv.put(next._1(), value.right().get());
+      }
+
+      BlockingException blockingException =
+          PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
+      t = blockingException;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java
new file mode 100644
index 00000000000..0b74d0be928
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java
@@ -0,0 +1,151 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.ScalaTraitMatchers.isTraitMethod;
+import static datadog.trace.instrumentation.play26.appsec.NoDeclaredMethodMatcher.hasNoDeclaredMethod;
+import static net.bytebuddy.matcher.ElementMatchers.is;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import net.bytebuddy.asm.Advice;
+import play.api.libs.json.JsValue;
+import play.api.mvc.BodyParser;
+import play.api.mvc.MultipartFormData;
+import play.api.mvc.PlayBodyParsers;
+import play.core.Execution;
+import scala.collection.Seq;
+import scala.collection.immutable.Map;
+import scala.xml.NodeSeq;
+
+/** @see play.api.mvc.PlayBodyParsers$class#tolerantFormUrlEncoded(PlayBodyParsers, int) */
+@AutoService(Instrumenter.class)
+public class PlayBodyParsersInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForKnownTypes {
+  private static final String TRAIT_NAME = "play.api.mvc.PlayBodyParsers";
+
+  public PlayBodyParsersInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public String[] knownMatchingTypes() {
+    return new String[] {TRAIT_NAME, TRAIT_NAME + "$class"};
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "tolerantFormUrlEncoded", is(int.class).or(is(long.class)))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$UrlEncodedAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "tolerantText", long.class)
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "text", long.class)
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class, boolean.class)
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class)
+            .and(returns(named("play.api.mvc.BodyParser")))
+            .and(
+                /* only if prev didn't match */
+                hasNoDeclaredMethod(
+                    isTraitMethod(
+                            TRAIT_NAME,
+                            "multipartFormData",
+                            "scala.Function1",
+                            long.class,
+                            boolean.class)
+                        .and(returns(named("play.api.mvc.BodyParser"))))),
+        PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "tolerantJson", is(int.class).or(is(long.class)))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$JsonAdvice");
+    transformation.applyAdvice(
+        isTraitMethod(TRAIT_NAME, "tolerantXml", is(int.class).or(is(long.class)))
+            .and(returns(named("play.api.mvc.BodyParser"))),
+        PlayBodyParsersInstrumentation.class.getName() + "$XmlAdvice");
+  }
+
+  static class UrlEncodedAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+        @Advice.Return(readOnly = false) BodyParser<Map<String, Seq<String>>> parser) {
+
+      parser =
+          parser.map(
+              BodyParserHelpers.getHandleUrlEncodedMapF(),
+              Execution.Implicits$.MODULE$.trampoline());
+    }
+  }
+
+  static class TextAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before() {
+      CallDepthThreadLocalMap.incrementCallDepth(PlayBodyParsers.class);
+    }
+
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(
+        @Advice.Return(readOnly = false) BodyParser<String> parser, @Advice.Thrown Throwable t) {
+      int depth = CallDepthThreadLocalMap.decrementCallDepth(PlayBodyParsers.class);
+      if (depth > 0 || t != null) {
+        return;
+      }
+
+      parser =
+          parser.map(
+              BodyParserHelpers.getHandleStringMapF(), Execution.Implicits$.MODULE$.trampoline());
+    }
+  }
+
+  static class MultipartFormDataAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<MultipartFormData<?>> parser) {
+
+      parser =
+          parser.map(
+              BodyParserHelpers.getHandleMultipartFormDataF(),
+              Execution.Implicits$.MODULE$.trampoline());
+    }
+  }
+
+  static class JsonAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
+
+      parser =
+          parser.map(BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.trampoline());
+    }
+  }
+
+  static class XmlAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<NodeSeq> parser) {
+
+      parser =
+          parser.map(BodyParserHelpers.getHandleXmlF(), Execution.Implicits$.MODULE$.trampoline());
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java
new file mode 100644
index 00000000000..fb44978f5d1
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java
@@ -0,0 +1,84 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import net.bytebuddy.asm.Advice;
+import play.libs.F;
+import play.routing.RoutingDsl;
+
+/** @see RoutingDsl.Route */
+@AutoService(Instrumenter.class)
+public class RoutingDslInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public RoutingDslInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Only";
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.routing.RoutingDsl$Route";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {
+      new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
+          .withMethod(
+              new String[0],
+              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+              "routeTo",
+              "Lplay/routing/RoutingDsl;",
+              "Ljava/util/function/Supplier;")
+          .build(),
+      MuzzleReferences.PLAY_26_ONLY[0],
+      MuzzleReferences.PLAY_26_ONLY[1],
+    };
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".ArgumentCaptureWrappers",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
+      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor()
+            .and(takesArguments(5))
+            .and(takesArgument(3, Object.class))
+            .and(takesArgument(4, java.lang.reflect.Method.class)),
+        RoutingDslInstrumentation.class.getName() + "$RouteConstructorAdvice");
+  }
+
+  static class RouteConstructorAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+      if (action instanceof Function) {
+        action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
+      } else if (action instanceof BiFunction) {
+        action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
+      } else if (action instanceof F.Function3) {
+        action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java
new file mode 100644
index 00000000000..667546788b3
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java
@@ -0,0 +1,83 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.advice.ActiveRequestContext;
+import datadog.trace.advice.RequiresRequestContext;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import java.util.HashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import scala.collection.immutable.List;
+
+/** @see play.api.routing.sird.PathExtractor */
+@AutoService(Instrumenter.class)
+public class SirdPathExtractorInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public SirdPathExtractorInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS; // force failure in <2.6
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.api.routing.sird.PathExtractor";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("extract")
+            .and(takesArguments(1))
+            .and(takesArgument(0, String.class))
+            .and(returns(named("scala.Option"))),
+        SirdPathExtractorInstrumentation.class.getName() + "$ExtractAdvice");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".PathExtractionHelpers",
+    };
+  }
+
+  @RequiresRequestContext(RequestContextSlot.APPSEC)
+  static class ExtractAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(
+        @Advice.Return scala.Option<scala.collection.immutable.List<String>> ret,
+        @ActiveRequestContext RequestContext reqCtx,
+        @Advice.Thrown(readOnly = false) Throwable t) {
+      if (ret.isEmpty() || t != null) {
+        return;
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      List<String> stringList = ret.get();
+      for (int i = 0; i < stringList.size(); i++) {
+        conv.put(Integer.toString(i), stringList.apply(i));
+      }
+
+      t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              reqCtx, conv, "sird.PathExtractor#extract");
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java
new file mode 100644
index 00000000000..7d959f0cbfd
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java
@@ -0,0 +1,75 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import akka.util.ByteString;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.advice.RequiresRequestContext;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.TolerantJson#parse(Http.RequestHeader, ByteString) */
+@AutoService(Instrumenter.class)
+public class TolerantJsonInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public TolerantJsonInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$TolerantJson";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
+        TolerantJsonInstrumentation.class.getName() + "$ParseAdvice");
+  }
+
+  @RequiresRequestContext(RequestContextSlot.APPSEC)
+  static class ParseAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
+      if (t != null) {
+        return;
+      }
+      try {
+        BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
+      } catch (BlockingException be) {
+        t = be;
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java
new file mode 100644
index 00000000000..2db389820d5
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java
@@ -0,0 +1,72 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import akka.util.ByteString;
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.TolerantText#parse(Http.RequestHeader, ByteString) */
+@AutoService(Instrumenter.class)
+public class TolerantTextInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public TolerantTextInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$TolerantText";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(String.class)),
+        TolerantTextInstrumentation.class.getName() + "$ParseAdvice");
+  }
+
+  static class ParseAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
+      if (t != null) {
+        return;
+      }
+      try {
+        // error is reported as client error, which doesn't preserve the exception
+        BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
+      } catch (BlockingException be) {
+        t = be;
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java
new file mode 100644
index 00000000000..878403c43ce
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java
@@ -0,0 +1,72 @@
+package datadog.trace.instrumentation.play26.appsec;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import akka.util.ByteString;
+import com.google.auto.service.AutoService;
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.instrumentation.play26.MuzzleReferences;
+import net.bytebuddy.asm.Advice;
+import play.mvc.Http;
+
+/** @see play.mvc.BodyParser.TolerantXml#parse(Http.RequestHeader, ByteString) */
+@AutoService(Instrumenter.class)
+public class TolerantXmlInstrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public TolerantXmlInstrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play26Plus";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return MuzzleReferences.PLAY_26_PLUS;
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.mvc.BodyParser$TolerantXml";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".BodyParserHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        named("parse")
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+            .and(takesArgument(1, named("akka.util.ByteString")))
+            .and(returns(named("org.w3c.dom.Document"))),
+        TolerantXmlInstrumentation.class.getName() + "$ParseAdvice");
+  }
+
+  static class ParseAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    static void after(
+        @Advice.Return org.w3c.dom.Document ret, @Advice.Thrown(readOnly = false) Throwable t) {
+      if (t != null) {
+        return;
+      }
+      try {
+        BodyParserHelpers.handleXmlDocument(ret, "TolerantXml#parse");
+      } catch (BlockingException be) {
+        t = be;
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java
new file mode 100644
index 00000000000..137f485fbb3
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java
@@ -0,0 +1,64 @@
+package datadog.trace.instrumentation.play27.appsec;
+
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import play.routing.RoutingDsl;
+
+/** @see RoutingDsl.Route */
+@AutoService(Instrumenter.class)
+public class RoutingDsl27Instrumentation extends Instrumenter.AppSec
+    implements Instrumenter.ForSingleType {
+  public RoutingDsl27Instrumentation() {
+    super("play");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "play27";
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "play.routing.RoutingDsl$Route";
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {
+      new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
+          .withMethod(
+              new String[0],
+              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+              "routingTo",
+              "Lplay/routing/RoutingDsl;",
+              "Lplay/routing/RequestFunctions$Params1;")
+          .build()
+    };
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".ArgumentCaptureAdvice",
+      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam1",
+      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam2",
+      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam3",
+      "datadog.trace.instrumentation.play26.appsec.PathExtractionHelpers",
+    };
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isConstructor()
+            .and(takesArguments(5))
+            .and(takesArgument(3, Object.class))
+            .and(takesArgument(4, java.lang.reflect.Method.class)),
+        packageName + ".ArgumentCaptureAdvice$RouteConstructorAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java_play27/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java b/dd-java-agent/instrumentation/play-2.6/src/main/java_play27/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java
new file mode 100644
index 00000000000..fefc4747eb1
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/main/java_play27/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java
@@ -0,0 +1,151 @@
+package datadog.trace.instrumentation.play27.appsec;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.appsec.api.blocking.BlockingException;
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.instrumentation.play26.appsec.PathExtractionHelpers;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import play.mvc.Http;
+import play.routing.RequestFunctions;
+
+public class ArgumentCaptureAdvice {
+  private static Logger log = LoggerFactory.getLogger(ArgumentCaptureAdvice.class);
+
+  public static class RouteConstructorAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+      if (action instanceof RequestFunctions.Params1) {
+        action = new ArgumentCaptureFunctionParam1((RequestFunctions.Params1) action);
+      } else if (action instanceof RequestFunctions.Params2) {
+        action = new ArgumentCaptureFunctionParam2((RequestFunctions.Params2) action);
+      } else if (action instanceof RequestFunctions.Params3) {
+        action = new ArgumentCaptureFunctionParam3((RequestFunctions.Params3) action);
+      }
+    }
+  }
+
+  public static class ArgumentCaptureFunctionParam1<R>
+      implements RequestFunctions.Params1<Object, R> {
+    private final RequestFunctions.Params1<Object, R> delegate;
+
+    public ArgumentCaptureFunctionParam1(RequestFunctions.Params1<Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Http.Request req, Object o1) {
+      if (o1 == null) {
+        return delegate.apply(req, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(req, o1);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(req, o1);
+      }
+
+      Map<String, Object> conv = Collections.singletonMap("0", o1);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routingTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(req, o1);
+    }
+  }
+
+  public static class ArgumentCaptureFunctionParam2<R>
+      implements RequestFunctions.Params2<Object, Object, R> {
+    private final RequestFunctions.Params2<Object, Object, R> delegate;
+
+    public ArgumentCaptureFunctionParam2(RequestFunctions.Params2<Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Http.Request req, Object o1, Object o2) throws Throwable {
+      if (o1 == null && o2 == null) {
+        return delegate.apply(req, null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(req, o1, o2);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(req, o1, o2);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routingTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(req, o1, o2);
+    }
+  }
+
+  public static class ArgumentCaptureFunctionParam3<R>
+      implements RequestFunctions.Params3<Object, Object, Object, R> {
+    private final RequestFunctions.Params3<Object, Object, Object, R> delegate;
+
+    public ArgumentCaptureFunctionParam3(
+        RequestFunctions.Params3<Object, Object, Object, R> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public R apply(Http.Request req, Object o1, Object o2, Object o3) throws Throwable {
+      if (o1 == null && o2 == null && o3 == null) {
+        return delegate.apply(req, null, null, null);
+      }
+
+      AgentSpan agentSpan = activeSpan();
+      if (agentSpan == null) {
+        return delegate.apply(req, o1, o2, o3);
+      }
+
+      RequestContext requestContext = agentSpan.getRequestContext();
+      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+        return delegate.apply(req, o1, o2, o3);
+      }
+
+      Map<String, Object> conv = new HashMap<>();
+      conv.put("0", o1);
+      conv.put("1", o2);
+      conv.put("2", o3);
+
+      BlockingException t =
+          PathExtractionHelpers.callRequestPathParamsCallback(
+              requestContext, conv, "RoutingDsl#routingTo");
+      if (t != null) {
+        throw t;
+      }
+
+      return delegate.apply(req, o1, o2, o3);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/routeGenerator/scala/generator/CompileRoutes.scala b/dd-java-agent/instrumentation/play-2.6/src/routeGenerator/scala/generator/CompileRoutes.scala
new file mode 100644
index 00000000000..1b8ff7667ba
--- /dev/null
+++ b/dd-java-agent/instrumentation/play-2.6/src/routeGenerator/scala/generator/CompileRoutes.scala
@@ -0,0 +1,17 @@
+package generator
+
+import play.routes.compiler.{InjectedRoutesGenerator, RoutesCompiler}
+
+import java.io.File
+import scala.collection.immutable
+
+object CompileRoutes extends App {
+  val routesFile = args(0)
+  val destinationDir = args(1)
+
+  val routesCompilerTask = RoutesCompiler.RoutesCompilerTask(
+    new File(routesFile), immutable.Seq.empty,
+    true, false, false)
+  RoutesCompiler.compile(
+    routesCompilerTask, InjectedRoutesGenerator, new File(destinationDir))
+}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerTest.groovy
deleted file mode 100644
index 567c6dab618..00000000000
--- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerTest.groovy
+++ /dev/null
@@ -1,97 +0,0 @@
-package server
-
-import datadog.trace.agent.test.base.HttpServer
-import play.BuiltInComponents
-import play.libs.concurrent.HttpExecution
-import play.mvc.Results
-import play.routing.RoutingDsl
-import spock.lang.Shared
-
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Executors
-import java.util.function.Supplier
-
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
-
-class PlayAsyncServerTest extends PlayServerTest {
-  @Shared
-  def executor
-
-  def cleanupSpec() {
-    executor.shutdown()
-  }
-
-  @Override
-  HttpServer server() {
-    executor = Executors.newCachedThreadPool()
-    def execContext = HttpExecution.fromThread(executor)
-    return new PlayHttpServer({ BuiltInComponents components ->
-      RoutingDsl.fromComponents(components)
-        .GET(SUCCESS.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(SUCCESS) {
-              Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(FORWARDED.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(FORWARDED) {
-              Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_PARAM.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_PARAM) {
-              Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_ENCODED_QUERY.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_ENCODED_QUERY) {
-              Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_ENCODED_BOTH.getRawPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_ENCODED_BOTH) {
-              Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-                withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(REDIRECT.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(REDIRECT) {
-              Results.found(REDIRECT.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(ERROR.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(ERROR) {
-              Results.status(ERROR.getStatus(), ERROR.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(EXCEPTION.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(EXCEPTION) {
-              throw new RuntimeException(EXCEPTION.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .build()
-    })
-  }
-}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerWithErrorHandlerTest.groovy
deleted file mode 100644
index 809c91bfd56..00000000000
--- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayAsyncServerWithErrorHandlerTest.groovy
+++ /dev/null
@@ -1,105 +0,0 @@
-package server
-
-import datadog.trace.agent.test.base.HttpServer
-import play.BuiltInComponents
-import play.libs.concurrent.HttpExecution
-import play.mvc.Results
-import play.routing.RoutingDsl
-import spock.lang.Shared
-
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Executors
-import java.util.function.Supplier
-
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
-
-class PlayAsyncServerWithErrorHandlerTest extends PlayServerWithErrorHandlerTest {
-  @Shared
-  def executor
-
-  def cleanupSpec() {
-    executor.shutdown()
-  }
-
-  @Override
-  HttpServer server() {
-    executor = Executors.newCachedThreadPool()
-    def execContext = HttpExecution.fromThread(executor)
-    return new PlayHttpServer({ BuiltInComponents components ->
-      RoutingDsl.fromComponents(components)
-        .GET(SUCCESS.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(SUCCESS) {
-              Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(FORWARDED.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(FORWARDED) {
-              Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_PARAM.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_PARAM) {
-              Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_ENCODED_QUERY.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_ENCODED_QUERY) {
-              Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(QUERY_ENCODED_BOTH.getRawPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(QUERY_ENCODED_BOTH) {
-              Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-                withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(REDIRECT.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(REDIRECT) {
-              Results.found(REDIRECT.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(ERROR.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(ERROR) {
-              Results.status(ERROR.getStatus(), ERROR.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(EXCEPTION.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(EXCEPTION) {
-              throw new RuntimeException(EXCEPTION.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .GET(CUSTOM_EXCEPTION.getPath()).routeAsync({
-          CompletableFuture.supplyAsync({
-            controller(CUSTOM_EXCEPTION) {
-              throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.getBody())
-            }
-          }, execContext)
-        } as Supplier)
-        .build()
-    }, new TestHttpErrorHandler())
-  }
-}
diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerWithErrorHandlerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerWithErrorHandlerTest.groovy
deleted file mode 100644
index 5ef4dbd749e..00000000000
--- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerWithErrorHandlerTest.groovy
+++ /dev/null
@@ -1,112 +0,0 @@
-package server
-
-import datadog.trace.agent.test.base.HttpServer
-import play.BuiltInComponents
-import play.mvc.Results
-import play.routing.RoutingDsl
-
-import java.util.function.Supplier
-
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
-import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
-import static org.junit.Assume.assumeTrue
-
-class PlayServerWithErrorHandlerTest extends PlayServerTest {
-  @Override
-  HttpServer server() {
-    return new PlayHttpServer({ BuiltInComponents components ->
-      RoutingDsl.fromComponents(components)
-        .GET(SUCCESS.getPath()).routeTo({
-          controller(SUCCESS) {
-            Results.status(SUCCESS.getStatus(), SUCCESS.getBody())
-          }
-        } as Supplier)
-        .GET(FORWARDED.getPath()).routeTo({
-          controller(FORWARDED) {
-            Results.status(FORWARDED.getStatus(), FORWARDED.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_PARAM.getPath()).routeTo({
-          controller(QUERY_PARAM) {
-            Results.status(QUERY_PARAM.getStatus(), QUERY_PARAM.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_ENCODED_QUERY.getPath()).routeTo({
-          controller(QUERY_ENCODED_QUERY) {
-            Results.status(QUERY_ENCODED_QUERY.getStatus(), QUERY_ENCODED_QUERY.getBody()) // cheating
-          }
-        } as Supplier)
-        .GET(QUERY_ENCODED_BOTH.getRawPath()).routeTo({
-          controller(QUERY_ENCODED_BOTH) {
-            Results.status(QUERY_ENCODED_BOTH.getStatus(), QUERY_ENCODED_BOTH.getBody()).
-              withHeader(IG_RESPONSE_HEADER, IG_RESPONSE_HEADER_VALUE) // cheating
-          }
-        } as Supplier)
-        .GET(REDIRECT.getPath()).routeTo({
-          controller(REDIRECT) {
-            Results.found(REDIRECT.getBody())
-          }
-        } as Supplier)
-        .GET(ERROR.getPath()).routeTo({
-          controller(ERROR) {
-            Results.status(ERROR.getStatus(), ERROR.getBody())
-          }
-        } as Supplier)
-        .GET(EXCEPTION.getPath()).routeTo({
-          controller(EXCEPTION) {
-            throw new RuntimeException(EXCEPTION.getBody())
-          }
-        } as Supplier)
-        .GET(CUSTOM_EXCEPTION.getPath()).routeTo({
-          controller(CUSTOM_EXCEPTION) {
-            throw new TestHttpErrorHandler.CustomRuntimeException(CUSTOM_EXCEPTION.getBody())
-          }
-        } as Supplier)
-        .build()
-    }, new TestHttpErrorHandler())
-  }
-
-  @Override
-  boolean testExceptionBody() {
-    true
-  }
-
-  def "test exception with custom status"() {
-    setup:
-    assumeTrue(testException())
-    def request = request(CUSTOM_EXCEPTION, method, body).build()
-    def response = client.newCall(request).execute()
-
-    expect:
-    response.code() == CUSTOM_EXCEPTION.status
-    if (testExceptionBody()) {
-      assert response.body().string() == CUSTOM_EXCEPTION.body
-    }
-
-    and:
-    assertTraces(1) {
-      trace(spanCount(CUSTOM_EXCEPTION)) {
-        sortSpansByStart()
-        serverSpan(it, null, null, method, CUSTOM_EXCEPTION)
-        if (hasHandlerSpan()) {
-          handlerSpan(it, CUSTOM_EXCEPTION)
-        }
-        controllerSpan(it, CUSTOM_EXCEPTION)
-        if (hasResponseSpan(CUSTOM_EXCEPTION)) {
-          responseSpan(it, CUSTOM_EXCEPTION)
-        }
-      }
-    }
-
-    where:
-    method = "GET"
-    body = null
-  }
-}
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
index e83e1065c84..8b8aba561e3 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
@@ -247,7 +247,9 @@ public static AgentScope startReceivingSpan(
       sortedTags.put(DIRECTION_TAG, DIRECTION_IN);
       sortedTags.put(TOPIC_TAG, queue);
       sortedTags.put(TYPE_TAG, "rabbitmq");
-      AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, sortedTags, produceMillis);
+      AgentTracer.get()
+          .getDataStreamsMonitoring()
+          .setCheckpoint(span, sortedTags, produceMillis, 0);
     }
 
     CONSUMER_DECORATE.afterStart(span);
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/test/groovy/server/RatpackHttpServerTest.groovy b/dd-java-agent/instrumentation/ratpack-1.5/src/test/groovy/server/RatpackHttpServerTest.groovy
index 49562de8bbf..373342c23e5 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/test/groovy/server/RatpackHttpServerTest.groovy
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/test/groovy/server/RatpackHttpServerTest.groovy
@@ -1,6 +1,5 @@
 package server
 
-
 import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
@@ -13,6 +12,7 @@ import ratpack.test.embed.EmbeddedApp
 
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
+import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
@@ -132,7 +132,7 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp> {
         "$Tags.HTTP_METHOD" String
         "$Tags.HTTP_STATUS" Integer
         "$Tags.HTTP_ROUTE" String
-        "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+        "$Tags.HTTP_CLIENT_IP" (endpoint == FORWARDED ? endpoint.body : '127.0.0.1')
         if (endpoint == EXCEPTION) {
           errorTags(Exception, EXCEPTION.body)
         }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttp2ClientTest.groovy b/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttp2ClientTest.groovy
new file mode 100644
index 00000000000..d91ac1498e7
--- /dev/null
+++ b/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttp2ClientTest.groovy
@@ -0,0 +1,149 @@
+import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import reactor.netty.DisposableServer
+import reactor.netty.http.HttpProtocol
+import reactor.netty.http.client.HttpClient
+import reactor.netty.http.server.HttpServer
+import spock.lang.Shared
+import spock.lang.Unroll
+
+class ReactorNettyHttp2ClientTest extends AgentTestRunner {
+  @Shared
+  DisposableServer server = HttpServer.create()
+  .protocol(HttpProtocol.H2C, HttpProtocol.HTTP11)
+  .host("localhost")
+  .port(0)
+  .handle { req, res -> res.status(200).send() }
+  .bindNow()
+
+  @Override
+  boolean useStrictTraceWrites() {
+    false
+  }
+
+  @Override
+  def cleanupSpec() {
+    server?.disposeNow()
+  }
+
+  @Unroll
+  def "test http2 client/server propagation"() {
+    setup:
+    HttpClient httpClient = HttpClient.create()
+      .disableRetry(true)
+      .protocol(protocols as HttpProtocol[])
+    when:
+    def status = runUnderTrace("parent", {
+      httpClient.baseUrl("http://localhost:${server.port()}")
+        .get()
+        .uri("/firstUrl") //we expect the h2 upgrade only here once
+        .response()
+        .block()
+      httpClient.baseUrl("http://localhost:${server.port()}")
+        .get()
+        .uri("/")
+        .response()
+        .block().status().code()
+    })
+    then:
+    status == 200
+    assertTraces(3) {
+      def firstClientCall
+      def secondClientCall
+      trace(3) {
+        sortSpansByStart()
+        basicSpan(it, "parent")
+        span {
+          firstClientCall = it.span
+          operationName "netty.client.request"
+          resourceName "GET /firstUrl"
+          spanType DDSpanTypes.HTTP_CLIENT
+          childOfPrevious()
+          tags {
+            "$Tags.COMPONENT" "netty-client"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+            "$Tags.PEER_HOSTNAME" "localhost"
+            "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
+            "$Tags.PEER_PORT" { it == null || it == server.port() }
+            "$Tags.HTTP_URL" "http://localhost:${server.port()}/firstUrl"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            defaultTags()
+          }
+        }
+        span {
+          secondClientCall = it.span
+          operationName "netty.client.request"
+          resourceName "GET /"
+          spanType DDSpanTypes.HTTP_CLIENT
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "netty-client"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+            "$Tags.PEER_HOSTNAME" "localhost"
+            "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
+            "$Tags.PEER_PORT" { it == null || it == server.port() }
+            "$Tags.HTTP_URL" "http://localhost:${server.port()}/"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            defaultTags()
+          }
+        }
+      }
+      trace(1) {
+        span {
+          operationName "netty.request"
+          resourceName "GET /firstUrl"
+          spanType DDSpanTypes.HTTP_SERVER
+          errored false
+          childOf firstClientCall
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_PORT" Integer
+            "$Tags.PEER_HOST_IPV4" { String }
+            "$Tags.HTTP_CLIENT_IP" { String }
+
+            "$Tags.HTTP_HOSTNAME" { String }
+            "$Tags.HTTP_URL" "http://localhost:${server.port()}/firstUrl"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            "$Tags.HTTP_USER_AGENT" String
+            defaultTags(true)
+          }
+        }
+        trace(1) {
+          span {
+            operationName "netty.request"
+            resourceName "GET /"
+            spanType DDSpanTypes.HTTP_SERVER
+            errored false
+            childOf secondClientCall
+            tags {
+              "$Tags.COMPONENT" "netty"
+              "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+              "$Tags.PEER_PORT" Integer
+              "$Tags.PEER_HOST_IPV4" { String }
+              "$Tags.HTTP_CLIENT_IP" { String }
+
+              "$Tags.HTTP_HOSTNAME" { String }
+              "$Tags.HTTP_URL" "http://localhost:${server.port()}/"
+              "$Tags.HTTP_METHOD" "GET"
+              "$Tags.HTTP_STATUS" 200
+              "$Tags.HTTP_USER_AGENT" String
+              defaultTags(true)
+            }
+          }
+        }
+      }
+    }
+    where:
+    protocols                               | _
+    [HttpProtocol.HTTP11, HttpProtocol.H2C] | _ // http2 upgrade through 1.1
+    [HttpProtocol.H2C]                      | _ // http2 prior knowledge
+  }
+}
diff --git a/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttpClientTest.groovy b/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttpClientTest.groovy
index ebcfb88ed36..c7c217344b3 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttpClientTest.groovy
+++ b/dd-java-agent/instrumentation/reactor-netty-1/src/test/groovy/ReactorNettyHttpClientTest.groovy
@@ -8,6 +8,7 @@ import reactor.netty.ByteBufFlux
 import reactor.netty.ByteBufMono
 import reactor.netty.http.client.HttpClient
 import reactor.netty.http.client.HttpClientResponse
+import spock.lang.Shared
 
 import java.time.Duration
 import java.util.function.BiFunction
@@ -15,8 +16,9 @@ import java.util.function.BiFunction
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 
-class ReactorNettyHttpClientTest extends HttpClientTest implements TestingNettyHttpNamingConventions.ClientV0{
-  // Can't be @Shared otherwise field-injected classes get loaded too early.
+class ReactorNettyHttpClientTest extends HttpClientTest implements TestingNettyHttpNamingConventions.ClientV0 {
+
+  @Shared
   HttpClient httpClient = HttpClient.create()
   .followRedirect(true)
   .responseTimeout(Duration.ofMillis(READ_TIMEOUT_MS))
@@ -25,7 +27,11 @@ class ReactorNettyHttpClientTest extends HttpClientTest implements TestingNettyH
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, String body, Closure callback) {
     httpClient
-      .headers({ hdrs -> headers.each { hdrs.set(it.key, it.value) } })
+      .headers({ hdrs ->
+        headers.each {
+          hdrs.set(it.key, it.value)
+        }
+      })
       .request(HttpMethod.valueOf(method))
       .uri(uri)
       .send(ByteBufFlux.fromString(Flux.just(body)))
@@ -35,7 +41,11 @@ class ReactorNettyHttpClientTest extends HttpClientTest implements TestingNettyH
           Mono.just(httpClientResponse.status().code())
         }
       })
-      .doOnSuccess({ if (callback) { callback.run() } })
+      .doOnSuccess({
+        if (callback) {
+          callback.run()
+        }
+      })
       .block()
   }
 
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
index 8b8b4fb7054..c8e48925aa6 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.resteasy;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -16,14 +17,15 @@ public static void onExit(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         if (result instanceof Collection) {
-          Collection collection = (Collection) result;
+          Collection<?> collection = (Collection<?>) result;
+          final IastContext ctx = IastContext.Provider.get();
           for (Object o : collection) {
             if (o instanceof String) {
-              module.taint(SourceTypes.REQUEST_COOKIE_VALUE, paramName, (String) o);
+              module.taint(ctx, o, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
             }
           }
         } else {
-          module.taint(SourceTypes.REQUEST_COOKIE_VALUE, paramName, (String) result);
+          module.taint(result, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
index 64d75e44899..cf6b629c28a 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.resteasy;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -16,14 +17,15 @@ public static void onExit(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         if (result instanceof Collection) {
+          final IastContext ctx = IastContext.Provider.get();
           Collection<?> collection = (Collection<?>) result;
           for (Object o : collection) {
             if (o instanceof String) {
-              module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+              module.taint(ctx, o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
             }
           }
         } else {
-          module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) result);
+          module.taint(result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
index bbac5d32ae7..e6bd6f5cc09 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.resteasy;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -17,14 +18,15 @@ public static void onExit(
       if (module != null) {
         try {
           if (result instanceof Collection) {
-            Collection collection = (Collection) result;
+            Collection<?> collection = (Collection<?>) result;
+            final IastContext ctx = IastContext.Provider.get();
             for (Object o : collection) {
               if (o instanceof String) {
-                module.taint(SourceTypes.REQUEST_HEADER_VALUE, paramName, (String) o);
+                module.taint(ctx, o, SourceTypes.REQUEST_HEADER_VALUE, paramName);
               }
             }
           } else {
-            module.taint(SourceTypes.REQUEST_HEADER_VALUE, paramName, (String) result);
+            module.taint(result, SourceTypes.REQUEST_HEADER_VALUE, paramName);
           }
         } catch (final Throwable e) {
           module.onUnexpectedException("HeaderParamInjectorAdvice.onExit threw", e);
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
index f5718d928d9..6c2e140e497 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.resteasy;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -17,13 +18,14 @@ public static void onExit(
       if (module != null) {
         if (result instanceof Collection) {
           Collection<?> collection = (Collection<?>) result;
+          final IastContext ctx = IastContext.Provider.get();
           for (Object o : collection) {
             if (o instanceof String) {
-              module.taint(SourceTypes.REQUEST_PATH_PARAMETER, paramName, (String) o);
+              module.taint(ctx, o, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
             }
           }
         } else {
-          module.taint(SourceTypes.REQUEST_PATH_PARAMETER, paramName, (String) result);
+          module.taint(result, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
index a8a7443e35c..811180e6489 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.resteasy;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -17,13 +18,14 @@ public static void onExit(
       if (module != null) {
         if (result instanceof Collection) {
           Collection<?> collection = (Collection<?>) result;
+          final IastContext ctx = IastContext.Provider.get();
           for (Object o : collection) {
             if (o instanceof String) {
-              module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) o);
+              module.taint(ctx, o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
             }
           }
         } else {
-          module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, paramName, (String) result);
+          module.taint(result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
index ff2fc9309ed..191f8ecc992 100644
--- a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
@@ -110,8 +110,8 @@ public static class EncodeURLAdvice {
     public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        if (null != url && url.length() > 0 && null != encoded && encoded.length() > 0) {
-          module.taintIfInputIsTainted(encoded, url);
+        if (null != url && !url.isEmpty() && null != encoded && !encoded.isEmpty()) {
+          module.taintIfTainted(encoded, url);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
index b53b79b3d91..40e7b978b70 100644
--- a/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
@@ -180,7 +180,7 @@ class HttpServletResponseInstrumentationTest extends AgentTestRunner {
 
     then:
     noExceptionThrown()
-    1 * module.taintIfInputIsTainted(_, "http://dummy.url.com")
+    1 * module.taintIfTainted(_, "http://dummy.url.com")
     0 * _
   }
 
@@ -195,7 +195,7 @@ class HttpServletResponseInstrumentationTest extends AgentTestRunner {
 
     then:
     noExceptionThrown()
-    1 * module.taintIfInputIsTainted(_, "http://dummy.url.com")
+    1 * module.taintIfTainted(_, "http://dummy.url.com")
     0 * _
   }
 
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
index 658643051eb..10bcde43a04 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
@@ -7,12 +7,12 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.source.WebModule;
+import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
-import java.util.Collections;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -59,9 +59,9 @@ public static class GetNameAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static String onExit(@Advice.Return final String name) {
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues("Content-Disposition", Collections.singleton(name));
+        module.taint(name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
       }
       return name;
     }
@@ -72,9 +72,9 @@ public static class GetHeaderAdvice {
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static String onExit(
         @Advice.Return final String value, @Advice.Argument(0) final String name) {
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues(name, Collections.singleton(value));
+        module.taint(value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
       }
       return value;
     }
@@ -86,12 +86,15 @@ public static class GetHeadersAdvice {
     public static void onExit(
         @Advice.Argument(0) final String headerName,
         @Advice.Return Collection<String> headerValues) {
-      if (null == headerValues) {
+      if (null == headerValues || headerValues.isEmpty()) {
         return;
       }
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues(headerName, headerValues);
+        final IastContext ctx = IastContext.Provider.get();
+        for (final String value : headerValues) {
+          module.taint(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+        }
       }
     }
   }
@@ -100,12 +103,15 @@ public static class GetHeaderNamesAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static void onExit(@Advice.Return final Collection<String> headerNames) {
-      if (null == headerNames) {
+      if (null == headerNames || headerNames.isEmpty()) {
         return;
       }
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartNames(headerNames);
+        final IastContext ctx = IastContext.Provider.get();
+        for (final String name : headerNames) {
+          module.taint(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+        }
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/HttpServlet3RequestCallSite.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/HttpServlet3RequestCallSite.java
deleted file mode 100644
index ab5edcb741c..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/HttpServlet3RequestCallSite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package datadog.trace.instrumentation.servlet3.callsite;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class HttpServlet3RequestCallSite {
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.util.Map javax.servlet.http.HttpServletRequest.getParameterMap()")
-  @CallSite.After("java.util.Map javax.servlet.http.HttpServletRequestWrapper.getParameterMap()")
-  public static java.util.Map<java.lang.String, java.lang.String[]> afterGetParameterMap(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final Map<String, String[]> map) {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module != null) {
-      try {
-        module.onParameterValues(map);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return map;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/Servlet3RequestCallSite.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/Servlet3RequestCallSite.java
deleted file mode 100644
index a6370fab20e..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/callsite/Servlet3RequestCallSite.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package datadog.trace.instrumentation.servlet3.callsite;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.source.WebModule;
-import java.util.Map;
-import javax.servlet.ServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class Servlet3RequestCallSite {
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
-  @CallSite.After("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
-  public static java.util.Map<java.lang.String, java.lang.String[]> afterGetParameterMap(
-      @CallSite.This final ServletRequest self, @CallSite.Return final Map<String, String[]> map) {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module != null) {
-      try {
-        module.onParameterValues(map);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return map;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy
index 3b1269895b4..73377c8822f 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy
@@ -1,6 +1,7 @@
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.source.WebModule
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
 import foo.bar.smoketest.MockPart
 
 class MultipartInstrumentationForkedTest extends AgentTestRunner {
@@ -16,57 +17,57 @@ class MultipartInstrumentationForkedTest extends AgentTestRunner {
 
   void 'test getName'() {
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
     part.getName()
 
     then:
-    1 * module.onMultipartValues(_, _)
+    1 * module.taint('partName', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'Content-Disposition')
     0 * _
   }
 
-  void 'test getHeader'(){
+  void 'test getHeader'() {
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
-    part.getHeader("headerName")
+    part.getHeader('headerName')
 
     then:
-    1 * module.onMultipartValues(_, _)
+    1 * module.taint('headerValue', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'headerName')
     0 * _
   }
 
-  void 'test getHeaders'(){
+  void 'test getHeaders'() {
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
-    part.getHeaders("headerName")
+    part.getHeaders('headerName')
 
     then:
-    1 *  module.onMultipartValues(_, _)
+    1 * module.taint(_, 'headerValue', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'headerName')
     0 * _
   }
 
-  void 'test getHeaderNames'(){
+  void 'test getHeaderNames'() {
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
     part.getHeaderNames()
 
     then:
-    1 * module.onMultipartNames(_)
+    1 * module.taint(_, 'headerName', SourceTypes.REQUEST_MULTIPART_PARAMETER)
     0 * _
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/Servlet3TestGetParameterInstrumentation.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/Servlet3TestGetParameterInstrumentation.groovy
deleted file mode 100644
index 417f2424acc..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/Servlet3TestGetParameterInstrumentation.groovy
+++ /dev/null
@@ -1,45 +0,0 @@
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.source.WebModule
-import foo.bar.smoketest.HttpServlet3TestSuite
-import foo.bar.smoketest.HttpServletWrapper3TestSuite
-import foo.bar.smoketest.Servlet3TestSuite
-
-import javax.servlet.ServletRequest
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletRequestWrapper
-
-class Servlet3TestGetParameterInstrumentation extends AgentTestRunner {
-
-  @Override
-  protected void configurePreAgent() {
-    injectSysConfig("dd.iast.enabled", "true")
-  }
-
-  void cleanup() {
-    InstrumentationBridge.clearIastModules()
-  }
-
-  void 'test getParameter'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final map = [param1: ['value1', 'value2'] as String[]]
-    final request = Mock(requestClass) {
-      getParameterMap() >> map
-    }
-
-    when:
-    final returnedMap = suite.getParameterMap(request)
-
-    then:
-    returnedMap == map
-    1 * iastModule.onParameterValues(map)
-
-    where:
-    suite                              | requestClass
-    new Servlet3TestSuite()            | ServletRequest
-    new HttpServlet3TestSuite()        | HttpServletRequest
-    new HttpServletWrapper3TestSuite() | HttpServletRequestWrapper
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServlet3TestSuite.java b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServlet3TestSuite.java
deleted file mode 100644
index 073a426ff30..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServlet3TestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo.bar.smoketest;
-
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
-public class HttpServlet3TestSuite implements ServletSuite<HttpServletRequest> {
-
-  @Override
-  public Map<String, String[]> getParameterMap(HttpServletRequest request) {
-    return request.getParameterMap();
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServletWrapper3TestSuite.java b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServletWrapper3TestSuite.java
deleted file mode 100644
index 185370b1a76..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/HttpServletWrapper3TestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo.bar.smoketest;
-
-import java.util.Map;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-public class HttpServletWrapper3TestSuite implements ServletSuite<HttpServletRequestWrapper> {
-
-  @Override
-  public Map<String, String[]> getParameterMap(HttpServletRequestWrapper request) {
-    return request.getParameterMap();
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java
index 02be9d32688..cde71fdd6ac 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java
@@ -2,17 +2,26 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import javax.servlet.http.Part;
 
 public class MockPart implements Part {
-  String name;
-  String headerValue;
+  private final String name;
 
-  public MockPart(String name, String headerValue) {
+  private final Map<String, Collection<String>> headers;
+
+  public MockPart(final String name, final Map<String, Collection<String>> headers) {
+    this.name = name;
+    this.headers = headers;
+  }
+
+  public MockPart(final String name, final String headerName, final String... headerValue) {
     this.name = name;
-    this.headerValue = headerValue;
+    this.headers = new HashMap<>();
+    this.headers.put(headerName, Arrays.asList(headerValue));
   }
 
   @Override
@@ -48,16 +57,17 @@ public void delete() throws IOException {}
 
   @Override
   public String getHeader(String name) {
-    return headerValue;
+    final Collection<String> values = this.headers.get(name);
+    return values == null || values.isEmpty() ? null : values.iterator().next();
   }
 
   @Override
   public Collection<String> getHeaders(String name) {
-    return Collections.singleton(headerValue);
+    return headers.get(name);
   }
 
   @Override
   public Collection<String> getHeaderNames() {
-    return Collections.singleton(name);
+    return this.headers.keySet();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/Servlet3TestSuite.java b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/Servlet3TestSuite.java
deleted file mode 100644
index e3d1ccfd606..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/Servlet3TestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo.bar.smoketest;
-
-import java.util.Map;
-import javax.servlet.ServletRequest;
-
-public class Servlet3TestSuite implements ServletSuite<ServletRequest> {
-
-  @Override
-  public Map<String, String[]> getParameterMap(ServletRequest request) {
-    return request.getParameterMap();
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/ServletSuite.java b/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/ServletSuite.java
deleted file mode 100644
index 7e55e71ecba..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/ServletSuite.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo.bar.smoketest;
-
-import java.util.Map;
-import javax.servlet.ServletRequest;
-
-public interface ServletSuite<S extends ServletRequest> {
-
-  Map<String, String[]> getParameterMap(S request);
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
index 9c5880b0ffd..9691777a6e8 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
@@ -3,128 +3,57 @@
 import datadog.trace.agent.tooling.csi.CallSite;
 import datadog.trace.api.iast.IastCallSites;
 import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Sink;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.VulnerabilityTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
-import datadog.trace.api.iast.source.WebModule;
-import datadog.trace.util.stacktrace.StackUtils;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
 
+/**
+ * Calls to these methods are often triggered outside of customer code, we use call sites to avoid
+ * all these unwanted tainting operations
+ */
 @CallSite(spi = IastCallSites.class)
 public class JakartaHttpServletRequestCallSite {
 
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+  @Source(SourceTypes.REQUEST_PATH)
+  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getRequestURI()")
+  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getRequestURI()")
+  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathInfo()")
+  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathInfo()")
+  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathTranslated()")
   @CallSite.After(
-      "java.lang.String jakarta.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getParameter(java.lang.String)")
-  public static String afterGetParameter(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String name,
-      @CallSite.Return final String value) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return value;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-  @CallSite.After(
-      "java.util.Enumeration jakarta.servlet.http.HttpServletRequest.getParameterNames()")
-  @CallSite.After(
-      "java.util.Enumeration jakarta.servlet.http.HttpServletRequestWrapper.getParameterNames()")
-  public static Enumeration<String> afterGetParameterNames(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> parameterNames = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String paramName = enumeration.nextElement();
-        parameterNames.add(paramName);
-      }
-      try {
-        module.onParameterNames(parameterNames);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameterNames threw", e);
+      "java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
+  public static String afterPath(
+      @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
+    if (null != retValue && !retValue.isEmpty()) {
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module != null) {
+        try {
+          module.taint(retValue, SourceTypes.REQUEST_PATH);
+        } catch (final Throwable e) {
+          module.onUnexpectedException("afterPath threw", e);
+        }
       }
-      return Collections.enumeration(parameterNames);
-    } catch (final Throwable e) {
-      module.onUnexpectedException(
-          "afterGetParameterNames threw while iterating parameter names", e);
-      throw StackUtils.filterFirstDatadog(e);
     }
+    return retValue;
   }
 
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After(
-      "java.lang.String[] jakarta.servlet.http.HttpServletRequest.getParameterValues(java.lang.String)")
+  @Source(SourceTypes.REQUEST_URI)
+  @CallSite.After("java.lang.StringBuffer jakarta.servlet.http.HttpServletRequest.getRequestURL()")
   @CallSite.After(
-      "java.lang.String[] jakarta.servlet.http.HttpServletRequestWrapper.getParameterValues(java.lang.String)")
-  public static String[] afterGetParameterValues(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String paramName,
-      @CallSite.Return final String[] parameterValues) {
-    if (null != parameterValues) {
-      final WebModule module = InstrumentationBridge.WEB;
+      "java.lang.StringBuffer jakarta.servlet.http.HttpServletRequestWrapper.getRequestURL()")
+  public static StringBuffer afterGetRequestURL(
+      @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
+    if (null != retValue && retValue.length() > 0) {
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.onParameterValues(paramName, parameterValues);
+          module.taint(retValue, SourceTypes.REQUEST_URI);
         } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetParameterValues threw", e);
+          module.onUnexpectedException("afterGetRequestURL threw", e);
         }
       }
     }
-    return parameterValues;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.util.Map jakarta.servlet.http.HttpServletRequest.getParameterMap()")
-  @CallSite.After("java.util.Map jakarta.servlet.http.HttpServletRequestWrapper.getParameterMap()")
-  public static java.util.Map<java.lang.String, java.lang.String[]> afterGetParameterMap(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final Map<String, String[]> map) {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module != null) {
-      try {
-        module.onParameterValues(map);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return map;
-  }
-
-  @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-  @CallSite.Before(
-      "jakarta.servlet.RequestDispatcher jakarta.servlet.http.HttpServletRequest.getRequestDispatcher(java.lang.String)")
-  @CallSite.Before(
-      "jakarta.servlet.RequestDispatcher jakarta.servlet.http.HttpServletRequestWrapper.getRequestDispatcher(java.lang.String)")
-  public static void beforeRequestDispatcher(@CallSite.Argument final String path) {
-    final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-    if (module != null) {
-      try {
-        module.onRedirect(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeRequestDispatcher threw", e);
-      }
-    }
+    return retValue;
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInputStreamCallSite.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInputStreamCallSite.java
deleted file mode 100644
index cd668baf453..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInputStreamCallSite.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package datadog.trace.instrumentation.servlet5;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.propagation.PropagationModule;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class JakartaHttpServletRequestInputStreamCallSite {
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After(
-      "jakarta.servlet.ServletInputStream jakarta.servlet.http.HttpServletRequest.getInputStream()")
-  @CallSite.After(
-      "jakarta.servlet.ServletInputStream jakarta.servlet.http.HttpServletRequestWrapper.getInputStream()")
-  public static ServletInputStream afterGetInputStream(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final ServletInputStream inputStream) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, inputStream);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetInputStream threw", e);
-      }
-    }
-    return inputStream;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
new file mode 100644
index 00000000000..e9d373b9fb8
--- /dev/null
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
@@ -0,0 +1,285 @@
+package datadog.trace.instrumentation.servlet5;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.iast.TaintableEnumeration;
+import datadog.trace.api.iast.IastContext;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Sink;
+import datadog.trace.api.iast.Source;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.VulnerabilityTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
+import jakarta.servlet.http.Cookie;
+import java.util.Enumeration;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@SuppressWarnings("unused")
+@AutoService(Instrumenter.class)
+public class JakartaHttpServletRequestInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForTypeHierarchy {
+
+  private static final String CLASS_NAME = JakartaHttpServletRequestInstrumentation.class.getName();
+  private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
+      named("jakarta.servlet.http.HttpServletRequestWrapper");
+
+  public JakartaHttpServletRequestInstrumentation() {
+    super("servlet", "servlet-5", "servlet-request");
+  }
+
+  @Override
+  public String hierarchyMarkerType() {
+    return "jakarta.servlet.http.HttpServletRequest";
+  }
+
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named(hierarchyMarkerType()))
+        .and(not(WRAPPER_CLASS))
+        .and(not(extendsClass(WRAPPER_CLASS)));
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {"datadog.trace.agent.tooling.iast.TaintableEnumeration"};
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod().and(named("getHeader")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetHeaderAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetHeadersAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getHeaderNames")).and(takesArguments(0)),
+        CLASS_NAME + "$GetHeaderNamesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameter")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetParameterAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetParameterValuesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterMap")).and(takesArguments(0)),
+        CLASS_NAME + "$GetParameterMapAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterNames")).and(takesArguments(0)),
+        CLASS_NAME + "$GetParameterNamesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getCookies")).and(takesArguments(0)),
+        CLASS_NAME + "$GetCookiesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getQueryString")).and(takesArguments(0)),
+        CLASS_NAME + "$GetQueryStringAdvice");
+    transformation.applyAdvice(
+        isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
+        CLASS_NAME + "$GetBodyAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetRequestDispatcherAdvice");
+  }
+
+  public static class GetHeaderAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String value) {
+      if (value == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(value, SourceTypes.REQUEST_HEADER_VALUE, name);
+    }
+  }
+
+  public static class GetHeadersAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name,
+        @Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+    }
+  }
+
+  public static class GetHeaderNamesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_NAME)
+    public static void onExit(@Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+    }
+  }
+
+  public static class GetParameterAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String value) {
+      if (value == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+    }
+  }
+
+  public static class GetParameterValuesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String[] values) {
+      if (values == null || values.length == 0) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final String value : values) {
+        module.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+      }
+    }
+  }
+
+  public static class GetParameterMapAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(@Advice.Return final Map<String, String[]> parameters) {
+      if (parameters == null || parameters.isEmpty()) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
+        final String name = entry.getKey();
+        module.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+        final String[] values = entry.getValue();
+        if (values != null) {
+          for (final String value : entry.getValue()) {
+            module.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+          }
+        }
+      }
+    }
+  }
+
+  public static class GetParameterNamesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_NAME)
+    public static void onExit(@Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+    }
+  }
+
+  public static class GetCookiesAdvice {
+
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+    public static void onExit(@Advice.Return final Cookie[] cookies) {
+      if (cookies == null || cookies.length == 0) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final Cookie cookie : cookies) {
+        module.taint(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+      }
+    }
+  }
+
+  public static class GetQueryStringAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_QUERY)
+    public static void onExit(@Advice.Return final String queryString) {
+      if (queryString == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(queryString, SourceTypes.REQUEST_QUERY);
+    }
+  }
+
+  public static class GetBodyAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_BODY)
+    public static void onExit(@Advice.Return final Object body) {
+      if (body == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(body, SourceTypes.REQUEST_BODY);
+    }
+  }
+
+  public static class GetRequestDispatcherAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+    public static void onExit(@Advice.Argument(0) final String path) {
+      if (path == null) {
+        return;
+      }
+      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+      if (module == null) {
+        return;
+      }
+      module.onRedirect(path);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
index f7c7c3b03ff..af06d7a6b2c 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
@@ -82,7 +82,7 @@ public static class AddHeaderAdvice {
     @Sink(VulnerabilityTypes.RESPONSE_HEADER)
     public static void onEnter(
         @Advice.Argument(0) final String name, @Advice.Argument(1) String value) {
-      if (null != value && value.length() > 0) {
+      if (null != value && !value.isEmpty()) {
         HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
         if (mod != null) {
           mod.onHeader(name, value);
@@ -97,7 +97,7 @@ public static class SendRedirectAdvice {
     public static void onEnter(@Advice.Argument(0) final String location) {
       final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
       if (module != null) {
-        if (null != location && location.length() > 0) {
+        if (null != location && !location.isEmpty()) {
           module.onRedirect(location);
         }
       }
@@ -109,8 +109,8 @@ public static class EncodeURLAdvice {
     public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        if (null != url && url.length() > 0 && null != encoded && encoded.length() > 0) {
-          module.taintIfInputIsTainted(encoded, url);
+        if (null != url && !url.isEmpty() && null != encoded && !encoded.isEmpty()) {
+          module.taintIfTainted(encoded, url);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
index 9bbb1804d94..6957a3f894d 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
@@ -7,12 +7,12 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.source.WebModule;
+import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
-import java.util.Collections;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -55,9 +55,9 @@ public static class GetNameAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static String onExit(@Advice.Return final String name) {
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues("Content-Disposition", Collections.singleton(name));
+        module.taint(name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
       }
       return name;
     }
@@ -68,9 +68,9 @@ public static class GetHeaderAdvice {
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static String onExit(
         @Advice.Return final String value, @Advice.Argument(0) final String name) {
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues(name, Collections.singleton(value));
+        module.taint(value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
       }
       return value;
     }
@@ -82,12 +82,15 @@ public static class GetHeadersAdvice {
     public static void onExit(
         @Advice.Argument(0) final String headerName,
         @Advice.Return Collection<String> headerValues) {
-      if (null == headerValues) {
+      if (null == headerValues || headerValues.isEmpty()) {
         return;
       }
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartValues(headerName, headerValues);
+        final IastContext ctx = IastContext.Provider.get();
+        for (final String value : headerValues) {
+          module.taint(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+        }
       }
     }
   }
@@ -96,12 +99,15 @@ public static class GetHeaderNamesAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
     public static void onExit(@Advice.Return final Collection<String> headerNames) {
-      if (null == headerNames) {
+      if (null == headerNames || headerNames.isEmpty()) {
         return;
       }
-      final WebModule module = InstrumentationBridge.WEB;
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.onMultipartNames(headerNames);
+        final IastContext ctx = IastContext.Provider.get();
+        for (final String name : headerNames) {
+          module.taint(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+        }
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletRequestCallSite.java
deleted file mode 100644
index 56cbc9cd379..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletRequestCallSite.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package datadog.trace.instrumentation.servlet5;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Sink;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.VulnerabilityTypes;
-import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
-import datadog.trace.api.iast.source.WebModule;
-import datadog.trace.util.stacktrace.StackUtils;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.ServletRequest;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
-@CallSite(spi = IastCallSites.class)
-public class JakartaServletRequestCallSite {
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.lang.String jakarta.servlet.ServletRequest.getParameter(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String jakarta.servlet.ServletRequestWrapper.getParameter(java.lang.String)")
-  public static String afterGetParameter(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Argument final String name,
-      @CallSite.Return final String value) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return value;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-  @CallSite.After("java.util.Enumeration jakarta.servlet.ServletRequest.getParameterNames()")
-  @CallSite.After("java.util.Enumeration jakarta.servlet.ServletRequestWrapper.getParameterNames()")
-  public static Enumeration<String> afterGetParameterNames(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> parameterNames = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String paramName = enumeration.nextElement();
-        parameterNames.add(paramName);
-      }
-      try {
-        module.onParameterNames(parameterNames);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameterNames threw", e);
-      }
-      return Collections.enumeration(parameterNames);
-    } catch (final Throwable e) {
-      module.onUnexpectedException(
-          "afterGetParameterNames threw while iterating parameter names", e);
-      throw StackUtils.filterFirstDatadog(e);
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After(
-      "java.lang.String[] jakarta.servlet.ServletRequest.getParameterValues(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String[] jakarta.servlet.ServletRequestWrapper.getParameterValues(java.lang.String)")
-  public static String[] afterGetParameterValues(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Argument final String paramName,
-      @CallSite.Return final String[] parameterValues) {
-    if (null != parameterValues) {
-      final WebModule module = InstrumentationBridge.WEB;
-      if (module != null) {
-        try {
-          module.onParameterValues(paramName, parameterValues);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetParameterValues threw", e);
-        }
-      }
-    }
-    return parameterValues;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.util.Map jakarta.servlet.ServletRequest.getParameterMap()")
-  @CallSite.After("java.util.Map jakarta.servlet.ServletRequestWrapper.getParameterMap()")
-  public static java.util.Map<java.lang.String, java.lang.String[]> afterGetParameterMap(
-      @CallSite.This final ServletRequest self, @CallSite.Return final Map<String, String[]> map) {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module != null) {
-      try {
-        module.onParameterValues(map);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return map;
-  }
-
-  @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-  @CallSite.Before(
-      "jakarta.servlet.RequestDispatcher jakarta.servlet.ServletRequest.getRequestDispatcher(java.lang.String)")
-  @CallSite.Before(
-      "jakarta.servlet.RequestDispatcher jakarta.servlet.ServletRequestWrapper.getRequestDispatcher(java.lang.String)")
-  public static void beforeRequestDispatcher(@CallSite.Argument final String path) {
-    final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-    if (module != null) {
-      try {
-        module.onRedirect(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeRequestDispatcher threw", e);
-      }
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After(
-      "jakarta.servlet.ServletInputStream jakarta.servlet.ServletRequest.getInputStream()")
-  @CallSite.After(
-      "jakarta.servlet.ServletInputStream jakarta.servlet.ServletRequestWrapper.getInputStream()")
-  public static ServletInputStream afterGetInputStream(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final ServletInputStream inputStream) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, inputStream);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetInputStream threw", e);
-      }
-    }
-    return inputStream;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy
new file mode 100644
index 00000000000..7c27dc724f1
--- /dev/null
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy
@@ -0,0 +1,459 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
+import datadog.trace.api.iast.sink.UnvalidatedRedirectModule
+import foo.bar.smoketest.JakartaHttpServletRequestTestSuite
+import foo.bar.smoketest.JakartaHttpServletRequestWrapperTestSuite
+import foo.bar.smoketest.ServletRequestTestSuite
+import jakarta.servlet.RequestDispatcher
+import jakarta.servlet.ServletInputStream
+import jakarta.servlet.http.Cookie
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequestWrapper
+
+import datadog.trace.agent.tooling.iast.TaintableEnumeration
+
+class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
+
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig('dd.iast.enabled', 'true')
+  }
+
+  void cleanup() {
+    InstrumentationBridge.clearIastModules()
+  }
+
+  void 'test getHeader'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeader('header')
+
+    then:
+    result == 'value'
+    1 * mock.getHeader('header') >> 'value'
+    1 * iastModule.taint('value', SourceTypes.REQUEST_HEADER_VALUE, 'header')
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getHeaders'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final headers = ['value1', 'value2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaders('headers').collect()
+
+    then:
+    result == headers
+    1 * mock.getHeaders('headers') >> Collections.enumeration(headers)
+    headers.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_HEADER_VALUE, 'headers') }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getHeaderNames'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final headers = ['header1', 'header2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaderNames().collect()
+
+    then:
+    result == headers
+    1 * mock.getHeaderNames() >> Collections.enumeration(headers)
+    headers.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_HEADER_NAME, it) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameter'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameter('parameter')
+
+    then:
+    result == 'value'
+    1 * mock.getParameter('parameter') >> 'value'
+    1 * iastModule.taint('value', SourceTypes.REQUEST_PARAMETER_VALUE, 'parameter')
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameterValues'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final values = ['value1', 'value2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterValues('parameter').collect()
+
+    then:
+    result == values
+    1 * mock.getParameterValues('parameter') >> { values as String[] }
+    values.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_PARAMETER_VALUE, 'parameter') }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameterMap'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final parameters = [parameter: ['header1', 'header2'] as String[]]
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterMap()
+
+    then:
+    result == parameters
+    1 * mock.getParameterMap() >> parameters
+    parameters.each { key, values ->
+      1 * iastModule.taint(_, key, SourceTypes.REQUEST_PARAMETER_NAME, key)
+      values.each { value ->
+        1 * iastModule.taint(_, value, SourceTypes.REQUEST_PARAMETER_VALUE, key)
+      }
+    }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+
+  void 'test getParameterNames'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final parameters = ['param1', 'param2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterNames().collect()
+
+    then:
+    result == parameters
+    1 * mock.getParameterNames() >> Collections.enumeration(parameters)
+    parameters.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_PARAMETER_NAME, it) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getCookies'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final cookies = [new Cookie('name1', 'value1'), new Cookie('name2', 'value2')] as Cookie[]
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getCookies()
+
+    then:
+    result == cookies
+    1 * mock.getCookies() >> cookies
+    cookies.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_COOKIE_VALUE) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test that get headers does not fail when servlet related code fails'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final enumeration = Mock(Enumeration) {
+      hasMoreElements() >> { throw new NuclearBomb('Boom!!!') }
+    }
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final headers = request.getHeaders('header')
+
+    then:
+    1 * mock.getHeaders('header') >> enumeration
+    noExceptionThrown()
+
+    when:
+    headers.hasMoreElements()
+
+    then:
+    final bomb = thrown(NuclearBomb)
+    bomb.stackTrace.find { it.className == TaintableEnumeration.name } == null
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test that get header names does not fail when servlet related code fails'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final enumeration = Mock(Enumeration) {
+      hasMoreElements() >> { throw new NuclearBomb('Boom!!!') }
+    }
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaderNames()
+
+    then:
+    1 * mock.getHeaderNames() >> enumeration
+    noExceptionThrown()
+
+    when:
+    result.hasMoreElements()
+
+    then:
+    final bomb = thrown(NuclearBomb)
+    bomb.stackTrace.find { it.className == TaintableEnumeration.name } == null
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test get query string'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final queryString = 'paramName=paramValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final String result = request.getQueryString()
+
+    then:
+    result == queryString
+    1 * mock.getQueryString() >> queryString
+    1 * iastModule.taint(queryString, SourceTypes.REQUEST_QUERY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getInputStream'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final is = Mock(ServletInputStream)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getInputStream()
+
+    then:
+    result == is
+    1 * mock.getInputStream() >> is
+    1 * iastModule.taint(is, SourceTypes.REQUEST_BODY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getReader'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final reader = Mock(BufferedReader)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getReader()
+
+    then:
+    result == reader
+    1 * mock.getReader() >> reader
+    1 * iastModule.taint(reader, SourceTypes.REQUEST_BODY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getRequestDispatcher'() {
+    setup:
+    final iastModule = Mock(UnvalidatedRedirectModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final path = 'http://dummy.location.com'
+    final dispatcher = Mock(RequestDispatcher)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestDispatcher(path)
+
+    then:
+    result == dispatcher
+    1 * mock.getRequestDispatcher(path) >> dispatcher
+    1 * iastModule.onRedirect(path)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getRequestURI'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final uri = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestURI()
+
+    then:
+    result == uri
+    1 * mock.getRequestURI() >> uri
+    1 * iastModule.taint(uri, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getPathInfo'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final pathInfo = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getPathInfo()
+
+    then:
+    result == pathInfo
+    1 * mock.getPathInfo() >> pathInfo
+    1 * iastModule.taint(pathInfo, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getPathTranslated'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final pathTranslated = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getPathTranslated()
+
+    then:
+    result == pathTranslated
+    1 * mock.getPathTranslated() >> pathTranslated
+    1 * iastModule.taint(pathTranslated, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getRequestURL'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final url = new StringBuffer('retValue')
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestURL()
+
+    then:
+    result == url
+    1 * mock.getRequestURL() >> url
+    1 * iastModule.taint(url, SourceTypes.REQUEST_URI)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  private List<Closure<? extends HttpServletRequest>> testSuite() {
+    return [
+      { HttpServletRequest request -> new CustomRequest(request: request) },
+      { HttpServletRequest request -> new CustomRequestWrapper(new CustomRequest(request: request)) },
+      { HttpServletRequest request ->
+        new HttpServletRequestWrapper(new CustomRequest(request: request))
+      }
+    ]
+  }
+
+  private List<Closure<? extends ServletRequestTestSuite>> testSuiteCallSites() {
+    return [
+      { HttpServletRequest request -> new JakartaHttpServletRequestTestSuite(request) },
+      { HttpServletRequest request -> new JakartaHttpServletRequestWrapperTestSuite(new CustomRequestWrapper(request)) },
+    ]
+  }
+
+  private static class NuclearBomb extends RuntimeException {
+    NuclearBomb(final String message) {
+      super(message)
+    }
+  }
+
+  private static class CustomRequest implements HttpServletRequest {
+    @Delegate
+    private HttpServletRequest request
+  }
+
+  private static class CustomRequestWrapper extends HttpServletRequestWrapper {
+
+    CustomRequestWrapper(final HttpServletRequest request) {
+      super(request)
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
index f077b6c0307..230119f8ff6 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
@@ -206,13 +206,13 @@ class JakartaHttpServletResponseInstrumentationTest extends AgentTestRunner {
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     final response = new DummyResponse()
+    final url = 'http://dummy.url.com'
 
     when:
-    response.encodeRedirectURL("http://dummy.url.com")
+    final result = response.encodeRedirectURL(url)
 
     then:
-    noExceptionThrown()
-    1 * module.taintIfInputIsTainted(_, "http://dummy.url.com")
+    1 * module.taintIfTainted(_, url) >> { args -> assert args[0] == result }
     0 * _
   }
 
@@ -221,13 +221,13 @@ class JakartaHttpServletResponseInstrumentationTest extends AgentTestRunner {
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     final response = new DummyResponse()
+    final url = 'http://dummy.url.com'
 
     when:
-    response.encodeURL("http://dummy.url.com")
+    final result = response.encodeURL(url)
 
     then:
-    noExceptionThrown()
-    1 * module.taintIfInputIsTainted(_, "http://dummy.url.com")
+    1 * module.taintIfTainted(_, url) >> { args -> assert args[0] == result }
     0 * _
   }
 
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
index 3632d2cc9bc..19c8a5eb990 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
@@ -1,6 +1,7 @@
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.source.WebModule
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
 import foo.bar.smoketest.MockPart
 
 class JakartaMultipartInstrumentationTest extends AgentTestRunner {
@@ -16,57 +17,57 @@ class JakartaMultipartInstrumentationTest extends AgentTestRunner {
 
   void 'test getName'() {
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
     part.getName()
 
     then:
-    1 * module.onMultipartValues(_, _)
+    1 * module.taint('partName', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'Content-Disposition')
     0 * _
   }
 
   void 'test getHeader'(){
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
-    part.getHeader("headerName")
+    part.getHeader('headerName')
 
     then:
-    1 * module.onMultipartValues(_, _)
+    1 * module.taint('headerValue', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'headerName')
     0 * _
   }
 
   void 'test getHeaders'(){
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
-    part.getHeaders("headerName")
+    part.getHeaders('headerName')
 
     then:
-    1 *  module.onMultipartValues(_, _)
+    1 * module.taint(_, 'headerValue', SourceTypes.REQUEST_MULTIPART_PARAMETER, 'headerName')
     0 * _
   }
 
   void 'test getHeaderNames'(){
     given:
-    final module = Mock(WebModule)
+    final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
-    final part = new MockPart("partName", "headerValue")
+    final part = new MockPart('partName', 'headerName', 'headerValue')
 
     when:
     part.getHeaderNames()
 
     then:
-    1 * module.onMultipartNames(_)
+    1 * module.taint(_, 'headerName', SourceTypes.REQUEST_MULTIPART_PARAMETER)
     0 * _
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaServletRequestCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaServletRequestCallSiteTest.groovy
deleted file mode 100644
index 354587a5ed1..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaServletRequestCallSiteTest.groovy
+++ /dev/null
@@ -1,137 +0,0 @@
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.SourceTypes
-import datadog.trace.api.iast.propagation.PropagationModule
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule
-import datadog.trace.api.iast.source.WebModule
-import foo.bar.smoketest.JakartaHttpServletRequestTestSuite
-import foo.bar.smoketest.JakartaHttpServletRequestWrapperTestSuite
-import foo.bar.smoketest.JakartaServletRequestTestSuite
-import foo.bar.smoketest.JakartaServletRequestWrapperTestSuite
-import groovy.transform.CompileDynamic
-import jakarta.servlet.ServletInputStream
-
-@CompileDynamic
-class JakartaServletRequestCallSiteTest extends AgentTestRunner {
-
-  @Override
-  protected void configurePreAgent() {
-    injectSysConfig("dd.iast.enabled", "true")
-  }
-
-  void cleanup() {
-    InstrumentationBridge.clearIastModules()
-  }
-
-  void 'test getParameter map'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final servletRequest = Mock(clazz)
-    testSuite.init(servletRequest)
-    final map = [param1: ['value1', 'value2'] as String[]]
-    servletRequest.getParameterMap() >> map
-
-    when:
-    final returnedMap = testSuite.getParameterMap()
-
-    then:
-    returnedMap == map
-    1 * iastModule.onParameterValues(map)
-
-    where:
-    testSuite                                       | clazz
-    new JakartaServletRequestTestSuite()            | jakarta.servlet.ServletRequest
-    new JakartaHttpServletRequestTestSuite()        | jakarta.servlet.http.HttpServletRequest
-    new JakartaServletRequestWrapperTestSuite()     | jakarta.servlet.ServletRequestWrapper
-    new JakartaHttpServletRequestWrapperTestSuite() | jakarta.servlet.http.HttpServletRequestWrapper
-  }
-
-  void 'test getParameterValues and getParameterNames'() {
-    setup:
-    final webMod = Mock(WebModule)
-    final propMod = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(webMod)
-    InstrumentationBridge.registerIastModule(propMod)
-    final map = [param1: ['value1', 'value2'] as String[]]
-    final servletRequest = Mock(clazz) {
-      getParameter(_ as String) >> { map.get(it[0]).first() }
-      getParameterValues(_ as String) >> { map.get(it[0]) }
-      getParameterNames() >> { Collections.enumeration(map.keySet()) }
-    }
-
-    testSuite.init(servletRequest)
-
-    when:
-    testSuite.getParameter('param1')
-
-    then:
-    1 * propMod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, 'param1', 'value1')
-
-    when:
-    testSuite.getParameterValues('param1')
-
-    then:
-    1 * webMod.onParameterValues('param1', ['value1', 'value2'])
-
-    when:
-    testSuite.getParameterNames()
-
-    then:
-    1 * webMod.onParameterNames(['param1'])
-
-    where:
-    testSuite                                       | clazz
-    new JakartaServletRequestTestSuite()            | jakarta.servlet.ServletRequest
-    new JakartaHttpServletRequestTestSuite()        | jakarta.servlet.http.HttpServletRequest
-    new JakartaServletRequestWrapperTestSuite()     | jakarta.servlet.ServletRequestWrapper
-    new JakartaHttpServletRequestWrapperTestSuite() | jakarta.servlet.http.HttpServletRequestWrapper
-  }
-
-  void 'test getRequestDispatcher'() {
-    setup:
-    final iastModule = Mock(UnvalidatedRedirectModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final servletRequest = Mock(clazz)
-    final path = 'http://dummy.location.com'
-    testSuite.init(servletRequest)
-
-    when:
-    testSuite.getRequestDispatcher(path)
-
-    then:
-    1 * servletRequest.getRequestDispatcher(path)
-    1 * iastModule.onRedirect(path)
-
-    where:
-    testSuite                                       | clazz
-    new JakartaServletRequestTestSuite()            | jakarta.servlet.ServletRequest
-    new JakartaHttpServletRequestTestSuite()        | jakarta.servlet.http.HttpServletRequest
-    new JakartaServletRequestWrapperTestSuite()     | jakarta.servlet.ServletRequestWrapper
-    new JakartaHttpServletRequestWrapperTestSuite() | jakarta.servlet.http.HttpServletRequestWrapper
-  }
-
-  void 'test getInputStream'() {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final stream = Mock(ServletInputStream)
-    final servletRequest = Mock(clazz) {
-      getInputStream() >> stream
-    }
-    testSuite.init(servletRequest)
-
-    when:
-    testSuite.getInputStream()
-
-    then:
-    1 * iastModule.taintObject(SourceTypes.REQUEST_BODY, stream)
-
-    where:
-    testSuite                                       | clazz
-    new JakartaServletRequestTestSuite()            | jakarta.servlet.ServletRequest
-    new JakartaHttpServletRequestTestSuite()        | jakarta.servlet.http.HttpServletRequest
-    new JakartaServletRequestWrapperTestSuite()     | jakarta.servlet.ServletRequestWrapper
-    new JakartaHttpServletRequestWrapperTestSuite() | jakarta.servlet.http.HttpServletRequestWrapper
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
index b25e9925599..41f3b87641e 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
@@ -1,47 +1,31 @@
 package foo.bar.smoketest;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Enumeration;
 
-public class JakartaHttpServletRequestTestSuite
-    implements ServletRequestTestSuite<HttpServletRequest> {
-  HttpServletRequest request;
+public class JakartaHttpServletRequestTestSuite implements ServletRequestTestSuite {
+  private final HttpServletRequest request;
 
-  @Override
-  public void init(HttpServletRequest request) {
+  public JakartaHttpServletRequestTestSuite(final HttpServletRequest request) {
     this.request = request;
   }
 
   @Override
-  public java.util.Map<String, String[]> getParameterMap() {
-    return request.getParameterMap();
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
+  public String getRequestURI() {
+    return request.getRequestURI();
   }
 
   @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
+  public String getPathInfo() {
+    return request.getPathInfo();
   }
 
   @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
+  public String getPathTranslated() {
+    return request.getPathTranslated();
   }
 
   @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
+  public StringBuffer getRequestURL() {
+    return request.getRequestURL();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
index 318c5a631df..80039d4cdca 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
@@ -1,47 +1,31 @@
 package foo.bar.smoketest;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequestWrapper;
-import java.io.IOException;
-import java.util.Enumeration;
 
-public class JakartaHttpServletRequestWrapperTestSuite
-    implements ServletRequestTestSuite<HttpServletRequestWrapper> {
-  HttpServletRequestWrapper request;
+public class JakartaHttpServletRequestWrapperTestSuite implements ServletRequestTestSuite {
+  private final HttpServletRequestWrapper request;
 
-  @Override
-  public void init(HttpServletRequestWrapper request) {
+  public JakartaHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
     this.request = request;
   }
 
   @Override
-  public java.util.Map<String, String[]> getParameterMap() {
-    return request.getParameterMap();
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
+  public String getRequestURI() {
+    return request.getRequestURI();
   }
 
   @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
+  public String getPathInfo() {
+    return request.getPathInfo();
   }
 
   @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
+  public String getPathTranslated() {
+    return request.getPathTranslated();
   }
 
   @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
+  public StringBuffer getRequestURL() {
+    return request.getRequestURL();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestTestSuite.java
deleted file mode 100644
index 486af8292e8..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package foo.bar.smoketest;
-
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.ServletRequest;
-import java.io.IOException;
-import java.util.Enumeration;
-
-public class JakartaServletRequestTestSuite implements ServletRequestTestSuite<ServletRequest> {
-  ServletRequest request;
-
-  @Override
-  public void init(ServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public java.util.Map<String, String[]> getParameterMap() {
-    return request.getParameterMap();
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
-
-  @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestWrapperTestSuite.java
deleted file mode 100644
index 710cc7a4d37..00000000000
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaServletRequestWrapperTestSuite.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package foo.bar.smoketest;
-
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.ServletRequestWrapper;
-import java.io.IOException;
-import java.util.Enumeration;
-
-public class JakartaServletRequestWrapperTestSuite
-    implements ServletRequestTestSuite<ServletRequestWrapper> {
-  ServletRequestWrapper request;
-
-  @Override
-  public void init(ServletRequestWrapper request) {
-    this.request = request;
-  }
-
-  @Override
-  public java.util.Map<String, String[]> getParameterMap() {
-    return request.getParameterMap();
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
-
-  @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java
index 82d30540503..0dcb52282e1 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java
@@ -3,16 +3,25 @@
 import jakarta.servlet.http.Part;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 public class MockPart implements Part {
-  String name;
-  String headerValue;
+  private final String name;
 
-  public MockPart(String name, String headerValue) {
+  private final Map<String, Collection<String>> headers;
+
+  public MockPart(final String name, final Map<String, Collection<String>> headers) {
+    this.name = name;
+    this.headers = headers;
+  }
+
+  public MockPart(final String name, final String headerName, final String... headerValue) {
     this.name = name;
-    this.headerValue = headerValue;
+    this.headers = new HashMap<>();
+    this.headers.put(headerName, Arrays.asList(headerValue));
   }
 
   @Override
@@ -48,16 +57,17 @@ public void delete() throws IOException {}
 
   @Override
   public String getHeader(String name) {
-    return headerValue;
+    final Collection<String> values = this.headers.get(name);
+    return values == null || values.isEmpty() ? null : values.iterator().next();
   }
 
   @Override
   public Collection<String> getHeaders(String name) {
-    return Collections.singleton(headerValue);
+    return headers.get(name);
   }
 
   @Override
   public Collection<String> getHeaderNames() {
-    return Collections.singleton(name);
+    return this.headers.keySet();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
index 0fd50c559d8..c1e5e45cde4 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
@@ -1,23 +1,12 @@
 package foo.bar.smoketest;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
+public interface ServletRequestTestSuite {
 
-public interface ServletRequestTestSuite<E> {
+  String getRequestURI();
 
-  void init(final E request);
+  String getPathInfo();
 
-  java.util.Map<String, String[]> getParameterMap();
+  String getPathTranslated();
 
-  String getParameter(String paramName);
-
-  String[] getParameterValues(String paramName);
-
-  Enumeration getParameterNames();
-
-  RequestDispatcher getRequestDispatcher(String path);
-
-  ServletInputStream getInputStream() throws IOException;
+  StringBuffer getRequestURL();
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
index 237cd35ff9f..37c7b7b2589 100644
--- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
@@ -48,7 +48,7 @@ public static void afterGetName(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, result, result, self);
+          module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
         } catch (final Throwable e) {
           module.onUnexpectedException("afterGetName threw", e);
         }
@@ -67,7 +67,7 @@ public static void afterGetValue(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_VALUE, name, result, self);
+          module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
         } catch (final Throwable e) {
           module.onUnexpectedException("getValue threw", e);
         }
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
new file mode 100644
index 00000000000..fce80bb78bc
--- /dev/null
+++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
@@ -0,0 +1,59 @@
+package datadog.trace.instrumentation.servlet.http;
+
+import datadog.trace.agent.tooling.csi.CallSite;
+import datadog.trace.api.iast.IastCallSites;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Source;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Calls to these methods are often triggered outside of customer code, we use call sites to avoid
+ * all these unwanted tainting operations
+ */
+@CallSite(spi = IastCallSites.class)
+public class HttpServletRequestCallSite {
+
+  @Source(SourceTypes.REQUEST_PATH)
+  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getRequestURI()")
+  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getRequestURI()")
+  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathInfo()")
+  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathInfo()")
+  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathTranslated()")
+  @CallSite.After(
+      "java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
+  public static String afterPath(
+      @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
+    if (null != retValue && !retValue.isEmpty()) {
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module != null) {
+        try {
+          module.taint(retValue, SourceTypes.REQUEST_PATH);
+        } catch (final Throwable e) {
+          module.onUnexpectedException("afterPath threw", e);
+        }
+      }
+    }
+    return retValue;
+  }
+
+  @Source(SourceTypes.REQUEST_URI)
+  @CallSite.After("java.lang.StringBuffer javax.servlet.http.HttpServletRequest.getRequestURL()")
+  @CallSite.After(
+      "java.lang.StringBuffer javax.servlet.http.HttpServletRequestWrapper.getRequestURL()")
+  public static StringBuffer afterGetRequestURL(
+      @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
+    if (null != retValue && retValue.length() > 0) {
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module != null) {
+        try {
+          module.taint(retValue, SourceTypes.REQUEST_URI);
+        } catch (final Throwable e) {
+          module.onUnexpectedException("afterGetRequestURL threw", e);
+        }
+      }
+    }
+    return retValue;
+  }
+}
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
new file mode 100644
index 00000000000..952e95f4409
--- /dev/null
+++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
@@ -0,0 +1,285 @@
+package datadog.trace.instrumentation.servlet.http;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.iast.TaintableEnumeration;
+import datadog.trace.api.iast.IastContext;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Sink;
+import datadog.trace.api.iast.Source;
+import datadog.trace.api.iast.SourceTypes;
+import datadog.trace.api.iast.VulnerabilityTypes;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
+import java.util.Enumeration;
+import java.util.Map;
+import javax.servlet.http.Cookie;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@SuppressWarnings("unused")
+@AutoService(Instrumenter.class)
+public class HttpServletRequestInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForTypeHierarchy {
+
+  private static final String CLASS_NAME = HttpServletRequestInstrumentation.class.getName();
+  private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
+      named("javax.servlet.http.HttpServletRequestWrapper");
+
+  public HttpServletRequestInstrumentation() {
+    super("servlet", "servlet-request");
+  }
+
+  @Override
+  public String hierarchyMarkerType() {
+    return "javax.servlet.http.HttpServletRequest";
+  }
+
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named(hierarchyMarkerType()))
+        .and(not(WRAPPER_CLASS))
+        .and(not(extendsClass(WRAPPER_CLASS)));
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {"datadog.trace.agent.tooling.iast.TaintableEnumeration"};
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod().and(named("getHeader")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetHeaderAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetHeadersAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getHeaderNames")).and(takesArguments(0)),
+        CLASS_NAME + "$GetHeaderNamesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameter")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetParameterAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetParameterValuesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterMap")).and(takesArguments(0)),
+        CLASS_NAME + "$GetParameterMapAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getParameterNames")).and(takesArguments(0)),
+        CLASS_NAME + "$GetParameterNamesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getCookies")).and(takesArguments(0)),
+        CLASS_NAME + "$GetCookiesAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getQueryString")).and(takesArguments(0)),
+        CLASS_NAME + "$GetQueryStringAdvice");
+    transformation.applyAdvice(
+        isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
+        CLASS_NAME + "$GetBodyAdvice");
+    transformation.applyAdvice(
+        isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
+        CLASS_NAME + "$GetRequestDispatcherAdvice");
+  }
+
+  public static class GetHeaderAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String value) {
+      if (value == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(value, SourceTypes.REQUEST_HEADER_VALUE, name);
+    }
+  }
+
+  public static class GetHeadersAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name,
+        @Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+    }
+  }
+
+  public static class GetHeaderNamesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_NAME)
+    public static void onExit(@Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+    }
+  }
+
+  public static class GetParameterAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String value) {
+      if (value == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+    }
+  }
+
+  public static class GetParameterValuesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+        @Advice.Argument(0) final String name, @Advice.Return final String[] values) {
+      if (values == null || values.length == 0) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final String value : values) {
+        module.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+      }
+    }
+  }
+
+  public static class GetParameterMapAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(@Advice.Return final Map<String, String[]> parameters) {
+      if (parameters == null || parameters.isEmpty()) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
+        final String name = entry.getKey();
+        module.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+        final String[] values = entry.getValue();
+        if (values != null) {
+          for (final String value : entry.getValue()) {
+            module.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+          }
+        }
+      }
+    }
+  }
+
+  public static class GetParameterNamesAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_NAME)
+    public static void onExit(@Advice.Return(readOnly = false) Enumeration<String> enumeration) {
+      if (enumeration == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      enumeration =
+          TaintableEnumeration.wrap(enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+    }
+  }
+
+  public static class GetCookiesAdvice {
+
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+    public static void onExit(@Advice.Return final Cookie[] cookies) {
+      if (cookies == null || cookies.length == 0) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      final IastContext ctx = IastContext.Provider.get();
+      for (final Cookie cookie : cookies) {
+        module.taint(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+      }
+    }
+  }
+
+  public static class GetQueryStringAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_QUERY)
+    public static void onExit(@Advice.Return final String queryString) {
+      if (queryString == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(queryString, SourceTypes.REQUEST_QUERY);
+    }
+  }
+
+  public static class GetBodyAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_BODY)
+    public static void onExit(@Advice.Return final Object body) {
+      if (body == null) {
+        return;
+      }
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (module == null) {
+        return;
+      }
+      module.taint(body, SourceTypes.REQUEST_BODY);
+    }
+  }
+
+  public static class GetRequestDispatcherAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+    public static void onExit(@Advice.Argument(0) final String path) {
+      if (path == null) {
+        return;
+      }
+      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+      if (module == null) {
+        return;
+      }
+      module.onRedirect(path);
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestCallSite.java
deleted file mode 100644
index 8291e6ae1b8..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestCallSite.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package datadog.trace.instrumentation.servlet.request;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Sink;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.VulnerabilityTypes;
-import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
-import datadog.trace.api.iast.source.WebModule;
-import datadog.trace.util.stacktrace.StackUtils;
-import java.io.BufferedReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class HttpServletRequestCallSite {
-
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequest.getHeader(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequestWrapper.getHeader(java.lang.String)")
-  public static String afterGetHeader(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String name,
-      @CallSite.Return final String value) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_HEADER_VALUE, name, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetHeader threw", e);
-      }
-    }
-    return value;
-  }
-
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  @CallSite.After(
-      "java.util.Enumeration javax.servlet.http.HttpServletRequest.getHeaders(java.lang.String)")
-  @CallSite.After(
-      "java.util.Enumeration javax.servlet.http.HttpServletRequestWrapper.getHeaders(java.lang.String)")
-  public static Enumeration<String> afterGetHeaders(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String headerName,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    if (enumeration == null) {
-      return null;
-    }
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> headerValues = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String headerValue = enumeration.nextElement();
-        headerValues.add(headerValue);
-      }
-      try {
-        module.onHeaderValues(headerName, headerValues);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetHeaders threw", e);
-      }
-      return Collections.enumeration(headerValues);
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterGetHeaders threw while iterating headers", e);
-      throw StackUtils.filterFirstDatadog(e);
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_HEADER_NAME)
-  @CallSite.After("java.util.Enumeration javax.servlet.http.HttpServletRequest.getHeaderNames()")
-  @CallSite.After(
-      "java.util.Enumeration javax.servlet.http.HttpServletRequestWrapper.getHeaderNames()")
-  public static Enumeration<String> afterGetHeaderNames(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    if (enumeration == null) {
-      return null;
-    }
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> headerNames = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String headerName = enumeration.nextElement();
-        headerNames.add(headerName);
-      }
-      try {
-        module.onHeaderNames(headerNames);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetHeaderNames threw", e);
-      }
-      return Collections.enumeration(headerNames);
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterGetHeaderNames threw while iterating header names", e);
-      throw StackUtils.filterFirstDatadog(e);
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-  @CallSite.After("javax.servlet.http.Cookie[] javax.servlet.http.HttpServletRequest.getCookies()")
-  @CallSite.After(
-      "javax.servlet.http.Cookie[] javax.servlet.http.HttpServletRequestWrapper.getCookies()")
-  public static Cookie[] afterGetCookies(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final Cookie[] cookies) {
-    if (null != cookies && cookies.length > 0) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          module.taintObjects(SourceTypes.REQUEST_COOKIE_VALUE, cookies);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetCookies threw", e);
-        }
-      }
-    }
-    return cookies;
-  }
-
-  @Source(SourceTypes.REQUEST_QUERY)
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getQueryString()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getQueryString()")
-  public static String afterGetQueryString(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final String queryString) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_QUERY, null, queryString);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetQueryString threw", e);
-      }
-    }
-    return queryString;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequestWrapper.getParameter(java.lang.String)")
-  public static String afterGetParameter(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String name,
-      @CallSite.Return final String value) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return value;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-  @CallSite.After("java.util.Enumeration javax.servlet.http.HttpServletRequest.getParameterNames()")
-  @CallSite.After(
-      "java.util.Enumeration javax.servlet.http.HttpServletRequestWrapper.getParameterNames()")
-  public static Enumeration<String> afterGetParameterNames(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> parameterNames = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String paramName = enumeration.nextElement();
-        parameterNames.add(paramName);
-      }
-      try {
-        module.onParameterNames(parameterNames);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameterNames threw", e);
-      }
-      return Collections.enumeration(parameterNames);
-    } catch (final Throwable e) {
-      module.onUnexpectedException(
-          "afterGetParameterNames threw while iterating parameter names", e);
-      throw StackUtils.filterFirstDatadog(e);
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After(
-      "java.lang.String[] javax.servlet.http.HttpServletRequest.getParameterValues(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String[] javax.servlet.http.HttpServletRequestWrapper.getParameterValues(java.lang.String)")
-  public static String[] afterGetParameterValues(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String paramName,
-      @CallSite.Return final String[] parameterValues) {
-    if (null != parameterValues) {
-      final WebModule module = InstrumentationBridge.WEB;
-      if (module != null) {
-        try {
-          module.onParameterValues(paramName, parameterValues);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetParameterValues threw", e);
-        }
-      }
-    }
-    return parameterValues;
-  }
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After("java.io.BufferedReader javax.servlet.http.HttpServletRequest.getReader()")
-  @CallSite.After("java.io.BufferedReader javax.servlet.http.HttpServletRequestWrapper.getReader()")
-  public static BufferedReader afterGetReader(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final BufferedReader bufferedReader) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, bufferedReader);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetReader threw", e);
-      }
-    }
-    return bufferedReader;
-  }
-
-  @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-  @CallSite.Before(
-      "javax.servlet.RequestDispatcher javax.servlet.http.HttpServletRequest.getRequestDispatcher(java.lang.String)")
-  @CallSite.Before(
-      "javax.servlet.RequestDispatcher javax.servlet.http.HttpServletRequestWrapper.getRequestDispatcher(java.lang.String)")
-  public static void beforeRequestDispatcher(@CallSite.Argument final String path) {
-    final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-    if (module != null) {
-      try {
-        module.onRedirect(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeRequestDispatcher threw", e);
-      }
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_PATH)
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getRequestURI()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathInfo()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathTranslated()")
-  public static String afterGetPathInfo(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
-    if (null != retValue && !retValue.isEmpty()) {
-      final WebModule module = InstrumentationBridge.WEB;
-      if (module != null) {
-        try {
-          module.onGetPathInfo(retValue);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetPathInfo threw", e);
-        }
-      }
-    }
-    return retValue;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestInputStreamCallSite.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestInputStreamCallSite.java
deleted file mode 100644
index 244bae2cfbe..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/HttpServletRequestInputStreamCallSite.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package datadog.trace.instrumentation.servlet.request;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.propagation.PropagationModule;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class HttpServletRequestInputStreamCallSite {
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After(
-      "javax.servlet.ServletInputStream javax.servlet.http.HttpServletRequest.getInputStream()")
-  @CallSite.After(
-      "javax.servlet.ServletInputStream javax.servlet.http.HttpServletRequestWrapper.getInputStream()")
-  public static ServletInputStream afterGetInputStream(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final ServletInputStream inputStream) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, inputStream);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetInputStream threw", e);
-      }
-    }
-    return inputStream;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/ServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/ServletRequestCallSite.java
deleted file mode 100644
index e9c73051c67..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/request/ServletRequestCallSite.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package datadog.trace.instrumentation.servlet.request;
-
-import datadog.trace.agent.tooling.csi.CallSite;
-import datadog.trace.api.iast.IastCallSites;
-import datadog.trace.api.iast.InstrumentationBridge;
-import datadog.trace.api.iast.Sink;
-import datadog.trace.api.iast.Source;
-import datadog.trace.api.iast.SourceTypes;
-import datadog.trace.api.iast.VulnerabilityTypes;
-import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
-import datadog.trace.api.iast.source.WebModule;
-import datadog.trace.util.stacktrace.StackUtils;
-import java.io.BufferedReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-
-@CallSite(spi = IastCallSites.class)
-public class ServletRequestCallSite {
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After("java.lang.String javax.servlet.ServletRequest.getParameter(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String javax.servlet.ServletRequestWrapper.getParameter(java.lang.String)")
-  public static String afterGetParameter(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Argument final String name,
-      @CallSite.Return final String value) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameter threw", e);
-      }
-    }
-    return value;
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-  @CallSite.After("java.util.Enumeration javax.servlet.ServletRequest.getParameterNames()")
-  @CallSite.After("java.util.Enumeration javax.servlet.ServletRequestWrapper.getParameterNames()")
-  public static Enumeration<String> afterGetParameterNames(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final Enumeration<String> enumeration)
-      throws Throwable {
-    final WebModule module = InstrumentationBridge.WEB;
-    if (module == null) {
-      return enumeration;
-    }
-    try {
-      final List<String> parameterNames = new ArrayList<>();
-      while (enumeration.hasMoreElements()) {
-        final String paramName = enumeration.nextElement();
-        parameterNames.add(paramName);
-      }
-      try {
-        module.onParameterNames(parameterNames);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetParameterNames threw", e);
-      }
-      return Collections.enumeration(parameterNames);
-    } catch (final Throwable e) {
-      module.onUnexpectedException(
-          "afterGetParameterNames threw while iterating parameter names", e);
-      throw StackUtils.filterFirstDatadog(e);
-    }
-  }
-
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  @CallSite.After(
-      "java.lang.String[] javax.servlet.ServletRequest.getParameterValues(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String[] javax.servlet.ServletRequestWrapper.getParameterValues(java.lang.String)")
-  public static String[] afterGetParameterValues(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Argument final String paramName,
-      @CallSite.Return final String[] parameterValues) {
-    if (null != parameterValues) {
-      final WebModule module = InstrumentationBridge.WEB;
-      if (module != null) {
-        try {
-          module.onParameterValues(paramName, parameterValues);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetParameterValues threw", e);
-        }
-      }
-    }
-    return parameterValues;
-  }
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After("javax.servlet.ServletInputStream javax.servlet.ServletRequest.getInputStream()")
-  @CallSite.After(
-      "javax.servlet.ServletInputStream javax.servlet.ServletRequestWrapper.getInputStream()")
-  public static ServletInputStream afterGetInputStream(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final ServletInputStream inputStream) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, inputStream);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetInputStream threw", e);
-      }
-    }
-    return inputStream;
-  }
-
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After("java.io.BufferedReader javax.servlet.ServletRequest.getReader()")
-  @CallSite.After("java.io.BufferedReader javax.servlet.ServletRequestWrapper.getReader()")
-  public static BufferedReader afterGetReader(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final BufferedReader bufferedReader) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObject(SourceTypes.REQUEST_BODY, bufferedReader);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterGetReader threw", e);
-      }
-    }
-    return bufferedReader;
-  }
-
-  @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-  @CallSite.Before(
-      "javax.servlet.RequestDispatcher javax.servlet.ServletRequest.getRequestDispatcher(java.lang.String)")
-  @CallSite.Before(
-      "javax.servlet.RequestDispatcher javax.servlet.ServletRequestWrapper.getRequestDispatcher(java.lang.String)")
-  public static void beforeRequestDispatcher(@CallSite.Argument final String path) {
-    final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-    if (module != null) {
-      try {
-        module.onRedirect(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeRequestDispatcher threw", e);
-      }
-    }
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy
index ccea6f41e4b..2d7173c8446 100644
--- a/dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy
@@ -1,10 +1,11 @@
-import datadog.smoketest.controller.CookieTestSuite
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
 import groovy.transform.CompileDynamic
 
+import javax.servlet.http.Cookie
+
 @CompileDynamic
 class CookieInstrumentationTest extends AgentTestRunner {
 
@@ -20,27 +21,27 @@ class CookieInstrumentationTest extends AgentTestRunner {
     setup:
     final iastModule = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(iastModule)
-    final cookieTestSuite = new CookieTestSuite(NAME, VALUE)
+    final cookie = new Cookie(NAME, VALUE)
 
     when:
-    final result = cookieTestSuite.getName()
+    final result = cookie.getName()
 
     then:
     result == NAME
-    1 * iastModule.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, NAME, NAME, cookieTestSuite.getCookie())
+    1 * iastModule.taintIfTainted(NAME, cookie, SourceTypes.REQUEST_COOKIE_NAME, NAME)
   }
 
   void 'test getValue'() {
     setup:
     final iastModule = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(iastModule)
-    final cookieTestSuite = new CookieTestSuite(NAME, VALUE)
+    final cookie = new Cookie(NAME, VALUE)
 
     when:
-    final result = cookieTestSuite.getValue()
+    final result = cookie.getValue()
 
     then:
     result == VALUE
-    1 * iastModule.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_VALUE, NAME, VALUE, cookieTestSuite.getCookie())
+    1 * iastModule.taintIfTainted(VALUE, cookie, SourceTypes.REQUEST_COOKIE_VALUE, NAME)
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestCallSiteTest.groovy
deleted file mode 100644
index 2952f3c2a17..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestCallSiteTest.groovy
+++ /dev/null
@@ -1,250 +0,0 @@
-import datadog.smoketest.controller.TestHttpServletRequestCallSiteSuite
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.SourceTypes
-import datadog.trace.api.iast.propagation.PropagationModule
-import datadog.trace.api.iast.source.WebModule
-import datadog.trace.instrumentation.servlet.request.HttpServletRequestCallSite
-import groovy.transform.CompileDynamic
-
-import javax.servlet.http.Cookie
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletRequestWrapper
-
-@CompileDynamic
-class HttpServletRequestCallSiteTest extends AgentTestRunner {
-
-  @Override
-  protected void configurePreAgent() {
-    injectSysConfig('dd.iast.enabled', 'true')
-  }
-
-  def cleanup() {
-    InstrumentationBridge.clearIastModules()
-  }
-
-  def 'test getHeader'(final Class<? extends HttpServletRequest> clazz) {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getHeader('header') >> 'value'
-    })
-
-    when:
-    final result = testSuite.getHeader('header')
-
-    then:
-    result == 'value'
-    1 * iastModule.taint(SourceTypes.REQUEST_HEADER_VALUE, 'header', 'value')
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getHeaders'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getHeaders('headers') >> Collections.enumeration(['value1', 'value2'])
-    })
-
-    when:
-    final result = testSuite.getHeaders('headers')?.toList()
-
-    then:
-    result == ['value1', 'value2']
-    1 * iastModule.onHeaderValues('headers', ['value1', 'value2'])
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getHeaderNames'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final headers = ['header1', 'header2']
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getHeaderNames() >> Collections.enumeration(headers)
-    })
-
-    when:
-    final result = testSuite.getHeaderNames()?.toList()
-
-    then:
-    result == headers
-    1 * iastModule.onHeaderNames(headers)
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getCookies'(final Class<? extends HttpServletRequest> clazz) {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final cookies = [new Cookie('name1', 'value1'), new Cookie('name2', 'value2')] as Cookie[]
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getCookies() >> cookies
-    })
-
-    when:
-    final result = testSuite.getCookies()
-
-    then:
-    result == cookies
-    1 * iastModule.taintObjects(SourceTypes.REQUEST_COOKIE_VALUE, cookies)
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  def 'test that get headers does not fail when servlet related code fails'(final Class<? extends HttpServletRequest> clazz) {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final enumeration = Mock(Enumeration) {
-      hasMoreElements() >> { throw new NuclearBomb('Boom!!!')}
-    }
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getHeaders('header') >> enumeration
-    })
-
-    when:
-    testSuite.getHeaders('header')
-
-    then:
-    final bomb = thrown(NuclearBomb)
-    bomb.stackTrace.find { it.className == HttpServletRequestCallSite.name } == null
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  def 'test that get header names does not fail when servlet related code fails'(final Class<? extends HttpServletRequest> clazz) {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final enumeration = Mock(Enumeration) {
-      hasMoreElements() >> { throw new NuclearBomb('Boom!!!')}
-    }
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getHeaderNames() >> enumeration
-    })
-
-    when:
-    testSuite.getHeaderNames()
-
-    then:
-    final bomb = thrown(NuclearBomb)
-    bomb.stackTrace.find { it.className == HttpServletRequestCallSite.name } == null
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test get query string'() {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final testSuite = new TestHttpServletRequestCallSiteSuite(Mock(clazz) {
-      getQueryString() >> 'paramName=paramValue'
-    })
-
-    when:
-    testSuite.getQueryString()
-
-    then:
-
-    1 * iastModule.taint(SourceTypes.REQUEST_QUERY, null, 'paramName=paramValue')
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getRequestURI'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final mock = Mock(HttpServletRequest){
-      getRequestURI() >> 'retValue'
-    }
-    final testSuite = new TestHttpServletRequestCallSiteSuite(mock)
-
-    when:
-    testSuite.getRequestURI()
-
-    then:
-    1 * iastModule.onGetPathInfo('retValue')
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getPathInfo'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final mock = Mock(HttpServletRequest){
-      getPathInfo() >> 'retValue'
-    }
-    final testSuite = new TestHttpServletRequestCallSiteSuite(mock)
-
-    when:
-    testSuite.getPathInfo()
-
-    then:
-    1 * iastModule.onGetPathInfo('retValue')
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-  void 'test getPathTranslated'() {
-    setup:
-    final iastModule = Mock(WebModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final mock = Mock(HttpServletRequest){
-      getPathTranslated() >> 'retValue'
-    }
-    final testSuite = new TestHttpServletRequestCallSiteSuite(mock)
-
-    when:
-    testSuite.getPathTranslated()
-
-    then:
-    1 * iastModule.onGetPathInfo('retValue')
-
-    where:
-    clazz                     | _
-    HttpServletRequest        | _
-    HttpServletRequestWrapper | _
-  }
-
-
-  private static class NuclearBomb extends RuntimeException {
-    NuclearBomb(final String message) {
-      super(message)
-    }
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy
new file mode 100644
index 00000000000..c501d89ad47
--- /dev/null
+++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy
@@ -0,0 +1,459 @@
+import datadog.smoketest.controller.JavaxHttpServletRequestTestSuite
+import datadog.smoketest.controller.JavaxHttpServletRequestWrapperTestSuite
+import datadog.smoketest.controller.ServletRequestTestSuite
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.SourceTypes
+import datadog.trace.api.iast.propagation.PropagationModule
+import datadog.trace.api.iast.sink.UnvalidatedRedirectModule
+
+import javax.servlet.RequestDispatcher
+import javax.servlet.ServletInputStream
+import javax.servlet.http.Cookie
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletRequestWrapper
+
+import datadog.trace.agent.tooling.iast.TaintableEnumeration
+
+class HttpServletRequestTest extends AgentTestRunner {
+
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig('dd.iast.enabled', 'true')
+  }
+
+  void cleanup() {
+    InstrumentationBridge.clearIastModules()
+  }
+
+  void 'test getHeader'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeader('header')
+
+    then:
+    result == 'value'
+    1 * mock.getHeader('header') >> 'value'
+    1 * iastModule.taint('value', SourceTypes.REQUEST_HEADER_VALUE, 'header')
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getHeaders'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final headers = ['value1', 'value2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaders('headers').collect()
+
+    then:
+    result == headers
+    1 * mock.getHeaders('headers') >> Collections.enumeration(headers)
+    headers.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_HEADER_VALUE, 'headers') }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getHeaderNames'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final headers = ['header1', 'header2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaderNames().collect()
+
+    then:
+    result == headers
+    1 * mock.getHeaderNames() >> Collections.enumeration(headers)
+    headers.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_HEADER_NAME, it) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameter'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameter('parameter')
+
+    then:
+    result == 'value'
+    1 * mock.getParameter('parameter') >> 'value'
+    1 * iastModule.taint('value', SourceTypes.REQUEST_PARAMETER_VALUE, 'parameter')
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameterValues'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final values = ['value1', 'value2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterValues('parameter').collect()
+
+    then:
+    result == values
+    1 * mock.getParameterValues('parameter') >> { values as String[] }
+    values.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_PARAMETER_VALUE, 'parameter') }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameterMap'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final parameters = [parameter: ['header1', 'header2'] as String[]]
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterMap()
+
+    then:
+    result == parameters
+    1 * mock.getParameterMap() >> parameters
+    parameters.each { key, values ->
+      1 * iastModule.taint(_, key, SourceTypes.REQUEST_PARAMETER_NAME, key)
+      values.each { value ->
+        1 * iastModule.taint(_, value, SourceTypes.REQUEST_PARAMETER_VALUE, key)
+      }
+    }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getParameterNames'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final parameters = ['param1', 'param2']
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getParameterNames().collect()
+
+    then:
+    result == parameters
+    1 * mock.getParameterNames() >> Collections.enumeration(parameters)
+    parameters.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_PARAMETER_NAME, it) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getCookies'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final cookies = [new Cookie('name1', 'value1'), new Cookie('name2', 'value2')] as Cookie[]
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getCookies()
+
+    then:
+    result == cookies
+    1 * mock.getCookies() >> cookies
+    cookies.each { 1 * iastModule.taint(_, it, SourceTypes.REQUEST_COOKIE_VALUE) }
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test that get headers does not fail when servlet related code fails'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final enumeration = Mock(Enumeration) {
+      hasMoreElements() >> { throw new NuclearBomb('Boom!!!') }
+    }
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final headers = request.getHeaders('header')
+
+    then:
+    1 * mock.getHeaders('header') >> enumeration
+    noExceptionThrown()
+
+    when:
+    headers.hasMoreElements()
+
+    then:
+    final bomb = thrown(NuclearBomb)
+    bomb.stackTrace.find { it.className == TaintableEnumeration.name } == null
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test that get header names does not fail when servlet related code fails'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final enumeration = Mock(Enumeration) {
+      hasMoreElements() >> { throw new NuclearBomb('Boom!!!') }
+    }
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getHeaderNames()
+
+    then:
+    1 * mock.getHeaderNames() >> enumeration
+    noExceptionThrown()
+
+    when:
+    result.hasMoreElements()
+
+    then:
+    final bomb = thrown(NuclearBomb)
+    bomb.stackTrace.find { it.className == TaintableEnumeration.name } == null
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test get query string'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final queryString = 'paramName=paramValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final String result = request.getQueryString()
+
+    then:
+    result == queryString
+    1 * mock.getQueryString() >> queryString
+    1 * iastModule.taint(queryString, SourceTypes.REQUEST_QUERY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getInputStream'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final is = Mock(ServletInputStream)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getInputStream()
+
+    then:
+    result == is
+    1 * mock.getInputStream() >> is
+    1 * iastModule.taint(is, SourceTypes.REQUEST_BODY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getReader'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final reader = Mock(BufferedReader)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getReader()
+
+    then:
+    result == reader
+    1 * mock.getReader() >> reader
+    1 * iastModule.taint(reader, SourceTypes.REQUEST_BODY)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getRequestDispatcher'() {
+    setup:
+    final iastModule = Mock(UnvalidatedRedirectModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final path = 'http://dummy.location.com'
+    final dispatcher = Mock(RequestDispatcher)
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestDispatcher(path)
+
+    then:
+    result == dispatcher
+    1 * mock.getRequestDispatcher(path) >> dispatcher
+    1 * iastModule.onRedirect(path)
+    0 * _
+
+    where:
+    suite << testSuite()
+  }
+
+  void 'test getRequestURI'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final uri = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestURI()
+
+    then:
+    result == uri
+    1 * mock.getRequestURI() >> uri
+    1 * iastModule.taint(uri, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getPathInfo'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final pathInfo = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getPathInfo()
+
+    then:
+    result == pathInfo
+    1 * mock.getPathInfo() >> pathInfo
+    1 * iastModule.taint(pathInfo, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getPathTranslated'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final pathTranslated = 'retValue'
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getPathTranslated()
+
+    then:
+    result == pathTranslated
+    1 * mock.getPathTranslated() >> pathTranslated
+    1 * iastModule.taint(pathTranslated, SourceTypes.REQUEST_PATH)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  void 'test getRequestURL'() {
+    setup:
+    final iastModule = Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(iastModule)
+    final url = new StringBuffer('retValue')
+    final mock = Mock(HttpServletRequest)
+    final request = suite.call(mock)
+
+    when:
+    final result = request.getRequestURL()
+
+    then:
+    result == url
+    1 * mock.getRequestURL() >> url
+    1 * iastModule.taint(url, SourceTypes.REQUEST_URI)
+    0 * _
+
+    where:
+    suite << testSuiteCallSites()
+  }
+
+  private List<Closure<? extends HttpServletRequest>> testSuite() {
+    return [
+      { HttpServletRequest request -> new CustomRequest(request: request) },
+      { HttpServletRequest request -> new CustomRequestWrapper(new CustomRequest(request: request)) },
+      { HttpServletRequest request ->
+        new HttpServletRequestWrapper(new CustomRequest(request: request))
+      }
+    ]
+  }
+
+  private List<Closure<? extends ServletRequestTestSuite>> testSuiteCallSites() {
+    return [
+      { HttpServletRequest request -> new JavaxHttpServletRequestTestSuite(request) },
+      { HttpServletRequest request -> new JavaxHttpServletRequestWrapperTestSuite(new CustomRequestWrapper(request)) },
+    ]
+  }
+
+  private static class NuclearBomb extends RuntimeException {
+    NuclearBomb(final String message) {
+      super(message)
+    }
+  }
+
+  private static class CustomRequest implements HttpServletRequest {
+    @Delegate
+    private HttpServletRequest request
+  }
+
+  private static class CustomRequestWrapper extends HttpServletRequestWrapper {
+
+    CustomRequestWrapper(final HttpServletRequest request) {
+      super(request)
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/ServletRequestCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/ServletRequestCallSiteTest.groovy
deleted file mode 100644
index 7f16a5e9e2d..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/groovy/ServletRequestCallSiteTest.groovy
+++ /dev/null
@@ -1,96 +0,0 @@
-import datadog.smoketest.controller.JavaxHttpServletRequestTestSuite
-import datadog.smoketest.controller.JavaxHttpServletRequestWrapperTestSuite
-import datadog.smoketest.controller.JavaxServletRequestTestSuite
-import datadog.smoketest.controller.JavaxServletRequestWrapperTestSuite
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.SourceTypes
-import datadog.trace.api.iast.propagation.PropagationModule
-import datadog.trace.api.iast.sink.UnvalidatedRedirectModule
-import groovy.transform.CompileDynamic
-
-import javax.servlet.ServletInputStream
-
-@CompileDynamic
-class ServletRequestCallSiteTest extends AgentTestRunner {
-
-  @Override
-  protected void configurePreAgent() {
-    injectSysConfig("dd.iast.enabled", "true")
-  }
-
-  void 'test getInputStream'() {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final is = Mock(ServletInputStream)
-    final servletRequest = Mock(clazz) {
-      getInputStream() >> is
-    }
-    testSuite.init(servletRequest)
-
-    when:
-    final result = testSuite.getInputStream()
-
-    then:
-    result == is
-    1 * iastModule.taintObject(SourceTypes.REQUEST_BODY, is)
-
-    where:
-    testSuite                                     | clazz
-    new JavaxServletRequestTestSuite()            | javax.servlet.ServletRequest
-    new JavaxHttpServletRequestTestSuite()        | javax.servlet.http.HttpServletRequest
-    new JavaxServletRequestWrapperTestSuite()     | javax.servlet.ServletRequestWrapper
-    new JavaxHttpServletRequestWrapperTestSuite() | javax.servlet.http.HttpServletRequestWrapper
-  }
-
-  void 'test getReader'() {
-    setup:
-    final iastModule = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final reader = Mock(BufferedReader)
-    final servletRequest = Mock(clazz) {
-      getReader() >> reader
-    }
-
-    testSuite.init(servletRequest)
-
-    when:
-    final result = testSuite.getReader()
-
-    then:
-    result == reader
-    1 * iastModule.taintObject(SourceTypes.REQUEST_BODY, reader)
-
-    where:
-    testSuite                                     | clazz
-    new JavaxServletRequestTestSuite()            | javax.servlet.ServletRequest
-    new JavaxHttpServletRequestTestSuite()        | javax.servlet.http.HttpServletRequest
-    new JavaxServletRequestWrapperTestSuite()     | javax.servlet.ServletRequestWrapper
-    new JavaxHttpServletRequestWrapperTestSuite() | javax.servlet.http.HttpServletRequestWrapper
-  }
-
-  void 'test getRequestDispatcher'() {
-    setup:
-    final iastModule = Mock(UnvalidatedRedirectModule)
-    InstrumentationBridge.registerIastModule(iastModule)
-    final servletRequest = Mock(clazz)
-    final path = 'http://dummy.location.com'
-
-    testSuite.init(servletRequest)
-
-    when:
-    testSuite.getRequestDispatcher(path)
-
-    then:
-    1 * servletRequest.getRequestDispatcher(path)
-    1 * iastModule.onRedirect(path)
-
-    where:
-    testSuite                                     | clazz
-    new JavaxServletRequestTestSuite()            | javax.servlet.ServletRequest
-    new JavaxHttpServletRequestTestSuite()        | javax.servlet.http.HttpServletRequest
-    new JavaxServletRequestWrapperTestSuite()     | javax.servlet.ServletRequestWrapper
-    new JavaxHttpServletRequestWrapperTestSuite() | javax.servlet.http.HttpServletRequestWrapper
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/TestGetParameterInstrumentation.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/TestGetParameterInstrumentation.groovy
deleted file mode 100644
index d98aa037127..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/groovy/TestGetParameterInstrumentation.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-import datadog.smoketest.controller.JavaxHttpServletRequestTestSuite
-import datadog.smoketest.controller.JavaxHttpServletRequestWrapperTestSuite
-import datadog.smoketest.controller.JavaxServletRequestTestSuite
-import datadog.smoketest.controller.JavaxServletRequestWrapperTestSuite
-import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.config.TracerConfig
-import datadog.trace.api.iast.InstrumentationBridge
-import datadog.trace.api.iast.SourceTypes
-import datadog.trace.api.iast.propagation.PropagationModule
-import datadog.trace.api.iast.source.WebModule
-import groovy.transform.CompileDynamic
-
-@CompileDynamic
-class TestGetParameterInstrumentation extends AgentTestRunner {
-
-  @Override
-  protected void configurePreAgent() {
-    injectSysConfig(TracerConfig.SCOPE_ITERATION_KEEP_ALIVE, "1") // don't let iteration spans linger
-    injectSysConfig("dd.iast.enabled", "true")
-  }
-
-  void cleanup() {
-    InstrumentationBridge.clearIastModules()
-  }
-
-  void 'test getParameter'() {
-    final webMod = Mock(WebModule)
-    final propMod = Mock(PropagationModule)
-    InstrumentationBridge.registerIastModule(webMod)
-    InstrumentationBridge.registerIastModule(propMod)
-    final map = [param1: ['value1', 'value2'] as String[]]
-    final servletRequest = Mock(clazz) {
-      getParameter(_ as String) >> { map.get(it[0]).first() }
-      getParameterValues(_ as String) >> { map.get(it[0]) }
-      getParameterNames() >> { Collections.enumeration(map.keySet()) }
-    }
-    testSuite.init(servletRequest)
-
-    when:
-    testSuite.getParameter('param1')
-
-    then:
-    1 * propMod.taint(SourceTypes.REQUEST_PARAMETER_VALUE, 'param1', 'value1')
-
-    when:
-    testSuite.getParameterValues('param1')
-
-    then:
-    1 * webMod.onParameterValues('param1', ['value1', 'value2'])
-
-    when:
-    testSuite.getParameterNames()
-
-    then:
-    1 * webMod.onParameterNames(['param1'])
-
-    where:
-    testSuite                                     | clazz
-    new JavaxServletRequestTestSuite()            | javax.servlet.ServletRequest
-    new JavaxHttpServletRequestTestSuite()        | javax.servlet.http.HttpServletRequest
-    new JavaxServletRequestWrapperTestSuite()     | javax.servlet.ServletRequestWrapper
-    new JavaxHttpServletRequestWrapperTestSuite() | javax.servlet.http.HttpServletRequestWrapper
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/CookieTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/CookieTestSuite.java
deleted file mode 100644
index 2987529a120..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/CookieTestSuite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package datadog.smoketest.controller;
-
-import javax.servlet.http.Cookie;
-
-public class CookieTestSuite {
-
-  private Cookie cookie;
-
-  public CookieTestSuite(final String name, final String value) {
-    cookie = new Cookie(name, value);
-  }
-
-  public String getName() {
-    return cookie.getName();
-  }
-
-  public String getValue() {
-    return cookie.getValue();
-  }
-
-  public Cookie getCookie() {
-    return cookie;
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
index 2cdc3fe2429..0c55d315158 100644
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
@@ -1,48 +1,31 @@
 package datadog.smoketest.controller;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 
-public class JavaxHttpServletRequestTestSuite
-    implements ServletRequestTestSuite<HttpServletRequest> {
-  HttpServletRequest request;
+public class JavaxHttpServletRequestTestSuite implements ServletRequestTestSuite {
+  private final HttpServletRequest request;
 
-  @Override
-  public void init(HttpServletRequest request) {
+  public JavaxHttpServletRequestTestSuite(final HttpServletRequest request) {
     this.request = request;
   }
 
   @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
-
-  @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
+  public String getRequestURI() {
+    return request.getRequestURI();
   }
 
   @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
+  public String getPathInfo() {
+    return request.getPathInfo();
   }
 
   @Override
-  public BufferedReader getReader() throws IOException {
-    return request.getReader();
+  public String getPathTranslated() {
+    return request.getPathTranslated();
   }
 
   @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
+  public StringBuffer getRequestURL() {
+    return request.getRequestURL();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
index 12952c8bb2e..79a81ef2f3b 100644
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
@@ -1,48 +1,32 @@
 package datadog.smoketest.controller;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-public class JavaxHttpServletRequestWrapperTestSuite
-    implements ServletRequestTestSuite<HttpServletRequestWrapper> {
-  HttpServletRequestWrapper request;
+public class JavaxHttpServletRequestWrapperTestSuite implements ServletRequestTestSuite {
 
-  @Override
-  public void init(HttpServletRequestWrapper request) {
-    this.request = request;
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
+  private final HttpServletRequestWrapper request;
 
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
+  public JavaxHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
+    this.request = request;
   }
 
   @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
+  public String getRequestURI() {
+    return request.getRequestURI();
   }
 
   @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
+  public String getPathInfo() {
+    return request.getPathInfo();
   }
 
   @Override
-  public BufferedReader getReader() throws IOException {
-    return request.getReader();
+  public String getPathTranslated() {
+    return request.getPathTranslated();
   }
 
   @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
+  public StringBuffer getRequestURL() {
+    return request.getRequestURL();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestTestSuite.java
deleted file mode 100644
index bf9f1a66f68..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestTestSuite.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package datadog.smoketest.controller;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-
-public class JavaxServletRequestTestSuite implements ServletRequestTestSuite<ServletRequest> {
-  ServletRequest request;
-
-  @Override
-  public void init(ServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
-
-  @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
-  }
-
-  @Override
-  public BufferedReader getReader() throws IOException {
-    return request.getReader();
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestWrapperTestSuite.java
deleted file mode 100644
index 35947b5e255..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxServletRequestWrapperTestSuite.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package datadog.smoketest.controller;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequestWrapper;
-
-public class JavaxServletRequestWrapperTestSuite
-    implements ServletRequestTestSuite<ServletRequestWrapper> {
-  ServletRequestWrapper request;
-
-  @Override
-  public void init(ServletRequestWrapper request) {
-    this.request = request;
-  }
-
-  @Override
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
-
-  @Override
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
-
-  @Override
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return request.getInputStream();
-  }
-
-  @Override
-  public BufferedReader getReader() throws IOException {
-    return request.getReader();
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String path) {
-    return request.getRequestDispatcher(path);
-  }
-}
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
index 5a021e89541..cfa4c98d997 100644
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
@@ -1,24 +1,12 @@
 package datadog.smoketest.controller;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
+public interface ServletRequestTestSuite {
 
-public interface ServletRequestTestSuite<E> {
+  String getRequestURI();
 
-  void init(final E request);
+  String getPathInfo();
 
-  String getParameter(String paramName);
+  String getPathTranslated();
 
-  String[] getParameterValues(String paramName);
-
-  Enumeration getParameterNames();
-
-  RequestDispatcher getRequestDispatcher(String path);
-
-  ServletInputStream getInputStream() throws IOException;
-
-  BufferedReader getReader() throws IOException;
+  StringBuffer getRequestURL();
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/TestHttpServletRequestCallSiteSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/TestHttpServletRequestCallSiteSuite.java
deleted file mode 100644
index 46f91912628..00000000000
--- a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/TestHttpServletRequestCallSiteSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package datadog.smoketest.controller;
-
-import java.util.Enumeration;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-public class TestHttpServletRequestCallSiteSuite {
-
-  private HttpServletRequest request;
-
-  public TestHttpServletRequestCallSiteSuite(final HttpServletRequest request) {
-    this.request = request;
-  }
-
-  public String getHeader(final String headerName) {
-    return request.getHeader(headerName);
-  }
-
-  public Enumeration<?> getHeaders(final String headerName) {
-    return request.getHeaders(headerName);
-  }
-
-  public Enumeration<?> getHeaderNames() {
-    return request.getHeaderNames();
-  }
-
-  public Cookie[] getCookies() {
-    return request.getCookies();
-  }
-
-  public String getQueryString() {
-    return request.getQueryString();
-  }
-
-  public String getRequestURI() {
-    return request.getRequestURI();
-  }
-
-  public String getPathInfo() {
-    return request.getPathInfo();
-  }
-
-  public String getPathTranslated() {
-    return request.getPathTranslated();
-  }
-}
diff --git a/dd-java-agent/instrumentation/spring-core/build.gradle b/dd-java-agent/instrumentation/spring-core/build.gradle
new file mode 100644
index 00000000000..70258ccb85b
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-core/build.gradle
@@ -0,0 +1,19 @@
+muzzle {
+  pass {
+    group = 'org.springframework'
+    module = 'spring-core'
+    versions = '[3.2.2.RELEASE,]'
+    assertInverse = true
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'org.springframework', name: 'spring-beans', version: '3.2.2.RELEASE'
+  testImplementation group: 'org.springframework', name: 'spring-beans', version: '3.2.2.RELEASE'
+  testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
+  latestDepTestImplementation group: 'org.unbescape', name: 'unbescape', version: '+'
+}
diff --git a/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java b/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java
new file mode 100644
index 00000000000..84300071eb5
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java
@@ -0,0 +1,61 @@
+package datadog.trace.instrumentation.springcore;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.Propagation;
+import datadog.trace.api.iast.propagation.PropagationModule;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import net.bytebuddy.asm.Advice;
+import org.springframework.util.StreamUtils;
+
+@AutoService(Instrumenter.class)
+public final class StreamUtilsInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public StreamUtilsInstrumentation() {
+    super("spring-core");
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(named("copyToString"))
+            .and(takesArguments(2))
+            .and(takesArgument(0, InputStream.class))
+            .and(takesArgument(1, Charset.class)),
+        StreamUtilsInstrumentation.class.getName() + "$SpringAdvice");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.springframework.util.StreamUtils";
+  }
+
+  public static class SpringAdvice {
+
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void checkReturnedObject(
+        @Advice.Return String string, @Advice.Argument(0) final InputStream in) {
+      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+      if (in != null && string != null && !string.isEmpty()) {
+        module.taintIfTainted(string, in);
+      }
+    }
+
+    private static void muzzleCheck() throws IOException {
+      StreamUtils.copyToString(
+          new ByteArrayInputStream("test".getBytes()), Charset.defaultCharset());
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-core/src/test/groovy/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentationTest.groovy b/dd-java-agent/instrumentation/spring-core/src/test/groovy/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentationTest.groovy
new file mode 100644
index 00000000000..fe58485ce0b
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-core/src/test/groovy/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentationTest.groovy
@@ -0,0 +1,30 @@
+package datadog.trace.instrumentation.springcore
+
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.iast.InstrumentationBridge
+import datadog.trace.api.iast.propagation.PropagationModule
+import org.springframework.util.StreamUtils
+
+import java.nio.charset.StandardCharsets
+
+class StreamUtilsInstrumentationTest extends AgentTestRunner {
+
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig("dd.iast.enabled", "true")
+  }
+
+  void 'test'(){
+    setup:
+    InstrumentationBridge.clearIastModules()
+    final module= Mock(PropagationModule)
+    InstrumentationBridge.registerIastModule(module)
+
+    when:
+    StreamUtils.copyToString(new ByteArrayInputStream("test".getBytes()), StandardCharsets.ISO_8859_1)
+
+    then:
+    1 * module.taintIfTainted(_ as String, _ as InputStream)
+    0 * _
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring-scheduling-3.1/build.gradle
index f51c40e0450..a9ca06d8e8a 100644
--- a/dd-java-agent/instrumentation/spring-scheduling-3.1/build.gradle
+++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/build.gradle
@@ -1,4 +1,7 @@
-
+ext {
+  spring6TestMinJavaVersionForTests = JavaVersion.VERSION_17
+  spring6LatestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
+}
 muzzle {
   pass {
     group = 'org.springframework'
@@ -6,25 +9,51 @@ muzzle {
     versions = "[3.1.0.RELEASE,6)"
     // assertInverse = true
   }
+  pass {
+    group = 'org.springframework'
+    module = 'spring-context'
+    versions = "[6,)"
+    javaVersion = "17"
+    // assertInverse = true
+  }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteForDir('spring6Test', 'test')
+addTestSuiteExtendingForDir('spring6LatestDepTest', 'latestDepTest', 'test')
+
+[compileSpring6TestJava, compileSpring6LatestDepTestJava].each {
+  setJavaVersion(it, 17)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+
+[compileSpring6TestGroovy, compileSpring6LatestDepTestGroovy, spring6Test, spring6LatestDepTest].each {
+  it.javaLauncher = getJavaLauncherFor(17)
+}
+
+[spring6Test, spring6LatestDepTest].each {
+  it.jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED'
+}
 
 dependencies {
   // choose a recent version so that we can test both lambdas (JDK8)
   // @Async requires proxying and older versions can't read classfile versions > 51
   // we muzzle older versions of spring anyway
   compileOnly group: 'org.springframework', name: 'spring-context', version: '5.0.0.RELEASE'
-  testImplementation group: 'org.springframework', name: 'spring-context', version: '5.0.0.RELEASE'
 
+  testImplementation group: 'org.springframework', name: 'spring-context', version: '5.0.0.RELEASE'
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
 
   testImplementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '4.21.0'
   testImplementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '4.21.0'
   testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '2.4.0'
+  testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '2.4.0'
+
 
   latestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '5.+'
 
@@ -32,4 +61,12 @@ dependencies {
   latestDepTestImplementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '4.+'
   latestDepTestImplementation group: 'com.h2database', name: 'h2', version: '+'
   latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '2.+'
+
+  spring6TestImplementation group: 'org.springframework', name: 'spring-context', version: '6.0.0.RELEASE'
+  spring6TestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '3.0.0'
+
+  spring6LatestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '6.+'
+  spring6LatestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '3.+'
+
+
 }
diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
index c3b44a7373e..7f891a5a92e 100644
--- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
@@ -1,23 +1,29 @@
 package datadog.trace.instrumentation.springscheduling;
 
-import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import org.springframework.scheduling.TaskScheduler;
 
 @AutoService(Instrumenter.class)
 public final class SpringSchedulingInstrumentation extends Instrumenter.Tracing
-    implements Instrumenter.ForSingleType {
+    implements Instrumenter.ForTypeHierarchy {
 
   public SpringSchedulingInstrumentation() {
     super("spring-scheduling");
   }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.scheduling.config.Task";
+  public String hierarchyMarkerType() {
+    return "org.springframework.scheduling.TaskScheduler";
   }
 
   @Override
@@ -27,18 +33,36 @@ public String[] helperClassNames() {
     };
   }
 
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named(hierarchyMarkerType()));
+  }
+
   @Override
   public void adviceTransformations(AdviceTransformation transformation) {
     transformation.applyAdvice(
-        isConstructor().and(takesArgument(0, Runnable.class)),
-        SpringSchedulingInstrumentation.class.getName() + "$SpringSchedulingAdvice");
+        isMethod().and(nameStartsWith("schedule")).and(takesArgument(0, Runnable.class)),
+        getClass().getName() + "$SpringSchedulingAdvice");
   }
 
   public static class SpringSchedulingAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onConstruction(
+    public static boolean beforeSchedule(
         @Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+      if (CallDepthThreadLocalMap.incrementCallDepth(TaskScheduler.class) > 0) {
+        return false;
+      }
       runnable = SpringSchedulingRunnableWrapper.wrapIfNeeded(runnable);
+      return true;
+    }
+
+    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+    public static void afterSchedule(
+        @Advice.Enter boolean reset,
+        @Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+      if (reset) {
+        CallDepthThreadLocalMap.reset(TaskScheduler.class);
+      }
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy
index c7bcc321c13..28263ef7f5f 100644
--- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy
+++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy
@@ -1,5 +1,6 @@
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.bootstrap.instrumentation.api.Tags
+import org.springframework.boot.actuate.scheduling.ScheduledTasksEndpoint
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 
 import java.util.concurrent.TimeUnit
@@ -29,6 +30,12 @@ class SpringSchedulingTest extends AgentTestRunner {
         }
       }
     }
+    and:
+    def scheduledTaskEndpoint = context.getBean(ScheduledTasksEndpoint)
+    assert scheduledTaskEndpoint != null
+    scheduledTaskEndpoint.scheduledTasks().getCron().each {
+      it.getRunnable().getTarget() == TriggerTask.getName()
+    }
     cleanup:
     context.close()
   }
diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
index e032d082d36..ec7e435ee2b 100644
--- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
@@ -1,6 +1,10 @@
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.actuate.scheduling.ScheduledTasksEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.config.ScheduledTaskHolder;
 
 @Configuration
 @EnableScheduling
@@ -9,4 +13,10 @@ public class TriggerTaskConfig {
   public TriggerTask triggerTasks() {
     return new TriggerTask();
   }
+
+  @Bean
+  public ScheduledTasksEndpoint scheduledTasksEndpoint(
+      ObjectProvider<ScheduledTaskHolder> holders) {
+    return new ScheduledTasksEndpoint(holders.orderedStream().collect(Collectors.toSet()));
+  }
 }
diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderInstrumentation.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
similarity index 57%
rename from dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderInstrumentation.java
rename to dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
index 3306309fb30..6af562cd561 100644
--- a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
@@ -2,8 +2,9 @@
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.*;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
@@ -11,16 +12,16 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(Instrumenter.class)
-public class AbstractUserDetailsAuthenticationProviderInstrumentation extends Instrumenter.AppSec
+public class UsernameNotFoundExceptionInstrumentation extends Instrumenter.AppSec
     implements Instrumenter.ForTypeHierarchy {
 
-  public AbstractUserDetailsAuthenticationProviderInstrumentation() {
+  public UsernameNotFoundExceptionInstrumentation() {
     super("spring-security");
   }
 
   @Override
   public String hierarchyMarkerType() {
-    return "org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider";
+    return "org.springframework.security.core.userdetails.UsernameNotFoundException";
   }
 
   @Override
@@ -28,14 +29,17 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
     return extendsClass(named(hierarchyMarkerType()));
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      "datadog.trace.instrumentation.springsecurity5.SpringSecurityUserEventDecorator"
+    };
+  }
+
   @Override
   public void adviceTransformations(AdviceTransformation transformation) {
     transformation.applyAdvice(
-        isMethod()
-            .and(named("authenticate"))
-            .and(takesArgument(0, named("org.springframework.security.core.Authentication")))
-            .and(returns(named("org.springframework.security.core.Authentication")))
-            .and(isPublic()),
-        packageName + ".AbstractUserDetailsAuthenticationProviderAdvice");
+        isConstructor().and(takesArgument(0, named("java.lang.String"))).and(isPublic()),
+        packageName + ".UsernameNotFoundExceptionAdvice");
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderAdvice.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderAdvice.java
deleted file mode 100644
index 837584bc44b..00000000000
--- a/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/AbstractUserDetailsAuthenticationProviderAdvice.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package datadog.trace.instrumentation.springsecurity5;
-
-import datadog.trace.bootstrap.ActiveSubsystems;
-import net.bytebuddy.asm.Advice;
-import org.springframework.security.core.AuthenticationException;
-
-public class AbstractUserDetailsAuthenticationProviderAdvice {
-
-  @Advice.OnMethodEnter
-  public static boolean onEnter(
-      @Advice.FieldValue(value = "hideUserNotFoundExceptions", readOnly = false)
-          boolean hideUserNotFoundExceptions) {
-    boolean originalValue = hideUserNotFoundExceptions;
-    if (ActiveSubsystems.APPSEC_ACTIVE) {
-      // Ensure we are not hiding exception
-      hideUserNotFoundExceptions = false;
-    }
-    return originalValue;
-  }
-
-  @Advice.OnMethodExit(onThrowable = AuthenticationException.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Enter final boolean originalValue,
-      @Advice.FieldValue(value = "hideUserNotFoundExceptions", readOnly = false)
-          boolean hideUserNotFoundExceptions) {
-    // Restore original value
-    hideUserNotFoundExceptions = originalValue;
-  }
-}
diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
index d5815209bf0..48fb4385668 100644
--- a/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
+++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
@@ -9,7 +9,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -40,18 +39,28 @@ public void onSignup(UserDetails user) {
   }
 
   public void onLogin(Authentication authentication, Throwable throwable, Authentication result) {
+    if (authentication == null) {
+      return;
+    }
     UserEventTrackingMode mode = Config.get().getAppSecUserEventsTrackingMode();
+    if (mode == DISABLED) {
+      return;
+    }
+
+    // For now, exclude all OAuth events. See APPSEC-12547.
+    if (authentication.getClass().getName().contains("OAuth")) {
+      return;
+    }
 
     String userId = null;
-    Map<String, String> metadata = null;
 
-    if (mode == EXTENDED && authentication != null) {
+    if (mode == EXTENDED) {
       userId = authentication.getName();
     }
 
     if (mode != DISABLED) {
       if (throwable == null && result != null && result.isAuthenticated()) {
-
+        Map<String, String> metadata = null;
         Object principal = result.getPrincipal();
         if (principal instanceof User) {
           User user = (User) principal;
@@ -68,9 +77,18 @@ public void onLogin(Authentication authentication, Throwable throwable, Authenti
         }
 
         onLoginSuccess(userId, metadata);
-      } else {
-        boolean userExists = throwable instanceof BadCredentialsException;
-        onLoginFailure(userId, null, userExists);
+      } else if (throwable != null) {
+        // On bad password, throwable would be
+        // org.springframework.security.authentication.BadCredentialsException,
+        // on user not found, throwable can be BadCredentials or
+        // org.springframework.security.core.userdetails.UsernameNotFoundException depending on the
+        // internal setting
+        // hideUserNotFoundExceptions (or a custom AuthenticationProvider implementation overriding
+        // this).
+        // This would be the ideal place to check whether the user exists or not, but we cannot do
+        // so reliably yet.
+        // See UsernameNotFoundExceptionInstrumentation for more details.
+        onLoginFailure(userId, null);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionAdvice.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionAdvice.java
new file mode 100644
index 00000000000..f3d24b75ea0
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java17/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionAdvice.java
@@ -0,0 +1,11 @@
+package datadog.trace.instrumentation.springsecurity5;
+
+import net.bytebuddy.asm.Advice;
+
+public class UsernameNotFoundExceptionAdvice {
+
+  @Advice.OnMethodEnter(suppress = Throwable.class)
+  public static void onEnter() {
+    SpringSecurityUserEventDecorator.DECORATE.onUserNotFound();
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-security-5/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-security-5/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy
index f3902397c61..6f70f6c19c0 100644
--- a/dd-java-agent/instrumentation/spring-security-5/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy
+++ b/dd-java-agent/instrumentation/spring-security-5/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy
@@ -11,7 +11,6 @@ import org.springframework.boot.SpringApplication
 import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext
 import org.springframework.context.ConfigurableApplicationContext
 import spock.lang.Shared
-import spock.lang.Stepwise
 
 import static datadog.trace.instrumentation.springsecurity5.TestEndpoint.LOGIN
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
@@ -20,8 +19,6 @@ import static datadog.trace.instrumentation.springsecurity5.TestEndpoint.UNKNOWN
 import static datadog.trace.instrumentation.springsecurity5.TestEndpoint.NOT_FOUND
 
 
-// Use Stepwise to ensure tests are running sequentially
-@Stepwise
 class SpringBootBasedTest extends AppSecHttpServerTest<ConfigurableApplicationContext> {
 
   @Shared
@@ -184,7 +181,8 @@ class SpringBootBasedTest extends AppSecHttpServerTest<ConfigurableApplicationCo
     !span.getTags().isEmpty()
     span.getTag("appsec.events.users.login.failure.track") == true
     span.getTag("_dd.appsec.events.users.login.failure.auto.mode") == 'EXTENDED'
-    span.getTag("appsec.events.users.login.failure.usr.exists") == true
+    // TODO: Ideally should be `false` but we have no reliable method to detect it it is just absent. See APPSEC-12765.
+    span.getTag("appsec.events.users.login.failure.usr.exists") == null
     span.getTag("appsec.events.users.login.failure.usr.id") == 'admin'
   }
 
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/build.gradle b/dd-java-agent/instrumentation/spring-webflux-5/build.gradle
index 9754044b239..9983fc3af3a 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/build.gradle
+++ b/dd-java-agent/instrumentation/spring-webflux-5/build.gradle
@@ -76,6 +76,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:netty-promise-4')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
+  testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1')
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
 
   testImplementation group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/bootTest/groovy/SpringWebfluxTest.groovy b/dd-java-agent/instrumentation/spring-webflux-5/src/bootTest/groovy/SpringWebfluxTest.groovy
index 6e0a5bb83d9..f78f28b949d 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/bootTest/groovy/SpringWebfluxTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/bootTest/groovy/SpringWebfluxTest.groovy
@@ -1,22 +1,29 @@
 import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.utils.OkHttpUtils
+import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.bootstrap.instrumentation.api.URIUtils
+import datadog.trace.core.DDSpan
 import dd.trace.instrumentation.springwebflux.server.EchoHandlerFunction
 import dd.trace.instrumentation.springwebflux.server.FooModel
 import dd.trace.instrumentation.springwebflux.server.SpringWebFluxTestApplication
 import dd.trace.instrumentation.springwebflux.server.TestController
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory
 import org.springframework.boot.web.server.LocalServerPort
 import org.springframework.context.annotation.Bean
+import org.springframework.http.client.reactive.ReactorClientHttpConnector
+import org.springframework.web.reactive.function.BodyExtractors
+import org.springframework.web.reactive.function.BodyInserters
+import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.server.ResponseStatusException
+import reactor.core.publisher.Mono
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [SpringWebFluxTestApplication, ForceNettyAutoConfiguration])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+classes = [SpringWebFluxTestApplication, ForceNettyAutoConfiguration],
+properties = "server.http2.enabled=true")
 class SpringWebfluxTest extends AgentTestRunner {
 
   @TestConfiguration
@@ -27,33 +34,36 @@ class SpringWebfluxTest extends AgentTestRunner {
     }
   }
 
-  static final okhttp3.MediaType PLAIN_TYPE = okhttp3.MediaType.parse("text/plain; charset=utf-8")
   static final String INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX = SpringWebFluxTestApplication.getName() + "\$"
   static final String SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX = SpringWebFluxTestApplication.getSimpleName() + "\$"
 
   @LocalServerPort
-  private int port
+  int port
 
-  OkHttpClient client = OkHttpUtils.client(true)
+  WebClient client = WebClient.builder().clientConnector (new ReactorClientHttpConnector()).build()
 
   def "Basic GET test #testName"() {
     setup:
     String url = "http://localhost:$port$urlPath"
-    def request = new Request.Builder().url(url).get().build()
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange().block()
 
     then:
-    response.code == 200
-    response.body().string() == expectedResponseBody
-    assertTraces(1) {
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
+      def traceParent
       sortSpansByStart()
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
       trace(2) {
         span {
           resourceName "GET $urlPathWithVariables"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -66,7 +76,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -116,21 +126,25 @@ class SpringWebfluxTest extends AgentTestRunner {
   def "GET test with async response #testName"() {
     setup:
     String url = "http://localhost:$port$urlPath"
-    def request = new Request.Builder().url(url).get().build()
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange().block()
 
     then:
-    response.code == 200
-    response.body().string() == expectedResponseBody
-    assertTraces(1) {
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
       sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
       trace(3) {
         span {
           resourceName "GET $urlPathWithVariables"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -143,7 +157,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -224,21 +238,25 @@ class SpringWebfluxTest extends AgentTestRunner {
   def "Create span during handler function"() {
     setup:
     String url = "http://localhost:$port$urlPath"
-    def request = new Request.Builder().url(url).get().build()
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange().block()
 
     then:
-    response.code == 200
-    response.body().string() == expectedResponseBody
-    assertTraces(1) {
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
       sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
       trace(3) {
         span {
           resourceName "GET $urlPathWithVariables"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent)
         }
         span {
           if (annotatedMethod == null) {
@@ -268,21 +286,25 @@ class SpringWebfluxTest extends AgentTestRunner {
   def "404 GET test"() {
     setup:
     String url = "http://localhost:$port/notfoundgreet"
-    def request = new Request.Builder().url(url).get().build()
 
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange().block()
 
     then:
-    response.code == 404
-    assertTraces(1) {
+    response.statusCode().value() == 404
+    assertTraces(2) {
       sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 404, true)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 404, true)
+      }
       trace(2) {
         span {
           resourceName "404"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -294,7 +316,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_STATUS" 404
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -319,23 +341,26 @@ class SpringWebfluxTest extends AgentTestRunner {
     setup:
     String echoString = "TEST"
     String url = "http://localhost:$port/echo"
-    RequestBody body = RequestBody.create(PLAIN_TYPE, echoString)
-    def request = new Request.Builder().url(url).post(body).build()
 
     when:
-    def response = client.newCall(request).execute()
+    def response = client.post().uri(url).body(BodyInserters.fromPublisher(Mono.just(echoString),String)).exchange().block()
 
     then:
-    response.code() == 202
-    response.body().string() == echoString
-    assertTraces(1) {
+    response.statusCode().value() == 202
+    response.body(BodyExtractors.toMono(String)).block() == echoString
+    assertTraces(2) {
       sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "POST", URI.create(url), 202)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "POST", URI.create(url), 202)
+      }
       trace(3) {
         span {
           resourceName "POST /echo"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -348,7 +373,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "/echo"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -382,22 +407,26 @@ class SpringWebfluxTest extends AgentTestRunner {
   def "GET to bad endpoint #testName"() {
     setup:
     String url = "http://localhost:$port$urlPath"
-    def request = new Request.Builder().url(url).get().build()
 
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange().block()
 
     then:
-    response.code() == 500
-    assertTraces(1) {
+    response.statusCode().value() == 500
+    assertTraces(2) {
       sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500)
+      }
       trace(2) {
         span {
           resourceName "GET $urlPathWithVariables"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
           errored true
-          parent()
+          childOf(traceParent)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -410,7 +439,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -459,22 +488,38 @@ class SpringWebfluxTest extends AgentTestRunner {
     setup:
     String url = "http://localhost:$port/double-greet-redirect"
     String finalUrl = "http://localhost:$port/double-greet"
-    def request = new Request.Builder().url(url).get().build()
 
     when:
-    def response = client.newCall(request).execute()
+    def response = client.get().uri(url).exchange()
+    .flatMap(response -> {
+      if (response.statusCode().is3xxRedirection()) {
+        String redirectUrl = response.headers().header("Location").get(0)
+        return response.bodyToMono(Void.class).then(client.get().uri(URI.create("http://localhost:$port").resolve(redirectUrl)).exchange())
+      }
+      return Mono.just(response)
+    }).block()
 
     then:
-    response.code == 200
-    assertTraces(2) {
+    response.statusCode().value() == 200
+    assertTraces(4) {
       sortSpansByStart()
       // TODO: why order of spans is different in these traces?
+      def traceParent1, traceParent2, traceParent3
+
+      trace(2) {
+        traceParent1 = clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 307)
+        traceParent2 =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 307)
+      }
+      trace(2) {
+        clientSpan(it, traceParent1, "http.request", "spring-webflux-client", "GET", URI.create(finalUrl))
+        traceParent3 =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(finalUrl))
+      }
       trace(2) {
         span {
           resourceName "GET /double-greet-redirect"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          childOf(traceParent2)
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -487,7 +532,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "/double-greet-redirect"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -501,7 +546,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "request.predicate" "(GET && /double-greet-redirect)"
             "handler.type" { String tagVal ->
               return (tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
-                || tagVal.contains("Lambda"))
+              || tagVal.contains("Lambda"))
             }
             defaultTags()
           }
@@ -512,7 +557,7 @@ class SpringWebfluxTest extends AgentTestRunner {
           resourceName "GET /double-greet"
           operationName "netty.request"
           spanType DDSpanTypes.HTTP_SERVER
-          parent()
+          traceParent3
           tags {
             "$Tags.COMPONENT" "netty"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -525,7 +570,7 @@ class SpringWebfluxTest extends AgentTestRunner {
             "$Tags.HTTP_USER_AGENT" String
             "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
             "$Tags.HTTP_ROUTE" "/double-greet"
-            defaultTags()
+            defaultTags(true)
           }
         }
         span {
@@ -551,22 +596,26 @@ class SpringWebfluxTest extends AgentTestRunner {
     setup:
     def requestsCount = 50 // Should be more than 2x CPUs to fish out some bugs
     String url = "http://localhost:$port$urlPath"
-    def request = new Request.Builder().url(url).get().build()
     when:
-    def responses = (0..requestsCount - 1).collect { client.newCall(request).execute() }
+    def responses = (0..requestsCount - 1).collect { client.get().uri(url).exchange().block() }
 
     then:
-    responses.every { it.code == 200 }
-    responses.every { it.body().string() == expectedResponseBody }
-    assertTraces(responses.size()) {
+    responses.every { it.statusCode().value() == 200 }
+    responses.every { it.body(BodyExtractors.toMono(String)).block() == expectedResponseBody }
+    assertTraces(responses.size() * 2) {
       sortSpansByStart()
       responses.eachWithIndex { def response, int i ->
+        def traceParent
+        trace(2) {
+          clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+          traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+        }
         trace(2) {
           span {
             resourceName "GET $urlPathWithVariables"
             operationName "netty.request"
             spanType DDSpanTypes.HTTP_SERVER
-            parent()
+            childOf(traceParent)
             tags {
               "$Tags.COMPONENT" "netty"
               "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
@@ -579,7 +628,7 @@ class SpringWebfluxTest extends AgentTestRunner {
               "$Tags.HTTP_USER_AGENT" String
               "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
               "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
-              defaultTags()
+              defaultTags(true)
             }
           }
           span {
@@ -619,4 +668,62 @@ class SpringWebfluxTest extends AgentTestRunner {
     "functional API delayed response" | "/greet-delayed" | "/greet-delayed"     | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE
     "annotation API delayed response" | "/foo-delayed"   | "/foo-delayed"       | "getFooDelayed" | new FooModel(3L, "delayed").toString()
   }
+
+  def clientSpan(
+    TraceAssert trace,
+    Object parentSpan,
+    String operation,
+    String component,
+    String method = "GET",
+    URI uri,
+    Integer status = 200,
+    boolean error = false,
+    Throwable exception = null,
+    boolean tagQueryString = false,
+    Map<String, Serializable> extraTags = null) {
+    def ret
+
+    def expectedQuery = tagQueryString ? uri.query : null
+    def expectedUrl = URIUtils.buildURL(uri.scheme, uri.host, uri.port, uri.path)
+    if (expectedQuery != null && !expectedQuery.empty) {
+      expectedUrl = "$expectedUrl?$expectedQuery"
+    }
+    trace.span {
+      ret = it.span
+      if (parentSpan == null) {
+        parent()
+      } else {
+        childOf((DDSpan) parentSpan)
+      }
+      operationName operation
+      spanType DDSpanTypes.HTTP_CLIENT
+      errored error
+      measured true
+      tags {
+        "$Tags.COMPONENT" component
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+        "$Tags.PEER_HOSTNAME" uri.host
+        "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
+        "$Tags.PEER_PORT" { it == null || it == uri.port }
+        "$Tags.HTTP_URL" expectedUrl
+        "$Tags.HTTP_METHOD" method
+        if (status) {
+          "$Tags.HTTP_STATUS" status
+        }
+        if (tagQueryString) {
+          "$DDTags.HTTP_QUERY" expectedQuery
+          "$DDTags.HTTP_FRAGMENT" { it == null || it == uri.fragment } // Optional
+        }
+        if (exception) {
+          errorTags(exception.class, exception.message)
+        }
+        peerServiceFrom(Tags.PEER_HOSTNAME)
+        defaultTags()
+        if (extraTags) {
+          it.addTags(extraTags)
+        }
+      }
+    }
+    return ret
+  }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux/server/IastWebFluxTest.groovy b/dd-java-agent/instrumentation/spring-webflux-5/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux/server/IastWebFluxTest.groovy
index a98352ffaab..59e650cf296 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux/server/IastWebFluxTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux/server/IastWebFluxTest.groovy
@@ -226,7 +226,7 @@ class IastWebFluxTest extends IastRequestTestRunner {
     (respBody =~ "URI: http://[^/]+/iast/shr\\?var1=foo").find()
     (respBody =~ "Path: /iast/shr").find()
     respBody.contains 'Query params: [var1 (tainted):[foo (tainted)]]'
-    respBody.contains 'Cookies: [var2:[var2 -> bar (tainted)]]'
+    respBody.contains 'Cookies: [var2 (tainted):[var2 (tainted) -> bar (tainted)]]'
     (respBody =~ "User-Agent: okhttp/[\\d.]+ \\(tainted\\)").find()
 
     when:
@@ -241,11 +241,10 @@ class IastWebFluxTest extends IastRequestTestRunner {
       value 'foo'
       range 0, 3, source(SourceTypes.REQUEST_PARAMETER_VALUE, 'var1', 'foo')
     }
-    // WebModule is not tainting cookie names
-    //    toc.hasTaintedObject {
-    //      value 'var2'
-    //      range 0, 4, source(SourceTypes.REQUEST_COOKIE_NAME, 'var2', null)
-    //    }
+    toc.hasTaintedObject {
+      value 'var2'
+      range 0, 4, source(SourceTypes.REQUEST_COOKIE_NAME, 'var2', 'var2')
+    }
     toc.hasTaintedObject {
       value 'bar'
       range 0, 3, source(SourceTypes.REQUEST_COOKIE_VALUE, 'var2',  'bar')
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
index cedee2e5e09..ff2d65ef215 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
@@ -5,7 +5,7 @@
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
@@ -13,7 +13,7 @@
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerRequest;
 
-public class RouteOnSuccessOrError implements BiConsumer<HandlerFunction<?>, Throwable> {
+public class RouteOnSuccessOrError implements Consumer<HandlerFunction<?>> {
 
   private static final Pattern SPECIAL_CHARACTERS_REGEX = Pattern.compile("[\\(\\)&|]");
   private static final Pattern SPACES_REGEX = Pattern.compile("[ \\t]+");
@@ -41,26 +41,6 @@ public RouteOnSuccessOrError(
     this.serverRequest = serverRequest;
   }
 
-  @Override
-  public void accept(final HandlerFunction<?> handler, final Throwable throwable) {
-    if (handler != null) {
-      final String predicateString = parsePredicateString();
-      if (predicateString != null) {
-        final AgentSpan span =
-            (AgentSpan) serverRequest.attributes().get(AdviceUtils.SPAN_ATTRIBUTE);
-        if (span != null) {
-          span.setTag("request.predicate", predicateString);
-        }
-        final AgentSpan parentSpan =
-            (AgentSpan) serverRequest.attributes().get(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
-        if (parentSpan != null) {
-          HTTP_RESOURCE_DECORATOR.withRoute(
-              parentSpan, serverRequest.methodName(), parseRoute(predicateString));
-        }
-      }
-    }
-  }
-
   private String parsePredicateString() {
     final String routerFunctionString = routerFunction.toString();
     // Router functions containing lambda predicates should not end up in span tags since they are
@@ -77,4 +57,25 @@ private String parsePredicateString() {
   private String parseRoute(@Nonnull String routerString) {
     return parsedRouteCache.computeIfAbsent(routerString, PATH_EXTRACTOR);
   }
+
+  @Override
+  public void accept(HandlerFunction<?> handlerFunction) {
+    if (handlerFunction == null) {
+      // in this case the route is added by instrumenting the method annotation. we stop here.
+      return;
+    }
+    final String predicateString = parsePredicateString();
+    if (predicateString != null) {
+      final AgentSpan span = (AgentSpan) serverRequest.attributes().get(AdviceUtils.SPAN_ATTRIBUTE);
+      if (span != null) {
+        span.setTag("request.predicate", predicateString);
+      }
+      final AgentSpan parentSpan =
+          (AgentSpan) serverRequest.attributes().get(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
+      if (parentSpan != null) {
+        HTTP_RESOURCE_DECORATOR.withRoute(
+            parentSpan, serverRequest.methodName(), parseRoute(predicateString));
+      }
+    }
+  }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
index 17f6553d48b..b9a94d354e9 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
@@ -19,7 +19,8 @@ public static void methodExit(
       @Advice.Return(readOnly = false) Mono<HandlerFunction<?>> result,
       @Advice.Thrown final Throwable throwable) {
     if (throwable == null) {
-      result = result.doOnSuccessOrError(new RouteOnSuccessOrError(thiz, serverRequest));
+      // doOnSuccessOrError is deprecated and no more existing
+      result = result.doOnSuccess(new RouteOnSuccessOrError(thiz, serverRequest));
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
index 2085354e019..b812c77a2a7 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
@@ -21,6 +21,6 @@ public static void after(@Advice.This DataBuffer dataBuffer, @Advice.Return Inpu
       return;
     }
 
-    mod.taintIfInputIsTainted(is, dataBuffer);
+    mod.taintIfTainted(is, dataBuffer);
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
index 674c7c86743..5ac2054dec7 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
@@ -4,6 +4,7 @@
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -28,7 +29,7 @@ public static void after(
       return;
     }
 
-    Object iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+    IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
 
     PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
@@ -40,7 +41,7 @@ public static void after(
             continue; // should not happen
           }
           module.taint(
-              iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+              iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
         }
       }
 
@@ -58,15 +59,15 @@ public static void after(
             if (innerKey != null) {
               module.taint(
                   iastRequestContext,
+                  innerKey,
                   SourceTypes.REQUEST_MATRIX_PARAMETER,
-                  parameterName,
-                  innerKey);
+                  parameterName);
             }
             Iterable<String> innerValues = ie.getValue();
             if (innerValues != null) {
               for (String iv : innerValues) {
                 module.taint(
-                    iastRequestContext, SourceTypes.REQUEST_MATRIX_PARAMETER, parameterName, iv);
+                    iastRequestContext, iv, SourceTypes.REQUEST_MATRIX_PARAMETER, parameterName);
               }
             }
           }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
index 55780ddd6da..5b1b4695e29 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
@@ -2,11 +2,11 @@
 
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.List;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -18,24 +18,27 @@ public class RequestHeaderMapResolveAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   @Source(SourceTypes.REQUEST_HEADER_VALUE)
   public static void after(@Advice.Return(typing = Assigner.Typing.DYNAMIC) Map<String, ?> values) {
-    WebModule module = InstrumentationBridge.WEB;
     PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (module == null || prop == null || values == null) {
+    if (prop == null || values == null || values.isEmpty()) {
       return;
     }
 
-    module.onHeaderNames(values.keySet());
-
+    final IastContext ctx = IastContext.Provider.get();
     if (values instanceof MultiValueMap) {
       for (Map.Entry<String, List<String>> e :
           ((MultiValueMap<String, String>) values).entrySet()) {
+        final String name = e.getKey();
+        prop.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
         for (String v : e.getValue()) {
-          prop.taint(SourceTypes.REQUEST_HEADER_VALUE, e.getKey(), v);
+          prop.taint(ctx, v, SourceTypes.REQUEST_HEADER_VALUE, name);
         }
       }
     } else {
       for (Map.Entry<String, String> e : ((Map<String, String>) values).entrySet()) {
-        prop.taint(SourceTypes.REQUEST_HEADER_VALUE, e.getKey(), e.getValue());
+        final String name = e.getKey();
+        final String value = e.getValue();
+        prop.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+        prop.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
index 1e29fc9b8d7..3fa7d645f1c 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
@@ -2,6 +2,7 @@
 
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -16,13 +17,17 @@ class TaintCookiesAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   public static void after(@Advice.Return MultiValueMap<String, HttpCookie> cookies) {
     PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
+    if (module == null || cookies.isEmpty()) {
       return;
     }
 
+    final IastContext ctx = IastContext.Provider.get();
     for (List<HttpCookie> cookieList : cookies.values()) {
       for (HttpCookie cookie : cookieList) {
-        module.taint(SourceTypes.REQUEST_COOKIE_VALUE, cookie.getName(), cookie.getValue());
+        final String name = cookie.getName();
+        final String value = cookie.getValue();
+        module.taint(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        module.taint(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
index e8f632fcb3d..5c8a0e65906 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
@@ -13,7 +13,7 @@ public TaintFluxElementsFunction(PropagationModule propagationModule) {
 
   @Override
   public T apply(T t) {
-    propagation.taintObject(SourceTypes.REQUEST_BODY, t);
+    propagation.taint(t, SourceTypes.REQUEST_BODY);
     return t;
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
index 45cbf06eccc..ddcf315eeae 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
@@ -21,7 +21,7 @@ public static void after(@Advice.Return(readOnly = false) Flux<DataBuffer> flux)
     }
 
     // taint both the flux and the individual DataBuffers
-    propagation.taintObject(SourceTypes.REQUEST_BODY, flux);
+    propagation.taint(flux, SourceTypes.REQUEST_BODY);
     flux = flux.map(new TaintFluxElementsFunction<>(propagation));
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
index 584892b8a05..963720cee6a 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
@@ -2,6 +2,7 @@
 
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -17,15 +18,16 @@ class TaintHttpHeadersGetAdvice {
   @Source(SourceTypes.REQUEST_HEADER_VALUE)
   public static void after(@Advice.Argument(0) Object arg, @Advice.Return List<String> values) {
     PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || values == null) {
+    if (module == null || values == null || values.isEmpty()) {
       return;
     }
     if (!(arg instanceof String)) {
       return;
     }
+    final IastContext ctx = IastContext.Provider.get();
     String lc = ((String) arg).toLowerCase(Locale.ROOT);
     for (String value : values) {
-      module.taint(SourceTypes.REQUEST_HEADER_VALUE, lc, value);
+      module.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, lc);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
index 3cfd9a3a8fa..2dbffa0debc 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
@@ -18,6 +18,6 @@ public static void after(@Advice.Argument(0) String arg, @Advice.Return String v
     if (module == null || arg == null || value == null) {
       return;
     }
-    module.taint(SourceTypes.REQUEST_HEADER_VALUE, arg, value);
+    module.taint(value, SourceTypes.REQUEST_HEADER_VALUE, arg);
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
index 7fab42437ce..1a85435d3f4 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
@@ -2,11 +2,11 @@
 
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import org.springframework.http.HttpHeaders;
@@ -17,15 +17,17 @@ class TaintHttpHeadersToSingleValueMapAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   @Source(SourceTypes.REQUEST_HEADER_VALUE)
   public static void after(@Advice.Return Map<String, String> values) {
-    PropagationModule propModule = InstrumentationBridge.PROPAGATION;
-    WebModule module = InstrumentationBridge.WEB;
-    if (module == null || propModule == null || values == null) {
+    PropagationModule module = InstrumentationBridge.PROPAGATION;
+    if (module == null || values == null || values.isEmpty()) {
       return;
     }
 
-    module.onHeaderNames(values.keySet());
+    final IastContext ctx = IastContext.Provider.get();
     for (Map.Entry<String, String> e : values.entrySet()) {
-      propModule.taint(SourceTypes.REQUEST_HEADER_VALUE, e.getKey(), e.getValue());
+      final String name = e.getKey();
+      final String value = e.getValue();
+      module.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+      module.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
index 14dda7fd293..1e371eefa88 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
@@ -2,11 +2,11 @@
 
 import datadog.trace.advice.RequiresRequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
-import datadog.trace.api.iast.source.WebModule;
 import java.util.List;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -19,18 +19,17 @@ class TaintQueryParamsAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
   public static void after(@Advice.Return MultiValueMap<String, String> queryParams) {
-    final WebModule web = InstrumentationBridge.WEB;
     final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (web == null || prop == null) {
+    if (prop == null || queryParams == null || queryParams.isEmpty()) {
       return;
     }
 
-    web.onParameterNames(queryParams.keySet());
-
+    final IastContext ctx = IastContext.Provider.get();
     for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
       String name = e.getKey();
+      prop.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
       for (String value : e.getValue()) {
-        prop.taint(SourceTypes.REQUEST_PARAMETER_VALUE, name, value);
+        prop.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/build.gradle b/dd-java-agent/instrumentation/spring-webflux-6/build.gradle
index 5ef5a096e3e..f29cdda07f5 100644
--- a/dd-java-agent/instrumentation/spring-webflux-6/build.gradle
+++ b/dd-java-agent/instrumentation/spring-webflux-6/build.gradle
@@ -13,7 +13,15 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-[compileMain_java17Java, compileTestJava].each {
+// test that webflux5 instrumentation works for webflux6 too
+addTestSuite('iastTest')
+addTestSuite('bootTest')
+addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepBootTest', 'latestDepTest', 'bootTest')
+
+tasks.matching {it.name == 'compileMain_java17Java' || it.name.endsWith('TestJava')}.withType(JavaCompile)
+.each {
   it.configure {
     setJavaVersion(it, 17)
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -21,10 +29,7 @@ apply from: "$rootDir/gradle/java.gradle"
   }
 }
 
-// test that webflux5 instrumentation works for webflux6 too
-addTestSuite('iastTest')
-
-[compileTestGroovy, compileIastTestGroovy].each {
+tasks.withType(GroovyCompile).each {
   it.javaLauncher = getJavaLauncherFor(17)
 }
 
@@ -39,12 +44,40 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:netty-promise-4')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
+  testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1')
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
 
   testImplementation group: 'org.springframework', name: 'spring-webflux', version: '6.0.0'
   testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.1.3'
   testImplementation group: 'org.springframework', name: 'spring-test', version: '6.0.0'
 
+  latestDepTestImplementation group: 'org.springframework', name: 'spring-webflux', version: '6.+'
+  latestDepTestImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.+'
+  latestDepTestImplementation group: 'org.springframework', name: 'spring-test', version: '6.+'
+
+  bootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.0.0'
+  bootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.0.0', {
+    exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    exclude group: 'org.hamcrest', module: 'hamcrest-library'
+  }
+  bootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
+  // our default version of spock is too old
+  bootTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.4-M1-groovy-3.0'
+  bootTestImplementation group: 'org.spockframework', name: 'spock-junit4', version: '2.4-M1-groovy-3.0'
+  bootTestImplementation group: 'org.spockframework', name: 'spock-spring', version: '2.4-M1-groovy-3.0'
+
+  latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.+'
+  latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.+', {
+    exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    exclude group: 'org.hamcrest', module: 'hamcrest-library'
+  }
+  latestDepBootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
+  // our default version of spock is too old
+  latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.4-M1-groovy-3.0'
+  latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-junit4', version: '2.4-M1-groovy-3.0'
+  latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-spring', version: '2.4-M1-groovy-3.0'
+
+
   iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '3.0.0'
   iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: '3.0.0'
   iastTestImplementation(testFixtures(project(':dd-java-agent:agent-iast')))
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/SpringWebfluxTest.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/SpringWebfluxTest.groovy
new file mode 100644
index 00000000000..fa6866770f9
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/SpringWebfluxTest.groovy
@@ -0,0 +1,753 @@
+import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ANNOTATION_ASYNC
+
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.DDTags
+import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.bootstrap.instrumentation.api.URIUtils
+import datadog.trace.core.DDSpan
+import dd.trace.instrumentation.springwebflux.server.EchoHandlerFunction
+import dd.trace.instrumentation.springwebflux.server.FooModel
+import dd.trace.instrumentation.springwebflux.server.SpringWebFluxTestApplication
+import dd.trace.instrumentation.springwebflux.server.TestController
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory
+import org.springframework.context.annotation.Bean
+import org.springframework.http.client.reactive.ReactorClientHttpConnector
+import org.springframework.web.reactive.function.BodyExtractors
+import org.springframework.web.reactive.function.BodyInserters
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.server.ResponseStatusException
+import reactor.core.publisher.Mono
+import reactor.netty.http.HttpProtocol
+import reactor.netty.http.client.HttpClient
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+classes = [SpringWebFluxTestApplication],
+properties = "server.http2.enabled=true")
+class SpringWebfluxHttp11Test extends AgentTestRunner {
+  protected HttpClient buildClient() {
+    HttpClient.create().protocol(HttpProtocol.HTTP11)
+  }
+
+  static final String INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX = SpringWebFluxTestApplication.getName() + "\$"
+  static final String SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX = SpringWebFluxTestApplication.getSimpleName() + "\$"
+
+  @LocalServerPort
+  int port
+
+  WebClient client = WebClient.builder().clientConnector (new ReactorClientHttpConnector(buildClient())).build()
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    injectSysConfig(TRACE_ANNOTATION_ASYNC, "true")
+  }
+
+  def "Basic GET test #testName"() {
+    setup:
+    String url = "http://localhost:$port$urlPath"
+    when:
+    def response = client.get().uri(url).exchange().block()
+
+    then:
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
+      def traceParent
+      sortSpansByStart()
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
+      trace(2) {
+        span {
+          resourceName "GET $urlPathWithVariables"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
+            defaultTags(true)
+          }
+        }
+        span {
+          if (annotatedMethod == null) {
+            // Functional API
+            resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+            operationNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+          } else {
+            // Annotation API
+            resourceName TestController.getSimpleName() + "." + annotatedMethod
+            operationName TestController.getSimpleName() + "." + annotatedMethod
+          }
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            if (annotatedMethod == null) {
+              // Functional API
+              "request.predicate" "(GET && $urlPathWithVariables)"
+              "handler.type" { String tagVal ->
+                return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+              }
+            } else {
+              // Annotation API
+              "handler.type" TestController.getName()
+            }
+            defaultTags()
+          }
+        }
+      }
+    }
+
+    where:
+    testName                             | urlPath              | urlPathWithVariables   | annotatedMethod | expectedResponseBody
+    "functional API without parameters"  | "/greet"             | "/greet"               | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE
+    "functional API with one parameter"  | "/greet/WORLD"       | "/greet/{name}"        | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE + " WORLD"
+    "functional API with two parameters" | "/greet/World/Test1" | "/greet/{name}/{word}" | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE + " World Test1"
+    "functional API delayed response"    | "/greet-delayed"     | "/greet-delayed"       | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE
+
+    "annotation API without parameters"  | "/foo"               | "/foo"                 | "getFooModel"   | new FooModel(0L, "DEFAULT").toString()
+    "annotation API with one parameter"  | "/foo/1"             | "/foo/{id}"            | "getFooModel"   | new FooModel(1L, "pass").toString()
+    "annotation API with two parameters" | "/foo/2/world"       | "/foo/{id}/{name}"     | "getFooModel"   | new FooModel(2L, "world").toString()
+    "annotation API delayed response"    | "/foo-delayed"       | "/foo-delayed"         | "getFooDelayed" | new FooModel(3L, "delayed").toString()
+  }
+
+  def "GET test with async response #testName"() {
+    setup:
+    String url = "http://localhost:$port$urlPath"
+    when:
+    def response = client.get().uri(url).exchange().block()
+
+    then:
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
+      sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
+      trace(3) {
+        span {
+          resourceName "GET $urlPathWithVariables"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
+            defaultTags(true)
+          }
+        }
+        span {
+          if (annotatedMethod == null) {
+            // Functional API
+            resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+            operationNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+          } else {
+            // Annotation API
+            resourceName TestController.getSimpleName() + "." + annotatedMethod
+            operationName TestController.getSimpleName() + "." + annotatedMethod
+          }
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            if (annotatedMethod == null) {
+              // Functional API
+              "request.predicate" "(GET && $urlPathWithVariables)"
+              "handler.type" { String tagVal ->
+                return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+              }
+            } else {
+              // Annotation API
+              "handler.type" TestController.getName()
+            }
+            defaultTags()
+          }
+        }
+        span {
+          if (annotatedMethod == null) {
+            // Functional API
+            resourceName "SpringWebFluxTestApplication.tracedMethod"
+            operationName "trace.annotation"
+          } else {
+            // Annotation API
+            resourceName "TestController.tracedMethod"
+            operationName "trace.annotation"
+          }
+          childOf(span(0)) // FIXME this is wrong
+          errored false
+          tags {
+            "$Tags.COMPONENT" "trace"
+            defaultTags()
+          }
+        }
+      }
+    }
+
+    where:
+    testName                                  | urlPath                       | urlPathWithVariables             | annotatedMethod       | expectedResponseBody
+    "functional API traced method from mono"  | "/greet-mono-from-callable/4" | "/greet-mono-from-callable/{id}" | null                  | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE + " 4"
+    "functional API traced method with delay" | "/greet-delayed-mono/6"       | "/greet-delayed-mono/{id}"       | null                  | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE + " 6"
+
+    "annotation API traced method from mono"  | "/foo-mono-from-callable/7"   | "/foo-mono-from-callable/{id}"   | "getMonoFromCallable" | new FooModel(7L, "tracedMethod").toString()
+    "annotation API traced method with delay" | "/foo-delayed-mono/9"         | "/foo-delayed-mono/{id}"         | "getFooDelayedMono"   | new FooModel(9L, "tracedMethod").toString()
+  }
+
+  /*
+   This test differs from the previous in one important aspect.
+   The test above calls endpoints which does not create any spans during their invocation.
+   They merely assemble reactive pipeline where some steps create spans.
+   Thus all those spans are created when WebFlux span created by DispatcherHandlerInstrumentation
+   has already finished. Therefore, they have `SERVER` span as their parent.
+   This test below calls endpoints which do create spans right inside endpoint handler.
+   Therefore, in theory, those spans should have INTERNAL span created by DispatcherHandlerInstrumentation
+   as their parent. But there is a difference how Spring WebFlux handles functional endpoints
+   (created in server.SpringWebFluxTestApplication.greetRouterFunction) and annotated endpoints
+   (created in server.TestController).
+   In the former case org.springframework.web.reactive.function.server.support.HandlerFunctionAdapter.handle
+   calls handler function directly. Thus "tracedMethod" span below has INTERNAL handler span as its parent.
+   In the latter case org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerAdapter.handle
+   merely wraps handler call into Mono and thus actual invocation of handler function happens later,
+   when INTERNAL handler span has already finished. Thus, "tracedMethod" has SERVER Netty span as its parent.
+   */
+
+  def "Create span during handler function"() {
+    setup:
+    String url = "http://localhost:$port$urlPath"
+    when:
+    def response = client.get().uri(url).exchange().block()
+
+    then:
+    response.statusCode().value() == 200
+    response.body(BodyExtractors.toMono(String)).block() == expectedResponseBody
+    assertTraces(2) {
+      sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+      }
+      trace(3) {
+        span {
+          resourceName "GET $urlPathWithVariables"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent)
+        }
+        span {
+          if (annotatedMethod == null) {
+            // Functional API
+            operationNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+          } else {
+            // Annotation API
+            operationName TestController.getSimpleName() + "." + annotatedMethod
+          }
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf span(0)
+        }
+        span {
+          operationName "trace.annotation"
+          childOf span(annotatedMethod ? 0 : 1)
+          errored false
+        }
+      }
+    }
+
+    where:
+    testName                       | urlPath                  | urlPathWithVariables        | annotatedMethod   | expectedResponseBody
+    "functional API traced method" | "/greet-traced-method/5" | "/greet-traced-method/{id}" | null              | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE + " 5"
+    "annotation API traced method" | "/foo-traced-method/8"   | "/foo-traced-method/{id}"   | "getTracedMethod" | new FooModel(8L, "tracedMethod").toString()
+  }
+
+  def "404 GET test"() {
+    setup:
+    String url = "http://localhost:$port/notfoundgreet"
+
+    when:
+    def response = client.get().uri(url).exchange().block()
+
+    then:
+    response.statusCode().value() == 404
+    assertTraces(2) {
+      sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 404, true)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 404, true)
+      }
+      trace(2) {
+        span {
+          resourceName "404"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 404
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            defaultTags(true)
+          }
+        }
+        span {
+          resourceName "ResourceWebHandler.handle"
+          operationName "ResourceWebHandler.handle"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          errored true
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "handler.type" "org.springframework.web.reactive.resource.ResourceWebHandler"
+            errorTags(ResponseStatusException, String)
+            defaultTags()
+          }
+        }
+      }
+    }
+  }
+
+  def "Basic POST test"() {
+    setup:
+    String echoString = "TEST"
+    String url = "http://localhost:$port/echo"
+
+    when:
+    def response = client.post().uri(url).body(BodyInserters.fromPublisher(Mono.just(echoString),String)).exchange().block()
+
+    then:
+    response.statusCode().value() == 202
+    response.body(BodyExtractors.toMono(String)).block() == echoString
+    assertTraces(2) {
+      sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "POST", URI.create(url), 202)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "POST", URI.create(url), 202)
+      }
+      trace(3) {
+        span {
+          resourceName "POST /echo"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "POST"
+            "$Tags.HTTP_STATUS" 202
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "/echo"
+            defaultTags(true)
+          }
+        }
+        span {
+          resourceName EchoHandlerFunction.getSimpleName() + ".handle"
+          operationName EchoHandlerFunction.getSimpleName() + ".handle"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "request.predicate" "(POST && /echo)"
+            "handler.type" { String tagVal ->
+              return tagVal.contains(EchoHandlerFunction.getName())
+            }
+            defaultTags()
+          }
+        }
+        span {
+          resourceName "echo"
+          operationName "echo"
+          childOf(span(1))
+          tags {
+            "$Tags.COMPONENT" "trace"
+            defaultTags()
+          }
+        }
+      }
+    }
+  }
+
+  def "GET to bad endpoint #testName"() {
+    setup:
+    String url = "http://localhost:$port$urlPath"
+
+    when:
+    def response = client.get().uri(url).exchange().block()
+
+    then:
+    response.statusCode().value() == 500
+    assertTraces(2) {
+      sortSpansByStart()
+      def traceParent
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500)
+        traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500)
+      }
+      trace(2) {
+        span {
+          resourceName "GET $urlPathWithVariables"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          errored true
+          childOf(traceParent)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 500
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
+            defaultTags(true)
+          }
+        }
+        span {
+          if (annotatedMethod == null) {
+            // Functional API
+            resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+            operationNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+          } else {
+            // Annotation API
+            resourceName TestController.getSimpleName() + "." + annotatedMethod
+            operationName TestController.getSimpleName() + "." + annotatedMethod
+          }
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          errored true
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            if (annotatedMethod == null) {
+              // Functional API
+              "request.predicate" "(GET && $urlPathWithVariables)"
+              "handler.type" { String tagVal ->
+                return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+              }
+            } else {
+              // Annotation API
+              "handler.type" TestController.getName()
+            }
+            errorTags(RuntimeException, "bad things happen")
+            defaultTags()
+          }
+        }
+      }
+    }
+
+    where:
+    testName                   | urlPath             | urlPathWithVariables   | annotatedMethod
+    "functional API fail fast" | "/greet-failfast/1" | "/greet-failfast/{id}" | null
+    "functional API fail Mono" | "/greet-failmono/1" | "/greet-failmono/{id}" | null
+
+    "annotation API fail fast" | "/foo-failfast/1"   | "/foo-failfast/{id}"   | "getFooFailFast"
+    "annotation API fail Mono" | "/foo-failmono/1"   | "/foo-failmono/{id}"   | "getFooFailMono"
+  }
+
+  def "Redirect test"() {
+    setup:
+    String url = "http://localhost:$port/double-greet-redirect"
+    String finalUrl = "http://localhost:$port/double-greet"
+
+    when:
+    def response = client.get().uri(url).exchange()
+    .flatMap(response -> {
+      if (response.statusCode().is3xxRedirection()) {
+        String redirectUrl = response.headers().header("Location").get(0)
+        return response.bodyToMono(Void.class).then(client.get().uri(URI.create("http://localhost:$port").resolve(redirectUrl)).exchange())
+      }
+      return Mono.just(response)
+    }).block()
+
+    then:
+    response.statusCode().value() == 200
+    assertTraces(4) {
+      sortSpansByStart()
+      // TODO: why order of spans is different in these traces?
+      def traceParent1, traceParent2
+
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 307)
+        traceParent1 = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 307)
+      }
+      trace(2) {
+        span {
+          resourceName "GET /double-greet-redirect"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent1)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" url
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 307
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "/double-greet-redirect"
+            defaultTags(true)
+          }
+        }
+        span {
+          resourceName "RedirectComponent.lambda"
+          operationName "RedirectComponent.lambda"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "request.predicate" "(GET && /double-greet-redirect)"
+            "handler.type" { String tagVal ->
+              return (tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+              || tagVal.contains("Lambda"))
+            }
+            defaultTags()
+          }
+        }
+      }
+      trace(2) {
+        clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(finalUrl))
+        traceParent2 = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(finalUrl))
+      }
+      trace(2) {
+        span {
+          resourceName "GET /double-greet"
+          operationName "netty.request"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(traceParent2)
+          tags {
+            "$Tags.COMPONENT" "netty"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+            "$Tags.PEER_PORT" Integer
+            "$Tags.HTTP_URL" finalUrl
+            "$Tags.HTTP_HOSTNAME" "localhost"
+            "$Tags.HTTP_METHOD" "GET"
+            "$Tags.HTTP_STATUS" 200
+            "$Tags.HTTP_USER_AGENT" String
+            "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+            "$Tags.HTTP_ROUTE" "/double-greet"
+            defaultTags(true)
+          }
+        }
+        span {
+          resourceNameContains(SpringWebFluxTestApplication.getSimpleName() + "\$", ".handle")
+          operationNameContains(SpringWebFluxTestApplication.getSimpleName() + "\$", ".handle")
+          spanType DDSpanTypes.HTTP_SERVER
+          childOf(span(0))
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "request.predicate" "(GET && /double-greet)"
+            "handler.type" { String tagVal ->
+              return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+            }
+            defaultTags()
+          }
+        }
+      }
+    }
+  }
+
+  def "Multiple GETs to delaying route #testName"() {
+    setup:
+    def requestsCount = 50 // Should be more than 2x CPUs to fish out some bugs
+    String url = "http://localhost:$port$urlPath"
+    when:
+    def responses = (0..requestsCount - 1).collect { client.get().uri(url).exchange().block() }
+
+    then:
+    responses.every { it.statusCode().value() == 200 }
+    responses.every { it.body(BodyExtractors.toMono(String)).block() == expectedResponseBody }
+    assertTraces(responses.size() * 2) {
+      sortSpansByStart()
+      responses.eachWithIndex { def response, int i ->
+        def traceParent
+        trace(2) {
+          clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url))
+          traceParent =  clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url))
+        }
+        trace(2) {
+          span {
+            resourceName "GET $urlPathWithVariables"
+            operationName "netty.request"
+            spanType DDSpanTypes.HTTP_SERVER
+            childOf(traceParent)
+            tags {
+              "$Tags.COMPONENT" "netty"
+              "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+              "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+              "$Tags.PEER_PORT" Integer
+              "$Tags.HTTP_URL" url
+              "$Tags.HTTP_HOSTNAME" "localhost"
+              "$Tags.HTTP_METHOD" "GET"
+              "$Tags.HTTP_STATUS" 200
+              "$Tags.HTTP_USER_AGENT" String
+              "$Tags.HTTP_CLIENT_IP" "127.0.0.1"
+              "$Tags.HTTP_ROUTE" "$urlPathWithVariables"
+              defaultTags(true)
+            }
+          }
+          span {
+            if (annotatedMethod == null) {
+              // Functional API
+              resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+              operationNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
+            } else {
+              // Annotation API
+              resourceName TestController.getSimpleName() + "." + annotatedMethod
+              operationName TestController.getSimpleName() + "." + annotatedMethod
+            }
+            spanType DDSpanTypes.HTTP_SERVER
+            childOf(span(0))
+            tags {
+              "$Tags.COMPONENT" "spring-webflux-controller"
+              "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+              if (annotatedMethod == null) {
+                // Functional API
+                "request.predicate" "(GET && $urlPathWithVariables)"
+                "handler.type" { String tagVal ->
+                  return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
+                }
+              } else {
+                // Annotation API
+                "handler.type" TestController.getName()
+              }
+              defaultTags()
+            }
+          }
+        }
+      }
+    }
+
+    where:
+    testName                          | urlPath          | urlPathWithVariables | annotatedMethod | expectedResponseBody
+    "functional API delayed response" | "/greet-delayed" | "/greet-delayed"     | null            | SpringWebFluxTestApplication.GreetingHandler.DEFAULT_RESPONSE
+    "annotation API delayed response" | "/foo-delayed"   | "/foo-delayed"       | "getFooDelayed" | new FooModel(3L, "delayed").toString()
+  }
+
+  def clientSpan(
+    TraceAssert trace,
+    Object parentSpan,
+    String operation,
+    String component,
+    String method = "GET",
+    URI uri,
+    Integer status = 200,
+    boolean error = false,
+    Throwable exception = null,
+    boolean tagQueryString = false,
+    Map<String, Serializable> extraTags = null) {
+    def ret
+
+    def expectedQuery = tagQueryString ? uri.query : null
+    def expectedUrl = URIUtils.buildURL(uri.scheme, uri.host, uri.port, uri.path)
+    if (expectedQuery != null && !expectedQuery.empty) {
+      expectedUrl = "$expectedUrl?$expectedQuery"
+    }
+    trace.span {
+      ret = it.span
+      if (parentSpan == null) {
+        parent()
+      } else {
+        childOf((DDSpan) parentSpan)
+      }
+      operationName operation
+      spanType DDSpanTypes.HTTP_CLIENT
+      errored error
+      measured true
+      tags {
+        "$Tags.COMPONENT" component
+        "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+        "$Tags.PEER_HOSTNAME" uri.host
+        "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
+        "$Tags.PEER_PORT" { it == null || it == uri.port }
+        "$Tags.HTTP_URL" expectedUrl
+        "$Tags.HTTP_METHOD" method
+        if (status) {
+          "$Tags.HTTP_STATUS" status
+        }
+        if (tagQueryString) {
+          "$DDTags.HTTP_QUERY" expectedQuery
+          "$DDTags.HTTP_FRAGMENT" { it == null || it == uri.fragment } // Optional
+        }
+        if (exception) {
+          errorTags(exception.class, exception.message)
+        }
+        peerServiceFrom(Tags.PEER_HOSTNAME)
+        defaultTags()
+        if (extraTags) {
+          it.addTags(extraTags)
+        }
+      }
+    }
+    return ret
+  }
+
+  @Override
+  boolean useStrictTraceWrites() {
+    false
+  }
+}
+
+class SpringWebfluxHttp2UpgradeTest extends SpringWebfluxHttp11Test {
+  @Override
+  protected HttpClient buildClient() {
+    HttpClient.create().protocol(HttpProtocol.HTTP11, HttpProtocol.H2C)
+  }
+}
+
+class SpringWebfluxHttp2PriorKnowledgeTest extends SpringWebfluxHttp11Test {
+  @Override
+  protected HttpClient buildClient() {
+    HttpClient.create().protocol(HttpProtocol.H2C)
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandler.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandler.groovy
new file mode 100644
index 00000000000..972b9c9630a
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandler.groovy
@@ -0,0 +1,21 @@
+package dd.trace.instrumentation.springwebflux.server
+
+import datadog.trace.api.Trace
+import org.springframework.http.MediaType
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import reactor.core.publisher.Mono
+
+/**
+ * Note: this class has to stay outside of 'datadog.*' package because we need
+ * it transformed by {@code @Trace} annotation.
+ */
+@Component
+class EchoHandler {
+  @Trace(operationName = "echo", resourceName = "echo")
+  Mono<ServerResponse> echo(ServerRequest request) {
+    return ServerResponse.accepted().contentType(MediaType.TEXT_PLAIN)
+      .body(request.bodyToMono(String), String)
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandlerFunction.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandlerFunction.groovy
new file mode 100644
index 00000000000..ca00a79bb5a
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/EchoHandlerFunction.groovy
@@ -0,0 +1,21 @@
+package dd.trace.instrumentation.springwebflux.server
+
+
+import org.springframework.web.reactive.function.server.HandlerFunction
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import reactor.core.publisher.Mono
+
+class EchoHandlerFunction implements HandlerFunction<ServerResponse> {
+
+  EchoHandler echoHandler
+
+  EchoHandlerFunction(EchoHandler echoHandler) {
+    this.echoHandler = echoHandler
+  }
+
+  @Override
+  Mono<ServerResponse> handle(ServerRequest request) {
+    return echoHandler.echo(request)
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/FooModel.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/FooModel.groovy
new file mode 100644
index 00000000000..b119968487d
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/FooModel.groovy
@@ -0,0 +1,16 @@
+package dd.trace.instrumentation.springwebflux.server
+
+class FooModel {
+  public long id
+  public String name
+
+  FooModel(long id, String name) {
+    this.id = id
+    this.name = name
+  }
+
+  @Override
+  String toString() {
+    return "{\"id\":" + id + ",\"name\":\"" + name + "\"}"
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/SpringWebFluxTestApplication.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/SpringWebFluxTestApplication.groovy
new file mode 100644
index 00000000000..aa3b3135500
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/SpringWebFluxTestApplication.groovy
@@ -0,0 +1,120 @@
+package dd.trace.instrumentation.springwebflux.server
+
+import datadog.trace.api.Trace
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.context.annotation.Bean
+import org.springframework.http.MediaType
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.BodyInserters
+import org.springframework.web.reactive.function.server.HandlerFunction
+import org.springframework.web.reactive.function.server.RouterFunction
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import reactor.core.publisher.Mono
+
+import java.time.Duration
+
+import static org.springframework.web.reactive.function.server.RequestPredicates.GET
+import static org.springframework.web.reactive.function.server.RequestPredicates.POST
+import static org.springframework.web.reactive.function.server.RouterFunctions.route
+
+@SpringBootApplication
+class SpringWebFluxTestApplication {
+
+  @Bean
+  RouterFunction<ServerResponse> echoRouterFunction(EchoHandler echoHandler) {
+    return route(POST("/echo"), new EchoHandlerFunction(echoHandler))
+  }
+
+  @Bean
+  RouterFunction<ServerResponse> greetRouterFunction(GreetingHandler greetingHandler) {
+    return route(GET("/greet"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.defaultGreet()
+        }
+      }).andRoute(GET("/greet/{name}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.customGreet(request)
+        }
+      }).andRoute(GET("/greet/{name}/{word}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.customGreetWithWord(request)
+        }
+      }).andRoute(GET("/double-greet"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.doubleGreet()
+        }
+      }).andRoute(GET("/greet-delayed"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.defaultGreet().delayElement(Duration.ofMillis(100))
+        }
+      }).andRoute(GET("/greet-failfast/{id}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          throw new RuntimeException("bad things happen")
+        }
+      }).andRoute(GET("/greet-failmono/{id}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return Mono.error(new RuntimeException("bad things happen"))
+        }
+      }).andRoute(GET("/greet-traced-method/{id}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.intResponse(Mono.just(tracedMethod(request.pathVariable("id").toInteger())))
+        }
+      }).andRoute(GET("/greet-mono-from-callable/{id}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.intResponse(Mono.fromCallable {
+            return tracedMethod(request.pathVariable("id").toInteger())
+          })
+        }
+      }).andRoute(GET("/greet-delayed-mono/{id}"), new HandlerFunction<ServerResponse>() {
+        @Override
+        Mono<ServerResponse> handle(ServerRequest request) {
+          return greetingHandler.intResponse(Mono.just(request.pathVariable("id").toInteger()).delayElement(Duration.ofMillis(100)).map { i -> tracedMethod(i) })
+        }
+      })
+  }
+
+  @Component
+  class GreetingHandler {
+    static final String DEFAULT_RESPONSE = "HELLO"
+
+    Mono<ServerResponse> defaultGreet() {
+      return ServerResponse.ok().contentType(MediaType.TEXT_PLAIN)
+        .body(BodyInserters.fromObject(DEFAULT_RESPONSE))
+    }
+
+    Mono<ServerResponse> doubleGreet() {
+      return ServerResponse.ok().contentType(MediaType.TEXT_PLAIN)
+        .body(BodyInserters.fromObject(DEFAULT_RESPONSE + DEFAULT_RESPONSE))
+    }
+
+    Mono<ServerResponse> customGreet(ServerRequest request) {
+      return ServerResponse.ok().contentType(MediaType.TEXT_PLAIN)
+        .body(BodyInserters.fromObject(DEFAULT_RESPONSE + " " + request.pathVariable("name")))
+    }
+
+    Mono<ServerResponse> customGreetWithWord(ServerRequest request) {
+      return ServerResponse.ok().contentType(MediaType.TEXT_PLAIN)
+        .body(BodyInserters.fromObject(DEFAULT_RESPONSE + " " + request.pathVariable("name") + " " + request.pathVariable("word")))
+    }
+
+    Mono<ServerResponse> intResponse(Mono<FooModel> mono) {
+      return ServerResponse.ok().contentType(MediaType.TEXT_PLAIN)
+        .body(BodyInserters.fromPublisher(mono.map { i -> DEFAULT_RESPONSE + " " + i.id }, String))
+    }
+  }
+
+  @Trace()
+  private static FooModel tracedMethod(long id) {
+    return new FooModel(id, "tracedMethod")
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/TestController.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/TestController.groovy
new file mode 100644
index 00000000000..0f2747b98bd
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/TestController.groovy
@@ -0,0 +1,63 @@
+package dd.trace.instrumentation.springwebflux.server
+
+import datadog.trace.api.Trace
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Mono
+
+import java.time.Duration
+
+@RestController
+class TestController {
+
+  @GetMapping("/foo")
+  Mono<FooModel> getFooModel() {
+    return Mono.just(new FooModel(0L, "DEFAULT"))
+  }
+
+  @GetMapping("/foo/{id}")
+  Mono<FooModel> getFooModel(@PathVariable("id") long id) {
+    return Mono.just(new FooModel(id, "pass"))
+  }
+
+  @GetMapping("/foo/{id}/{name}")
+  Mono<FooModel> getFooModel(@PathVariable("id") long id, @PathVariable("name") String name) {
+    return Mono.just(new FooModel(id, name))
+  }
+
+  @GetMapping("/foo-delayed")
+  Mono<FooModel> getFooDelayed() {
+    return Mono.just(new FooModel(3L, "delayed")).delayElement(Duration.ofMillis(100))
+  }
+
+  @GetMapping("/foo-failfast/{id}")
+  Mono<FooModel> getFooFailFast(@PathVariable("id") long id) {
+    throw new RuntimeException("bad things happen")
+  }
+
+  @GetMapping("/foo-failmono/{id}")
+  Mono<FooModel> getFooFailMono(@PathVariable("id") long id) {
+    return Mono.error(new RuntimeException("bad things happen"))
+  }
+
+  @GetMapping("/foo-traced-method/{id}")
+  Mono<FooModel> getTracedMethod(@PathVariable("id") long id) {
+    return Mono.just(tracedMethod(id))
+  }
+
+  @GetMapping("/foo-mono-from-callable/{id}")
+  Mono<FooModel> getMonoFromCallable(@PathVariable("id") long id) {
+    return Mono.fromCallable { return tracedMethod(id) }
+  }
+
+  @GetMapping("/foo-delayed-mono/{id}")
+  Mono<FooModel> getFooDelayedMono(@PathVariable("id") long id) {
+    return Mono.just(id).delayElement(Duration.ofMillis(100)).map { i -> tracedMethod(i) }
+  }
+
+  @Trace()
+  private FooModel tracedMethod(long id) {
+    return new FooModel(id, "tracedMethod")
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
new file mode 100644
index 00000000000..85917014396
--- /dev/null
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
@@ -0,0 +1,21 @@
+package dd.trace.instrumentation.springwebflux.server;
+
+import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
+
+import java.net.URI;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+// Need to keep this in Java because groovy creates crazy proxies around lambdas
+@Component
+public class RedirectComponent {
+  @Bean
+  public RouterFunction<ServerResponse> redirectRouterFunction() {
+    return route(
+        GET("/double-greet-redirect"),
+        req -> ServerResponse.temporaryRedirect(URI.create("/double-greet")).build());
+  }
+}
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux6/server/IastWebFluxTest.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux6/server/IastWebFluxTest.groovy
index 329a37c47bd..726b9f4b7bb 100644
--- a/dd-java-agent/instrumentation/spring-webflux-6/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux6/server/IastWebFluxTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webflux-6/src/iastTest/groovy/datadog/trace/instrumentation/springwebflux6/server/IastWebFluxTest.groovy
@@ -229,7 +229,7 @@ class IastWebFluxTest extends IastRequestTestRunner {
     (respBody =~ "URI: http://[^/]+/iast/shr\\?var1=foo").find()
     (respBody =~ "Path: /iast/shr").find()
     respBody.contains 'Query params: [var1 (tainted):[foo (tainted)]]'
-    respBody.contains 'Cookies: [var2:[var2 -> bar (tainted)]]'
+    respBody.contains 'Cookies: [var2 (tainted):[var2 (tainted) -> bar (tainted)]]'
     (respBody =~ "User-Agent: okhttp/[\\d.]+ \\(tainted\\)").find()
 
     when:
@@ -244,11 +244,10 @@ class IastWebFluxTest extends IastRequestTestRunner {
       value 'foo'
       range 0, 3, source(SourceTypes.REQUEST_PARAMETER_VALUE, 'var1', 'foo')
     }
-    // WebModule is not tainting cookie names
-    //    toc.hasTaintedObject {
-    //      value 'var2'
-    //      range 0, 4, source(SourceTypes.REQUEST_COOKIE_NAME, 'var2', null)
-    //    }
+    toc.hasTaintedObject {
+      value 'var2'
+      range 0, 4, source(SourceTypes.REQUEST_COOKIE_NAME, 'var2', 'var2')
+    }
     toc.hasTaintedObject {
       value 'bar'
       range 0, 3, source(SourceTypes.REQUEST_COOKIE_VALUE, 'var2',  'bar')
diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
index 4e3b02498c8..e3945f4441f 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
@@ -17,6 +17,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -181,7 +182,7 @@ public static void after(
       }
 
       { // iast
-        Object iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+        IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
         if (iastRequestContext != null) {
           PropagationModule module = InstrumentationBridge.PROPAGATION;
           if (module != null) {
@@ -193,7 +194,7 @@ public static void after(
                   continue; // should not happen
                 }
                 module.taint(
-                    iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                    iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
               }
             }
 
@@ -211,18 +212,18 @@ public static void after(
                   if (innerKey != null) {
                     module.taint(
                         iastRequestContext,
+                        innerKey,
                         SourceTypes.REQUEST_MATRIX_PARAMETER,
-                        parameterName,
-                        innerKey);
+                        parameterName);
                   }
                   Iterable<String> innerValues = ie.getValue();
                   if (innerValues != null) {
                     for (String iv : innerValues) {
                       module.taint(
                           iastRequestContext,
+                          iv,
                           SourceTypes.REQUEST_MATRIX_PARAMETER,
-                          parameterName,
-                          iv);
+                          parameterName);
                     }
                   }
                 }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
index 47e58e5c168..b17266cd3cf 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
@@ -17,6 +17,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -140,7 +141,7 @@ public static void after(
       }
 
       { // iast
-        Object iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+        IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
         if (iastRequestContext != null) {
           PropagationModule module = InstrumentationBridge.PROPAGATION;
           if (module != null) {
@@ -151,7 +152,7 @@ public static void after(
                 continue; // should not happen
               }
               module.taint(
-                  iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                  iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
             }
           }
         }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy
index ec67c76f413..bf35356ba14 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy
@@ -5,6 +5,7 @@ import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
+import datadog.trace.api.iast.IastContext
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
@@ -258,7 +259,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
     TEST_WRITER.waitForTraces(1)
 
     then:
-    1 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'id', '123')
+    1 * mod.taint(_ as IastContext, '123', SourceTypes.REQUEST_PATH_PARAMETER, 'id')
     0 * mod._
 
     cleanup:
@@ -294,11 +295,11 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
     TEST_WRITER.waitForTraces(1)
 
     then:
-    1 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'var', 'a=x,y;a=z')
-    1 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'a')
-    1 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'x')
-    1 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'y')
-    1 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'z')
+    1 * mod.taint(_ as IastContext, 'a=x,y;a=z', SourceTypes.REQUEST_PATH_PARAMETER, 'var')
+    1 * mod.taint(_ as IastContext, 'a', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    1 * mod.taint(_ as IastContext, 'x', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    1 * mod.taint(_ as IastContext, 'y', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    1 * mod.taint(_ as IastContext, 'z', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
     0 * mod._
 
     cleanup:
diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/urlhandlermapping/UrlHandlerMappingTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/urlhandlermapping/UrlHandlerMappingTest.groovy
index fa6e841c070..cbfb014bed4 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/urlhandlermapping/UrlHandlerMappingTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/urlhandlermapping/UrlHandlerMappingTest.groovy
@@ -4,6 +4,7 @@ import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.iast.IastContext
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
@@ -191,7 +192,7 @@ class UrlHandlerMappingTest extends HttpServerTest<ConfigurableApplicationContex
 
   void 'tainting on template var'() {
     setup:
-    PropagationModule mod = Mock()
+    final mod = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(mod)
     Request request = this.request(PATH_PARAM, 'GET', null).build()
 
@@ -202,7 +203,7 @@ class UrlHandlerMappingTest extends HttpServerTest<ConfigurableApplicationContex
     TEST_WRITER.waitForTraces(1)
 
     then:
-    1 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'id', '123')
+    1 * mod.taint(_ as IastContext, '123', SourceTypes.REQUEST_PATH_PARAMETER, 'id')
     0 * mod._
 
     cleanup:
diff --git a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
index f86d4481abb..5db0c0e4492 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
@@ -21,7 +21,7 @@ public static String afterEscape(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterEscape threw", e);
       }
@@ -38,7 +38,7 @@ public static String afterHtmlEscape2(
     final PropagationModule module = InstrumentationBridge.PROPAGATION;
     if (module != null) {
       try {
-        module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+        module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
       } catch (final Throwable e) {
         module.onUnexpectedException("afterHtmlEscape2 threw", e);
       }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/test/groovy/EscapeUtilsCallSiteTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/test/groovy/EscapeUtilsCallSiteTest.groovy
index c5dc7f60714..f18f2691391 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/test/groovy/EscapeUtilsCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/test/groovy/EscapeUtilsCallSiteTest.groovy
@@ -21,13 +21,13 @@ class EscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    1 * module.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
-    method | args                                | expected
-    'htmlEscape' | ['Ø-This is a quote']               | '&Oslash;-This is a quote'
-    'htmlEscape' | ['Ø-This is a quote', 'ISO-8859-1'] | '&Oslash;-This is a quote'
+    method             | args                                                            | expected
+    'htmlEscape'       | ['Ø-This is a quote']                                           | '&Oslash;-This is a quote'
+    'htmlEscape'       | ['Ø-This is a quote', 'ISO-8859-1']                             | '&Oslash;-This is a quote'
     'javaScriptEscape' | ['<script>function a(){console.log("escape this < ")}<script>'] | '\\u003Cscript\\u003Efunction a(){console.log(\\"escape this \\u003C \\")}\\u003Cscript\\u003E'
   }
 
@@ -42,13 +42,12 @@ class EscapeUtilsCallSiteTest extends AgentTestRunner {
     then:
     def ex = thrown(Exception)
     assert ex.stackTrace[0].getClassName().startsWith('org.springframework')
-    0 * module.taintIfInputIsTaintedWithMarks(_)
     0 * _
 
     where:
-    method | args
-    'htmlEscape' | [null]
-    'htmlEscape' | [null, null]
+    method             | args
+    'htmlEscape'       | [null]
+    'htmlEscape'       | [null, null]
     'javaScriptEscape' | [null]
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
index c01d374bb95..20e8458c3ed 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
@@ -8,6 +8,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -112,7 +113,7 @@ public static void after(
     }
 
     { // iast
-      Object iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+      IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
       if (iastRequestContext != null) {
         PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
@@ -124,7 +125,7 @@ public static void after(
                 continue; // should not happen
               }
               module.taint(
-                  iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                  iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
             }
           }
 
@@ -142,18 +143,18 @@ public static void after(
                 if (innerKey != null) {
                   module.taint(
                       iastRequestContext,
+                      innerKey,
                       SourceTypes.REQUEST_MATRIX_PARAMETER,
-                      parameterName,
-                      innerKey);
+                      parameterName);
                 }
                 Iterable<String> innerValues = ie.getValue();
                 if (innerValues != null) {
                   for (String iv : innerValues) {
                     module.taint(
                         iastRequestContext,
+                        iv,
                         SourceTypes.REQUEST_MATRIX_PARAMETER,
-                        parameterName,
-                        iv);
+                        parameterName);
                   }
                 }
               }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
index d3b3633a7d8..3e293762f66 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
+++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
@@ -8,6 +8,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -80,7 +81,7 @@ public static void after(
     }
 
     { // iast
-      Object iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+      IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
       if (iastRequestContext != null) {
         PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
@@ -91,7 +92,7 @@ public static void after(
               continue; // should not happen
             }
             module.taint(
-                iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
           }
         }
       }
diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy
index d185428e25a..89a10033b6d 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy
@@ -5,6 +5,7 @@ import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.api.ConfigDefaults
 import datadog.trace.api.DDSpanTypes
+import datadog.trace.api.iast.IastContext
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
@@ -274,7 +275,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
 
     then:
     // spring-security filter causes uri matching to happen twice
-    2 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'id', '123')
+    2 * mod.taint(_, '123', SourceTypes.REQUEST_PATH_PARAMETER, 'id')
     0 * mod._
 
     cleanup:
@@ -313,11 +314,11 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
 
     then:
     // spring-security filter (AuthorizationFilter.java:95) causes uri matching to happen twice
-    2 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'var', 'a=x,y') // this version of spring removes ;a=z
-    2 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'a')
-    2 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'x')
-    2 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'y')
-    2 * mod.taint(_, SourceTypes.REQUEST_MATRIX_PARAMETER, 'var', 'z')
+    2 * mod.taint(_ as IastContext, 'a=x,y', SourceTypes.REQUEST_PATH_PARAMETER, 'var') // this version of spring removes ;a=z
+    2 * mod.taint(_ as IastContext, 'a', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    2 * mod.taint(_ as IastContext, 'x', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    2 * mod.taint(_ as IastContext, 'y', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
+    2 * mod.taint(_ as IastContext, 'z', SourceTypes.REQUEST_MATRIX_PARAMETER, 'var')
     0 * mod._
 
     cleanup:
diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy
index a400b64dc15..9c211b34aad 100644
--- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy
+++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy
@@ -207,7 +207,7 @@ class UrlHandlerMappingTest extends HttpServerTest<ConfigurableApplicationContex
     TEST_WRITER.waitForTraces(1)
 
     then:
-    1 * mod.taint(_, SourceTypes.REQUEST_PATH_PARAMETER, 'id', '123')
+    1 * mod.taint(_, '123', SourceTypes.REQUEST_PATH_PARAMETER, 'id')
     0 * mod._
 
     cleanup:
diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy
index 313b185b7a0..3095742e99f 100644
--- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy
+++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy
@@ -1,12 +1,8 @@
 package datadog.trace.instrumentation.testng
 
-import datadog.trace.agent.test.asserts.ListWriterAssert
-import datadog.trace.api.DDTags
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.InstrumentationBridge
+
 import datadog.trace.api.civisibility.config.SkippableTest
-import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.civisibility.CiVisibilityTest
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import org.example.TestError
 import org.example.TestFailed
 import org.example.TestFailedAndSucceed
@@ -29,889 +25,80 @@ import org.testng.TestNG
 import org.testng.xml.SuiteXmlParser
 import org.testng.xml.XmlSuite
 
-abstract class TestNGTest extends CiVisibilityTest {
+abstract class TestNGTest extends CiVisibilityInstrumentationTest {
 
   static testOutputDir = "build/tmp/test-output"
 
-  def "test success generates spans"() {
-    setup:
-    runTests(TestSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test inheritance generates spans"() {
+  def "test #testcaseName"() {
     setup:
-    runTests(TestInheritance)
+    givenSkippableTests(skippedTests)
 
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestInheritance", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestInheritance", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
+    if (!tests.isEmpty()) {
+      runTests(tests, parallelMode)
+    } else {
+      def xmlSuite = null
+      TestNGTest.classLoader.getResourceAsStream(testcaseName + "/suite.xml").withCloseable {
+        xmlSuite = new SuiteXmlParser().parse("testng.xml", it, true)
       }
-    })
-  }
-
-  def "test failed generates spans"() {
-    setup:
-    try {
-      runTests(TestFailed)
-    } catch (Throwable ignored) {
-      // Ignored
+      runXmlSuites([xmlSuite], parallelMode)
     }
 
     expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new AssertionError(assertionErrorMessage(), null)
-  }
-
-  def "test failed with success percentage generates spans"() {
-    setup:
-    try {
-      runTests(TestFailedWithSuccessPercentage)
-    } catch (Throwable ignored) {
-      // Ignored
-    }
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 6, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedWithSuccessPercentage", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedWithSuccessPercentage", "test_failed_with_success_percentage", "test_failed_with_success_percentage()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedWithSuccessPercentage", "test_failed_with_success_percentage", "test_failed_with_success_percentage()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedWithSuccessPercentage", "test_failed_with_success_percentage", "test_failed_with_success_percentage()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedWithSuccessPercentage", "test_failed_with_success_percentage", "test_failed_with_success_percentage()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedWithSuccessPercentage", "test_failed_with_success_percentage", "test_failed_with_success_percentage()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionError(assertionErrorMessage(), null)
-  }
-
-  def "test error generates spans"() {
-    setup:
-    runTests(TestError)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestError", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestError", "test_error", "test_error()V", CIConstants.TEST_FAIL, null, exception)
-      }
-    })
-
-    where:
-    exception = new IllegalArgumentException("This exception is an example")
-  }
-
-  def "test skipped generates spans"() {
-    setup:
-    runTests(TestSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkipped", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test parameterized generates spans"() {
-    setup:
-    runTests(TestParameterized)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"arguments":{"0":"hello","1":"true"}}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"arguments":{"0":"\\\"goodbye\\\"","1":"false"}}']
-  }
-
-  def "test success with groups generates spans"() {
-    setup:
-    runTests(TestSucceedGroups)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedGroups", CIConstants.TEST_PASS,
-        null, null, false, ["classGroup", "parentGroup"])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedGroups", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-        null, null, false, ["classGroup", "testCaseGroup", "parentGroup"])
-      }
-    })
-  }
-
-  def "test class skipped generated spans"() {
-    setup:
-    runTests(TestSkippedClass)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedClass", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_class_another_skipped", "test_class_another_skipped()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSkippedClass", "test_class_skipped", "test_class_skipped()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): classSkipReason()] // framework versions used in tests cannot provide skip reason
-  }
-
-
-  def "test success and skipped generates spans"() {
-    setup:
-    runTests(TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test success and failure generates spans"() {
-    setup:
-    runTests(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionError(assertionErrorMessage(), null)
-  }
-
-  def "test suite teardown failure generates spans"() {
-    setup:
-    runTests(TestFailedSuiteTearDown)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteTearDown", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteTearDown", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite tear down failed")
-  }
-
-  def "test suite setup failure generates spans"() {
-    setup:
-    runTests(TestFailedSuiteSetup)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedSuiteSetup", CIConstants.TEST_FAIL, null, exception)
-      }
-      // if suite set up fails, TestNG will report that suite's test cases as skipped
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteSetup", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedSuiteSetup", "test_succeed", "test_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    exception = new RuntimeException("suite set up failed")
-    testTags = testCaseTagsIfSuiteSetUpFailedOrSkipped(exception.message)
-  }
-
-  def "test multiple successful suites"() {
-    setup:
-    runTests(TestSucceed, TestSucceedAndSkipped)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        firstSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceedAndSkipped", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_skipped", "test_skipped()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestSucceedAndSkipped", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Ignore reason in test"]
-  }
-
-  def "test successful suite and failing suite"() {
-    setup:
-    runTests(TestSucceed, TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 5, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long firstSuiteId
-      long secondSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_FAIL)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_FAIL)
-        firstSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-        secondSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_FAIL)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_FAIL, null, exception)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, secondSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, firstSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    exception = new AssertionError(assertionErrorMessage(), null)
-  }
-
-  def "test nested successful suites"() {
-    setup:
-    runTests(TestSucceedNested, TestSucceedNested.NestedSuite)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long topLevelSuiteId
-      long nestedSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        topLevelSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedNested", CIConstants.TEST_PASS)
-        nestedSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, 'org.example.TestSucceedNested$NestedSuite', CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, nestedSuiteId, 'org.example.TestSucceedNested$NestedSuite', "test_succeed_nested", "test_succeed_nested()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, topLevelSuiteId, "org.example.TestSucceedNested", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test nested skipped suites"() {
-    setup:
-    runTests(TestSkippedNested)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long topLevelSuiteId
-      long nestedSuiteId
-      trace(4, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        topLevelSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSkippedNested", CIConstants.TEST_SKIP)
-        nestedSuiteId = testSuiteSpan(it, 3, testSessionId, testModuleId, 'org.example.TestSkippedNested$NestedSuite', CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, nestedSuiteId, 'org.example.TestSkippedNested$NestedSuite', "test_succeed_nested", "test_succeed_nested()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, topLevelSuiteId, "org.example.TestSkippedNested", "test_succeed", "test_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-    })
-
-    where:
-    testTags = testCaseTagsIfSuiteSetUpFailedOrSkipped("Ignore reason in class")
-  }
-
-  def "test factory data provider tests"() {
-    setup:
-
-    runTests(TestSucceedDataProvider)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedDataProvider", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedDataProvider", "testMethod", "testMethod()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test successful test cases executed in parallel"() {
-    setup:
-    runTests(new Class[] { TestSucceedMultiple }, "methods")
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedMultiple", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedMultiple", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedMultiple", "test_succeed_another", "test_succeed_another()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test parameterized tests executed in parallel"() {
-    setup:
-    runTests(new Class[] { TestParameterized }, "methods")
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_PASS, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [(Tags.TEST_PARAMETERS): '{"arguments":{"0":"hello","1":"true"}}']
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"arguments":{"0":"\\\"goodbye\\\"","1":"false"}}']
-  }
-
-  def "test successful test cases executed in parallel with TESTS parallel mode"() {
-    setup:
-    def suiteXml = """
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
-    <test name="Test A">
-        <classes>
-            <class name="org.example.TestSucceedMultiple">
-                <methods>
-                    <include name="test_succeed"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-
-    <test name="Test B">
-        <classes>
-            <class name="org.example.TestSucceedMultiple">
-                <methods>
-                    <include name="test_succeed_another"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-</suite>
-    """
-
-    def parser = new SuiteXmlParser()
-    def xmlSuite = parser.parse("testng.xml", new ByteArrayInputStream(suiteXml.bytes), true)
-
-    runXmlSuites(Collections.singletonList(xmlSuite), "methods")
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedMultiple", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedMultiple", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedMultiple", "test_succeed_another", "test_succeed_another()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test successful test cases executed in parallel with TESTS parallel mode and not all test methods included"() {
-    setup:
-    def suiteXml = """
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
-    <test name="Test A">
-        <classes>
-            <class name="org.example.TestSucceedThreeCases">
-                <methods>
-                    <include name="test_succeed_a"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-
-    <test name="Test B">
-        <classes>
-            <class name="org.example.TestSucceedThreeCases">
-                <methods>
-                    <include name="test_succeed_b"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-</suite>
-    """
-
-    def parser = new SuiteXmlParser()
-    def xmlSuite = parser.parse("testng.xml", new ByteArrayInputStream(suiteXml.bytes), true)
-
-    runXmlSuites(Collections.singletonList(xmlSuite), "tests")
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedThreeCases", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedThreeCases", "test_succeed_a", "test_succeed_a()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedThreeCases", "test_succeed_b", "test_succeed_b()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test successful test cases executed in parallel with TESTS parallel mode and same test case running concurrently"() {
-    setup:
-    def suiteXml = """
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
-    <test name="Test A">
-        <classes>
-            <class name="org.example.TestSucceed">
-                <methods>
-                    <include name="test_succeed"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-
-    <test name="Test B">
-        <classes>
-            <class name="org.example.TestSucceed">
-                <methods>
-                    <include name="test_succeed"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-    
-    <test name="Test C">
-        <classes>
-            <class name="org.example.TestSucceed">
-                <methods>
-                    <include name="test_succeed"/>
-                </methods>
-            </class>
-        </classes>
-    </test>
-</suite>
-    """
-
-    def parser = new SuiteXmlParser()
-    def xmlSuite = parser.parse("testng.xml", new ByteArrayInputStream(suiteXml.bytes), true)
-
-    runXmlSuites(Collections.singletonList(xmlSuite), "tests")
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS)
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-  }
-
-  def "test ITR skipping"() {
-    setup:
-    givenSkippableTests([
+    assertSpansData(testcaseName, expectedTracesCount)
+
+    where:
+    testcaseName                                                                      | tests                                              | expectedTracesCount | parallelMode | skippedTests
+    "test-succeed"                                                                    | [TestSucceed]                                      | 2                   | null         | []
+    "test-inheritance"                                                                | [TestInheritance]                                  | 2                   | null         | []
+    "test-failed-${version()}"                                                        | [TestFailed]                                       | 2                   | null         | []
+    "test-failed-with-success-percentage-${version()}"                                | [TestFailedWithSuccessPercentage]                  | 6                   | null         | []
+    "test-error"                                                                      | [TestError]                                        | 2                   | null         | []
+    "test-skipped"                                                                    | [TestSkipped]                                      | 2                   | null         | []
+    "test-parameterized"                                                              | [TestParameterized]                                | 3                   | null         | []
+    "test-success-with-groups"                                                        | [TestSucceedGroups]                                | 2                   | null         | []
+    "test-class-skipped"                                                              | [TestSkippedClass]                                 | 3                   | null         | []
+    "test-success-and-skipped"                                                        | [TestSucceedAndSkipped]                            | 3                   | null         | []
+    "test-success-and-failure-${version()}"                                           | [TestFailedAndSucceed]                             | 4                   | null         | []
+    "test-suite-teardown-failure"                                                     | [TestFailedSuiteTearDown]                          | 3                   | null         | []
+    "test-suite-setup-failure"                                                        | [TestFailedSuiteSetup]                             | 3                   | null         | []
+    "test-multiple-successful-suites"                                                 | [TestSucceed, TestSucceedAndSkipped]               | 4                   | null         | []
+    "test-successful-suite-and-failed-suite-${version()}"                             | [TestSucceed, TestFailedAndSucceed]                | 5                   | null         | []
+    "test-nested-successful-suites"                                                   | [TestSucceedNested, TestSucceedNested.NestedSuite] | 3                   | null         | []
+    "test-nested-skipped-suites-${version()}"                                         | [TestSkippedNested]                                | 3                   | null         | []
+    "test-factory-data-provider"                                                      | [TestSucceedDataProvider]                          | 2                   | null         | []
+    "test-successful-test-cases-in-parallel"                                          | [TestSucceedMultiple]                              | 3                   | "methods"    | []
+    "test-parameterized-test-cases-in-parallel"                                       | [TestParameterized]                                | 3                   | "methods"    | []
+    "test-itr-skipping"                                                               | [TestFailedAndSucceed]                             | 4                   | null         | [
       new SkippableTest("org.example.TestFailedAndSucceed", "test_another_succeed", null, null),
-      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null),
-    ])
-
-    runTests(TestFailedAndSucceed)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 4, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 2,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestFailedAndSucceed", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_another_succeed", "test_another_succeed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_failed", "test_failed()V", CIConstants.TEST_SKIP, testTags)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestFailedAndSucceed", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS)
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner", (Tags.TEST_SKIPPED_BY_ITR): true]
-  }
-
-  def "test ITR skipping for parameterized tests"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestParameterized", "parameterized_test_succeed", testTags_0[Tags.TEST_PARAMETERS], null),
-    ])
-
-    runTests(TestParameterized)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 3, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestParameterized", CIConstants.TEST_PASS)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_SKIP, testTags_0)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestParameterized", "parameterized_test_succeed", "parameterized_test_succeed(Ljava/lang/String;Z)V", CIConstants.TEST_PASS, testTags_1)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_PARAMETERS): '{"arguments":{"0":"hello","1":"true"}}',
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
+      new SkippableTest("org.example.TestFailedAndSucceed", "test_failed", null, null)
     ]
-    testTags_1 = [(Tags.TEST_PARAMETERS): '{"arguments":{"0":"\\\"goodbye\\\"","1":"false"}}']
-  }
-
-  def "test ITR skipping for factory data provider tests"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestSucceedDataProvider", "testMethod", null, null),
-    ])
-
-    runTests(TestSucceedDataProvider)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_SKIP)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_SKIP, [
-          (DDTags.CI_ITR_TESTS_SKIPPED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 1,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedDataProvider", CIConstants.TEST_SKIP)
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedDataProvider", "testMethod", "testMethod()V", CIConstants.TEST_SKIP, testTags_0)
-      }
-    })
-
-    where:
-    testTags_0 = [
-      (Tags.TEST_SKIP_REASON): "Skipped by Datadog Intelligent Test Runner",
-      (Tags.TEST_SKIPPED_BY_ITR): true
+    "test-itr-skipping-parameterized"                                                 | [TestParameterized]                                | 3                   | null         | [
+      new SkippableTest("org.example.TestParameterized", "parameterized_test_succeed", '{"arguments":{"0":"hello","1":"true"}}', null)
     ]
+    "test-itr-skipping-factory-data-provider"                                         | [TestSucceedDataProvider]                          | 2                   | null         | [new SkippableTest("org.example.TestSucceedDataProvider", "testMethod", null, null)]
+    "test-itr-unskippable"                                                            | [TestSucceedUnskippable]                           | 2                   | null         | [new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null)]
+    "test-itr-unskippable-not-skipped"                                                | [TestSucceedUnskippable]                           | 2                   | null         | []
+    "test-successful-test-cases-in-TESTS-parallel-mode"                               | []                                                 | 3                   | "tests"      | []
+    "test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included" | []                                                 | 3                   | "tests"      | []
+    "test-successful-test-cases-in-TESTS-parallel-mode-same-test-case"                | []                                                 | 4                   | "tests"      | []
   }
 
-  def "test ITR unskippable"() {
-    setup:
-    givenSkippableTests([
-      new SkippableTest("org.example.TestSucceedUnskippable", "test_succeed", null, null),
-    ])
-
-    runTests(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS,
-        null, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-        testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true, (Tags.TEST_ITR_FORCED_RUN): true]
-  }
-
-  def "test unskippable ITR test that is not supposed to be skipped"() {
-    setup:
-    givenSkippableTests([])
-    runTests(TestSucceedUnskippable)
-
-    expect:
-    ListWriterAssert.assertTraces(TEST_WRITER, 2, false, SORT_TRACES_BY_DESC_SIZE_THEN_BY_NAMES, {
-      long testSessionId
-      long testModuleId
-      long testSuiteId
-      trace(3, true) {
-        testSessionId = testSessionSpan(it, 1, CIConstants.TEST_PASS)
-        testModuleId = testModuleSpan(it, 0, testSessionId, CIConstants.TEST_PASS, [
-          (Tags.TEST_ITR_TESTS_SKIPPING_ENABLED): true,
-          (Tags.TEST_ITR_TESTS_SKIPPING_TYPE): "test",
-          (Tags.TEST_ITR_TESTS_SKIPPING_COUNT): 0,
-        ])
-        testSuiteId = testSuiteSpan(it, 2, testSessionId, testModuleId, "org.example.TestSucceedUnskippable", CIConstants.TEST_PASS,
-        null, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-      trace(1) {
-        testSpan(it, 0, testSessionId, testModuleId, testSuiteId, "org.example.TestSucceedUnskippable", "test_succeed", "test_succeed()V", CIConstants.TEST_PASS,
-        testTags, null, false, [InstrumentationBridge.ITR_UNSKIPPABLE_TAG])
-      }
-    })
-
-    where:
-    testTags = [(Tags.TEST_ITR_UNSKIPPABLE): true]
-  }
-
-  protected void runTests(Class[] testClasses, String parallelMode = null) {
+  protected void runTests(List<Class> testClasses, String parallelMode = null) {
     TestEventsHandlerHolder.start()
 
     def testNG = new TestNG()
     testNG.setOutputDirectory(testOutputDir)
-    testNG.setTestClasses(testClasses)
+    Class[] testClassesArray = testClasses.toArray(new Class[0])
+    testNG.setTestClasses(testClassesArray)
     if (parallelMode != null) {
       testNG.setParallel(parallelMode)
     }
-    testNG.run()
+
+    try {
+      testNG.run()
+    } catch (Throwable ignored) {
+      // Ignored
+    }
 
     TestEventsHandlerHolder.stop()
   }
@@ -925,34 +112,25 @@ abstract class TestNGTest extends CiVisibilityTest {
     if (parallelMode != null) {
       testNG.setParallel(parallelMode)
     }
-    testNG.run()
+
+    try {
+      testNG.run()
+    } catch (Throwable ignored) {
+      // Ignored
+    }
 
     TestEventsHandlerHolder.stop()
   }
 
-  @Override
-  String expectedOperationPrefix() {
-    "testng"
-  }
+  protected abstract String version()
 
   @Override
-  String expectedTestFramework() {
+  String instrumentedLibraryName() {
     TracingListener.FRAMEWORK_NAME
   }
 
   @Override
-  String expectedTestFrameworkVersion() {
+  String instrumentedLibraryVersion() {
     TracingListener.FRAMEWORK_VERSION
   }
-
-  @Override
-  String component() {
-    "testng"
-  }
-
-  abstract String assertionErrorMessage()
-
-  abstract String classSkipReason()
-
-  abstract Map<String, String> testCaseTagsIfSuiteSetUpFailedOrSkipped(String skipReason)
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/groovy/TestNG6Test.groovy b/dd-java-agent/instrumentation/testng/testng-6/src/test/groovy/TestNG6Test.groovy
index 8193d366edf..b57ab2457dc 100644
--- a/dd-java-agent/instrumentation/testng/testng-6/src/test/groovy/TestNG6Test.groovy
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/groovy/TestNG6Test.groovy
@@ -1,23 +1,8 @@
 import datadog.trace.instrumentation.testng.TestNGTest
 
 class TestNG6Test extends TestNGTest {
-
-  @Override
-  String assertionErrorMessage() {
-    "expected:<true> but was:<false>"
-  }
-
-  @Override
-  String classSkipReason() {
-    // For the TestNG version used for tests (minimum supported)
-    // class skip reason is not provided
-    return null
-  }
-
   @Override
-  Map<String, String> testCaseTagsIfSuiteSetUpFailedOrSkipped(String skipReason) {
-    // For the TestNG version used for tests (minimum supported)
-    // if suite set up fails, skip listeners do not receive error message
-    return null
+  protected String version() {
+    return "6"
   }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl
new file mode 100644
index 00000000000..0e5f71c01ab
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedClass",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedClass.test_class_another_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_another_skipped()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_another_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedClass.test_class_skipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_skipped()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl
new file mode 100644
index 00000000000..fd00d554aa2
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestError",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestError.test_error",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_error()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_error",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.IllegalArgumentException",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl
new file mode 100644
index 00000000000..8d0f1d736af
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedDataProvider",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedDataProvider.testMethod",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testMethod()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testMethod",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl
new file mode 100644
index 00000000000..8b167aa5d31
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailed.test_failed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl
new file mode 100644
index 00000000000..e383ccf2080
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl
@@ -0,0 +1,369 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedWithSuccessPercentage",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_5},
+    "span_id" : ${content_span_id_5},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl
new file mode 100644
index 00000000000..1b882174d5c
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestInheritance",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestInheritance.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl
new file mode 100644
index 00000000000..4c7f5f9f0e8
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedDataProvider",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedDataProvider.testMethod",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testMethod()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testMethod",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl
new file mode 100644
index 00000000000..33d19112a46
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -0,0 +1,219 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..fc42e700dba
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,269 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 2,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 2
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
new file mode 100644
index 00000000000..3a49184d8cd
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..222b52cf8e1
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl
new file mode 100644
index 00000000000..8605a0f81d0
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl
@@ -0,0 +1,299 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl
new file mode 100644
index 00000000000..771777d8fa9
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl
@@ -0,0 +1,248 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested$NestedSuite",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl
new file mode 100644
index 00000000000..ad6c4107454
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl
@@ -0,0 +1,248 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedNested",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedNested$NestedSuite",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedNested.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl
new file mode 100644
index 00000000000..4eedafb19e8
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl
new file mode 100644
index 00000000000..4eedafb19e8
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..d611cd3b9fa
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkipped",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkipped.test_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..e1d46fe0254
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl
new file mode 100644
index 00000000000..4a04c232d3a
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl
@@ -0,0 +1,266 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl
new file mode 100644
index 00000000000..e102d1c124c
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl
new file mode 100644
index 00000000000..06d67ef6320
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedGroups",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"classGroup\",\"parentGroup\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedGroups",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedGroups.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedGroups",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"classGroup\",\"testCaseGroup\",\"parentGroup\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl
new file mode 100644
index 00000000000..76e4d00ef18
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl
@@ -0,0 +1,351 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl
new file mode 100644
index 00000000000..aeb05d15944
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedThreeCases",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedThreeCases.test_succeed_a",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_a()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_a",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedThreeCases.test_succeed_b",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_b()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_b",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml
new file mode 100644
index 00000000000..e51d3c4fb30
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceedThreeCases">
+        <methods>
+          <include name="test_succeed_a"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceedThreeCases">
+        <methods>
+          <include name="test_succeed_b"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl
new file mode 100644
index 00000000000..95154c13a45
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl
@@ -0,0 +1,263 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml
new file mode 100644
index 00000000000..5593e4bc8c6
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml
@@ -0,0 +1,32 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test C">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl
new file mode 100644
index 00000000000..32b807a6a3d
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedMultiple",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed_another",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_another()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_another",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml
new file mode 100644
index 00000000000..9173c131f04
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceedMultiple">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceedMultiple">
+        <methods>
+          <include name="test_succeed_another"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl
new file mode 100644
index 00000000000..32b807a6a3d
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedMultiple",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed_another",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_another()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_another",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl
new file mode 100644
index 00000000000..f9eecf502fb
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedSuiteSetup",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteSetup.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteSetup.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl
new file mode 100644
index 00000000000..5089587c68b
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedSuiteTearDown",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-6",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-6",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-6",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-6",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-6",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/groovy/TestNG7Test.groovy b/dd-java-agent/instrumentation/testng/testng-7/src/test/groovy/TestNG7Test.groovy
index 111b60efeb4..043cb6fbb98 100644
--- a/dd-java-agent/instrumentation/testng/testng-7/src/test/groovy/TestNG7Test.groovy
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/groovy/TestNG7Test.groovy
@@ -1,24 +1,9 @@
-import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.instrumentation.testng.TestNGTest
 import datadog.trace.instrumentation.testng.TracingListener
 
 class TestNG7Test extends TestNGTest {
-
-  @Override
-  String assertionErrorMessage() {
-    // error message format differs based on framework version
-    TracingListener.FRAMEWORK_VERSION >= "7.5"
-      ? "expected [true] but found [false]"
-      : "did not expect to find [true] but found [false]"
-  }
-
-  @Override
-  String classSkipReason() {
-    "Ignore reason in class"
-  }
-
   @Override
-  Map<String, String> testCaseTagsIfSuiteSetUpFailedOrSkipped(String skipReason) {
-    return [(Tags.TEST_SKIP_REASON): skipReason]
+  protected String version() {
+    TracingListener.FRAMEWORK_VERSION >= "7.5" ? "latest" : "7"
   }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl
new file mode 100644
index 00000000000..074516e21d3
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedClass",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedClass.test_class_another_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_another_skipped()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_another_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedClass.test_class_skipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_class_skipped()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_class_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedClass",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl
new file mode 100644
index 00000000000..ed0e1b91c49
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestError",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestError.test_error",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_error()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_error",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestError",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.IllegalArgumentException",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl
new file mode 100644
index 00000000000..37058c5591d
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedDataProvider",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedDataProvider.testMethod",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testMethod()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testMethod",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl
new file mode 100644
index 00000000000..c84597f6fdb
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailed.test_failed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl
new file mode 100644
index 00000000000..c84597f6fdb
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailed.test_failed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl
new file mode 100644
index 00000000000..5cfb1607f11
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl
@@ -0,0 +1,369 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedWithSuccessPercentage",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_5},
+    "span_id" : ${content_span_id_5},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl
new file mode 100644
index 00000000000..5cfb1607f11
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl
@@ -0,0 +1,369 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedWithSuccessPercentage",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_5},
+    "span_id" : ${content_span_id_5},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedWithSuccessPercentage.test_failed_with_success_percentage",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed_with_success_percentage()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed_with_success_percentage",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedWithSuccessPercentage",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl
new file mode 100644
index 00000000000..e6f7bd20879
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestInheritance",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestInheritance.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestInheritance",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl
new file mode 100644
index 00000000000..89099c5b6be
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedDataProvider",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedDataProvider.testMethod",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "testMethod()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "testMethod",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedDataProvider",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl
new file mode 100644
index 00000000000..4e5a256036e
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -0,0 +1,219 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl
new file mode 100644
index 00000000000..2f7803321e5
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl
@@ -0,0 +1,269 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 2,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 2
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
new file mode 100644
index 00000000000..53046341962
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl
@@ -0,0 +1,166 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl
new file mode 100644
index 00000000000..e3dc93cedb1
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl
@@ -0,0 +1,167 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedUnskippable",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedUnskippable.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.itr.forced_run" : "true",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.itr.unskippable" : "true",
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedUnskippable",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl
new file mode 100644
index 00000000000..be73b665fdf
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl
@@ -0,0 +1,299 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl
new file mode 100644
index 00000000000..3bb6bbbbc0c
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl
@@ -0,0 +1,249 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested$NestedSuite",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl
new file mode 100644
index 00000000000..3bb6bbbbc0c
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl
@@ -0,0 +1,249 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkippedNested$NestedSuite",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkippedNested.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkippedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in class",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl
new file mode 100644
index 00000000000..2df01873732
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl
@@ -0,0 +1,248 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedNested",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedNested$NestedSuite",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedNested$NestedSuite.test_succeed_nested",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_nested()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_nested",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested$NestedSuite",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedNested.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedNested",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl
new file mode 100644
index 00000000000..74652ce2ff9
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl
new file mode 100644
index 00000000000..74652ce2ff9
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl
@@ -0,0 +1,215 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestParameterized",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestParameterized.parameterized_test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "parameterized_test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestParameterized",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl
new file mode 100644
index 00000000000..512ab04fa10
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl
@@ -0,0 +1,164 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSkipped",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSkipped.test_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl
new file mode 100644
index 00000000000..caf07e953d4
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl
@@ -0,0 +1,163 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl
new file mode 100644
index 00000000000..723962144f6
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl
@@ -0,0 +1,266 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl
new file mode 100644
index 00000000000..723962144f6
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl
@@ -0,0 +1,266 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl
new file mode 100644
index 00000000000..52aa066b9ea
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl
@@ -0,0 +1,214 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedAndSkipped",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_skipped",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_skipped()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_skipped",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Ignore reason in test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedAndSkipped.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedAndSkipped",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl
new file mode 100644
index 00000000000..96302487e79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl
@@ -0,0 +1,165 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedGroups",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "test.traits" : "{\"category\":[\"classGroup\",\"parentGroup\"]}",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedGroups",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedGroups.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedGroups",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.traits" : "{\"category\":[\"classGroup\",\"testCaseGroup\",\"parentGroup\"]}",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl
new file mode 100644
index 00000000000..15312c02663
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl
@@ -0,0 +1,351 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl
new file mode 100644
index 00000000000..15312c02663
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl
@@ -0,0 +1,351 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedAndSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_failed()V",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "error.type" : "java.lang.AssertionError",
+      "_dd.profiling.ctx" : "test",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedAndSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedAndSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_4},
+    "span_id" : ${content_span_id_4},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_8},
+    "duration" : ${content_duration_8},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl
new file mode 100644
index 00000000000..179ec5bd2b4
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedThreeCases",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedThreeCases.test_succeed_a",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_a()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_a",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedThreeCases.test_succeed_b",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_b()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_b",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedThreeCases",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml
new file mode 100644
index 00000000000..e51d3c4fb30
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/suite.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceedThreeCases">
+        <methods>
+          <include name="test_succeed_a"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceedThreeCases">
+        <methods>
+          <include name="test_succeed_b"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl
new file mode 100644
index 00000000000..37dd101f9ac
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl
@@ -0,0 +1,263 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceed",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_3},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml
new file mode 100644
index 00000000000..5593e4bc8c6
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/suite.xml
@@ -0,0 +1,32 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test C">
+    <classes>
+      <class name="org.example.TestSucceed">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl
new file mode 100644
index 00000000000..41049944a80
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedMultiple",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed_another",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_another()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_another",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml
new file mode 100644
index 00000000000..9173c131f04
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/suite.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="API Test Suite" parallel="tests" configfailurepolicy="continue">
+  <test name="Test A">
+    <classes>
+      <class name="org.example.TestSucceedMultiple">
+        <methods>
+          <include name="test_succeed"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Test B">
+    <classes>
+      <class name="org.example.TestSucceedMultiple">
+        <methods>
+          <include name="test_succeed_another"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite>
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl
new file mode 100644
index 00000000000..41049944a80
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl
@@ -0,0 +1,213 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestSucceedMultiple",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestSucceedMultiple.test_succeed_another",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed_another()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed_another",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestSucceedMultiple",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl
new file mode 100644
index 00000000000..64d9d1514b5
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl
@@ -0,0 +1,218 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedSuiteSetup",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteSetup.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "suite set up failed",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteSetup.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "skip",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteSetup",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "suite set up failed",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/coverages.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl
new file mode 100644
index 00000000000..177b69817c2
--- /dev/null
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl
@@ -0,0 +1,216 @@
+[ {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_suite",
+    "resource" : "org.example.TestFailedSuiteTearDown",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : { },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "error.type" : "java.lang.RuntimeException",
+      "span.kind" : "test_suite_end",
+      "error.message" : ${content_meta_error_message},
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_another_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_another_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test",
+    "resource" : "org.example.TestFailedSuiteTearDown.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 18,
+      "test.source.start" : 12
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "dummy_source_path",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "testng-7",
+      "test.status" : "pass",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "org.example.TestFailedSuiteTearDown",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_session",
+    "resource" : "testng-7",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "component" : "testng",
+      "_dd.profiling.ctx" : "test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "testng-7",
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
+    "name" : "testng.test_module",
+    "resource" : "testng-7",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0
+    },
+    "meta" : {
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "testng-7",
+      "test.status" : "fail",
+      "runtime.name" : ${content_meta_runtime_name},
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "env" : "none",
+      "os.platform" : ${content_meta_os_platform},
+      "dummy_ci_tag" : "dummy_ci_tag_value",
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "testng",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.framework_version" : ${content_meta_test_framework_version},
+      "test.framework" : "testng",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/tinylog-2/build.gradle b/dd-java-agent/instrumentation/tinylog-2/build.gradle
new file mode 100644
index 00000000000..b503a24a89d
--- /dev/null
+++ b/dd-java-agent/instrumentation/tinylog-2/build.gradle
@@ -0,0 +1,14 @@
+
+apply from: "$rootDir/gradle/java.gradle"
+
+muzzle {
+  pass {
+    group = 'org.tinylog'
+    module = 'tinylog-impl'
+    versions = '[2.0.0,]'
+  }
+}
+
+dependencies {
+  compileOnly group: 'org.tinylog', name: 'tinylog-impl', version: '2.0.0'
+}
diff --git a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java
new file mode 100644
index 00000000000..497363e6101
--- /dev/null
+++ b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java
@@ -0,0 +1,109 @@
+package datadog.trace.instrumentation.tinylog2;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static java.util.Collections.singletonMap;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.log.UnionMap;
+import datadog.trace.api.Config;
+import datadog.trace.api.CorrelationIdentifier;
+import datadog.trace.api.DDSpanId;
+import datadog.trace.api.DDTraceId;
+import datadog.trace.api.InstrumenterConfig;
+import datadog.trace.bootstrap.InstrumentationContext;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
+import java.util.HashMap;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.implementation.bytecode.assign.Assigner;
+import org.tinylog.core.LogEntry;
+
+@AutoService(Instrumenter.class)
+public class LogEntryInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+  public LogEntryInstrumentation() {
+    super("tinylog");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.tinylog.core.LogEntry";
+  }
+
+  @Override
+  public Map<String, String> contextStore() {
+    return singletonMap("org.tinylog.core.LogEntry", AgentSpan.Context.class.getName());
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod().and(named("getContext")).and(takesArguments(0)),
+        LogEntryInstrumentation.class.getName() + "$GetContextAdvice");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      "datadog.trace.agent.tooling.log.UnionMap",
+      "datadog.trace.agent.tooling.log.UnionMap$1",
+      "datadog.trace.agent.tooling.log.UnionMap$1$1",
+    };
+  }
+
+  public static class GetContextAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+        @Advice.This LogEntry event,
+        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
+            Map<String, String> mdc) {
+
+      if (mdc instanceof UnionMap) {
+        return;
+      }
+
+      AgentSpan.Context context =
+          InstrumentationContext.get(LogEntry.class, AgentSpan.Context.class).get(event);
+
+      // TinyLoggingProviderInstrumentation only populates the context if injection is enabled
+      // Impossible for context to be not null while injection is disabled
+      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+        // Nothing to add so return early
+        return;
+      }
+
+      Map<String, String> correlationValues = new HashMap<>(8);
+
+      if (context != null) {
+        DDTraceId traceId = context.getTraceId();
+        String traceIdValue =
+            InstrumenterConfig.get().isLogs128bTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                ? traceId.toHexString()
+                : traceId.toString();
+        correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+        correlationValues.put(
+            CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
+      }
+
+      String serviceName = Config.get().getServiceName();
+      if (null != serviceName && !serviceName.isEmpty()) {
+        correlationValues.put(Tags.DD_SERVICE, serviceName);
+      }
+      String env = Config.get().getEnv();
+      if (null != env && !env.isEmpty()) {
+        correlationValues.put(Tags.DD_ENV, env);
+      }
+      String version = Config.get().getVersion();
+      if (null != version && !version.isEmpty()) {
+        correlationValues.put(Tags.DD_VERSION, version);
+      }
+
+      mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java
new file mode 100644
index 00000000000..eb94cfa044a
--- /dev/null
+++ b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java
@@ -0,0 +1,59 @@
+package datadog.trace.instrumentation.tinylog2;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
+import static java.util.Collections.singletonMap;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.bootstrap.InstrumentationContext;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import org.tinylog.core.LogEntry;
+
+@AutoService(Instrumenter.class)
+public class TinylogLoggingProviderInstrumentation extends Instrumenter.Tracing
+    implements Instrumenter.ForSingleType {
+  public TinylogLoggingProviderInstrumentation() {
+    super("tinylog");
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.tinylog.core.TinylogLoggingProvider";
+  }
+
+  @Override
+  public Map<String, String> contextStore() {
+    return singletonMap("org.tinylog.core.LogEntry", AgentSpan.Context.class.getName());
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(isPrivate())
+            .and(named("output"))
+            .and(takesArguments(2))
+            .and(takesArgument(0, named("org.tinylog.core.LogEntry"))),
+        TinylogLoggingProviderInstrumentation.class.getName() + "$OutputAdvice");
+  }
+
+  public static class OutputAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Argument(0) LogEntry event) {
+      AgentSpan span = activeSpan();
+
+      if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
+        InstrumentationContext.get(LogEntry.class, AgentSpan.Context.class)
+            .put(event, span.context());
+      }
+    }
+  }
+}
diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
new file mode 100644
index 00000000000..6d5cf633435
--- /dev/null
+++ b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
@@ -0,0 +1,78 @@
+package datadog.trace.instrumentation.tomcat7;
+
+import static datadog.trace.bootstrap.blocking.BlockingActionHelper.TemplateType.HTML;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+
+import datadog.trace.api.Config;
+import datadog.trace.api.iast.InstrumentationBridge;
+import datadog.trace.api.iast.sink.StacktraceLeakModule;
+import datadog.trace.bootstrap.blocking.BlockingActionHelper;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import net.bytebuddy.asm.Advice;
+import org.apache.catalina.connector.Response;
+
+public class ErrorReportValueAdvice {
+
+  @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
+  public static boolean onEnter(
+      @Advice.Argument(value = 1) Response response,
+      @Advice.Argument(value = 2) Throwable throwable,
+      @Advice.Origin("#t") String className,
+      @Advice.Origin("#m") String methodName) {
+    int statusCode = response.getStatus();
+
+    // Do nothing on a 1xx, 2xx, 3xx and 404 status
+    // Do nothing if the response hasn't been explicitly marked as in error
+    //    and that error has not been reported.
+    if (statusCode < 400 || statusCode == 404 || !response.isError()) {
+      return true; // skip original method
+    }
+
+    final AgentSpan span = activeSpan();
+    if (span != null && throwable != null) {
+      // Report IAST
+      final StacktraceLeakModule module = InstrumentationBridge.STACKTRACE_LEAK_MODULE;
+      if (module != null) {
+        try {
+          module.onStacktraceLeak(throwable, "Tomcat 7+", className, methodName);
+        } catch (final Throwable e) {
+          module.onUnexpectedException("onResponseException threw", e);
+        }
+      }
+    }
+
+    // If we don't need to suppress stacktrace leak
+    if (!Config.get().isIastStacktraceLeakSuppress()) {
+      return false;
+    }
+
+    byte[] template = BlockingActionHelper.getTemplate(HTML);
+    if (template == null) {
+      return false;
+    }
+
+    try {
+      try {
+        String contentType = BlockingActionHelper.getContentType(HTML);
+        response.setContentType(contentType);
+      } catch (Throwable t) {
+        // Ignore
+      }
+      Writer writer = response.getReporter();
+      if (writer != null) {
+        // If writer is null, it's an indication that the response has
+        // been hard committed already, which should never happen
+        String html = new String(template, StandardCharsets.UTF_8);
+        writer.write(html);
+        response.finishResponse();
+      }
+    } catch (IOException | IllegalStateException e) {
+      // Ignore
+    }
+
+    return false;
+  }
+}
diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java
new file mode 100644
index 00000000000..117ce32f082
--- /dev/null
+++ b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java
@@ -0,0 +1,40 @@
+package datadog.trace.instrumentation.tomcat7;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isProtected;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+
+@AutoService(Instrumenter.class)
+public class ErrorReportValueInstrumentation extends Instrumenter.Iast
+    implements Instrumenter.ForSingleType {
+
+  public ErrorReportValueInstrumentation() {
+    super("tomcat");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "from7";
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "org.apache.catalina.valves.ErrorReportValve";
+  }
+
+  @Override
+  public void adviceTransformations(AdviceTransformation transformation) {
+    transformation.applyAdvice(
+        isMethod()
+            .and(named("report"))
+            .and(takesArgument(0, named("org.apache.catalina.connector.Request")))
+            .and(takesArgument(1, named("org.apache.catalina.connector.Response")))
+            .and(takesArgument(2, Throwable.class))
+            .and(isProtected()),
+        packageName + ".ErrorReportValueAdvice");
+  }
+}
diff --git a/dd-java-agent/instrumentation/unbescape/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java b/dd-java-agent/instrumentation/unbescape/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
index 523dc2a4d30..6a70cf3c71b 100644
--- a/dd-java-agent/instrumentation/unbescape/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/unbescape/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
@@ -24,7 +24,7 @@ public static String afterEscape(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTaintedWithMarks(result, input, VulnerabilityMarks.XSS_MARK);
+          module.taintIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
         } catch (final Throwable e) {
           module.onUnexpectedException("afterEscape threw", e);
         }
diff --git a/dd-java-agent/instrumentation/unbescape/src/test/groovy/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSiteTest.groovy b/dd-java-agent/instrumentation/unbescape/src/test/groovy/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSiteTest.groovy
index 8c6cc2b99ad..d21427da07d 100644
--- a/dd-java-agent/instrumentation/unbescape/src/test/groovy/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSiteTest.groovy
+++ b/dd-java-agent/instrumentation/unbescape/src/test/groovy/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSiteTest.groovy
@@ -23,15 +23,15 @@ class EscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     result == expected
-    1 * module.taintIfInputIsTaintedWithMarks(_ as String, args[0], VulnerabilityMarks.XSS_MARK)
+    1 * module.taintIfTainted(_ as String, args[0], false, VulnerabilityMarks.XSS_MARK)
     0 * _
 
     where:
-    method       | args                  | expected
-    'escapeHtml4Xml' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
-    'escapeHtml4' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
-    'escapeHtml5' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
-    'escapeHtml5Xml' | ['<htmlTag>"escape this < </htmlTag>'] | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    method             | args                                                            | expected
+    'escapeHtml4Xml'   | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    'escapeHtml4'      | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    'escapeHtml5'      | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
+    'escapeHtml5Xml'   | ['<htmlTag>"escape this < </htmlTag>']                          | '&lt;htmlTag&gt;&quot;escape this &lt; &lt;/htmlTag&gt;'
     'escapeJavaScript' | ['<script>function a(){console.log("escape this < ")}<script>'] | '<script>function a(){console.log(\\"escape this < \\")}<script>'
   }
 
@@ -46,15 +46,14 @@ class EscapeUtilsCallSiteTest extends AgentTestRunner {
 
     then:
     notThrown(Exception)
-    0 * module.taintIfInputIsTaintedWithMarks(_)
     0 * _
 
     where:
-    method       | _
-    'escapeHtml4Xml' | _
-    'escapeHtml4' | _
-    'escapeHtml5' | _
-    'escapeHtml5Xml' | _
+    method             | _
+    'escapeHtml4Xml'   | _
+    'escapeHtml4'      | _
+    'escapeHtml5'      | _
+    'escapeHtml5Xml'   | _
     'escapeJavaScript' | _
   }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/test/groovy/UndertowServletTest.groovy b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/test/groovy/UndertowServletTest.groovy
index eb967148a88..dd3769209b8 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/test/groovy/UndertowServletTest.groovy
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/test/groovy/UndertowServletTest.groovy
@@ -57,7 +57,6 @@ class UndertowServletTest extends HttpServerTest<Undertow> {
 
       DeploymentManager manager = container.addDeployment(builder)
       manager.deploy()
-      System.out.println(">>> builder.getContextPath(): " + builder.getContextPath())
       root.addPrefixPath(builder.getContextPath(), manager.start())
 
       undertowServer = Undertow.builder()
diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/build.gradle
index 2d2a33be79c..1499cbc2913 100644
--- a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/build.gradle
+++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/build.gradle
@@ -5,7 +5,7 @@ muzzle {
   pass {
     group = 'io.vertx'
     module = 'vertx-mysql-client'
-    versions = '[4.4.2,4.5.0)'
+    versions = '[4.4.2,4.6.0)'
     assertInverse = true
   }
 }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
index d52aa051bb0..26b4388f78f 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
@@ -52,14 +52,14 @@ public void adviceTransformations(final AdviceTransformation transformation) {
 
   public static class ParamsAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(
         @Advice.Local("beforeParams") Object beforeParams,
         @Advice.FieldValue("params") final Object params) {
       beforeParams = params;
     }
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void onExit(
         @Advice.Local("beforeParams") final Object beforeParams,
@@ -68,11 +68,7 @@ public static void onExit(
       if (beforeParams != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          try {
-            module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, multiMap);
-          } catch (final Throwable e) {
-            module.onUnexpectedException("params threw", e);
-          }
+          module.taint(multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
         }
       }
     }
@@ -80,14 +76,14 @@ public static void onExit(
 
   public static class AttributesAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(
         @Advice.Local("beforeAttributes") Object beforeAttributes,
         @Advice.FieldValue("attributes") final Object attributes) {
       beforeAttributes = attributes;
     }
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void onExit(
         @Advice.Local("beforeAttributes") final Object beforeAttributes,
@@ -96,11 +92,7 @@ public static void onExit(
       if (beforeAttributes != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          try {
-            module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, multiMap);
-          } catch (final Throwable e) {
-            module.onUnexpectedException("formAttributes threw", e);
-          }
+          module.taint(multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
         }
       }
     }
@@ -108,16 +100,12 @@ public static void onExit(
 
   public static class DataAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_BODY)
     public static void onExit(@Advice.Argument(0) final Object data) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        try {
-          module.taintObject(SourceTypes.REQUEST_BODY, data);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("handleData threw", e);
-        }
+        module.taint(data, SourceTypes.REQUEST_BODY);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
index ee346dc6332..2a1c8a34cfa 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
@@ -64,7 +64,7 @@ public static void get(@Advice.This final Object self, @Advice.Return final Stri
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTainted(result, self);
+          module.taintIfTainted(result, self);
         } catch (final Throwable e) {
           module.onUnexpectedException("toString threw", e);
         }
@@ -79,7 +79,7 @@ public static void get(@Advice.This final Object self, @Advice.Return final Obje
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTainted(result, self);
+          module.taintIfTainted(result, self);
         } catch (final Throwable e) {
           module.onUnexpectedException("getByteBuf threw", e);
         }
@@ -95,7 +95,7 @@ public static void get(
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
         try {
-          module.taintIfInputIsTainted(result, buffer);
+          module.taintIfTainted(result, buffer);
         } catch (final Throwable e) {
           module.onUnexpectedException("appendBuffer threw", e);
         }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
index bc6ce00488c..c9e368fe651 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
@@ -13,11 +13,13 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.bytebuddy.iast.TaintableVisitor;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -73,7 +75,7 @@ public AdviceTransformer transformer() {
   }
 
   public static class GetAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void afterGet(
         @Advice.This final Object self,
@@ -81,63 +83,66 @@ public static void afterGet(
         @Advice.Return final String result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
       if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_PARAMETER_VALUE, name, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("get threw", e);
-        }
+        propagation.taintIfTainted(result, self, SourceTypes.REQUEST_PARAMETER_VALUE, name);
       }
     }
   }
 
   public static class GetAllAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void afterGetAll(
         @Advice.This final Object self,
         @Advice.Argument(0) final String name,
         @Advice.Return final Collection<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_PARAMETER_VALUE, name, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("getAll threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String value : result) {
+            propagation.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+          }
         }
       }
     }
   }
 
   public static class EntriesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
     public static void afterEntries(
         @Advice.This final Object self,
         @Advice.Return final List<Map.Entry<String, String>> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_VALUE, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("entries threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          final Set<String> names = new HashSet<>();
+          for (final Map.Entry<String, String> entry : result) {
+            final String name = entry.getKey();
+            final String value = entry.getValue();
+            if (names.add(name)) {
+              propagation.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            }
+            propagation.taint(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+          }
         }
       }
     }
   }
 
   public static class NamesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PARAMETER_NAME)
     public static void afterNames(
         @Advice.This final Object self, @Advice.Return final Set<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_NAME, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("names threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String name : result) {
+            propagation.taint(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+          }
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
index 47f847e7319..4b865b9ed2e 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
@@ -11,11 +11,13 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.bytebuddy.iast.TaintableVisitor;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -65,7 +67,7 @@ public AdviceTransformer transformer() {
   }
 
   public static class GetAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterGet(
         @Advice.This final Object self,
@@ -73,69 +75,67 @@ public static void afterGet(
         @Advice.Return final String result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
       if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_HEADER_VALUE,
-              name == null ? null : name.toString(),
-              result,
-              self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("get threw", e);
-        }
+        propagation.taintIfTainted(result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
       }
     }
   }
 
   public static class GetAllAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterGetAll(
         @Advice.This final Object self,
         @Advice.Argument(0) final CharSequence name,
         @Advice.Return final Collection<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_HEADER_VALUE,
-              name == null ? null : name.toString(),
-              result,
-              self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("getAll threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          final String headerName = name == null ? null : name.toString();
+          for (final String value : result) {
+            propagation.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, headerName);
+          }
         }
       }
     }
   }
 
   public static class EntriesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterEntries(
         @Advice.This final Object self,
         @Advice.Return final List<Map.Entry<String, String>> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("entries threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          final Set<String> names = new HashSet<>();
+          for (Map.Entry<String, String> entry : result) {
+            final String name = entry.getKey();
+            final String value = entry.getValue();
+            if (names.add(name)) {
+              propagation.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+            }
+            propagation.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+          }
         }
       }
     }
   }
 
   public static class NamesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_NAME)
     public static void afterNames(
         @Advice.This final Object self, @Advice.Return final Set<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("names threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String name : result) {
+            propagation.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+          }
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
index 29e7dbcb77a..9e648c95cb0 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
@@ -45,7 +45,7 @@ public static void onEnter(
       beforeHeaders = headersMap;
     }
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void onExit(
         @Advice.Local("beforeHeaders") final Object beforeHeaders,
@@ -54,11 +54,7 @@ public static void onExit(
       if (beforeHeaders != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          try {
-            module.taintObject(SourceTypes.REQUEST_HEADER_VALUE, multiMap);
-          } catch (final Throwable e) {
-            module.onUnexpectedException("headers threw", e);
-          }
+          module.taint(multiMap, SourceTypes.REQUEST_HEADER_VALUE);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
index cc22a204531..a2186330199 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
@@ -39,14 +39,14 @@ public void adviceTransformations(AdviceTransformation transformation) {
 
   public static class HeadersAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(
         @Advice.Local("beforeHeaders") Object beforeHeaders,
         @Advice.FieldValue("headers") final Object headers) {
       beforeHeaders = headers;
     }
 
-    @Advice.OnMethodExit()
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void onExit(
         @Advice.Local("beforeHeaders") final Object beforeHeaders,
@@ -55,11 +55,7 @@ public static void onExit(
       if (beforeHeaders != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          try {
-            module.taintObject(SourceTypes.REQUEST_HEADER_VALUE, multiMap);
-          } catch (final Throwable e) {
-            module.onUnexpectedException("headers threw", e);
-          }
+          module.taint(multiMap, SourceTypes.REQUEST_HEADER_VALUE);
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
index a88be24064d..b06d2b56ffd 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
@@ -51,36 +51,27 @@ public AdviceTransformer transformer() {
   }
 
   public static class GetNameAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_COOKIE_NAME)
     public static void afterGetName(
         @Advice.This final Cookie self, @Advice.Return final String result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        try {
-          module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, result, result, self);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("getName threw", e);
-        }
+        module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
       }
     }
   }
 
   public static class GetValueAdvice {
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     public static void afterGetValue(
         @Advice.This final Cookie self, @Advice.Return final String result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        try {
-          // TODO calling self.getName() actually taints the name of the cookie
-          module.taintIfInputIsTainted(
-              SourceTypes.REQUEST_COOKIE_VALUE, self.getName(), result, self);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("getValue threw", e);
-        }
+        // TODO calling self.getName() actually taints the name of the cookie
+        module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
index ebaf25a5691..cd685575017 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
@@ -9,6 +9,7 @@
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Sink;
 import datadog.trace.api.iast.Source;
@@ -52,14 +53,15 @@ public void adviceTransformations(final AdviceTransformation transformation) {
   }
 
   public static class CookiesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     public static void onCookies(@Advice.Return final Set<Object> cookies) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      try {
-        module.taintObjects(SourceTypes.REQUEST_COOKIE_VALUE, cookies);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("cookies threw", e);
+      if (module != null && cookies != null && !cookies.isEmpty()) {
+        final IastContext ctx = IastContext.Provider.get();
+        for (final Object cookie : cookies) {
+          module.taint(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+        }
       }
     }
   }
@@ -70,7 +72,7 @@ public static class GetCookieAdvice {
     public static void onGetCookie(@Advice.Return final Object cookie) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintObject(SourceTypes.REQUEST_COOKIE_VALUE, cookie);
+        module.taint(cookie, SourceTypes.REQUEST_COOKIE_VALUE);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
index 3eb6cafa1f9..3cc69be3913 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
@@ -9,6 +9,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -61,7 +62,7 @@ public static Throwable publishParams(Map<String, String> params) {
     }
 
     { // iast
-      Object iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+      IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
       if (iastRequestContext != null) {
         PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
@@ -72,7 +73,7 @@ public static Throwable publishParams(Map<String, String> params) {
               continue; // should not happen
             }
             module.taint(
-                iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
           }
         }
       }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/BufferInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/BufferInstrumentationTest.groovy
index 6a6d9f05f49..29aba239e1e 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/BufferInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/BufferInstrumentationTest.groovy
@@ -27,7 +27,7 @@ class BufferInstrumentationTest extends AgentTestRunner {
     method.call(buffer)
 
     then:
-    1 * module.taintIfInputIsTainted(_, buffer)
+    1 * module.taintIfTainted(_, buffer)
 
     where:
     _ | method
@@ -46,7 +46,7 @@ class BufferInstrumentationTest extends AgentTestRunner {
     method.call(buffer, tainted)
 
     then:
-    1 * module.taintIfInputIsTainted(buffer, tainted)
+    1 * module.taintIfTainted(buffer, tainted)
 
     where:
     _ | method
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/CaseInsensitiveHeadersInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/CaseInsensitiveHeadersInstrumentationTest.groovy
index 832bb0e4b4a..a153c15c200 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/CaseInsensitiveHeadersInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/CaseInsensitiveHeadersInstrumentationTest.groovy
@@ -7,6 +7,7 @@ import datadog.trace.api.iast.propagation.PropagationModule
 import groovy.transform.CompileDynamic
 import io.vertx.core.MultiMap
 import io.vertx.core.http.CaseInsensitiveHeaders
+import org.junit.Assume
 
 @CompileDynamic
 class CaseInsensitiveHeadersInstrumentationTest extends AgentTestRunner {
@@ -27,7 +28,7 @@ class CaseInsensitiveHeadersInstrumentationTest extends AgentTestRunner {
     headers.get('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_VALUE, 'key', 'value', headers)
+    1 * module.taintIfTainted('value', headers, SourceTypes.REQUEST_PARAMETER_VALUE, 'key')
   }
 
   void 'test that getAll() is instrumented'() {
@@ -41,7 +42,16 @@ class CaseInsensitiveHeadersInstrumentationTest extends AgentTestRunner {
     headers.getAll('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_VALUE, 'key', ['value1', 'value2'], headers)
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.getAll('key')
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'value1', SourceTypes.REQUEST_PARAMETER_VALUE, 'key')
+    1 * module.taint(_, 'value2', SourceTypes.REQUEST_PARAMETER_VALUE, 'key')
   }
 
   void 'test that names() is instrumented'() {
@@ -55,26 +65,43 @@ class CaseInsensitiveHeadersInstrumentationTest extends AgentTestRunner {
     headers.names()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_NAME, _, headers) >> {
-      final names = it[1] as List<String>
-      assert names == ['key']
-    }
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.names()
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'key', SourceTypes.REQUEST_PARAMETER_NAME, 'key')
   }
 
   void 'test that entries() is instrumented'() {
     given:
+    // latest versions of vertx 3.x define the entries in the MultiMap interface, so we will lose propagation
+    Assume.assumeTrue(hasMethod(CaseInsensitiveHeaders, 'entries'))
     final headers = new CaseInsensitiveHeaders()
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     addAll([[key: 'value1'], [key: 'value2']], headers)
 
+    when:
+    final result = headers.entries()
+
+    then:
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
     when:
     headers.entries()
 
     then:
-    // latest versions of vertx 3.x define the entries in the MultiMap interface, so we will lose propagation
-    if (hasMethod(CaseInsensitiveHeaders, 'entries')) {
-      1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_VALUE, _, headers)
+    1 * module.isTainted(headers) >> { true }
+    result.collect { it.key }.unique().each {
+      1 * module.taint(_, it, SourceTypes.REQUEST_PARAMETER_NAME, it)
+    }
+    result.each {
+      1 * module.taint(_, it.value, SourceTypes.REQUEST_PARAMETER_VALUE, it.key)
     }
   }
 
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/HeadersAdaptorInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/HeadersAdaptorInstrumentationTest.groovy
index d8a579c5e66..6964b5e46c3 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/HeadersAdaptorInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/core/HeadersAdaptorInstrumentationTest.groovy
@@ -10,6 +10,7 @@ import io.netty.handler.codec.http2.DefaultHttp2Headers
 import io.vertx.core.MultiMap
 import io.vertx.core.http.impl.HeadersAdaptor
 import io.vertx.core.http.impl.Http2HeadersAdaptor
+import org.junit.Assume
 
 @CompileDynamic
 class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
@@ -29,7 +30,7 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
     headers.get('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, 'key', 'value', headers)
+    1 * module.taintIfTainted('value', headers, SourceTypes.REQUEST_HEADER_VALUE, 'key')
 
     where:
     headers        | _
@@ -47,7 +48,16 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
     headers.getAll('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, 'key', ['value1', 'value2'], headers)
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.getAll('key')
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'value1', SourceTypes.REQUEST_HEADER_VALUE, 'key')
+    1 * module.taint(_, 'value2', SourceTypes.REQUEST_HEADER_VALUE, 'key')
 
     where:
     headers        | _
@@ -65,10 +75,15 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
     headers.names()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, _, headers) >> {
-      final names = it[1] as List<String>
-      assert names == ['key']
-    }
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.names()
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'key', SourceTypes.REQUEST_HEADER_NAME, 'key')
 
     where:
     headers        | _
@@ -78,17 +93,29 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
 
   void 'test that entries() is instrumented'() {
     given:
+    // latest versions of vertx 3.x define the entries in the MultiMap interface, so we will lose propagation
+    Assume.assumeTrue(hasMethod(headers.getClass(), 'entries'))
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     addAll([[key: 'value1'], [key: 'value2']], headers)
 
+    when:
+    final result = headers.entries()
+
+    then:
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
     when:
     headers.entries()
 
     then:
-    // latest versions of vertx 3.x define the entries in the MultiMap interface, so we will lose propagation
-    if (hasMethod(headers.getClass(), 'entries')) {
-      1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, _ as List<Map.Entry<String, String>>, headers)
+    1 * module.isTainted(headers) >> { true }
+    result.collect { it.key }.unique().each {
+      1 * module.taint(_, it, SourceTypes.REQUEST_HEADER_NAME, it)
+    }
+    result.each {
+      1 * module.taint(_, it.value, SourceTypes.REQUEST_HEADER_VALUE, it.key)
     }
 
     where:
@@ -97,7 +124,7 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
     http2Adaptor() | _
   }
 
-  private static boolean hasMethod(final Class<?> target, final String name, final Class<?>...types) {
+  private static boolean hasMethod(final Class<?> target, final String name, final Class<?>... types) {
     try {
       target.getDeclaredMethod(name, types) != null
     } catch (Throwable e) {
@@ -118,6 +145,6 @@ class HeadersAdaptorInstrumentationTest extends AgentTestRunner {
   }
 
   private static void addAll(final List<Map<String, String>> list, final MultiMap headers) {
-    list.each { addAll(it, headers)  }
+    list.each { addAll(it, headers) }
   }
 }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/server/IastSourceTest.groovy b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/server/IastSourceTest.groovy
index f61d00cbf4d..237cf356592 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/server/IastSourceTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/groovy/server/IastSourceTest.groovy
@@ -1,6 +1,6 @@
 package server
 
-
+import datadog.trace.api.iast.IastContext
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.SourceTypes
 import datadog.trace.api.iast.propagation.PropagationModule
@@ -21,13 +21,13 @@ class IastSourceTest extends IastVertx34Server {
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     final url = "${address}/iast/propagation/cookies"
-    final request = new Request.Builder().url(url).build()
+    final request = new Request.Builder().url(url).addHeader('Cookie', 'cookie=test').build()
 
     when:
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObjects(SourceTypes.REQUEST_COOKIE_VALUE, _)
+    (1.._) * module.taint(_ as IastContext, _, SourceTypes.REQUEST_COOKIE_VALUE)
   }
 
   void 'test that getCookie is instrumented'() {
@@ -35,13 +35,13 @@ class IastSourceTest extends IastVertx34Server {
     final module = Mock(PropagationModule)
     InstrumentationBridge.registerIastModule(module)
     final url = "${address}/iast/propagation/getcookie"
-    final request = new Request.Builder().url(url).build()
+    final request = new Request.Builder().url(url).addHeader('Cookie', 'cookie=test').build()
 
     when:
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObject(SourceTypes.REQUEST_COOKIE_VALUE, _)
+    1 * module.taint(_, SourceTypes.REQUEST_COOKIE_VALUE)
   }
 
   void 'test that cookie getName is instrumented'() {
@@ -55,7 +55,7 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, 'cookieName', 'cookieName', _)
+    1 * module.taintIfTainted('cookieName', _, SourceTypes.REQUEST_COOKIE_NAME, 'cookieName')
   }
 
   void 'test that cookie getValue is instrumented'() {
@@ -69,8 +69,8 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, 'cookieName', 'cookieName', _)
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_VALUE, 'cookieName', 'cookieValue', _)
+    1 * module.taintIfTainted('cookieName', _, SourceTypes.REQUEST_COOKIE_NAME, 'cookieName')
+    1 * module.taintIfTainted('cookieValue', _, SourceTypes.REQUEST_COOKIE_VALUE, 'cookieName')
   }
 
   void 'test that headers() is instrumented'() {
@@ -84,7 +84,7 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObject(SourceTypes.REQUEST_HEADER_VALUE, _)
+    1 * module.taint(_, SourceTypes.REQUEST_HEADER_VALUE)
   }
 
   void 'test that params() is instrumented'() {
@@ -98,7 +98,7 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, _)
+    1 * module.taint(_, SourceTypes.REQUEST_PARAMETER_VALUE)
   }
 
   void 'test that formAttributes() is instrumented'() {
@@ -113,9 +113,9 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, _ as MultiMap) // once for formAttributes()
-    1 * module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, _ as MultiMap) // once for params()
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_PARAMETER_VALUE, 'formAttribute', 'form', _ as MultiMap)
+    1 * module.taint(_ as MultiMap, SourceTypes.REQUEST_PARAMETER_VALUE) // once for formAttributes()
+    1 * module.taint(_ as MultiMap, SourceTypes.REQUEST_PARAMETER_VALUE) // once for params()
+    1 * module.taintIfTainted('form', _ as MultiMap, SourceTypes.REQUEST_PARAMETER_VALUE, 'formAttribute')
   }
 
   void 'test that handleData()/onData() is instrumented'() {
@@ -130,8 +130,8 @@ class IastSourceTest extends IastVertx34Server {
     client.newCall(request).execute()
 
     then:
-    1 * module.taintObject(SourceTypes.REQUEST_BODY, _ as Buffer)
-    1 * module.taintIfInputIsTainted('{ "my_key": "my_value" }', _ as Buffer)
+    1 * module.taint(_ as Buffer, SourceTypes.REQUEST_BODY)
+    1 * module.taintIfTainted('{ "my_key": "my_value" }', _ as Buffer)
   }
 
 
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
index 05997f3cc2a..e73ca00d610 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
@@ -6,6 +6,7 @@
 import io.vertx.ext.web.Cookie;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.handler.BodyHandler;
+import io.vertx.ext.web.handler.CookieHandler;
 import io.vertx.ext.web.impl.CookieImpl;
 
 public class IastSourceVerticle extends AbstractVerticle {
@@ -17,6 +18,7 @@ public void start(final Future<Void> startPromise) {
     final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
     Router router = Router.router(vertx);
     router.route().handler(BodyHandler.create());
+    router.route().handler(CookieHandler.create());
     router
         .route("/iast/propagation/cookies")
         .handler(
diff --git a/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
index 1f9153d461e..7337d7a9422 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
@@ -10,11 +10,13 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.bytebuddy.iast.TaintableVisitor;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -71,7 +73,7 @@ public AdviceTransformer transformer() {
   }
 
   public static class GetAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterGet(
         @Advice.This final Object self,
@@ -79,69 +81,66 @@ public static void afterGet(
         @Advice.Return final String result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
       if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_HEADER_VALUE,
-              name == null ? null : name.toString(),
-              result,
-              self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("get threw", e);
-        }
+        propagation.taintIfTainted(result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
       }
     }
   }
 
   public static class GetAllAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterGetAll(
         @Advice.This final Object self,
         @Advice.Argument(0) final CharSequence name,
         @Advice.Return final Collection<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(
-              SourceTypes.REQUEST_HEADER_VALUE,
-              name == null ? null : name.toString(),
-              result,
-              self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("getAll threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String value : result) {
+            propagation.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+          }
         }
       }
     }
   }
 
   public static class EntriesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_VALUE)
     public static void afterEntries(
         @Advice.This final Object self,
         @Advice.Return final List<Map.Entry<String, String>> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("entries threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          final Set<String> names = new HashSet<>();
+          for (final Map.Entry<String, String> entry : result) {
+            final String name = entry.getKey();
+            final String value = entry.getValue();
+            if (names.add(name)) {
+              propagation.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+            }
+            propagation.taint(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+          }
         }
       }
     }
   }
 
   public static class NamesAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_HEADER_NAME)
     public static void afterNames(
         @Advice.This final Object self, @Advice.Return final Set<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        try {
-          propagation.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, result, self);
-        } catch (final Throwable e) {
-          propagation.onUnexpectedException("names threw", e);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        if (propagation.isTainted(self)) {
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String name : result) {
+            propagation.taint(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+          }
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-3.5/src/test/groovy/core/VertxHttpHeadersInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-3.5/src/test/groovy/core/VertxHttpHeadersInstrumentationTest.groovy
index 2affc4e7133..422a95cfd87 100644
--- a/dd-java-agent/instrumentation/vertx-web-3.5/src/test/groovy/core/VertxHttpHeadersInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-3.5/src/test/groovy/core/VertxHttpHeadersInstrumentationTest.groovy
@@ -27,7 +27,7 @@ class VertxHttpHeadersInstrumentationTest extends AgentTestRunner {
     headers.get('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, 'key', 'value', headers)
+    1 * module.taintIfTainted('value', headers, SourceTypes.REQUEST_HEADER_VALUE, 'key')
   }
 
   void 'test that getAll() is instrumented'() {
@@ -41,7 +41,16 @@ class VertxHttpHeadersInstrumentationTest extends AgentTestRunner {
     headers.getAll('key')
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, 'key', ['value1', 'value2'], headers)
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.getAll('key')
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'value1', SourceTypes.REQUEST_HEADER_VALUE, 'key')
+    1 * module.taint(_, 'value2', SourceTypes.REQUEST_HEADER_VALUE, 'key')
   }
 
   void 'test that names() is instrumented'() {
@@ -55,7 +64,15 @@ class VertxHttpHeadersInstrumentationTest extends AgentTestRunner {
     headers.names()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_NAME, ['key'] as Set<String>, headers)
+    1 * module.isTainted(headers) >> { false }
+    0 * _
+
+    when:
+    headers.names()
+
+    then:
+    1 * module.isTainted(headers) >> { true }
+    1 * module.taint(_, 'key', SourceTypes.REQUEST_HEADER_NAME, 'key')
   }
 
   void 'test that entries() is instrumented'() {
@@ -65,11 +82,24 @@ class VertxHttpHeadersInstrumentationTest extends AgentTestRunner {
     InstrumentationBridge.registerIastModule(module)
     addAll([[key: 'value1'], [key: 'value2']], headers)
 
+    when:
+    final result = headers.entries()
+
+    then:
+    module.isTainted(headers) >> { false }
+    0 * _
+
     when:
     headers.entries()
 
     then:
-    1 * module.taintIfInputIsTainted(SourceTypes.REQUEST_HEADER_VALUE, _ as List<Map.Entry<String, String>>, headers)
+    module.isTainted(headers) >> { true }
+    result.collect { it.key }.unique().each {
+      (1.._) * module.taint(_, it, SourceTypes.REQUEST_HEADER_NAME, it) // entries relies on names() on some impls
+    }
+    result.each {
+      1 * module.taint(_, it.value, SourceTypes.REQUEST_HEADER_VALUE, it.key)
+    }
   }
 
   private static void addAll(final Map<String, String> map, final MultiMap headers) {
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
index bc887e6929a..ff0f792de7d 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
@@ -44,6 +44,6 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
   testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4')
 
-  latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.+'
-  latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.+'
+  latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.4.+'
+  latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.4.+'
 }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
index 931a6155666..92ba216eabe 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
@@ -11,6 +11,7 @@
 
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Source;
 import datadog.trace.api.iast.SourceTypes;
@@ -77,7 +78,7 @@ public static void onExit(
       if (beforeParams != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, multiMap);
+          module.taint(multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
         }
       }
     }
@@ -101,7 +102,7 @@ public static void onExit(
       if (beforeAttributes != multiMap) {
         final PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
-          module.taintObject(SourceTypes.REQUEST_PARAMETER_VALUE, multiMap);
+          module.taint(multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
         }
       }
     }
@@ -114,7 +115,7 @@ public static class HeadersAdvice {
     public static void onExit(@Advice.Return final Object multiMap) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintObject(SourceTypes.REQUEST_HEADER_VALUE, multiMap);
+        module.taint(multiMap, SourceTypes.REQUEST_HEADER_VALUE);
       }
     }
   }
@@ -126,7 +127,7 @@ public static class DataAdvice {
     public static void onExit(@Advice.Argument(0) final Object data) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintObject(SourceTypes.REQUEST_BODY, data);
+        module.taint(data, SourceTypes.REQUEST_BODY);
       }
     }
   }
@@ -137,8 +138,11 @@ public static class CookiesAdvice {
     @Source(SourceTypes.REQUEST_COOKIE_VALUE)
     public static void onExit(@Advice.Return final Set<Object> cookies) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjects(SourceTypes.REQUEST_COOKIE_VALUE, cookies);
+      if (module != null && cookies != null && !cookies.isEmpty()) {
+        final IastContext ctx = IastContext.Provider.get();
+        for (final Object cookie : cookies) {
+          module.taint(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+        }
       }
     }
   }
@@ -150,7 +154,7 @@ public static class GetCookieAdvice {
     public static void onExit(@Advice.Return final Object cookie) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintObject(SourceTypes.REQUEST_COOKIE_VALUE, cookie);
+        module.taint(cookie, SourceTypes.REQUEST_COOKIE_VALUE);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
index 82110a92c66..a8a16ca0660 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
@@ -62,7 +62,7 @@ public static class ToStringAdvice {
     public static void get(@Advice.This final Object self, @Advice.Return final String result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, self);
+        module.taintIfTainted(result, self);
       }
     }
   }
@@ -73,7 +73,7 @@ public static class GetByteBuffAdvice {
     public static void get(@Advice.This final Object self, @Advice.Return final Object result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, self);
+        module.taintIfTainted(result, self);
       }
     }
   }
@@ -85,7 +85,7 @@ public static void get(
         @Advice.Argument(0) final Object buffer, @Advice.Return final Object result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(result, buffer);
+        module.taintIfTainted(result, buffer);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
index 8bd6dfab5cd..4d0d8770849 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
@@ -10,11 +10,13 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.bytebuddy.iast.TaintableVisitor;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.Taintable.Source;
 import datadog.trace.api.iast.propagation.PropagationModule;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -73,10 +75,9 @@ public static void afterGet(
         @Advice.Return final String result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
       if (propagation != null) {
-        final Source source = propagation.firstTaintedSource(self);
+        final Source source = propagation.findSource(self);
         if (source != null) {
-          propagation.taintIfInputIsTainted(
-              source.getOrigin(), name == null ? null : name.toString(), result, self);
+          propagation.taint(result, source.getOrigin(), name);
         }
       }
     }
@@ -90,11 +91,13 @@ public static void afterGetAll(
         @Advice.Argument(0) final CharSequence name,
         @Advice.Return final Collection<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final Source source = propagation.firstTaintedSource(self);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        final Source source = propagation.findSource(self);
         if (source != null) {
-          propagation.taintIfInputIsTainted(
-              source.getOrigin(), name == null ? null : name.toString(), result, self);
+          final IastContext ctx = IastContext.Provider.get();
+          for (final String value : result) {
+            propagation.taint(ctx, value, source.getOrigin(), name);
+          }
         }
       }
     }
@@ -107,10 +110,20 @@ public static void afterEntries(
         @Advice.This final Object self,
         @Advice.Return final List<Map.Entry<String, String>> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final Source source = propagation.firstTaintedSource(self);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        final Source source = propagation.findSource(self);
         if (source != null) {
-          propagation.taintIfInputIsTainted(source.getOrigin(), result, self);
+          final IastContext ctx = IastContext.Provider.get();
+          final byte nameOrigin = namedSource(source.getOrigin());
+          final Set<String> keys = new HashSet<>();
+          for (final Map.Entry<String, String> entry : result) {
+            final String name = entry.getKey();
+            final String value = entry.getValue();
+            if (keys.add(name)) {
+              propagation.taint(ctx, name, nameOrigin, name);
+            }
+            propagation.taint(ctx, value, source.getOrigin(), name);
+          }
         }
       }
     }
@@ -122,10 +135,14 @@ public static class NamesAdvice {
     public static void afterNames(
         @Advice.This final Object self, @Advice.Return final Set<String> result) {
       final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final Source source = propagation.firstTaintedSource(self);
+      if (propagation != null && result != null && !result.isEmpty()) {
+        final Source source = propagation.findSource(self);
         if (source != null) {
-          propagation.taintIfInputIsTainted(namedSource(source.getOrigin()), result, self);
+          final IastContext ctx = IastContext.Provider.get();
+          final byte nameOrigin = namedSource(source.getOrigin());
+          for (final String name : result) {
+            propagation.taint(ctx, name, nameOrigin, name);
+          }
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
index dfbe7aebb25..efdc2cd0194 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
@@ -55,7 +55,7 @@ public static void afterGetName(
         @Advice.This final Cookie self, @Advice.Return final String result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(SourceTypes.REQUEST_COOKIE_NAME, result, result, self);
+        module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
       }
     }
   }
@@ -68,8 +68,7 @@ public static void afterGetValue(
         @Advice.This final Cookie self, @Advice.Return final String result) {
       final PropagationModule module = InstrumentationBridge.PROPAGATION;
       if (module != null) {
-        module.taintIfInputIsTainted(
-            SourceTypes.REQUEST_COOKIE_VALUE, self.getName(), result, self);
+        module.taintIfTainted(result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
index e96887f3a4c..07b5e9538a3 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
@@ -9,6 +9,7 @@
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.SourceTypes;
 import datadog.trace.api.iast.propagation.PropagationModule;
@@ -59,7 +60,7 @@ public static Throwable publishParams(Map<String, String> params) {
     }
 
     { // iast
-      Object iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+      IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
       if (iastRequestContext != null) {
         PropagationModule module = InstrumentationBridge.PROPAGATION;
         if (module != null) {
@@ -70,7 +71,7 @@ public static Throwable publishParams(Map<String, String> params) {
               continue; // should not happen
             }
             module.taint(
-                iastRequestContext, SourceTypes.REQUEST_PATH_PARAMETER, parameterName, value);
+                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
           }
         }
       }
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/BufferInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/BufferInstrumentationTest.groovy
index 6a6d9f05f49..29aba239e1e 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/BufferInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/BufferInstrumentationTest.groovy
@@ -27,7 +27,7 @@ class BufferInstrumentationTest extends AgentTestRunner {
     method.call(buffer)
 
     then:
-    1 * module.taintIfInputIsTainted(_, buffer)
+    1 * module.taintIfTainted(_, buffer)
 
     where:
     _ | method
@@ -46,7 +46,7 @@ class BufferInstrumentationTest extends AgentTestRunner {
     method.call(buffer, tainted)
 
     then:
-    1 * module.taintIfInputIsTainted(buffer, tainted)
+    1 * module.taintIfTainted(buffer, tainted)
 
     where:
     _ | method
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/MultiMapInstrumentationTest.groovy b/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/MultiMapInstrumentationTest.groovy
index 8fae3406c4f..85deed3ce6b 100644
--- a/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/MultiMapInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/test/groovy/core/MultiMapInstrumentationTest.groovy
@@ -36,8 +36,15 @@ class MultiMapInstrumentationTest extends AgentTestRunner {
     instance.get('key')
 
     then:
-    1 * module.firstTaintedSource(instance) >> { mockedSource(origin) }
-    1 * module.taintIfInputIsTainted(origin, 'key', 'value', instance)
+    1 * module.findSource(instance) >> { null }
+    0 * _
+
+    when:
+    instance.get('key')
+
+    then:
+    1 * module.findSource(instance) >> { mockedSource(origin) }
+    1 * module.taint('value', origin, 'key')
 
     where:
     instance << multiMaps()
@@ -54,8 +61,16 @@ class MultiMapInstrumentationTest extends AgentTestRunner {
     instance.getAll('key')
 
     then:
-    1 * module.firstTaintedSource(instance) >> { mockedSource(origin) }
-    1 * module.taintIfInputIsTainted(origin, 'key', ['value1', 'value2'], instance)
+    1 * module.findSource(instance) >> { null }
+    0 * _
+
+    when:
+    instance.getAll('key')
+
+    then:
+    1 * module.findSource(instance) >> { mockedSource(origin) }
+    1 * module.taint(_, 'value1', origin, 'key')
+    1 * module.taint(_, 'value2', origin, 'key')
 
     where:
     instance << multiMaps()
@@ -72,11 +87,15 @@ class MultiMapInstrumentationTest extends AgentTestRunner {
     instance.names()
 
     then:
-    1 * module.firstTaintedSource(instance) >> { mockedSource(origin) }
-    1 * module.taintIfInputIsTainted(namedSource(origin), _, instance) >> {
-      final names = it[1] as List<String>
-      assert names == ['key']
-    }
+    1 * module.findSource(instance) >> { null }
+    0 * _
+
+    when:
+    instance.names()
+
+    then:
+    1 * module.findSource(instance) >> { mockedSource(origin) }
+    1 * module.taint(_, 'key', namedSource(origin), 'key')
 
     where:
     instance << multiMaps()
@@ -95,8 +114,17 @@ class MultiMapInstrumentationTest extends AgentTestRunner {
     instance.entries()
 
     then:
-    1 * module.firstTaintedSource(instance) >> { mockedSource(origin) }
-    1 * module.taintIfInputIsTainted(origin, _, instance)
+    1 * module.findSource(instance) >> { null }
+    0 * _
+
+    when:
+    instance.entries()
+
+    then:
+    1 * module.findSource(instance) >> { mockedSource(origin) }
+    1 * module.taint(_, 'key', namedSource(origin), 'key')
+    1 * module.taint(_, 'value1', origin, 'key')
+    1 * module.taint(_, 'value2', origin, 'key')
 
     where:
     instance << multiMaps()
diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
index d10c011d93e..107ec5f4b56 100644
--- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
+++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
@@ -10,6 +10,7 @@
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -121,7 +122,7 @@ static boolean lessThanJava8(String version, PrintStream output) {
   private static boolean alreadyInitialized() {
     if (initialized) {
       System.out.println(
-          "Warning: dd-java-agent is being initialized more than once. Please, check that you are defining -javaagent:dd-java-agent.jar only once.");
+          "Warning: dd-java-agent is being initialized more than once. Please check that you are defining -javaagent:dd-java-agent.jar only once.");
       return true;
     }
     initialized = true;
@@ -129,7 +130,43 @@ private static boolean alreadyInitialized() {
   }
 
   private static boolean isJdkTool() {
-    return System.getProperty("jdk.module.main", "").startsWith("jdk.");
+    String moduleMain = System.getProperty("jdk.module.main");
+    if (null != moduleMain && !moduleMain.isEmpty() && moduleMain.charAt(0) == 'j') {
+      switch (moduleMain) {
+        case "java.base": // keytool
+        case "java.corba":
+        case "java.desktop":
+        case "java.rmi":
+        case "java.scripting":
+        case "java.security.jgss":
+        case "jdk.aot":
+        case "jdk.compiler":
+        case "jdk.dev":
+        case "jdk.hotspot.agent":
+        case "jdk.httpserver":
+        case "jdk.jartool":
+        case "jdk.javadoc":
+        case "jdk.jcmd":
+        case "jdk.jconsole":
+        case "jdk.jdeps":
+        case "jdk.jdi":
+        case "jdk.jfr":
+        case "jdk.jlink":
+        case "jdk.jpackage":
+        case "jdk.jshell":
+        case "jdk.jstatd":
+        case "jdk.jvmstat.rmi":
+        case "jdk.pack":
+        case "jdk.pack200":
+        case "jdk.policytool":
+        case "jdk.rmic":
+        case "jdk.scripting.nashorn.shell":
+        case "jdk.xml.bind":
+        case "jdk.xml.ws":
+          return true;
+      }
+    }
+    return false;
   }
 
   // Reachable for testing
@@ -167,26 +204,48 @@ public static void main(final String[] args) {
 
   private static synchronized URL installAgentJar(final Instrumentation inst)
       throws IOException, URISyntaxException {
-    URL ddJavaAgentJarURL = null;
-
     // First try Code Source
     final CodeSource codeSource = thisClass.getProtectionDomain().getCodeSource();
-
     if (codeSource != null) {
-      ddJavaAgentJarURL = codeSource.getLocation();
+      URL ddJavaAgentJarURL = codeSource.getLocation();
       if (ddJavaAgentJarURL != null) {
         final File ddJavaAgentJarPath = new File(ddJavaAgentJarURL.toURI());
 
         if (!ddJavaAgentJarPath.isDirectory()) {
-          checkJarManifestMainClassIsThis(ddJavaAgentJarURL);
-          inst.appendToBootstrapClassLoaderSearch(new JarFile(ddJavaAgentJarPath));
-          return ddJavaAgentJarURL;
+          return appendAgentToBootstrapClassLoaderSearch(
+              inst, ddJavaAgentJarURL, ddJavaAgentJarPath);
         }
       }
     }
 
     System.out.println("Could not get bootstrap jar from code source, using -javaagent arg");
+    File javaagentFile = getAgentFileFromJavaagentArg(inst);
+    if (javaagentFile != null) {
+      URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
+      return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
+    }
+
+    System.out.println(
+        "Could not get agent jar from -javaagent arg, using ClassLoader#getResource");
+    javaagentFile = getAgentFileUsingClassLoaderLookup();
+    if (!javaagentFile.isDirectory()) {
+      URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
+      return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
+    }
+
+    throw new IllegalStateException(
+        "Could not determine agent jar location, not installing tracing agent");
+  }
+
+  private static URL appendAgentToBootstrapClassLoaderSearch(
+      Instrumentation inst, URL ddJavaAgentJarURL, File javaagentFile) throws IOException {
+    checkJarManifestMainClassIsThis(ddJavaAgentJarURL);
+    inst.appendToBootstrapClassLoaderSearch(new JarFile(javaagentFile));
+    return ddJavaAgentJarURL;
+  }
 
+  private static File getAgentFileFromJavaagentArg(Instrumentation inst) throws IOException {
+    URL ddJavaAgentJarURL;
     // ManagementFactory indirectly references java.util.logging.LogManager
     // - On Oracle-based JDKs after 1.8
     // - On IBM-based JDKs since at least 1.7
@@ -200,33 +259,57 @@ private static synchronized URL installAgentJar(final Instrumentation inst)
         if (agentArgument == null) {
           agentArgument = arg;
         } else {
-          throw new IllegalStateException(
-              "Multiple javaagents specified and code source unavailable, not installing tracing agent");
+          System.out.println(
+              "Could not get bootstrap jar from -javaagent arg: multiple javaagents specified");
+          return null;
         }
       }
     }
 
     if (agentArgument == null) {
-      throw new IllegalStateException(
-          "Could not find javaagent parameter and code source unavailable, not installing tracing agent");
+      System.out.println("Could not get bootstrap jar from -javaagent arg: no argument specified");
+      return null;
     }
 
     // argument is of the form -javaagent:/path/to/dd-java-agent.jar=optionalargumentstring
     final Matcher matcher = Pattern.compile("-javaagent:([^=]+).*").matcher(agentArgument);
 
     if (!matcher.matches()) {
-      throw new IllegalStateException("Unable to parse javaagent parameter: " + agentArgument);
+      System.out.println(
+          "Could not get bootstrap jar from -javaagent arg: unable to parse javaagent parameter: "
+              + agentArgument);
+      return null;
     }
 
     final File javaagentFile = new File(matcher.group(1));
     if (!(javaagentFile.exists() || javaagentFile.isFile())) {
-      throw new IllegalStateException("Unable to find javaagent file: " + javaagentFile);
+      System.out.println(
+          "Could not get bootstrap jar from -javaagent arg: unable to find javaagent file: "
+              + javaagentFile);
+      return null;
     }
-    ddJavaAgentJarURL = javaagentFile.toURI().toURL();
-    checkJarManifestMainClassIsThis(ddJavaAgentJarURL);
-    inst.appendToBootstrapClassLoaderSearch(new JarFile(javaagentFile));
+    return javaagentFile;
+  }
 
-    return ddJavaAgentJarURL;
+  @SuppressForbidden
+  private static File getAgentFileUsingClassLoaderLookup() throws URISyntaxException {
+    File javaagentFile;
+    URL thisClassUrl;
+    String thisClassResourceName = thisClass.getName().replace('.', '/') + ".class";
+    ClassLoader classLoader = thisClass.getClassLoader();
+    if (classLoader == null) {
+      thisClassUrl = ClassLoader.getSystemResource(thisClassResourceName);
+    } else {
+      thisClassUrl = classLoader.getResource(thisClassResourceName);
+    }
+
+    if (thisClassUrl == null) {
+      throw new IllegalStateException(
+          "Could not locate agent bootstrap class resource, not installing tracing agent");
+    }
+
+    javaagentFile = new File(new URI(thisClassUrl.getFile().split("!")[0]));
+    return javaagentFile;
   }
 
   @SuppressForbidden
diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
index fad6e50cb2e..9ff2d97e32d 100644
--- a/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
+++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
@@ -55,7 +55,7 @@ class CustomLogManagerTest extends Specification {
         "-Djava.util.logging.manager=jvmbootstraptest.MissingLogManager"
       ] as String[]
       , "" as String[]
-      , ["DD_API_KEY": API_KEY]
+      , ["DD_API_KEY": API_KEY, "DD_SITE": ""]
       , true) == 0
   }
 
@@ -87,7 +87,7 @@ class CustomLogManagerTest extends Specification {
         "-Ddd.app.customjmxbuilder=false"
       ] as String[]
       , "" as String[]
-      , ["JBOSS_HOME": "/", "DD_API_KEY": API_KEY]
+      , ["JBOSS_HOME": "/", "DD_API_KEY": API_KEY, "DD_SITE": ""]
       , true) == 0
   }
 
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy
index 3d1798b5548..f8f5e1f76e7 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy
@@ -20,6 +20,7 @@ import datadog.trace.api.config.GeneralConfig
 import datadog.trace.api.config.TracerConfig
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.internal.TraceSegment
+import datadog.trace.api.sampling.SamplingRule
 import datadog.trace.api.time.SystemTimeSource
 import datadog.trace.bootstrap.ActiveSubsystems
 import datadog.trace.bootstrap.CallDepthThreadLocalMap
@@ -184,6 +185,11 @@ abstract class AgentTestRunner extends DDSpecification implements AgentBuilder.L
       return true
     }
 
+    @Override
+    boolean isTriageEnabled() {
+      return true
+    }
+
     @Override
     boolean isRuntimeMetricsEnabled() {
       return true
@@ -223,6 +229,16 @@ abstract class AgentTestRunner extends DDSpecification implements AgentBuilder.L
     Double getTraceSampleRate() {
       return null
     }
+
+    @Override
+    List<? extends SamplingRule.SpanSamplingRule> getSpanSamplingRules() {
+      return null
+    }
+
+    @Override
+    List<? extends SamplingRule.TraceSamplingRule> getTraceSamplingRules() {
+      return null
+    }
   }
 
   boolean originalAppSecRuntimeValue
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TestProfilingContextIntegration.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TestProfilingContextIntegration.groovy
index a03b1a1824f..5d38a152397 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TestProfilingContextIntegration.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TestProfilingContextIntegration.groovy
@@ -2,7 +2,6 @@ package datadog.trace.agent.test
 
 import datadog.trace.api.profiling.ProfilingContextAttribute
 import datadog.trace.api.profiling.ProfilingScope
-import datadog.trace.bootstrap.instrumentation.api.ProfilerContext
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration
 
 import java.util.concurrent.atomic.AtomicInteger
@@ -21,24 +20,8 @@ class TestProfilingContextIntegration implements ProfilingContextIntegration {
   }
 
   @Override
-  void setContext(ProfilerContext profilerContext) {
-  }
-
-  @Override
-  void clearContext() {
-  }
-
-  @Override
-  void setContext(long rootSpanId, long spanId) {
-  }
-
-  @Override
-  boolean isQueuingTimeEnabled() {
-    return true
-  }
-
-  @Override
-  void recordQueueingTime(long duration) {
+  String name() {
+    return "test"
   }
 
   @Override
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
index c1e9defdaa2..d5279043898 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
@@ -60,6 +60,7 @@ class TagsAssert {
     assertedTags.add(DDTags.PID_TAG)
     assertedTags.add(DDTags.SCHEMA_VERSION_TAG_KEY)
     assertedTags.add(DDTags.PROFILING_ENABLED)
+    assertedTags.add(DDTags.PROFILING_CONTEXT_ENGINE)
     assertedTags.add(DDTags.BASE_SERVICE)
 
     assert tags["thread.name"] != null
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
index 65bf2b9e619..f8561bdbbc3 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
@@ -23,6 +23,7 @@ import datadog.trace.api.gateway.IGSpanInfo
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.http.StoredBodySupplier
+import datadog.trace.api.iast.IastContext
 import datadog.trace.api.normalize.SimpleHttpPathNormalizer
 import datadog.trace.bootstrap.blocking.BlockingActionHelper
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer
@@ -104,7 +105,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
   }
 
   @CompileStatic
-  def setupSpec() {
+  void setupSpec() {
     // Register the Instrumentation Gateway callbacks
     def ss = get().getSubscriptionService(RequestContextSlot.APPSEC)
     def callbacks = new IGCallbacks()
@@ -388,6 +389,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     BODY_URLENCODED("body-urlencoded?ignore=pair", 200, '[a:[x]]'),
     BODY_MULTIPART("body-multipart?ignore=pair", 200, '[a:[x]]'),
     BODY_JSON("body-json", 200, '{"a":"x"}'),
+    BODY_XML("body-xml", 200, '<foo attr="attr_value">mytext<bar/></foo>'),
     REDIRECT("redirect", 302, "/redirected"),
     FORWARDED("forwarded", 200, "1.2.3.4"),
     ERROR("error-status", 500, "controller error"), // "error" is a special path for some frameworks
@@ -2095,8 +2097,9 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
           [
             it.key,
             (it.value instanceof Iterable || it.value instanceof String[]) ? it.value : [it.value]
-          ]}
-      } else if (!(obj instanceof String)) {
+          ]
+        }
+      } else if (!(obj instanceof String) && !(obj instanceof List)) {
         obj = obj.properties
           .findAll { it.key != 'class' }
           .collectEntries { [it.key, it.value instanceof Iterable ? it.value : [it.value]] }
@@ -2167,7 +2170,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
   }
 
   class IastIGCallbacks {
-    static class Context {
+    static class Context implements IastContext {
     }
 
     final Supplier<Flow<Context>> requestStartedCb =
diff --git a/dd-smoke-tests/agent-bootstrap/build.gradle b/dd-smoke-tests/agent-bootstrap/build.gradle
new file mode 100644
index 00000000000..2bc876453cf
--- /dev/null
+++ b/dd-smoke-tests/agent-bootstrap/build.gradle
@@ -0,0 +1,40 @@
+description = "Check agent can be loaded with another agent on a no protection domain system class-loader"
+
+apply from: rootProject.file('gradle/java.gradle')
+
+dependencies {
+  testImplementation(project(':dd-smoke-tests'))
+}
+
+sourceSets {
+  create('another-agent') {
+    java
+  }
+}
+
+tasks.jar {
+  archiveClassifier = 'app'
+  manifest {
+    attributes('Main-Class': 'datadog.smoketest.app.App')
+  }
+}
+
+tasks.register('anotherAgentJar', Jar) {
+  archiveClassifier = 'another-agent'
+  from(sourceSets['another-agent'].output)
+  manifest {
+    attributes('Premain-Class': 'datadog.smoketest.agent.AnotherAgent')
+  }
+}
+
+tasks.withType(Test).configureEach {
+  dependsOn "jar", "anotherAgentJar"
+
+  def toolchain17 = getJavaLauncherFor(17).get()
+
+  systemProperties(
+    'datadog.smoketest.java.home': toolchain17.metadata.installationPath.asFile.absolutePath,
+    'datadog.smoketest.jar.path': jar.archiveFile.get().asFile.absolutePath,
+    'datadog.smoketest.another.agent.path': anotherAgentJar.archiveFile.get().asFile.absolutePath,
+    )
+}
diff --git a/dd-smoke-tests/agent-bootstrap/src/another-agent/java/datadog/smoketest/agent/AnotherAgent.java b/dd-smoke-tests/agent-bootstrap/src/another-agent/java/datadog/smoketest/agent/AnotherAgent.java
new file mode 100644
index 00000000000..de76514744d
--- /dev/null
+++ b/dd-smoke-tests/agent-bootstrap/src/another-agent/java/datadog/smoketest/agent/AnotherAgent.java
@@ -0,0 +1,7 @@
+package datadog.smoketest.agent;
+
+public class AnotherAgent {
+  public static void premain(String argString) {
+    System.out.println("Hello from another agent!");
+  }
+}
diff --git a/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/app/App.java b/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/app/App.java
new file mode 100644
index 00000000000..1559316bab4
--- /dev/null
+++ b/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/app/App.java
@@ -0,0 +1,15 @@
+package datadog.smoketest.app;
+
+import datadog.smoketest.classloader.NoProtectionDomainClassLoader;
+
+public class App {
+  public static void main(String[] args) {
+    ClassLoader classLoader = App.class.getClassLoader();
+    if (!(classLoader instanceof NoProtectionDomainClassLoader)) {
+      throw new RuntimeException(
+          "You must run JVM with -Djava.system.class.loader=datadog.smoketest.classloader.NoProtectionDomainClassLoader");
+    }
+
+    System.out.println("Hello form app!");
+  }
+}
diff --git a/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/classloader/NoProtectionDomainClassLoader.java b/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/classloader/NoProtectionDomainClassLoader.java
new file mode 100644
index 00000000000..f30f6cb7138
--- /dev/null
+++ b/dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/classloader/NoProtectionDomainClassLoader.java
@@ -0,0 +1,156 @@
+package datadog.smoketest.classloader;
+
+import de.thetaphi.forbiddenapis.SuppressForbidden;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple class loader that defines classes without a protection domain (actually without a {@link
+ * java.security.CodeSource CodeSource}, to mimic IntelliJ's class loading behavior).
+ */
+@SuppressWarnings("unused")
+public class NoProtectionDomainClassLoader extends URLClassLoader {
+  private final Path[] classPath;
+
+  private final Map<String, Class<?>> classCache = new HashMap<>();
+
+  /**
+   * Packages that should be loaded by the parent class loader. There's likely more for a proper
+   * implementation like org.w3c. but not necessary for this test.
+   */
+  private final String[] excludedPackages =
+      new String[] {
+        "java.", "javax.", "jdk.", "sun.", "oracle.", "com.sun.", "com.ibm.", "COM.ibm.",
+      };
+
+  /**
+   * Used by system to inject the default class loader.
+   *
+   * @param parent Parent classloader
+   * @see ClassLoader#getSystemClassLoader
+   */
+  @SuppressForbidden
+  public NoProtectionDomainClassLoader(ClassLoader parent) {
+    super(new URL[0], parent);
+    // Stream equivalent is not possible for system classloader for JDK 8
+    List<Path> list = new ArrayList<>();
+    for (String s : System.getProperty("java.class.path").split(File.pathSeparator)) {
+      Path path = Paths.get(s);
+      list.add(path);
+    }
+    classPath = list.toArray(new Path[0]);
+  }
+
+  /**
+   * Loads the class with the specified name. JDK classes are loaded in the parent classloader,
+   * others by this classloader.
+   *
+   * @param name The binary name of the class
+   * @param resolve If true, then resolve the class
+   * @return The loaded class
+   * @throws ClassNotFoundException if the class is not found
+   */
+  @Override
+  protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+    for (String excludedPackage : excludedPackages) {
+      if (name.startsWith(excludedPackage)) {
+        return super.loadClass(name, resolve);
+      }
+    }
+    Class<?> cls = classCache.get(name);
+    if (cls != null) {
+      return cls;
+    }
+    return findClass(name);
+  }
+
+  /**
+   * Finds and loads the class with the specified name from the URL search path without {@link
+   * ProtectionDomain}. Any URLs referring to JAR files are loaded and opened as needed until the
+   * class is found.
+   *
+   * @param name the binary name of the class
+   * @return The defined class
+   * @throws ClassNotFoundException Thrown on any IO or if actually not found
+   */
+  public Class<?> findClass(String name) throws ClassNotFoundException {
+
+    String classFile = name.replace('.', '/') + ".class";
+    try (InputStream classData = getResourceAsStream(classFile)) {
+      byte[] array = readClassBytes(name, classData, classFile);
+
+      // Since this class is used as the system class loader, we need to delegate
+      // to the parent class loader, otherwise **this** class maybe loaded by again itself, thus
+      // resulting in defining different classes making `instanceof` checks fail.
+      if (name.equals(getClass().getCanonicalName())) {
+        return getParent().loadClass(name);
+      }
+
+      Class<?> aClass = defineClass(name, array, 0, array.length, (ProtectionDomain) null);
+      classCache.put(name, aClass);
+      return aClass;
+    } catch (IOException io) {
+      throw new ClassNotFoundException("Loading class failed", io);
+    }
+  }
+
+  /**
+   * Reads all bytes from the class file or from an input stream.
+   *
+   * @param name The binary name of the class
+   * @param classData The stream of the class bytes, nullable
+   * @param classFile The relative path to the class file, nullable
+   * @return The class bytes
+   * @throws IOException Thrown on failure to read the class bytes
+   * @throws ClassNotFoundException Thrown if the class file doesn't exist and classFile is null
+   */
+  private byte[] readClassBytes(String name, InputStream classData, String classFile)
+      throws IOException, ClassNotFoundException {
+    if (classData == null) {
+      // try local classpath
+      for (Path path : classPath) {
+        Path resolvedPath = path.resolve(classFile);
+        if (Files.exists(resolvedPath)) {
+          return Files.readAllBytes(resolvedPath);
+        }
+      }
+      throw new ClassNotFoundException("Couldn't find class " + name);
+    }
+
+    return readAllBytes(classData);
+  }
+
+  /** Straw man {@code readAllBytes} for pre-JDK 9. */
+  private static byte[] readAllBytes(final InputStream resource) throws IOException {
+    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    int bytesRead;
+    final byte[] data = new byte[1024];
+    while ((bytesRead = resource.read(data, 0, data.length)) != -1) {
+      buffer.write(data, 0, bytesRead);
+    }
+    buffer.flush();
+    return buffer.toByteArray();
+  }
+
+  /**
+   * Called by the VM to support dynamic additions to the class path.
+   *
+   * @see java.lang.instrument.Instrumentation#appendToSystemClassLoaderSearch
+   */
+  @SuppressWarnings("unused")
+  final void appendToClassPathForInstrumentation(String jar) throws IOException {
+    addURL(Paths.get(jar).toRealPath().toFile().toURI().toURL());
+  }
+}
diff --git a/dd-smoke-tests/agent-bootstrap/src/test/groovy/datadog/smoketest/MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy b/dd-smoke-tests/agent-bootstrap/src/test/groovy/datadog/smoketest/MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy
new file mode 100644
index 00000000000..8917144a1a5
--- /dev/null
+++ b/dd-smoke-tests/agent-bootstrap/src/test/groovy/datadog/smoketest/MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy
@@ -0,0 +1,63 @@
+package datadog.smoketest
+
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest extends AbstractSmokeTest {
+  private static final int TIMEOUT_SECS = 30
+
+  @Override
+  def logLevel() {
+    "debug"
+  }
+
+  @Override
+  String javaHome() {
+    return System.getProperty("datadog.smoketest.java.home")
+  }
+
+  @Override
+  ProcessBuilder createProcessBuilder() {
+    String appJar = System.getProperty("datadog.smoketest.jar.path")
+    assert new File(appJar).isFile()
+    String anotherAgentJar = System.getProperty("datadog.smoketest.another.agent.path")
+    assert new File(anotherAgentJar).isFile()
+
+    List<String> command = new ArrayList<>()
+    command.add(javaPath())
+    command.addAll(defaultJavaProperties)
+    command.add("-Djava.system.class.loader=datadog.smoketest.classloader.NoProtectionDomainClassLoader")
+    command.add("-javaagent:" + anotherAgentJar)
+    command.addAll((String[]) ["-jar", appJar])
+
+    ProcessBuilder processBuilder = new ProcessBuilder(command)
+    processBuilder.directory(new File(buildDirectory))
+
+    return processBuilder
+  }
+
+  def "no failure on bootstrap when multiple agent and no ProtectionDomain system class-loader"() {
+    when:
+    testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
+    boolean codeSourceNotAvailable = false
+    boolean multipleJavaagent = false
+    boolean useClassLoaderResource = false
+    checkLogPostExit {
+      if (it =~ /Could not get bootstrap jar from code source, using -javaagent arg/) {
+        codeSourceNotAvailable = true
+      }
+      if (it =~ /Could not get bootstrap jar from -javaagent arg: multiple javaagents specified/) {
+        multipleJavaagent = true
+      }
+      if (it =~ /Could not get agent jar from -javaagent arg, using ClassLoader#getResource/) {
+        useClassLoaderResource = true
+      }
+    }
+
+    then:
+    testedProcess.exitValue() == 0
+    codeSourceNotAvailable
+    multipleJavaagent
+    useClassLoaderResource
+    !logHasErrors
+  }
+}
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/build.gradle b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle
new file mode 100644
index 00000000000..bb3b9ddf5e9
--- /dev/null
+++ b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+  id "com.github.johnrengelman.shadow"
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+description = 'Spring Tomcat7 Smoke Tests.'
+
+jar {
+  manifest {
+    attributes('Main-Class': 'datadog.smoketest.appsec.springtomcat7.Main')
+  }
+}
+
+dependencies {
+  implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.47'
+  implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.47'
+  implementation group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.47'
+  implementation group: 'org.springframework', name: 'spring-webmvc', version: '4.0.0.RELEASE'
+
+  testImplementation project(':dd-smoke-tests:appsec')
+}
+
+tasks.withType(Test).configureEach {
+  dependsOn "shadowJar"
+
+  jvmArgs "-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
+}
+
+task testRuntimeActivation(type: Test) {
+  jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
+    "-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
+}
+tasks['check'].dependsOn(testRuntimeActivation)
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/AppConfigurer.java b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/AppConfigurer.java
new file mode 100644
index 00000000000..f32a9d67b82
--- /dev/null
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/AppConfigurer.java
@@ -0,0 +1,11 @@
+package datadog.smoketest.appsec.springtomcat7;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = {"datadog.smoketest.appsec.springtomcat7"})
+public class AppConfigurer extends WebMvcConfigurerAdapter {}
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java
new file mode 100644
index 00000000000..54e64878cf6
--- /dev/null
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java
@@ -0,0 +1,18 @@
+package datadog.smoketest.appsec.springtomcat7;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class Controller {
+
+  @RequestMapping("/")
+  public String htmlString() {
+    return "Hello world!";
+  }
+
+  @RequestMapping("/exception")
+  public void exceptionMethod() throws Throwable {
+    throw new Throwable("hello");
+  }
+}
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java
new file mode 100644
index 00000000000..629bd4e8ef5
--- /dev/null
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java
@@ -0,0 +1,56 @@
+package datadog.smoketest.appsec.springtomcat7;
+
+import de.thetaphi.forbiddenapis.SuppressForbidden;
+import java.io.File;
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+public class Main {
+
+  private static final String ROOT = "/";
+  private static final String SERVLET = "dispatcherServlet";
+
+  @SuppressForbidden
+  public static void main(String[] args) throws Exception {
+    int port = 8080;
+    for (String arg : args) {
+      if (arg.contains("=")) {
+        String[] kv = arg.split("=");
+        if (kv.length == 2) {
+          if ("--server.port".equalsIgnoreCase(kv[0])) {
+            try {
+              port = Integer.parseInt(kv[1]);
+            } catch (NumberFormatException e) {
+              System.out.println(
+                  "--server.port '"
+                      + kv[1]
+                      + "' is not valid port. Will be used default port "
+                      + port);
+            }
+          }
+        }
+      }
+    }
+
+    Tomcat tomcat = new Tomcat();
+    tomcat.setPort(port);
+
+    Context context = tomcat.addContext(ROOT, new File(".").getAbsolutePath());
+
+    Tomcat.addServlet(
+        context,
+        SERVLET,
+        new DispatcherServlet(
+            new AnnotationConfigWebApplicationContext() {
+              {
+                register(AppConfigurer.class);
+              }
+            }));
+    context.addServletMapping(ROOT, SERVLET);
+
+    tomcat.start();
+    tomcat.getServer().await();
+  }
+}
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/test/groovy/datadog/smoketest/appsec/SpringTomcatSmokeTest.groovy b/dd-smoke-tests/appsec/spring-tomcat7/src/test/groovy/datadog/smoketest/appsec/SpringTomcatSmokeTest.groovy
new file mode 100644
index 00000000000..75e7168cd3f
--- /dev/null
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/test/groovy/datadog/smoketest/appsec/SpringTomcatSmokeTest.groovy
@@ -0,0 +1,36 @@
+package datadog.smoketest.appsec
+
+import okhttp3.Request
+
+class SpringTomcatSmokeTest extends AbstractAppSecServerSmokeTest {
+
+  @Override
+  ProcessBuilder createProcessBuilder() {
+    String springBootShadowJar = System.getProperty("datadog.smoketest.appsec.springtomcat7.shadowJar.path")
+
+    List<String> command = new ArrayList<>()
+    command.add(javaPath())
+    command.addAll(defaultJavaProperties)
+    command.add("-Ddd.iast.enabled=true")
+    command.add("-Ddd.iast.stacktrace-leak.suppress=true")
+    command.addAll((String[]) ["-jar", springBootShadowJar, "--server.port=${httpPort}"])
+
+    ProcessBuilder processBuilder = new ProcessBuilder(command)
+    processBuilder.directory(new File(buildDirectory))
+  }
+
+  def "suppress exception stacktrace"() {
+    when:
+    String url = "http://localhost:${httpPort}/exception"
+    def request = new Request.Builder()
+      .url(url)
+      .build()
+    def response = client.newCall(request).execute()
+    def responseBodyStr = response.body().string()
+    waitForTraceCount 1
+
+    then:
+    responseBodyStr.contains('Sorry, you cannot access this page. Please contact the customer service team.')
+    response.code() == 500
+  }
+}
\ No newline at end of file
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
index b9205e16a4f..2c1ffc19559 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
@@ -35,10 +35,13 @@ static void run(String[] args) throws Exception {
     System.out.println("Waiting for instrumentation...");
     waitForInstrumentation(LOG_FILENAME, Main.class.getName());
     System.out.println("Executing method: " + methodName);
-    method.accept(args.length > 2 ? args[2] : null);
-    System.out.println("Executed");
-    waitForUpload(LOG_FILENAME, expectedUploads);
-    System.out.println("Exiting...");
+    try {
+      method.accept(args.length > 2 ? args[2] : null);
+      System.out.println("Executed");
+    } finally {
+      waitForUpload(LOG_FILENAME, expectedUploads);
+      System.out.println("Exiting...");
+    }
   }
 
   private static void registerMethods() {
@@ -47,6 +50,7 @@ private static void registerMethods() {
     methodsByName.put("fullMethod", Main::runFullMethod);
     methodsByName.put("multiProbesFullMethod", Main::runFullMethod);
     methodsByName.put("loopingFullMethod", Main::runLoopingFullMethod);
+    methodsByName.put("exceptionMethod", Main::runExceptionMethod);
   }
 
   private static void emptyMethod(String arg) {}
@@ -74,6 +78,10 @@ private static void runLoopingFullMethod(String arg) {
     }
   }
 
+  private static void runExceptionMethod(String s) {
+    exceptionMethod(s);
+  }
+
   private static String fullMethod(
       int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
     try {
@@ -92,4 +100,17 @@ private static String fullMethod(
       return null;
     }
   }
+
+  private static void exceptionMethod(String arg) {
+    if (arg.equals("uncaught")) {
+      throw new RuntimeException("oops uncaught!");
+    }
+    if (arg.equals("caught")) {
+      try {
+        throw new IllegalArgumentException("oops caught!");
+      } catch (IllegalArgumentException ex) {
+        ex.printStackTrace();
+      }
+    }
+  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
index 3574a285493..c48cd799631 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
@@ -151,7 +151,9 @@ protected List<String> getDebuggerCommandParams() {
             "-Ddd.dynamic.instrumentation.classfile.dump.enabled=true",
             "-Ddd.dynamic.instrumentation.upload.batch.size=" + batchSize,
             // flush uploads every 100ms to have quick tests
-            "-Ddd.dynamic.instrumentation.upload.flush.interval=100"));
+            "-Ddd.dynamic.instrumentation.upload.flush.interval=100",
+            // increase timeout for serialization
+            "-Ddd.dynamic.instrumentation.capture.timeout=200"));
   }
 
   protected RecordedRequest retrieveSnapshotRequest() throws Exception {
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
index 225c5a0899b..13aeab497bd 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
@@ -1,7 +1,12 @@
 package datadog.smoketest;
 
+import static com.datadog.debugger.el.DSL.and;
 import static com.datadog.debugger.el.DSL.eq;
+import static com.datadog.debugger.el.DSL.gt;
+import static com.datadog.debugger.el.DSL.len;
+import static com.datadog.debugger.el.DSL.nullValue;
 import static com.datadog.debugger.el.DSL.ref;
+import static com.datadog.debugger.el.DSL.value;
 import static com.datadog.debugger.el.DSL.when;
 import static com.datadog.debugger.util.LogProbeTestHelper.parseTemplate;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,6 +32,7 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 public class LogProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
   @Test
@@ -63,7 +69,7 @@ void testFullMethod() throws Exception {
     JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
     System.out.println(bodyStr);
     Snapshot snapshot = adapter.fromJson(bodyStr).get(0).getDebugger().getSnapshot();
-    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
     assertEquals(0, snapshot.getCaptures().getEntry().getLocals().size());
     assertNull(snapshot.getCaptures().getEntry().getThrowable());
@@ -90,7 +96,7 @@ void testFullMethodWithCondition() throws Exception {
             .where(MAIN_CLASS_NAME, METHOD_NAME)
             .when(
                 new ProbeCondition(
-                    when(eq(ref("argStr"), DSL.value("foobar"))), "argStr == \"foobar\""))
+                    when(eq(ref("argStr"), value("foobar"))), "argStr == \"foobar\""))
             .captureSnapshot(true)
             .build();
     setCurrentConfiguration(createConfig(probe));
@@ -102,10 +108,66 @@ void testFullMethodWithCondition() throws Exception {
     JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
     System.out.println(bodyStr);
     Snapshot snapshot = adapter.fromJson(bodyStr).get(0).getDebugger().getSnapshot();
-    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
   }
 
+  @Test
+  @DisplayName("testFullMethodWithConditionAtExit")
+  void testFullMethodWithConditionAtExit() throws Exception {
+    final String METHOD_NAME = "fullMethod";
+    final String EXPECTED_UPLOADS = "3";
+    LogProbe probe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .where(MAIN_CLASS_NAME, METHOD_NAME)
+            .when(
+                new ProbeCondition(
+                    when(and(gt(len(ref("@return")), value(0)), gt(ref("@duration"), value(0)))),
+                    "len(@return) > 0 && @duration > 0"))
+            .captureSnapshot(true)
+            .evaluateAt(MethodLocation.EXIT)
+            .build();
+    setCurrentConfiguration(createConfig(probe));
+    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+    RecordedRequest request = retrieveSnapshotRequest();
+    assertNotNull(request);
+    assertFalse(logHasErrors(logFilePath, it -> false));
+    String bodyStr = request.getBody().readUtf8();
+    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
+    System.out.println(bodyStr);
+    Snapshot snapshot = adapter.fromJson(bodyStr).get(0).getDebugger().getSnapshot();
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+    assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+  }
+
+  @Test
+  @DisplayName("testFullMethodWithConditionFailed")
+  void testFullMethodWithConditionFailed() throws Exception {
+    final String METHOD_NAME = "fullMethod";
+    final String EXPECTED_UPLOADS = "3";
+    LogProbe probe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .where(MAIN_CLASS_NAME, METHOD_NAME)
+            .when(new ProbeCondition(when(eq(ref("noarg"), nullValue())), "noarg == null"))
+            .captureSnapshot(true)
+            .evaluateAt(MethodLocation.EXIT)
+            .build();
+    setCurrentConfiguration(createConfig(probe));
+    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+    RecordedRequest request = retrieveSnapshotRequest();
+    assertNotNull(request);
+    assertFalse(logHasErrors(logFilePath, it -> false));
+    String bodyStr = request.getBody().readUtf8();
+    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
+    System.out.println(bodyStr);
+    Snapshot snapshot = adapter.fromJson(bodyStr).get(0).getDebugger().getSnapshot();
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+    assertEquals(1, snapshot.getEvaluationErrors().size());
+    assertEquals("Cannot find symbol: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
+  }
+
   @Test
   @DisplayName("testFullMethodWithLogTemplate")
   void testFullMethodWithLogTemplate() throws Exception {
@@ -127,7 +189,7 @@ void testFullMethodWithLogTemplate() throws Exception {
     JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
     System.out.println(bodyStr);
     JsonSnapshotSerializer.IntakeRequest intakeRequest = adapter.fromJson(bodyStr).get(0);
-    assertEquals("123356536", intakeRequest.getDebugger().getSnapshot().getProbe().getId());
+    assertEquals(PROBE_ID.getId(), intakeRequest.getDebugger().getSnapshot().getProbe().getId());
     assertEquals(
         "log line 42 foobar 3.42 {[key1=val1], [key2=val2], [key3=val3]} [var1, var2, var3]",
         intakeRequest.getMessage());
@@ -176,24 +238,25 @@ void testMultiProbes() throws Exception {
 
   @Test
   @DisplayName("testSamplingSnapshotDefault")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingSnapshotDefault() throws Exception {
     doSamplingSnapshot(null, MethodLocation.EXIT);
   }
 
   @Test
   @DisplayName("testSamplingSnapshotDefaultWithConditionAtEntry")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception {
     doSamplingSnapshot(
-        new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(1))), "1 == 1"),
-        MethodLocation.ENTRY);
+        new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.ENTRY);
   }
 
   @Test
   @DisplayName("testSamplingSnapshotDefaultWithConditionAtExit")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingSnapshotDefaultWithConditionAtExit() throws Exception {
     doSamplingSnapshot(
-        new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(1))), "1 == 1"),
-        MethodLocation.EXIT);
+        new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.EXIT);
   }
 
   private void doSamplingSnapshot(ProbeCondition probeCondition, MethodLocation evaluateAt)
@@ -219,6 +282,7 @@ private void doSamplingSnapshot(ProbeCondition probeCondition, MethodLocation ev
 
   @Test
   @DisplayName("testSamplingLogDefault")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingLogDefault() throws Exception {
     batchSize = 100;
     final int LOOP_COUNT = 1000;
@@ -237,11 +301,12 @@ void testSamplingLogDefault() throws Exception {
                 logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
             .start();
     int count = countSnapshots();
-    assertTrue(count >= 950 && count <= 1000, "logs=" + count);
+    assertTrue(count >= 850 && count <= 1000, "logs=" + count);
   }
 
   @Test
   @DisplayName("testSamplingLogCustom")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingLogCustom() throws Exception {
     final int LOOP_COUNT = 1000;
     final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
@@ -262,6 +327,71 @@ void testSamplingLogCustom() throws Exception {
     assertTrue(countSnapshots() < 120);
   }
 
+  @Test
+  @DisplayName("testUncaughtException")
+  void testUncaughtException() throws Exception {
+    final String EXPECTED_UPLOADS = "3";
+    final String METHOD_NAME = "exceptionMethod";
+    LogProbe probe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .where(MAIN_CLASS_NAME, METHOD_NAME)
+            .evaluateAt(MethodLocation.EXIT)
+            .captureSnapshot(true)
+            .build();
+    setCurrentConfiguration(createConfig(probe));
+    targetProcess =
+        createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "uncaught").start();
+    RecordedRequest request = retrieveSnapshotRequest();
+    assertNotNull(request);
+    assertFalse(logHasErrors(logFilePath, it -> false));
+    String bodyStr = request.getBody().readUtf8();
+    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
+    System.out.println(bodyStr);
+    JsonSnapshotSerializer.IntakeRequest intakeRequest = adapter.fromJson(bodyStr).get(0);
+    Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+    assertEquals("123356536", snapshot.getProbe().getId());
+    CapturedContext.CapturedThrowable throwable = snapshot.getCaptures().getReturn().getThrowable();
+    assertEquals("oops uncaught!", throwable.getMessage());
+    assertTrue(throwable.getStacktrace().size() > 0);
+    assertEquals(
+        "datadog.smoketest.debugger.Main.exceptionMethod",
+        throwable.getStacktrace().get(0).getFunction());
+  }
+
+  @Test
+  @DisplayName("testCaughtException")
+  void testCaughtException() throws Exception {
+    final String EXPECTED_UPLOADS = "3";
+    final String METHOD_NAME = "exceptionMethod";
+    LogProbe probe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .where(MAIN_CLASS_NAME, METHOD_NAME)
+            .evaluateAt(MethodLocation.EXIT)
+            .captureSnapshot(true)
+            .build();
+    setCurrentConfiguration(createConfig(probe));
+    targetProcess =
+        createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "caught").start();
+    RecordedRequest request = retrieveSnapshotRequest();
+    assertNotNull(request);
+    assertFalse(logHasErrors(logFilePath, it -> false));
+    String bodyStr = request.getBody().readUtf8();
+    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
+    System.out.println(bodyStr);
+    JsonSnapshotSerializer.IntakeRequest intakeRequest = adapter.fromJson(bodyStr).get(0);
+    Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(1, snapshot.getCaptures().getCaughtExceptions().size());
+    CapturedContext.CapturedThrowable throwable =
+        snapshot.getCaptures().getCaughtExceptions().get(0);
+    assertEquals("oops caught!", throwable.getMessage());
+    assertEquals(
+        "datadog.smoketest.debugger.Main.exceptionMethod",
+        throwable.getStacktrace().get(0).getFunction());
+  }
+
   private int countSnapshots() throws Exception {
     int snapshotCount = 0;
     RecordedRequest request;
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
index f4fbb0217a7..7bc4f8b8f90 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
@@ -1,11 +1,14 @@
 package datadog.smoketest;
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.datadog.debugger.agent.ProbeStatus;
 import com.datadog.debugger.el.DSL;
 import com.datadog.debugger.el.ValueScript;
 import com.datadog.debugger.probe.MetricProbe;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -37,6 +40,26 @@ void testMethodMetricCount() throws Exception {
         "dynamic.instrumentation.metric.probe.%s:42|c|#debugger.probeid:%s");
   }
 
+  @Test
+  @DisplayName("testMethodMetricCountInvalidSymbol")
+  void testMethodMetricCountInvalidSymbol() throws Exception {
+    doMethodInvalidMetric(
+        "fullMethod_count",
+        MetricProbe.MetricKind.COUNT,
+        new ValueScript(DSL.ref("noarg"), "noarg"),
+        "Cannot resolve symbol noarg");
+  }
+
+  @Test
+  @DisplayName("testMethodMetricCountInvalidType")
+  void testMethodMetricCountInvalidType() throws Exception {
+    doMethodInvalidMetric(
+        "fullMethod_count",
+        MetricProbe.MetricKind.COUNT,
+        new ValueScript(DSL.ref("argStr"), "argStr"),
+        "Incompatible type for expression: java.lang.String with expected types: [long]");
+  }
+
   @Test
   @DisplayName("testMethodMetricGauge")
   void testMethodMetricGauge() throws Exception {
@@ -87,6 +110,39 @@ private void doMethodMetric(
     assertNotNull(retrieveStatsdMessage(msgExpected));
   }
 
+  private void doMethodInvalidMetric(
+      String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsg)
+      throws Exception {
+    final String METHOD_NAME = "fullMethod";
+    final String EXPECTED_UPLOADS =
+        "-1"; // wait for TIMEOUT_S for letting the Probe Status to be sent (async)
+    MetricProbe metricProbe =
+        MetricProbe.builder()
+            .probeId(PROBE_ID)
+            .where(MAIN_CLASS_NAME, METHOD_NAME)
+            .kind(kind)
+            .metricName(metricName)
+            .valueScript(script)
+            .build();
+    setCurrentConfiguration(createMetricConfig(metricProbe));
+    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+    AtomicBoolean received = new AtomicBoolean();
+    AtomicBoolean error = new AtomicBoolean();
+    registerProbeStatusListener(
+        probeStatus -> {
+          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+            received.set(true);
+          }
+          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
+            assertEquals(expectedMsg, probeStatus.getDiagnostics().getException().getMessage());
+            error.set(true);
+          }
+          return received.get() && error.get();
+        });
+    processRequests();
+    clearProbeStatusListener();
+  }
+
   @Test
   @DisplayName("testLineMetricInc")
   void testLineMetricInc() throws Exception {
@@ -146,7 +202,8 @@ private void doLineMetric(
     MetricProbe metricProbe =
         MetricProbe.builder()
             .probeId(PROBE_ID)
-            .where("DebuggerTestApplication.java", 80)
+            // on line: System.out.println("fullMethod");
+            .where("DebuggerTestApplication.java", 88)
             .kind(kind)
             .metricName(metricName)
             .valueScript(script)
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
index 0729f654bd9..e6dc676d594 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
@@ -85,7 +85,18 @@ public JsonConditionVisitor(JsonWriter jsonWriter) {
 
     @Override
     public Void visit(BinaryExpression binaryExpression) {
-      throw new UnsupportedOperationException("binary expression");
+      try {
+        jsonWriter.beginObject();
+        binaryExpression.getOperator().accept(this);
+        jsonWriter.beginArray();
+        binaryExpression.getLeft().accept(this);
+        binaryExpression.getRight().accept(this);
+        jsonWriter.endArray();
+        jsonWriter.endObject();
+      } catch (IOException ex) {
+        LOGGER.debug("Cannot serialize: ", ex);
+      }
+      return null;
     }
 
     @Override
@@ -100,12 +111,14 @@ public Void visit(BinaryOperator operator) {
 
     @Override
     public Void visit(ComparisonExpression comparisonExpression) {
-      comparisonExpression.getOperator().accept(this);
       try {
+        jsonWriter.beginObject();
+        comparisonExpression.getOperator().accept(this);
         jsonWriter.beginArray();
         comparisonExpression.getLeft().accept(this);
         comparisonExpression.getRight().accept(this);
         jsonWriter.endArray();
+        jsonWriter.endObject();
       } catch (IOException ex) {
         LOGGER.debug("Cannot serialize: ", ex);
       }
@@ -169,7 +182,15 @@ public Void visit(IsUndefinedExpression isUndefinedExpression) {
 
     @Override
     public Void visit(LenExpression lenExpression) {
-      throw new UnsupportedOperationException("len expression");
+      try {
+        jsonWriter.beginObject();
+        jsonWriter.name("len");
+        lenExpression.getSource().accept(this);
+        jsonWriter.endObject();
+      } catch (IOException ex) {
+        LOGGER.debug("Cannot serialize: ", ex);
+      }
+      return null;
     }
 
     @Override
@@ -180,8 +201,8 @@ public Void visit(MatchesExpression matchesExpression) {
     @Override
     public Void visit(NotExpression notExpression) {
       try {
-        jsonWriter.name("not");
         jsonWriter.beginObject();
+        jsonWriter.name("not");
         notExpression.getPredicate().accept(this);
         jsonWriter.endObject();
       } catch (IOException ex) {
@@ -247,13 +268,7 @@ public Void visit(IndexExpression indexExpression) {
 
     @Override
     public Void visit(WhenExpression whenExpression) {
-      try {
-        jsonWriter.beginObject();
-        whenExpression.getExpression().accept(this);
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
+      whenExpression.getExpression().accept(this);
       return null;
     }
 
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
index bc0a9c3c4dd..9876f013021 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
@@ -12,10 +12,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 public class ProbeStateIntegrationTest extends ServerAppDebuggerIntegrationTest {
   @Test
   @DisplayName("testAddRemoveProbes")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testAddRemoveProbes() throws Exception {
     LogProbe logProbe =
         LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -37,6 +39,7 @@ void testAddRemoveProbes() throws Exception {
 
   @Test
   @DisplayName("testDisableEnableProbes")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testDisableEnableProbes() throws Exception {
     LogProbe logProbe =
         LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -58,6 +61,7 @@ void testDisableEnableProbes() throws Exception {
 
   @Test
   @DisplayName("testDisableEnableProbesUsingDenyList")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testDisableEnableProbesUsingDenyList() throws Exception {
     LogProbe logProbe =
         LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -88,6 +92,7 @@ void testDisableEnableProbesUsingDenyList() throws Exception {
 
   @Test
   @DisplayName("testDisableEnableProbesUsingAllowList")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testDisableEnableProbesUsingAllowList() throws Exception {
     LogProbe logProbe =
         LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -140,5 +145,6 @@ public void testProbeStatusError() throws Exception {
           }
           return received.get() && error.get();
         });
+    processRequests();
   }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
index 34ee1de31fa..251accd83bc 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
@@ -48,6 +48,7 @@ void setup(TestInfo testInfo) throws Exception {
     controlServer = new MockWebServer();
     // controlServer.setDispatcher(new ControlDispatcher());
     controlServer.start();
+    LOG.info("ControlServer on {}", controlServer.getPort());
     controlUrl = controlServer.url(CONTROL_URL);
     startApp();
     appUrl = waitForAppStartedAndGetUrl();
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
index 634ca3e4129..7aed4e56b16 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
@@ -16,7 +16,6 @@
 import com.datadog.debugger.el.ProbeCondition;
 import com.datadog.debugger.el.expressions.BooleanExpression;
 import com.datadog.debugger.probe.SpanDecorationProbe;
-import datadog.trace.api.Platform;
 import datadog.trace.bootstrap.debugger.EvaluationError;
 import datadog.trace.test.agent.decoder.DecodedSpan;
 import java.nio.file.Path;
@@ -26,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 public class SpanDecorationProbesIntegrationTests extends ServerAppDebuggerIntegrationTest {
 
@@ -39,11 +39,10 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params
 
   @Test
   @DisplayName("testMethodSimpleTagNoCondition")
+  @DisabledIf(
+      value = "datadog.trace.api.Platform#isJ9",
+      disabledReason = "we cannot get local variable debug info")
   void testMethodSimpleTagNoCondition() throws Exception {
-    if (Platform.isJ9()) {
-      // skip for J9/OpenJ9 as we cannot get local variable debug info.
-      return;
-    }
     SpanDecorationProbe spanDecorationProbe =
         SpanDecorationProbe.builder()
             .probeId(PROBE_ID)
@@ -70,11 +69,10 @@ void testMethodSimpleTagNoCondition() throws Exception {
 
   @Test
   @DisplayName("testMethodMultiTagsMultiConditions")
+  @DisabledIf(
+      value = "datadog.trace.api.Platform#isJ9",
+      disabledReason = "we cannot get local variable debug info")
   void testMethodMultiTagsMultiConditions() throws Exception {
-    if (Platform.isJ9()) {
-      // skip for J9/OpenJ9 as we cannot get local variable debug info.
-      return;
-    }
     List<SpanDecorationProbe.Decoration> decorations =
         Arrays.asList(
             createDecoration(
@@ -242,6 +240,7 @@ void testMethodMultiTagValueError() throws Exception {
 
   @Test
   @DisplayName("testSamplingSpanDecoration")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSamplingSpanDecoration() throws Exception {
     SpanDecorationProbe spanDecorationProbe =
         SpanDecorationProbe.builder()
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
index a97bb73d929..b7598f121a6 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 public class SpanProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
 
@@ -41,19 +42,30 @@ void testLineRangeSpan() throws Exception {
     final String METHOD_NAME = "fullMethod";
     final String EXPECTED_UPLOADS = "3"; // 2 + 1 for letting the trace being sent (async)
     SpanProbe spanProbe =
-        SpanProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, 80, 89).build();
+        SpanProbe.builder()
+            .probeId(PROBE_ID)
+            // from line: System.out.println("fullMethod");
+            // to line: + String.join(",", argVar);
+            .where(MAIN_CLASS_NAME, 88, 97)
+            .build();
     setCurrentConfiguration(createSpanConfig(spanProbe));
     targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
     DecodedSpan decodedSpan = retrieveSpanRequest(DebuggerTracer.OPERATION_NAME);
-    assertEquals("Main.fullMethod:L80-89", decodedSpan.getResource());
+    assertEquals("Main.fullMethod:L88-97", decodedSpan.getResource());
   }
 
   @Test
   @DisplayName("testSingleLineSpan")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testSingleLineSpan() throws Exception {
     final String METHOD_NAME = "fullMethod";
     final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR
-    SpanProbe spanProbe = SpanProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, 80).build();
+    SpanProbe spanProbe =
+        SpanProbe.builder()
+            .probeId(PROBE_ID)
+            // on line: System.out.println("fullMethod");
+            .where(MAIN_CLASS_NAME, 88)
+            .build();
     setCurrentConfiguration(createSpanConfig(spanProbe));
     targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
     AtomicBoolean received = new AtomicBoolean(false);
@@ -71,5 +83,6 @@ void testSingleLineSpan() throws Exception {
           }
           return received.get() && error.get();
         });
+    processRequests();
   }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
index 2d6f6817901..4b1884dd4b9 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
@@ -1,8 +1,9 @@
 package datadog.smoketest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static com.datadog.debugger.util.LogProbeTestHelper.parseTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.debugger.agent.JsonSnapshotSerializer;
@@ -56,7 +57,7 @@ void testTracer() throws Exception {
             .build();
     JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
     Snapshot snapshot = request.getDebugger().getSnapshot();
-    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
     assertTrue(Pattern.matches("\\d+", request.getSpanId()));
     assertFalse(
@@ -78,7 +79,7 @@ void testTracerDynamicLog() throws Exception {
             .build();
     JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
     Snapshot snapshot = request.getDebugger().getSnapshot();
-    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
     assertTrue(Pattern.matches("\\d+", request.getSpanId()));
     assertFalse(
@@ -96,12 +97,51 @@ void testTracerSameMethod() throws Exception {
             .build();
     JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
     Snapshot snapshot = request.getDebugger().getSnapshot();
-    assertEquals("123356536", snapshot.getProbe().getId());
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
     assertEquals(42, snapshot.getCaptures().getEntry().getArguments().get("argInt").getValue());
     assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
     assertTrue(Pattern.matches("\\d+", request.getSpanId()));
   }
 
+  @Test
+  @DisplayName("testTracerLineSnapshotProbe")
+  void testTracerLineSnapshotProbe() throws Exception {
+    LogProbe logProbe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            // on line: System.out.println(argInt);
+            .where("WebController.java", 15)
+            .captureSnapshot(true)
+            .build();
+    JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
+    Snapshot snapshot = request.getDebugger().getSnapshot();
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+    assertEquals(
+        42, snapshot.getCaptures().getLines().get(15).getArguments().get("argInt").getValue());
+    assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
+    assertTrue(Pattern.matches("\\d+", request.getSpanId()));
+  }
+
+  @Test
+  @DisplayName("testTracerLineDynamicLogProbe")
+  void testTracerLineDynamicLogProbe() throws Exception {
+    final String LOG_TEMPLATE = "processWithArg {argInt}";
+    LogProbe logProbe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+            // on line: System.out.println(argInt);
+            .where("WebController.java", 15)
+            .captureSnapshot(false)
+            .build();
+    JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
+    Snapshot snapshot = request.getDebugger().getSnapshot();
+    assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+    assertEquals("processWithArg 42", request.getMessage());
+    assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
+    assertTrue(Pattern.matches("\\d+", request.getSpanId()));
+  }
+
   private JsonSnapshotSerializer.IntakeRequest doTestTracer(LogProbe logProbe) throws Exception {
     setCurrentConfiguration(createConfig(logProbe));
     String httpPort = String.valueOf(PortUtils.randomOpenPort());
@@ -138,7 +178,6 @@ private JsonSnapshotSerializer.IntakeRequest doTestTracer(LogProbe logProbe) thr
   @Override
   protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
     List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true");
     commandParams.add(
         "-Ddd.trace.methods=datadog.smoketest.debugger.controller.WebController[processWithArg]");
     return ProcessBuilderHelper.createProcessBuilder(
diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle
index 759efbc9429..a16b49b635e 100644
--- a/dd-smoke-tests/gradle/build.gradle
+++ b/dd-smoke-tests/gradle/build.gradle
@@ -8,9 +8,7 @@ description = 'Gradle Daemon Instrumentation Smoke Tests.'
 dependencies {
   testImplementation project(':dd-smoke-tests')
   testImplementation gradleTestKit()
-
-  testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.0'
-  testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.20'
+  testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
 }
 
 test {
@@ -18,3 +16,4 @@ test {
     events "passed", "skipped", "failed", "standardOut", "standardError"
   }
 }
+
diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy
index 76f869f6f50..8eab8e6e229 100644
--- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy
+++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy
@@ -1,11 +1,15 @@
 package datadog.smoketest
 
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
-import datadog.trace.agent.test.server.http.TestHttpServer
+import datadog.trace.api.Platform
 import datadog.trace.api.config.CiVisibilityConfig
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.test.util.MultipartRequestParser
+import datadog.trace.civisibility.CiVisibilitySmokeTest
 import datadog.trace.util.Strings
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import org.gradle.internal.impldep.org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
@@ -18,10 +22,7 @@ import org.gradle.wrapper.Install
 import org.gradle.wrapper.PathAssembler
 import org.gradle.wrapper.WrapperConfiguration
 import org.junit.jupiter.api.Assumptions
-import org.msgpack.jackson.dataformat.MessagePackFactory
-import spock.lang.AutoCleanup
 import spock.lang.Shared
-import spock.lang.Specification
 import spock.lang.TempDir
 import spock.lang.Unroll
 import spock.util.environment.Jvm
@@ -32,14 +33,11 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.SimpleFileVisitor
 import java.nio.file.attribute.BasicFileAttributes
-import java.util.concurrent.ConcurrentLinkedQueue
-
-import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
-import static org.hamcrest.Matchers.emptyString
-import static org.hamcrest.Matchers.not
 
 @Unroll
-class GradleDaemonSmokeTest extends Specification {
+class GradleDaemonSmokeTest extends CiVisibilitySmokeTest {
+
+  private static final String LATEST_GRADLE_VERSION = getLatestGradleVersion()
 
   private static final String TEST_SERVICE_NAME = "test-gradle-service"
   private static final String TEST_ENVIRONMENT_NAME = "integration-test"
@@ -48,7 +46,6 @@ class GradleDaemonSmokeTest extends Specification {
   private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest"
   private static final String GRADLE_REGULAR_EXTENSION = ".gradle"
 
-  private static final long EVENTS_RECEIPT_TIMEOUT = 30_000
   public static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000 // Gradle's default timeout is 10s
 
   // TODO: Gradle daemons started by the TestKit have an idle period of 3 minutes
@@ -61,940 +58,59 @@ class GradleDaemonSmokeTest extends Specification {
   @TempDir
   Path projectFolder
 
-  @Shared
-  ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory())
-
-  @Shared
-  Queue<Map<String, Object>> receivedTraces = new ConcurrentLinkedQueue<>()
-
-  @Shared
-  Queue<Map<String, Object>> receivedCoverages = new ConcurrentLinkedQueue<>()
-
-  @Shared
-  @AutoCleanup
-  protected TestHttpServer intakeServer = httpServer {
-    handlers {
-      prefix("/api/v2/citestcycle") {
-        def decodedEvent = objectMapper.readValue(request.body, Map)
-        receivedTraces.add(decodedEvent)
-
-        response.status(200).send()
-      }
-
-      prefix("/api/v2/citestcov") {
-        def parsed = MultipartRequestParser.parseRequest(request.body, request.headers.get("Content-Type"))
-        def coverages = parsed.get("coverage1")
-        for (def coverage : coverages) {
-          def decodedCoverage = objectMapper.readValue(coverage.get(), Map)
-          receivedCoverages.add(decodedCoverage)
-        }
-
-        response.status(202).send()
-      }
-
-      prefix("/api/v2/libraries/tests/services/setting") {
-        response.status(200).send('{ "data": { "type": "ci_app_tracers_test_service_settings", "id": "uuid", "attributes": { "code_coverage": true, "tests_skipping": true } } }')
-      }
-
-      prefix("/api/v2/ci/tests/skippable") {
-        response.status(200).send('{ "data": [{' +
-          '  "id": "d230520a0561ee2f",' +
-          '  "type": "test",' +
-          '  "attributes": {' +
-          '    "configurations": {},' +
-          '    "name": "test_to_skip_with_itr",' +
-          '    "suite": "datadog.smoke.TestSucceed"' +
-          '  }' +
-          '}] }')
-      }
-    }
-  }
-
   def setupSpec() {
     givenGradleProperties()
   }
 
-  def setup() {
-    receivedTraces.clear()
-    receivedCoverages.clear()
-  }
-
-  def cleanup() {
-    receivedTraces.clear()
-    receivedCoverages.clear()
-  }
-
-  def "Successful build emits session and module spans: Gradle v#gradleVersion #gradleProject"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/$gradleProject/")
-    ensureDependenciesDownloaded(gradleVersion)
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion)
-
-    then:
-    assertBuildSuccessful(buildResult)
-
-    def events = waitForEvents(5)
-    assert events.size() == 5
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent)
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-          it["test.itr.tests_skipping.count"] == 1
-          it["test.code_coverage.lines_pct"] == 57
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-      }
-    }
-
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent)
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":test" // task path
-        test_module_id > 0
-        verifyAll(metrics) {
-          it["test.itr.tests_skipping.count"] == 1
-          it["test.code_coverage.lines_pct"] == 57
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":test" // task path
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-      }
-    }
-
-    def suiteEndEvent = events.find { it.type == "test_suite_end" }
-    assert suiteEndEvent != null
-    verifyCommonTags(suiteEndEvent, "pass", false)
-    verifyAll(suiteEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def testEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_succeed" }
-    assert testEvent != null
-    verifyCommonTags(testEvent, "pass", false)
-    verifyAll(testEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def skippedTestEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr" }
-    assert skippedTestEvent != null
-    verifyCommonTags(skippedTestEvent, "skip", false)
-    verifyAll(skippedTestEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_to_skip_with_itr"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.skip_reason"] == "Skipped by Datadog Intelligent Test Runner"
-          it["test.skipped_by_itr"] == "true"
-        }
-      }
-    }
-
-    def coverages = waitForCoverages(1)
-    assert coverages.size() == 1
-
-    def coverage = coverages.first()
-    coverage == [
-      test_session_id: testEvent.content.test_session_id,
-      test_suite_id  : testEvent.content.test_suite_id,
-      span_id        : testEvent.content.span_id,
-      files          : [
-        [
-          filename: "src/test/java/datadog/smoke/TestSucceed.java",
-          segments: [[11, -1, 12, -1, -1]]
-        ],
-        [
-          filename: "src/main/java/datadog/smoke/Calculator.java",
-          segments: [[5, -1, 5, -1, -1]]
-        ]
-      ]
-    ]
-
-    where:
-    gradleVersion | gradleProject
-    "4.0" | "success"
-    "5.0" | "success"
-    "6.0" | "success"
-    "7.0" | "success"
-    "7.6.1" | "success"
-    "8.0.2" | "success"
-    "8.1.1" | "success"
-    "8.3" | "success"
-    "8.3" | "successJunit5"
-  }
-
-  // this is a separate test case since older Gradle versions need to declare dependencies differently
-  // (`testImplementation` is not supported, and `compile` should be used instead)
-  def "Successful legacy project build emits session and module spans: Gradle v#gradleVersion"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/successLegacy/")
-    ensureDependenciesDownloaded(gradleVersion)
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion)
-
-    then:
-    assertBuildSuccessful(buildResult)
-
-    def events = waitForEvents(5)
-    assert events.size() == 5
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent)
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-        verifyAll(metrics) {
-          it["test.itr.tests_skipping.count"] == 1
-        }
-      }
-    }
-
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent)
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":test" // task path
-        test_module_id > 0
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":test" // task path
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-        verifyAll(metrics) {
-          it["test.itr.tests_skipping.count"] == 1
-        }
-      }
-    }
-
-    def suiteEndEvent = events.find { it.type == "test_suite_end" }
-    assert suiteEndEvent != null
-    verifyCommonTags(suiteEndEvent, "pass", false)
-    verifyAll(suiteEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def testEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_succeed" }
-    assert testEvent != null
-    verifyCommonTags(testEvent, "pass", false)
-    verifyAll(testEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def skippedTestEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr" }
-    assert skippedTestEvent != null
-    verifyCommonTags(skippedTestEvent, "skip", false)
-    verifyAll(skippedTestEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_to_skip_with_itr"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.skip_reason"] == "Skipped by Datadog Intelligent Test Runner"
-          it["test.skipped_by_itr"] == "true"
-        }
-      }
-    }
-
-    def coverages = waitForCoverages(1)
-    assert coverages.size() == 1
-
-    def coverage = coverages.first()
-    coverage == [
-      test_session_id: testEvent.content.test_session_id,
-      test_suite_id  : testEvent.content.test_suite_id,
-      span_id        : testEvent.content.span_id,
-      files          : [
-        [
-          filename: "src/test/java/datadog/smoke/TestSucceed.java",
-          segments: [[11, -1, 12, -1, -1]]
-        ]
-      ]
-    ]
-
-    where:
-    // Gradle TestKit supports versions 3.0 and later
-    gradleVersion << ["3.0"]
-  }
-
-  def "Successful multi-module build emits multiple module spans: Gradle v#gradleVersion"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/successMultiModule/")
-    ensureDependenciesDownloaded(gradleVersion)
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion)
-
-    then:
-    assertBuildSuccessful(buildResult)
-
-    def events = waitForEvents(7)
-    assert events.size() == 7
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent)
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-        }
-      }
-    }
-
-    def moduleAEndEvent = events.find { it.type == "test_module_end" && it.content.resource == ":submodule-a:test" }
-    assert moduleAEndEvent != null
-    verifyCommonTags(moduleAEndEvent)
-    verifyAll(moduleAEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":submodule-a:test" // task path
-        test_module_id > 0
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":submodule-a:test" // task path
-        }
-      }
-    }
-
-    def moduleBEndEvent = events.find { it.type == "test_module_end" && it.content.resource == ":submodule-b:test" }
-    assert moduleBEndEvent != null
-    verifyCommonTags(moduleBEndEvent)
-    verifyAll(moduleBEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":submodule-b:test" // task path
-        test_module_id > 0
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":submodule-b:test" // task path
-        }
-      }
-    }
-
-    def suiteAEndEvent = events.find { it.type == "test_suite_end" && it.content.test_module_id == moduleAEndEvent.content.test_module_id }
-    assert suiteAEndEvent != null
-    verifyCommonTags(suiteAEndEvent, "pass", false)
-    verifyAll(suiteAEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "submodule-a/src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def testAEvent = events.find { it.type == "test" && it.content.test_module_id == moduleAEndEvent.content.test_module_id }
-    assert testAEvent != null
-    verifyCommonTags(testAEvent, "pass", false)
-    verifyAll(testAEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "submodule-a/src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def suiteBEndEvent = events.find { it.type == "test_suite_end" && it.content.test_module_id == moduleBEndEvent.content.test_module_id }
-    assert suiteBEndEvent != null
-    verifyCommonTags(suiteBEndEvent, "pass", false)
-    verifyAll(suiteBEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "submodule-b/src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    def testBEvent = events.find { it.type == "test" && it.content.test_module_id == moduleBEndEvent.content.test_module_id }
-    assert testBEvent != null
-    verifyCommonTags(testBEvent, "pass", false)
-    verifyAll(testBEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "submodule-b/src/test/java/datadog/smoke/TestSucceed.java"
-        }
-      }
-    }
-
-    where:
-    //
-    gradleVersion << ["4.0", "5.0", "6.0", "7.0", "7.6.1", "8.0.2", "8.1.1", "8.3"]
-  }
-
-  def "Failed build emits session and module spans: Gradle v#gradleVersion"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/failure/")
-    ensureDependenciesDownloaded(gradleVersion)
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion, false)
-
-    then:
-    assert buildResult.tasks != null
-    assert buildResult.tasks.size() > 0
-    for (def task : buildResult.tasks) {
-      if (task.path != ":test") {
-        assert task.outcome != TaskOutcome.FAILED
-      } else {
-        assert task.outcome == TaskOutcome.FAILED
-      }
-    }
-
-    def events = waitForEvents(4)
-    assert events.size() == 4
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent, "fail")
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-        }
-      }
-    }
-
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent, "fail")
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":test" // task path
-        test_module_id > 0
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":test" // task path
-        }
-      }
-    }
-
-    def suiteEndEvent = events.find { it.type == "test_suite_end" }
-    assert suiteEndEvent != null
-    verifyCommonTags(suiteEndEvent, "fail", false)
-    verifyAll(suiteEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestFailed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestFailed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestFailed.java"
-        }
-      }
-    }
-
-    def testEvent = events.find { it.type == "test" }
-    assert testEvent != null
-    verifyCommonTags(testEvent, "fail", false)
-    verifyAll(testEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestFailed.test_failed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestFailed"
-          it["test.name"] == "test_failed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestFailed.java"
-        }
-      }
-    }
-
-    where:
-    gradleVersion << ["4.0", "5.0", "6.0", "7.0", "7.6.1", "8.0.2", "8.1.1", "8.3"]
-  }
-
-  def "Build without tests emits session and module spans: Gradle v#gradleVersion"() {
+  def "test #projectName, v#gradleVersion, configCache: #configurationCache"() {
     given:
     givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/skip/")
+    givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache)
+    givenGradleProjectFiles(projectName)
     ensureDependenciesDownloaded(gradleVersion)
 
     when:
-    BuildResult buildResult = runGradleTests(gradleVersion)
+    BuildResult buildResult = runGradleTests(gradleVersion, successExpected, configurationCache)
 
     then:
-    assertBuildSuccessful(buildResult)
-
-    def events = waitForEvents(2)
-    assert events.size() == 2
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent, "skip")
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-        }
-      }
+    if (successExpected) {
+      assertBuildSuccessful(buildResult)
     }
+    verifyEventsAndCoverages(projectName, "gradle", gradleVersion, expectedTraces, expectedCoverages)
 
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent, "skip")
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":test" // task path
-        test_module_id > 0
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":test" // task path
-          it["test.skip_reason"] == "NO-SOURCE"
-        }
-      }
-    }
-
-    where:
-    gradleVersion << ["4.0", "5.0", "6.0", "7.0", "7.6.1", "8.0.2", "8.1.1", "8.3"]
-  }
-
-  def "Corrupted build emits session span: Gradle v#gradleVersion"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/corruptedConfig/")
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion, false)
-
-    then:
-    assert buildResult.tasks != null
-    assert buildResult.tasks.size() == 0
-
-    def events = waitForEvents(1)
-    assert events.size() == 1
+    if (configurationCache) {
+      // if configuration cache is enabled, run the build one more time
+      // to verify that building with existing configuration cache entry works
+      when:
+      BuildResult buildResultWithConfigCacheEntry = runGradleTests(gradleVersion, successExpected, configurationCache)
 
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent, "fail")
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-        }
-      }
+      then:
+      assertBuildSuccessful(buildResultWithConfigCacheEntry)
+      verifyEventsAndCoverages(projectName, "gradle", gradleVersion, expectedTraces, expectedCoverages)
     }
 
     where:
-    gradleVersion << ["4.0", "5.0", "6.0", "7.0", "7.6.1", "8.0.2", "8.1.1", "8.3"]
-  }
-
-  def "Successful build with module that has multiple forks: Gradle v#gradleVersion"() {
-    given:
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
-    givenGradleProjectFiles("datadog/smoketest/successMultiForks/")
-    ensureDependenciesDownloaded(gradleVersion)
-
-    when:
-    BuildResult buildResult = runGradleTests(gradleVersion)
-
-    then:
-    assertBuildSuccessful(buildResult)
-
-    def events = waitForEvents(6)
-    assert events.size() == 6
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    assert sessionEndEvent != null
-    verifyCommonTags(sessionEndEvent)
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_session"
-        resource == "gradle-instrumentation-test-project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-          it["test.itr.tests_skipping.count"] == 0
-          it["test.code_coverage.lines_pct"] == 73
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "gradle:${gradleVersion}" // only applied to session events
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == null
-          verifyTestFrameworks(it)
-        }
-      }
-    }
-
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent)
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "gradle.test_module"
-        resource == ":test" // task path
-        test_module_id > 0
-        verifyAll(metrics) {
-          it["test.itr.tests_skipping.count"] == 0
-          it["test.code_coverage.lines_pct"] == 73
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == ":test" // task path
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == null
-          verifyTestFrameworks(it)
-        }
-      }
-    }
-
-    def suiteAEndEvent = events.find { it.type == "test_suite_end" && it.content.resource == "datadog.smoke.TestSucceed" }
-    assert suiteAEndEvent != null
-    verifyCommonTags(suiteAEndEvent, "pass", false)
-    verifyAll(suiteAEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.framework"] == "junit4"
-          it["test.framework_version"] == "4.13.2"
-        }
-      }
-    }
-
-    def testAEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_succeed" }
-    assert testAEvent != null
-    verifyCommonTags(testAEvent, "pass", false)
-    verifyAll(testAEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.framework"] == "junit4"
-          it["test.framework_version"] == "4.13.2"
-        }
-      }
-    }
-
-    def suiteBEndEvent = events.find { it.type == "test_suite_end" && it.content.resource == "datadog.smoke.TestSucceedJunit5" }
-    assert suiteBEndEvent != null
-    verifyCommonTags(suiteBEndEvent, "pass", false)
-    verifyAll(suiteBEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceedJunit5"
-        test_module_id > 0
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceedJunit5"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceedJunit5.java"
-          it["test.framework"] == "junit5"
-          it["test.framework_version"] == "5.9.3"
-        }
-      }
-    }
-
-    def testBEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceedJunit5.test_succeed" }
-    assert testBEvent != null
-    verifyCommonTags(testBEvent, "pass", false)
-    verifyAll(testBEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceedJunit5.test_succeed"
-        test_module_id > 0
-        test_suite_id > 0
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceedJunit5"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceedJunit5.java"
-          it["test.framework"] == "junit5"
-          it["test.framework_version"] == "5.9.3"
-        }
-      }
-    }
-
-    def coverages = waitForCoverages(2)
-    assert coverages.size() == 2
-
-    coverages.contains([
-      test_session_id: testAEvent.content.test_session_id,
-      test_suite_id  : testAEvent.content.test_suite_id,
-      span_id        : testAEvent.content.span_id,
-      files          : [
-        [
-          filename: "src/test/java/datadog/smoke/TestSucceed.java",
-          segments: [[7, -1, 7, -1, -1], [10, -1, 11, -1, -1]]
-        ],
-        [
-          filename: "src/main/java/datadog/smoke/Calculator.java",
-          segments: [[5, -1, 5, -1, -1]]
-        ]
-      ]
-    ])
-    coverages.contains([
-      test_session_id: testBEvent.content.test_session_id,
-      test_suite_id  : testBEvent.content.test_suite_id,
-      span_id        : testBEvent.content.span_id,
-      files          : [
-        [
-          filename: "src/main/java/datadog/smoke/Calculator.java",
-          segments: [[8, -1, 8, -1, -1]]
-        ],
-        [
-          filename: "src/test/java/datadog/smoke/TestSucceedJunit5.java",
-          segments: [[10, -1, 11, -1, -1]]
-        ]
-      ]
-    ])
-
-    where:
-    gradleVersion << ["8.3"]
-  }
-
-  private static boolean verifyTestFrameworks(it) {
-    // test frameworks may be reported by the forked JVMs in any order
-    // (depending on which JVM finishes executing its tests first)
-    it["test.framework"] == "[\"junit4\",\"junit5\"]" && it["test.framework_version"] == "[\"4.13.2\",\"5.9.3\"]"
-    || it["test.framework"] == "[\"junit5\",\"junit4\"]" && it["test.framework_version"] == "[\"5.9.3\",\"4.13.2\"]"
+    gradleVersion         | projectName                                        | configurationCache | successExpected | expectedTraces | expectedCoverages
+    "3.0"                 | "test-succeed-old-gradle"                          | false              | true            | 5              | 1
+    "4.0"                 | "test-succeed-legacy-instrumentation"              | false              | true            | 5              | 1
+    "5.0"                 | "test-succeed-legacy-instrumentation"              | false              | true            | 5              | 1
+    "6.0"                 | "test-succeed-legacy-instrumentation"              | false              | true            | 5              | 1
+    "7.6.3"               | "test-succeed-legacy-instrumentation"              | false              | true            | 5              | 1
+    "8.3"                 | "test-succeed-new-instrumentation"                 | false              | true            | 5              | 1
+    LATEST_GRADLE_VERSION | "test-succeed-new-instrumentation"                 | false              | true            | 5              | 1
+    "8.3"                 | "test-succeed-new-instrumentation"                 | true               | true            | 5              | 1
+    LATEST_GRADLE_VERSION | "test-succeed-new-instrumentation"                 | true               | true            | 5              | 1
+    "7.6.3"               | "test-succeed-multi-module-legacy-instrumentation" | false              | true            | 7              | 2
+    LATEST_GRADLE_VERSION | "test-succeed-multi-module-new-instrumentation"    | false              | true            | 7              | 2
+    "7.6.3"               | "test-succeed-multi-forks-legacy-instrumentation"  | false              | true            | 6              | 2
+    LATEST_GRADLE_VERSION | "test-succeed-multi-forks-new-instrumentation"     | false              | true            | 6              | 2
+    "7.6.3"               | "test-skip-legacy-instrumentation"                 | false              | true            | 2              | 0
+    LATEST_GRADLE_VERSION | "test-skip-new-instrumentation"                    | false              | true            | 2              | 0
+    "7.6.3"               | "test-failed-legacy-instrumentation"               | false              | false           | 4              | 0
+    LATEST_GRADLE_VERSION | "test-failed-new-instrumentation"                  | false              | false           | 4              | 0
+    "7.6.3"               | "test-corrupted-config-legacy-instrumentation"     | false              | false           | 1              | 0
+    LATEST_GRADLE_VERSION | "test-corrupted-config-new-instrumentation"        | false              | false           | 1              | 0
+    LATEST_GRADLE_VERSION | "test-succeed-junit-5"                             | false              | true            | 5              | 1
   }
 
   private void givenGradleProperties() {
@@ -1040,7 +156,7 @@ class GradleDaemonSmokeTest extends Specification {
     Files.createDirectory(projectFolder.resolve(".git"))
   }
 
-  private BuildResult runGradleTests(String gradleVersion, boolean successExpected = true) {
+  private BuildResult runGradleTests(String gradleVersion, boolean successExpected = true, boolean configurationCache = false) {
     def arguments = ["test", "--stacktrace"]
     if (gradleVersion > "5.6") {
       // fail on warnings is available starting from Gradle 5.6
@@ -1049,6 +165,9 @@ class GradleDaemonSmokeTest extends Specification {
       // warning mode available starting from Gradle 4.5
       arguments += ["--warning-mode", "all"]
     }
+    if (configurationCache) {
+      arguments += ["--configuration-cache", "--rerun-tasks"]
+    }
     BuildResult buildResult = runGradle(gradleVersion, arguments, successExpected)
     buildResult
   }
@@ -1108,93 +227,6 @@ class GradleDaemonSmokeTest extends Specification {
     }
   }
 
-  private List<Map<String, Object>> waitForEvents(eventsCount) {
-    println "${new Date()}: $specificationContext.currentIteration.displayName - Waiting for traces"
-
-    List<Map<String, Object>> events = new ArrayList<>()
-    def startTime = System.currentTimeMillis()
-    while (events.size() < eventsCount) {
-      def trace = receivedTraces.poll()
-      if (trace != null) {
-        events.addAll((List<Map<String, Object>>) trace["events"])
-        continue
-      }
-      def duration = System.currentTimeMillis() - startTime
-      if (duration > EVENTS_RECEIPT_TIMEOUT) {
-        throw new AssertionError((Object) "Waited for $eventsCount events, received: $events")
-      } else {
-        Thread.sleep(500)
-      }
-    }
-
-    println "${new Date()}: $specificationContext.currentIteration.displayName - Received traces"
-    return events
-  }
-
-  private List<Map<String, Object>> waitForCoverages(coveragesSize) {
-    println "${new Date()}: $specificationContext.currentIteration.displayName - Waiting for coverages"
-
-    List<Map<String, Object>> coverages = new ArrayList<>()
-    def startTime = System.currentTimeMillis()
-    while (coverages.size() < coveragesSize) {
-      def coverage = receivedCoverages.poll()
-      if (coverage != null) {
-        coverages.addAll((List<Map<String, Object>>) coverage["coverages"])
-        continue
-      }
-      def duration = System.currentTimeMillis() - startTime
-      if (duration > EVENTS_RECEIPT_TIMEOUT) {
-        throw new AssertionError((Object) "Waited for $coveragesSize coverages, received: $coverages")
-      } else {
-        Thread.sleep(500)
-      }
-    }
-
-    println "${new Date()}: $specificationContext.currentIteration.displayName - Received coverages"
-    return coverages
-  }
-
-  protected verifyCommonTags(Map<String, Object> event, String status = "pass", boolean buildEvent = true) {
-    verifyAll(event) {
-      version > 0
-      verifyAll(content) {
-        start > 0
-        duration > 0
-        test_session_id > 0
-        service == TEST_SERVICE_NAME
-        error == (status != "fail") ? 0 : 1
-        verifyAll(meta) {
-          it["test.type"] == "test"
-          it["test.status"] == status
-
-          if (buildEvent) {
-            it["test.command"] == "gradle test"
-            it["component"] == "gradle"
-          } else {
-            // testcase/suite event
-            it["component"] == "junit"
-          }
-
-          it["env"] == TEST_ENVIRONMENT_NAME
-          it["runtime.name"] not(emptyString())
-          it["runtime.vendor"] not(emptyString())
-          it["runtime.version"] not(emptyString())
-          it["runtime-id"] not(emptyString())
-          it["os.platform"] not(emptyString())
-          it["os.version"] not(emptyString())
-          it["library_version"] not(emptyString())
-
-          if (status == "fail") {
-            it["error.type"] not(emptyString())
-            it["error.message"] not(emptyString())
-            it["error.stack"] not(emptyString())
-          }
-        }
-      }
-    }
-    return true
-  }
-
   void givenGradleVersionIsCompatibleWithCurrentJvm(String gradleVersion) {
     Assumptions.assumeTrue(isSupported(gradleVersion),
       "Current JVM " + Jvm.current.javaVersion + " does not support Gradle version " + gradleVersion)
@@ -1202,7 +234,9 @@ class GradleDaemonSmokeTest extends Specification {
 
   private static boolean isSupported(String gradleVersion) {
     // https://docs.gradle.org/current/userguide/compatibility.html
-    if (Jvm.current.java20Compatible) {
+    if (Jvm.current.java21Compatible) {
+      return gradleVersion >= "8.4"
+    } else if (Jvm.current.java20) {
       return gradleVersion >= "8.1"
     } else if (Jvm.current.java19) {
       return gradleVersion >= "7.6"
@@ -1232,4 +266,23 @@ class GradleDaemonSmokeTest extends Specification {
     return false
   }
 
+  void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) {
+    if (configurationCacheEnabled) {
+      Assumptions.assumeFalse(Platform.isIbm8(), "Configuration cache is not compatible with IBM 8")
+    }
+  }
+
+  private static String getLatestGradleVersion() {
+    OkHttpClient client = new OkHttpClient()
+    Request request = new Request.Builder().url("https://services.gradle.org/versions/current").build()
+    try (Response response = client.newCall(request).execute()) {
+      if (!response.successful) {
+        return GradleVersion.current().version
+      }
+      def responseBody = response.body().string()
+      ObjectMapper mapper = new ObjectMapper()
+      JsonNode root = mapper.readTree(responseBody)
+      return root.get("version").asText()
+    }
+  }
 }
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..1d3867c5136
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl
@@ -0,0 +1,41 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "error.type" : "org.gradle.internal.exceptions.LocationAwareException",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "gradle test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/corruptedConfig/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..8f4344573a7
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/build.gradleTest
@@ -0,0 +1,10 @@
+apply plugin: 'java'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {{{{ // this project is expected to fail due to parsing error
+  testImplementation 'junit:junit:4.10'
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..ab0e26c2edc
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl
@@ -0,0 +1,41 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "error.type" : "org.gradle.internal.exceptions.LocationAwareException",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "gradle test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-a/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-a/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..8a3909f053b
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
@@ -0,0 +1,182 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "error.type" : "org.gradle.api.tasks.TaskExecutionException",
+      "test.code_coverage.enabled" : "true",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestFailed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestFailed.test_failed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
+      "test.source.method" : "test_failed()V",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "error.stack" : ${content_meta_error_stack_2},
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "error.type" : "org.gradle.internal.exceptions.LocationAwareException",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack_3},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/skip/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/skip/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/src/test/java/datadog/smoke/TestFailed.java b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/src/test/java/datadog/smoke/TestFailed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/failure/src/test/java/datadog/smoke/TestFailed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/src/test/java/datadog/smoke/TestFailed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/skip/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/skip/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..03237aaaafb
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
@@ -0,0 +1,182 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "error.type" : "org.gradle.internal.exceptions.LocationAwareException",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 1,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "error.type" : "org.gradle.api.tasks.TaskExecutionException",
+      "test.code_coverage.enabled" : "true",
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack_2},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestFailed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestFailed.test_failed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 1,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
+      "test.source.method" : "test_failed()V",
+      "test.status" : "fail",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_failed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestFailed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "error.type" : "java.lang.AssertionError",
+      "error.stack" : ${content_meta_error_stack_3},
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/src/test/java/datadog/smoke/TestFailed.java b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/src/test/java/datadog/smoke/TestFailed.java
new file mode 100644
index 00000000000..1d5d605d488
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/src/test/java/datadog/smoke/TestFailed.java
@@ -0,0 +1,13 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestFailed {
+
+  @Test
+  public void test_failed() {
+    assertTrue(false);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..d45905284b5
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl
@@ -0,0 +1,71 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "skip",
+      "test.skip_reason" : "NO-SOURCE",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "gradle test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..5aa8ddbc416
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/build.gradleTest
@@ -0,0 +1,10 @@
+apply plugin: 'java'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+  testImplementation 'junit:junit:4.10'
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8878e547a79
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/coverages.ftl
@@ -0,0 +1 @@
+[ ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..291e8416e31
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl
@@ -0,0 +1,71 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.command" : "gradle test"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "skip",
+      "test.skip_reason" : "NO-SOURCE",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl
new file mode 100644
index 00000000000..8fc0ad78841
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
new file mode 100644
index 00000000000..764246c5992
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
@@ -0,0 +1,226 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17,
+      "test.source.start" : 14
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/src/main/java/datadog/smoke/Calculator.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/src/main/java/datadog/smoke/Calculator.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/src/main/java/datadog/smoke/Calculator.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/src/main/java/datadog/smoke/Calculator.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..5aa8ddbc416
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/build.gradleTest
@@ -0,0 +1,10 @@
+apply plugin: 'java'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+  testImplementation 'junit:junit:4.10'
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8fc0ad78841
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..4039baf6186
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
@@ -0,0 +1,226 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17,
+      "test.source.start" : 14
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/settings.gradleTest
new file mode 100644
index 00000000000..6040f1decb8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/settings.gradleTest
@@ -0,0 +1 @@
+rootProject.name = 'gradle-instrumentation-test-project'
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/src/main/java/datadog/smoke/Calculator.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/src/main/java/datadog/smoke/Calculator.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successJunit5/src/main/java/datadog/smoke/Calculator.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/src/main/java/datadog/smoke/Calculator.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/success/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..e18b060709d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl
@@ -0,0 +1,23 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 7, -1, 7, -1, -1 ], [ 10, -1, 11, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 8, -1, 8, -1, -1 ] ]
+  }, {
+    "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+    "segments" : [ [ 10, -1, 11, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..65ac036cb76
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
@@ -0,0 +1,263 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 73
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]",
+      "test.framework" : "[\"junit4\",\"junit5\"]",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 11,
+      "test.source.start" : 8
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceedJunit5",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceedJunit5",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 11,
+      "test.source.start" : 8
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceedJunit5",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 73
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_6},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]",
+      "test.framework" : "[\"junit4\",\"junit5\"]"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/settings.gradleTest
new file mode 100644
index 00000000000..6040f1decb8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/settings.gradleTest
@@ -0,0 +1 @@
+rootProject.name = 'gradle-instrumentation-test-project'
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/main/java/datadog/smoke/Calculator.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/main/java/datadog/smoke/Calculator.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/main/java/datadog/smoke/Calculator.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/main/java/datadog/smoke/Calculator.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/test/java/datadog/smoke/TestSucceedJunit5.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceedJunit5.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiForks/src/test/java/datadog/smoke/TestSucceedJunit5.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/src/test/java/datadog/smoke/TestSucceedJunit5.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..a7c25145d36
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/build.gradleTest
@@ -0,0 +1,21 @@
+apply plugin: 'java'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+  testImplementation 'junit:junit:4.10'
+  testImplementation 'org.junit.platform:junit-platform-launcher:1.9.3'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+  testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+  testImplementation 'org.junit.vintage:junit-vintage-engine:5.9.2'
+}
+
+test {
+  maxParallelForks = 2
+  forkEvery = 1
+
+  useJUnitPlatform()
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..e18b060709d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl
@@ -0,0 +1,23 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 7, -1, 7, -1, -1 ], [ 10, -1, 11, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 8, -1, 8, -1, -1 ] ]
+  }, {
+    "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+    "segments" : [ [ 10, -1, 11, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..e60122c7f02
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
@@ -0,0 +1,263 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 73
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]",
+      "test.framework" : "[\"junit4\",\"junit5\"]"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 73
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]",
+      "test.framework" : "[\"junit4\",\"junit5\"]",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 11,
+      "test.source.start" : 8
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceedJunit5",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceedJunit5",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 11,
+      "test.source.start" : 8
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_6},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceedJunit5",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.9.3",
+      "test.framework" : "junit5"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/settings.gradleTest
new file mode 100644
index 00000000000..6040f1decb8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/settings.gradleTest
@@ -0,0 +1 @@
+rootProject.name = 'gradle-instrumentation-test-project'
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/main/java/datadog/smoke/Calculator.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/main/java/datadog/smoke/Calculator.java
new file mode 100644
index 00000000000..b2436fa5826
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/main/java/datadog/smoke/Calculator.java
@@ -0,0 +1,10 @@
+package datadog.smoke;
+
+public class Calculator {
+  public static int add(int a, int b) {
+    return a + b;
+  }
+  public static int subtract(int a, int b) {
+    return a - b;
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..0f67bd32f19
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,12 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSucceed {
+  @Test
+  public void test_succeed() {
+    assertTrue(Calculator.add(2, 2) == 4);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceedJunit5.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceedJunit5.java
new file mode 100644
index 00000000000..26c65625ac8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/src/test/java/datadog/smoke/TestSucceedJunit5.java
@@ -0,0 +1,12 @@
+package datadog.smoke;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class TestSucceedJunit5 {
+  @Test
+  public void test_succeed() {
+    assertTrue(Calculator.subtract(2, 2) == 0);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..e947ded6455
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/coverages.ftl
@@ -0,0 +1,17 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
new file mode 100644
index 00000000000..82f425df5fc
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
@@ -0,0 +1,307 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":submodule-a:test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":submodule-a:test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":submodule-b:test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":submodule-b:test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.module" : "submodule-a",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.module" : "submodule-b",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "submodule-a",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_6},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "submodule-b",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_7},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/settings.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/settings.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/settings.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-a/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-a/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-a/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-a/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-b/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-a/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-b/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-a/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-b/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-b/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successMultiModule/submodule-b/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-b/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..0c5b0fe191d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,13 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSucceed {
+
+  @Test
+  public void test_succeed() {
+    assertTrue(true);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..14bbd056756
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/build.gradleTest
@@ -0,0 +1,12 @@
+subprojects {
+    apply plugin: 'java'
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        testImplementation 'junit:junit:4.10'
+    }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..e947ded6455
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/coverages.ftl
@@ -0,0 +1,17 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  } ]
+}, {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2},
+  "span_id" : ${content_span_id_2},
+  "files" : [ {
+    "filename" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..55ab4fb88f3
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
@@ -0,0 +1,307 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":submodule-a:test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":submodule-a:test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":submodule-b:test",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":submodule-b:test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "span.kind" : "test_module_end",
+      "test.itr.tests_skipping.type" : "test",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4",
+      "test.itr.tests_skipping.enabled" : "true"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.module" : "submodule-a",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.module" : "submodule-b",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_6},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "submodule-a",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id_2},
+    "test_suite_id" : ${content_test_suite_id_2},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_3},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_7},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.module" : "submodule-b",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_3},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/settings.gradleTest
new file mode 100644
index 00000000000..91b7b6728c7
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/settings.gradleTest
@@ -0,0 +1,4 @@
+rootProject.name = 'gradle-instrumentation-test-project'
+
+include ':submodule-a'
+include ':submodule-b'
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/build.gradleTest
new file mode 100644
index 00000000000..241e4250d02
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/build.gradleTest
@@ -0,0 +1 @@
+description = "Test submodule A"
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..0c5b0fe191d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-a/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,13 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSucceed {
+
+  @Test
+  public void test_succeed() {
+    assertTrue(true);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/build.gradleTest
new file mode 100644
index 00000000000..cfab7ff5461
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/build.gradleTest
@@ -0,0 +1 @@
+description = "Test submodule B"
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..0c5b0fe191d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/submodule-b/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,13 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSucceed {
+
+  @Test
+  public void test_succeed() {
+    assertTrue(true);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest
new file mode 100644
index 00000000000..5aa8ddbc416
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/build.gradleTest
@@ -0,0 +1,10 @@
+apply plugin: 'java'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+  testImplementation 'junit:junit:4.10'
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl
new file mode 100644
index 00000000000..8fc0ad78841
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
new file mode 100644
index 00000000000..661a9d3c07d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
@@ -0,0 +1,226 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : ":",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17,
+      "test.source.start" : 14
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/settings.gradleTest
new file mode 100644
index 00000000000..6040f1decb8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/settings.gradleTest
@@ -0,0 +1 @@
+rootProject.name = 'gradle-instrumentation-test-project'
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/main/java/datadog/smoke/Calculator.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/main/java/datadog/smoke/Calculator.java
new file mode 100644
index 00000000000..acff45019ee
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/main/java/datadog/smoke/Calculator.java
@@ -0,0 +1,7 @@
+package datadog.smoke;
+
+public class Calculator {
+  public static int add(int a, int b) {
+    return a + b;
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..7f3074a5523
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,18 @@
+package datadog.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSucceed {
+
+  @Test
+  public void test_succeed() {
+    assertTrue(Calculator.add(2, 2) == 4);
+  }
+
+  @Test
+  public void test_to_skip_with_itr() {
+    assertTrue(true);
+  }
+}
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/build.gradleTest
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/build.gradleTest
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl
new file mode 100644
index 00000000000..727174f2e35
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl
@@ -0,0 +1,9 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 11, -1, 12, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
new file mode 100644
index 00000000000..74b481a9a6d
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
@@ -0,0 +1,226 @@
+[ {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_module",
+    "resource" : ":test",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : ":test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-gradle-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17,
+      "test.source.start" : 14
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-gradle-service",
+    "name" : "gradle.test_session",
+    "resource" : "gradle-instrumentation-test-project",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "gradle",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "gradle test",
+      "test.framework_version" : "4.10",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/settings.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/settings.gradleTest
new file mode 100644
index 00000000000..6040f1decb8
--- /dev/null
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/settings.gradleTest
@@ -0,0 +1 @@
+rootProject.name = 'gradle-instrumentation-test-project'
diff --git a/dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/src/test/java/datadog/smoke/TestSucceed.java
similarity index 100%
rename from dd-smoke-tests/gradle/src/test/resources/datadog/smoketest/successLegacy/src/test/java/datadog/smoke/TestSucceed.java
rename to dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/src/test/java/datadog/smoke/TestSucceed.java
diff --git a/dd-smoke-tests/iast-util/build.gradle b/dd-smoke-tests/iast-util/build.gradle
index 7b41b040a19..07f4f80a5be 100644
--- a/dd-smoke-tests/iast-util/build.gradle
+++ b/dd-smoke-tests/iast-util/build.gradle
@@ -9,4 +9,5 @@ description = 'iast-smoke-tests-utils'
 dependencies {
   api project(':dd-smoke-tests')
   compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE'
+  compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10'
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
index ac3f5ebafe7..6370a7fa7f8 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
@@ -1,10 +1,13 @@
 package datadog.smoketest.springboot.controller;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
 import datadog.smoketest.springboot.TestBean;
 import ddtest.client.sources.Hasher;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.IOException;
+import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpCookie;
 import java.net.HttpURLConnection;
@@ -31,6 +34,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.MatrixVariable;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -343,6 +347,25 @@ String pathInfo(HttpServletRequest request) {
     return String.format("Request.getRequestURI returns %s", pathInfo);
   }
 
+  @GetMapping("/getrequesturl")
+  String requestURL(HttpServletRequest request) {
+    StringBuffer requestURL = request.getRequestURL();
+    return String.format("Request.getRequestURL returns %s", requestURL);
+  }
+
+  @PostMapping("/gson_deserialization")
+  String gson(@RequestParam("json") String json) {
+    Gson gson = new Gson();
+    TestBean testBean = gson.fromJson(json, TestBean.class);
+    return "Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
+  }
+
+  @PostMapping(value = "/gson_json_parser_deserialization", consumes = MediaType.TEXT_PLAIN_VALUE)
+  String gsonJsonParser(@RequestBody String json) {
+    JsonParser.parseReader(new StringReader(json));
+    return "Ok";
+  }
+
   private void withProcess(final Operation<Process> op) {
     Process process = null;
     try {
diff --git a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractGsonIastSpringBootSmokeTest.groovy b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractGsonIastSpringBootSmokeTest.groovy
new file mode 100644
index 00000000000..4888ddaaf4f
--- /dev/null
+++ b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractGsonIastSpringBootSmokeTest.groovy
@@ -0,0 +1,89 @@
+package datadog.smoketest
+
+import okhttp3.FormBody
+import okhttp3.MediaType
+import okhttp3.Request
+import okhttp3.RequestBody
+
+import static datadog.trace.api.config.IastConfig.IAST_DEBUG_ENABLED
+import static datadog.trace.api.config.IastConfig.IAST_DETECTION_MODE
+import static datadog.trace.api.config.IastConfig.IAST_ENABLED
+import static datadog.trace.api.config.IastConfig.IAST_REDACTION_ENABLED
+
+abstract class AbstractGsonIastSpringBootSmokeTest extends  AbstractIastServerSmokeTest{
+
+
+  @Override
+  ProcessBuilder createProcessBuilder() {
+    String springBootShadowJar = System.getProperty('datadog.smoketest.springboot.shadowJar.path')
+
+    List<String> command = []
+    command.add(javaPath())
+    command.addAll(defaultJavaProperties)
+    command.addAll(getCustomSpringProperties())
+    command.addAll([
+      withSystemProperty(IAST_ENABLED, true),
+      withSystemProperty(IAST_DETECTION_MODE, 'FULL'),
+      withSystemProperty(IAST_DEBUG_ENABLED, true),
+      withSystemProperty(IAST_REDACTION_ENABLED, false)
+    ])
+    command.addAll((String[]) ['-jar', springBootShadowJar, "--server.port=${httpPort}"])
+    ProcessBuilder processBuilder = new ProcessBuilder(command)
+    processBuilder.directory(new File(buildDirectory))
+    // Spring will print all environment variables to the log, which may pollute it and affect log assertions.
+    processBuilder.environment().clear()
+    return processBuilder
+  }
+
+  abstract String[] getCustomSpringProperties()
+
+  void 'request body taint json'() {
+    setup:
+    String url = "http://localhost:${httpPort}/request_body/test"
+    def request = new Request.Builder().url(url).post(RequestBody.create(MediaType.parse('application/json; charset=utf-8'), '{"name": "nameTest", "value" : "valueTest"}')).build()
+
+    when:
+    client.newCall(request).execute()
+
+    then:
+    hasTainted { tainted ->
+      tainted.value == 'nameTest' &&
+        tainted.ranges[0].source.origin == 'http.request.body'
+    }
+  }
+
+  void 'gson deserialization'() {
+
+    given:
+    final url = "http://localhost:${httpPort}/gson_deserialization"
+    final body = new FormBody.Builder().add('json', '{"name": "gsonTest", "value" : "valueTest"}').build()
+    final request = new Request.Builder().url(url).post(body).build()
+
+    when:
+    client.newCall(request).execute()
+
+    then:
+    hasTainted { tainted ->
+      tainted.value == 'gsonTest' &&
+        tainted.ranges[0].source.name == 'json' &&
+        tainted.ranges[0].source.origin == 'http.request.parameter'
+    }
+  }
+
+  void 'gson json parser deserialization'() {
+
+    given:
+    final url = "http://localhost:${httpPort}/gson_json_parser_deserialization"
+    final request = new Request.Builder().url(url).post(RequestBody.create(MediaType.parse('text/plain'), '{"name": "gsonReaderTest", "value" : "valueTest"}')).build()
+
+    when:
+    def response = client.newCall(request).execute()
+
+    then:
+    response.successful
+    hasTainted { tainted ->
+      tainted.value == 'gsonReaderTest' &&
+        tainted.ranges[0].source.origin == 'http.request.body'
+    }
+  }
+}
diff --git a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy
index 3eea398cf0b..ee0cc033ecc 100644
--- a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy
+++ b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy
@@ -111,6 +111,34 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
 
   }
 
+  void 'Multipart Request original file name'(){
+    given:
+    String url = "http://localhost:${httpPort}/multipart"
+
+    RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM)
+      .addFormDataPart("theFile", "theFileName",
+      RequestBody.create(MediaType.parse("text/plain"), "FILE_CONTENT"))
+      .addFormDataPart("param1", "param1Value")
+      .build()
+
+    Request request = new Request.Builder()
+      .url(url)
+      .post(requestBody)
+      .build()
+    when:
+    final retValue = client.newCall(request).execute().body().string()
+
+    then:
+    retValue == "fileName: theFile"
+    hasTainted { tainted ->
+      tainted.value == 'theFileName' &&
+        tainted.ranges[0].source.name == 'filename' &&
+        tainted.ranges[0].source.origin == 'http.request.multipart.parameter'
+    }
+
+  }
+
+
   void 'iast.enabled tag is present'() {
     setup:
     String url = "http://localhost:${httpPort}/greeting"
@@ -494,6 +522,21 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
     }
   }
 
+  void 'getRequestURL taints its output'() {
+    setup:
+    String url = "http://localhost:${httpPort}/getrequesturl"
+    def request = new Request.Builder().url(url).get().build()
+
+    when:
+    client.newCall(request).execute()
+
+    then:
+    hasTainted { tainted ->
+      tainted.value == url &&
+        tainted.ranges[0].source.origin == 'http.request.uri'
+    }
+  }
+
   void 'request header taint string'() {
     setup:
     String url = "http://localhost:${httpPort}/request_header/test"
diff --git a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastVertxSmokeTest.groovy b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastVertxSmokeTest.groovy
index 482e4b3dcdb..b00f810ba63 100644
--- a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastVertxSmokeTest.groovy
+++ b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastVertxSmokeTest.groovy
@@ -11,6 +11,8 @@ import spock.lang.IgnoreIf
 @CompileDynamic
 abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {
 
+  private static final MediaType FORM = MediaType.get('application/x-www-form-urlencoded')
+
   void 'test header source'() {
     setup:
     final url = "http://localhost:${httpPort}/header"
@@ -43,6 +45,23 @@ abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {
     }
   }
 
+  void 'test header names list source'() {
+    setup:
+    final url = "http://localhost:${httpPort}/headernames"
+    final request = new Request.Builder().url(url).header('header', 'headerValues').get().build()
+
+    when:
+    client.newCall(request).execute()
+
+    then:
+    hasTainted { tainted ->
+      tainted.value == 'header' &&
+        tainted.ranges[0].source.name == 'header' &&
+        tainted.ranges[0].source.value == 'header' &&
+        tainted.ranges[0].source.origin == 'http.request.header.name'
+    }
+  }
+
   void 'test parameter source'() {
     setup:
     final url = "http://localhost:${httpPort}/param?param=paramValue"
@@ -75,6 +94,28 @@ abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {
     }
   }
 
+  void 'test parameter names list source'() {
+    setup:
+    final request = builder.call("http://localhost:${httpPort}/paramnames")
+    final name = params.split('=')[0]
+
+    when:
+    client.newCall(request).execute()
+
+    then:
+    hasTainted { tainted ->
+      tainted.value == name &&
+        tainted.ranges[0].source.name == name &&
+        tainted.ranges[0].source.value == name &&
+        tainted.ranges[0].source.origin == 'http.request.parameter.name'
+    }
+
+    where:
+    params            | builder
+    'postparam=value' | { String url -> new Request.Builder().url(url).post(RequestBody.create(FORM, params)).build() }
+    'getparam=value'  | { String url -> new Request.Builder().url("$url?$params").get().build() }
+  }
+
   void 'test form source'() {
     setup:
     final url = "http://localhost:${httpPort}/form_attribute"
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
index 260ec281797..a2edae29ac3 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
@@ -3,6 +3,7 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.LOGS_INJECTION_ENABLED;
 
 import datadog.trace.api.ConfigCollector;
+import datadog.trace.api.ConfigSetting;
 import datadog.trace.api.CorrelationIdentifier;
 import datadog.trace.api.Trace;
 import java.util.concurrent.TimeUnit;
@@ -22,15 +23,13 @@ public void run() throws InterruptedException {
 
     secondTracedMethod();
 
-    if (!waitForCondition(
-        () -> Boolean.FALSE.equals(ConfigCollector.get().collect().get(LOGS_INJECTION_ENABLED)))) {
+    if (!waitForCondition(() -> Boolean.FALSE.equals(getLogInjectionEnabled()))) {
       throw new RuntimeException("Logs injection config was never updated");
     }
 
     thirdTracedMethod();
 
-    if (!waitForCondition(
-        () -> Boolean.TRUE.equals(ConfigCollector.get().collect().get(LOGS_INJECTION_ENABLED)))) {
+    if (!waitForCondition(() -> Boolean.TRUE.equals(getLogInjectionEnabled()))) {
       throw new RuntimeException("Logs injection config was never updated a second time");
     }
 
@@ -44,6 +43,14 @@ public void run() throws InterruptedException {
     Thread.sleep(400);
   }
 
+  private static Object getLogInjectionEnabled() {
+    ConfigSetting configSetting = ConfigCollector.get().collect().get(LOGS_INJECTION_ENABLED);
+    if (configSetting == null) {
+      return null;
+    }
+    return configSetting.value;
+  }
+
   @Trace
   public void firstTracedMethod() {
     doLog("INSIDE FIRST SPAN");
diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle
index 272a0503f07..4a39d9a60b8 100644
--- a/dd-smoke-tests/maven/build.gradle
+++ b/dd-smoke-tests/maven/build.gradle
@@ -9,9 +9,7 @@ dependencies {
   implementation group: 'org.apache.maven.wrapper', name: 'maven-wrapper', version: '3.2.0'
 
   testImplementation project(':dd-smoke-tests')
-  testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.0'
-  testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.20'
-  testImplementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
+  testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
 }
 
 jar {
diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
index 29413d42f67..dc55cca1f10 100644
--- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
+++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
@@ -1,35 +1,37 @@
 package datadog.smoketest
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import datadog.trace.agent.test.server.http.TestHttpServer
+
 import datadog.trace.api.Config
 import datadog.trace.api.config.CiVisibilityConfig
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.test.util.MultipartRequestParser
+import datadog.trace.civisibility.CiVisibilitySmokeTest
 import datadog.trace.util.Strings
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import org.apache.maven.wrapper.MavenWrapperMain
-import org.msgpack.jackson.dataformat.MessagePackFactory
-import spock.lang.AutoCleanup
-import spock.lang.Shared
-import spock.lang.Specification
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.w3c.dom.Document
+import org.w3c.dom.NodeList
 import spock.lang.TempDir
-import spock.util.concurrent.PollingConditions
 
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
 import java.nio.file.FileVisitResult
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.SimpleFileVisitor
 import java.nio.file.attribute.BasicFileAttributes
-import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
-import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
-import static org.hamcrest.Matchers.emptyString
-import static org.hamcrest.Matchers.not
+class MavenSmokeTest extends CiVisibilitySmokeTest {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(MavenSmokeTest.class)
 
-class MavenSmokeTest extends Specification {
+  private static final String LATEST_MAVEN_VERSION = getLatestMavenVersion()
 
   private static final String TEST_SERVICE_NAME = "test-maven-service"
   private static final String TEST_ENVIRONMENT_NAME = "integration-test"
@@ -43,65 +45,11 @@ class MavenSmokeTest extends Specification {
   @TempDir
   Path projectHome
 
-  @Shared
-  ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory())
-
-  @Shared
-  Queue<Map<String, Object>> receivedTraces = new ConcurrentLinkedQueue<>()
-
-  @Shared
-  Queue<Map<String, Object>> receivedCoverages = new ConcurrentLinkedQueue<>()
-
-  @Shared
-  @AutoCleanup
-  protected TestHttpServer intakeServer = httpServer {
-    handlers {
-      prefix("/api/v2/citestcycle") {
-        def decodedEvent = objectMapper.readValue(request.body, Map)
-        receivedTraces.add(decodedEvent)
-
-        response.status(200).send()
-      }
-
-      prefix("/api/v2/citestcov") {
-        def parsed = MultipartRequestParser.parseRequest(request.body, request.headers.get("Content-Type"))
-        def coverages = parsed.get("coverage1")
-        for (def coverage : coverages) {
-          def decodedCoverage = objectMapper.readValue(coverage.get(), Map)
-          receivedCoverages.add(decodedCoverage)
-        }
-
-        response.status(202).send()
-      }
-
-      prefix("/api/v2/libraries/tests/services/setting") {
-        response.status(200).send('{ "data": { "type": "ci_app_tracers_test_service_settings", "id": "uuid", "attributes": { "code_coverage": true, "tests_skipping": true } } }')
-      }
-
-      prefix("/api/v2/ci/tests/skippable") {
-        response.status(200).send('{ "data": [{' +
-          '  "id": "d230520a0561ee2f",' +
-          '  "type": "test",' +
-          '  "attributes": {' +
-          '    "configurations": {},' +
-          '    "name": "test_to_skip_with_itr",' +
-          '    "suite": "datadog.smoke.TestSucceed"' +
-          '  }' +
-          '}] }')
-      }
-    }
-  }
-
-  def setup() {
-    receivedTraces.clear()
-    receivedCoverages.clear()
-  }
-
-  def "test successful maven run, v#mavenVersion"() {
+  def "test #projectName, v#mavenVersion"() {
     given:
     givenWrapperPropertiesFile(mavenVersion)
-    givenMavenProjectFiles("test_successful_maven_run")
-    givenMavenDependenciesAreLoaded()
+    givenMavenProjectFiles(projectName)
+    givenMavenDependenciesAreLoaded(projectName, mavenVersion)
 
     when:
     def exitCode = whenRunningMavenBuild()
@@ -109,176 +57,19 @@ class MavenSmokeTest extends Specification {
     then:
     exitCode == 0
 
-    verifyEventsAndCoverages(mavenVersion)
+    verifyEventsAndCoverages(projectName, "maven", mavenVersion, expectedEvents, expectedCoverages)
 
     where:
-    mavenVersion << ["3.2.1", "3.2.5", "3.3.9", "3.5.4", "3.6.3", "3.8.8", "3.9.4", "4.0.0-alpha-7"]
-  }
-
-  def "test maven run with jacoco and argLine, v#mavenVersion"() {
-    given:
-    givenWrapperPropertiesFile(mavenVersion)
-    givenMavenProjectFiles("test_successful_maven_run_with_jacoco_and_argline")
-    givenMavenDependenciesAreLoaded()
-
-    when:
-    def exitCode = whenRunningMavenBuild()
-
-    then:
-    exitCode == 0
-
-    verifyEventsAndCoverages(mavenVersion)
-
-    where:
-    mavenVersion << ["3.9.4"]
-  }
-
-  private verifyEventsAndCoverages(String mavenVersion) {
-    def events = waitForEvents(5)
-    assert events.size() == 5
-
-    def sessionEndEvent = events.find { it.type == "test_session_end" }
-    verifyCommonTags(sessionEndEvent)
-    verifyAll(sessionEndEvent) {
-      verifyAll(content) {
-        name == "maven.test_session"
-        resource == "Maven Smoke Tests Project" // project name
-        verifyAll(metrics) {
-          process_id > 0 // only applied to root spans
-          it["test.itr.tests_skipping.count"] == 1
-          it["test.code_coverage.lines_pct"] == 57
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_session_end"
-          it["language"] == "jvm" // only applied to root spans
-          it["test.toolchain"] == "maven:${mavenVersion}" // only applied to session events
-          it["test.status"] == "pass"
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-      }
-    }
-
-    def moduleEndEvent = events.find { it.type == "test_module_end" }
-    assert moduleEndEvent != null
-    verifyCommonTags(moduleEndEvent)
-    verifyAll(moduleEndEvent) {
-      verifyAll(content) {
-        name == "maven.test_module"
-        resource == "Maven Smoke Tests Project maven-surefire-plugin default-test" // project name + plugin name + execution ID
-        test_session_id == sessionEndEvent.content.test_session_id
-        test_module_id > 0
-        verifyAll(metrics) {
-          it["test.itr.tests_skipping.count"] == 1
-          it["test.code_coverage.lines_pct"] == 57
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_module_end"
-          it["test.module"] == "Maven Smoke Tests Project maven-surefire-plugin default-test" // project name + plugin name + execution ID
-          it["test.status"] == "pass"
-          it["test.code_coverage.enabled"] == "true"
-          it["test.itr.tests_skipping.enabled"] == "true"
-          it["test.itr.tests_skipping.type"] == "test"
-          it["_dd.ci.itr.tests_skipped"] == "true"
-        }
-      }
-    }
-
-    def suiteEndEvent = events.find { it.type == "test_suite_end" }
-    assert suiteEndEvent != null
-    verifyCommonTags(suiteEndEvent, false)
-    verifyAll(suiteEndEvent) {
-      verifyAll(content) {
-        name == "junit.test_suite"
-        resource == "datadog.smoke.TestSucceed"
-        test_session_id == sessionEndEvent.content.test_session_id
-        test_module_id == moduleEndEvent.content.test_module_id
-        test_suite_id > 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test_suite_end"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.status"] == "pass"
-        }
-      }
-    }
-
-    def testEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_succeed" }
-    verifyCommonTags(testEvent, false)
-    verifyAll(testEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_succeed"
-        test_session_id == sessionEndEvent.content.test_session_id
-        test_module_id == moduleEndEvent.content.test_module_id
-        test_suite_id == suiteEndEvent.content.test_suite_id
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_succeed"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.status"] == "pass"
-        }
-      }
-    }
-
-    def skippedTestEvent = events.find { it.type == "test" && it.content.resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr" }
-    verifyCommonTags(skippedTestEvent, false)
-    verifyAll(skippedTestEvent) {
-      verifyAll(content) {
-        name == "junit.test"
-        resource == "datadog.smoke.TestSucceed.test_to_skip_with_itr"
-        test_session_id == sessionEndEvent.content.test_session_id
-        test_module_id == moduleEndEvent.content.test_module_id
-        test_suite_id == suiteEndEvent.content.test_suite_id
-        trace_id > 0
-        span_id > 0
-        parent_id == 0
-        verifyAll(metrics) {
-          process_id > 0
-        }
-        verifyAll(meta) {
-          it["span.kind"] == "test"
-          it["test.suite"] == "datadog.smoke.TestSucceed"
-          it["test.name"] == "test_to_skip_with_itr"
-          it["test.source.file"] == "src/test/java/datadog/smoke/TestSucceed.java"
-          it["test.status"] == "skip"
-          it["test.skip_reason"] == "Skipped by Datadog Intelligent Test Runner"
-          it["test.skipped_by_itr"] == "true"
-        }
-      }
-    }
-
-    def coverages = waitForCoverages(1)
-    assert coverages.size() == 1
-
-    def coverage = coverages.first()
-    coverage == [
-      test_session_id: testEvent.content.test_session_id,
-      test_suite_id  : testEvent.content.test_suite_id,
-      span_id        : testEvent.content.span_id,
-      files          : [
-        [
-          filename: "src/test/java/datadog/smoke/TestSucceed.java",
-          segments: [[7, -1, 7, -1, -1], [11, -1, 12, -1, -1]]
-        ],
-        [
-          filename: "src/main/java/datadog/smoke/Calculator.java",
-          segments: [[5, -1, 5, -1, -1]]
-        ]
-      ]
-    ]
+    projectName                                         | mavenVersion         | expectedEvents | expectedCoverages
+    "test_successful_maven_run"                         | "3.2.1"              | 5              | 1
+    "test_successful_maven_run"                         | "3.3.9"              | 5              | 1
+    "test_successful_maven_run"                         | "3.5.4"              | 5              | 1
+    "test_successful_maven_run"                         | "3.6.3"              | 5              | 1
+    "test_successful_maven_run"                         | "3.8.8"              | 5              | 1
+    "test_successful_maven_run"                         | "3.9.5"              | 5              | 1
+    "test_successful_maven_run"                         | LATEST_MAVEN_VERSION | 5              | 1
+    "test_successful_maven_run_with_jacoco_and_argline" | "3.9.5"              | 5              | 1
+    "test_successful_maven_run_with_cucumber"           | "3.9.5"              | 7              | 1
   }
 
   private void givenWrapperPropertiesFile(String mavenVersion) {
@@ -326,15 +117,23 @@ class MavenSmokeTest extends Specification {
    * Here, in order to reduce flakiness, we ensure that all of the dependencies are loaded (retrying if necessary),
    * before proceeding with running the build
    */
-  private void givenMavenDependenciesAreLoaded() {
-    retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline"])
+  private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion) {
+    if (LOADED_DEPENDENCIES.add("$projectName:$mavenVersion")) {
+      retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline"])
+    }
     // dependencies below are download separately
     // because they are not declared in the project,
     // but are added at runtime by the tracer
-    retryUntilSuccessfulOrNoAttemptsLeft(["dependency:get", "-Dartifact=com.datadoghq:dd-javac-plugin:$JAVAC_PLUGIN_VERSION".toString()])
-    retryUntilSuccessfulOrNoAttemptsLeft(["dependency:get", "-Dartifact=org.jacoco:jacoco-maven-plugin:$JACOCO_PLUGIN_VERSION".toString()])
+    if (LOADED_DEPENDENCIES.add("com.datadoghq:dd-javac-plugin:$JAVAC_PLUGIN_VERSION")) {
+      retryUntilSuccessfulOrNoAttemptsLeft(["dependency:get", "-Dartifact=com.datadoghq:dd-javac-plugin:$JAVAC_PLUGIN_VERSION".toString()])
+    }
+    if (LOADED_DEPENDENCIES.add("org.jacoco:jacoco-maven-plugin:$JACOCO_PLUGIN_VERSION")) {
+      retryUntilSuccessfulOrNoAttemptsLeft(["dependency:get", "-Dartifact=org.jacoco:jacoco-maven-plugin:$JACOCO_PLUGIN_VERSION".toString()])
+    }
   }
 
+  private static final Collection<String> LOADED_DEPENDENCIES = new HashSet<>()
+
   private void retryUntilSuccessfulOrNoAttemptsLeft(List<String> mvnCommand) {
     def processBuilder = createProcessBuilder(mvnCommand, false)
     for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) {
@@ -347,7 +146,7 @@ class MavenSmokeTest extends Specification {
   }
 
   private int whenRunningMavenBuild() {
-    def processBuilder = createProcessBuilder(["test"])
+    def processBuilder = createProcessBuilder(["-B", "test"])
 
     processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF")
 
@@ -420,76 +219,6 @@ class MavenSmokeTest extends Specification {
     return [projectHome.toAbsolutePath().toString()]
   }
 
-  private List<Map<String, Object>> waitForEvents(expectedEventsSize = 4) {
-    def traceReceiveConditions = new PollingConditions(timeout: 15, initialDelay: 1, delay: 0.5, factor: 1)
-    traceReceiveConditions.eventually {
-      int eventsSize = 0
-      for (Map<String, Object> trace : receivedTraces) {
-        eventsSize += trace["events"].size()
-      }
-      assert eventsSize == expectedEventsSize
-    }
-
-    List<Map<String, Object>> events = new ArrayList<>()
-    while (!receivedTraces.isEmpty()) {
-      def trace = receivedTraces.poll()
-      events.addAll((List<Map<String, Object>>) trace["events"])
-    }
-    return events
-  }
-
-  private List<Map<String, Object>> waitForCoverages(traceSize = 1) {
-    def traceReceiveConditions = new PollingConditions(timeout: 15, initialDelay: 1, delay: 0.5, factor: 1)
-    traceReceiveConditions.eventually {
-      assert receivedCoverages.size() == traceSize
-    }
-
-    List<Map<String, Object>> coverages = new ArrayList<>()
-    while (!receivedCoverages.isEmpty()) {
-      def trace = receivedCoverages.poll()
-      coverages.addAll((List<Map<String, Object>>) trace["coverages"])
-    }
-    return coverages
-  }
-
-  protected verifyCommonTags(Map<String, Object> event, boolean buildEvent = true) {
-    verifyAll(event) {
-      version > 0
-      verifyAll(content) {
-        start > 0
-        duration > 0
-        test_session_id > 0
-        service == TEST_SERVICE_NAME
-        error == 0
-        verifyAll(meta) {
-          it["test.type"] == "test"
-
-          if (buildEvent) {
-            // Maven 4 sets "-B" flag ("batch", non-interactive mode)
-            it["test.command"] == "mvn test" || it["test.command"] == "mvn -B test"
-            it["component"] == "maven"
-          } else {
-            // testcase/suite event
-            it["component"] == "junit"
-          }
-
-          it["test.framework"] == "junit4"
-          it["test.framework_version"] == "4.13.2"
-
-          it["env"] == TEST_ENVIRONMENT_NAME
-          it["runtime.name"] not(emptyString())
-          it["runtime.vendor"] not(emptyString())
-          it["runtime.version"] not(emptyString())
-          it["runtime-id"] not(emptyString())
-          it["os.platform"] not(emptyString())
-          it["os.version"] not(emptyString())
-          it["library_version"] not(emptyString())
-        }
-      }
-    }
-    return true
-  }
-
   private static class StreamConsumer extends Thread {
     final InputStream is
     final String messagePrefix
@@ -513,4 +242,28 @@ class MavenSmokeTest extends Specification {
     }
   }
 
+  private static String getLatestMavenVersion() {
+    OkHttpClient client = new OkHttpClient()
+    Request request = new Request.Builder().url("https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/maven-metadata.xml").build()
+    try (Response response = client.newCall(request).execute()) {
+      if (response.successful) {
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance()
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder()
+        Document doc = dBuilder.parse(response.body().byteStream())
+        doc.getDocumentElement().normalize()
+
+        NodeList versionList = doc.getElementsByTagName("latest")
+        if (versionList.getLength() > 0) {
+          return versionList.item(0).getTextContent()
+        }
+      } else {
+        LOGGER.warn("Could not get latest maven version, response from repo.maven.apache.org is ${response.code()}: ${response.body().string()}")
+      }
+    } catch (Exception e) {
+      LOGGER.warn("Could not get latest maven version", e)
+    }
+    def hardcodedLatestVersion = "4.0.0-alpha-8"
+    LOGGER.warn("Will run the 'latest' tests with hard-coded version ${hardcodedLatestVersion}")
+    return hardcodedLatestVersion
+  }
 }
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl
new file mode 100644
index 00000000000..71c1c9ffd26
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 7, -1, 7, -1, -1 ], [ 11, -1, 12, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
new file mode 100644
index 00000000000..3286b274d64
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
@@ -0,0 +1,225 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_session",
+    "resource" : "Maven Smoke Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_module",
+    "resource" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/coverages.ftl
new file mode 100644
index 00000000000..de31bcc96d7
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_parent_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/calculator/CalculatorSteps.java",
+    "segments" : [ [ 13, -1, 13, -1, -1 ], [ 19, -1, 20, -1, -1 ], [ 24, -1, 27, -1, -1 ], [ 30, -1, 34, -1, -1 ], [ 36, -1, 40, -1, -1 ], [ 42, -1, 43, -1, -1 ], [ 49, -1, 51, -1, -1 ], [ 53, -1, 53, -1, -1 ], [ 56, -1, 56, -1, -1 ] ]
+  }, {
+    "filename" : "src/test/resources/datadog/smoke/basic_arithmetic.feature",
+    "segments" : [ ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
new file mode 100644
index 00000000000..8de0b11f47e
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
@@ -0,0 +1,244 @@
+[ {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "service" : "test-maven-service",
+    "name" : "cucumber.step",
+    "resource" : "I add {int} and {int}",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "library_version" : ${content_meta_library_version},
+      "component" : "cucumber",
+      "step.location" : "datadog.smoke.calculator.CalculatorSteps.adding(int,int)",
+      "step.type" : "io.cucumber.java.JavaStepDefinition",
+      "step.arguments" : "[4, 5]",
+      "step.name" : "I add {int} and {int}",
+      "env" : "integration-test"
+    }
+  }
+}, {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_session",
+    "resource" : "Maven Smoke Tests Project",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 0,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "5.4.0",
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_module",
+    "resource" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 0,
+      "test.code_coverage.lines_pct" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "5.4.0",
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "service" : "test-maven-service",
+    "name" : "cucumber.step",
+    "resource" : "a calculator I just turned on",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "library_version" : ${content_meta_library_version},
+      "component" : "cucumber",
+      "step.name" : "a calculator I just turned on",
+      "env" : "integration-test",
+      "step.location" : "datadog.smoke.calculator.CalculatorSteps.a_calculator_I_just_turned_on()",
+      "step.type" : "io.cucumber.java.JavaStepDefinition"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test_suite",
+    "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "test.type" : "test",
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "component" : "junit",
+      "span.kind" : "test_suite_end",
+      "test.suite" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.framework_version" : "5.4.0",
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_parent_id},
+    "parent_id" : ${content_parent_id_2},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test",
+    "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic.Addition",
+    "start" : ${content_start_6},
+    "duration" : ${content_duration_6},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_6},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "Addition",
+      "span.kind" : "test",
+      "test.suite" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "5.4.0",
+      "test.framework" : "cucumber"
+    }
+  }
+}, {
+  "type" : "span",
+  "version" : 1,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id_3},
+    "parent_id" : ${content_parent_id},
+    "service" : "test-maven-service",
+    "name" : "cucumber.step",
+    "resource" : "the result is {int}",
+    "start" : ${content_start_7},
+    "duration" : ${content_duration_7},
+    "error" : 0,
+    "metrics" : { },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_7},
+      "library_version" : ${content_meta_library_version},
+      "component" : "cucumber",
+      "step.location" : "datadog.smoke.calculator.CalculatorSteps.the_result_is(double)",
+      "step.type" : "io.cucumber.java.JavaStepDefinition",
+      "step.arguments" : "[9]",
+      "step.name" : "the result is {int}",
+      "env" : "integration-test"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml
new file mode 100644
index 00000000000..a1438bbcd50
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.datadog.ci.test</groupId>
+  <artifactId>maven-smoke-test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>Maven Smoke Tests Project</name>
+
+  <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <!-- Older Maven versions (e.g. 3.2.1) use http protocol instead of https for repositories by default.
+    Nowadays Maven Central does not work over unencrypted http -->
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>Central Repository</name>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>Central Repository</name>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.cucumber</groupId>
+      <artifactId>cucumber-java</artifactId>
+      <version>5.4.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.cucumber</groupId>
+      <artifactId>cucumber-junit</artifactId>
+      <version>5.4.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/TestSucceed.java b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/TestSucceed.java
new file mode 100644
index 00000000000..1a0360c4bf5
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/TestSucceed.java
@@ -0,0 +1,12 @@
+package datadog.smoke;
+
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+    features = "classpath:datadog/smoke/basic_arithmetic.feature",
+    glue = "datadog.smoke.calculator")
+public class TestSucceed {
+}
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/calculator/CalculatorSteps.java b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/calculator/CalculatorSteps.java
new file mode 100644
index 00000000000..bd78700348b
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/java/datadog/smoke/calculator/CalculatorSteps.java
@@ -0,0 +1,59 @@
+package datadog.smoke.calculator;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+
+public class CalculatorSteps {
+
+  private Calculator calc;
+
+  @Given("a calculator I just turned on")
+  public void a_calculator_I_just_turned_on() {
+    calc = new Calculator();
+  }
+
+  @When("I add {int} and {int}")
+  public void adding(int arg1, int arg2) {
+    calc.push(arg1);
+    calc.push(arg2);
+    calc.push("+");
+  }
+  @Then("the result is {int}")
+  public void the_result_is(double expected) {
+    assertEquals(expected, calc.value());
+  }
+  static class Calculator {
+    private static final List<String> OPS = asList("-", "+", "*", "/");
+    private final Deque<Number> stack = new LinkedList<>();
+    public void push(Object arg) {
+      if (OPS.contains(arg)) {
+        Number y = stack.removeLast();
+        Number x = stack.isEmpty() ? 0 : stack.removeLast();
+        Double val = null;
+        if (arg.equals("-")) {
+          val = x.doubleValue() - y.doubleValue();
+        } else if (arg.equals("+")) {
+          val = x.doubleValue() + y.doubleValue();
+        } else if (arg.equals("*")) {
+          val = x.doubleValue() * y.doubleValue();
+        } else if (arg.equals("/")) {
+          val = x.doubleValue() / y.doubleValue();
+        }
+        push(val);
+      } else {
+        stack.add((Number) arg);
+      }
+    }
+
+    public Number value() {
+      return stack.getLast();
+    }
+  }
+}
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/resources/datadog/smoke/basic_arithmetic.feature b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/resources/datadog/smoke/basic_arithmetic.feature
new file mode 100644
index 00000000000..8aeff84c5e0
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/src/test/resources/datadog/smoke/basic_arithmetic.feature
@@ -0,0 +1,8 @@
+Feature: Basic Arithmetic
+
+  Background: A Calculator
+    Given a calculator I just turned on
+
+  Scenario: Addition
+    When I add 4 and 5
+    Then the result is 9
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl
new file mode 100644
index 00000000000..71c1c9ffd26
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl
@@ -0,0 +1,12 @@
+[ {
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id},
+  "span_id" : ${content_span_id},
+  "files" : [ {
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java",
+    "segments" : [ [ 7, -1, 7, -1, -1 ], [ 11, -1, 12, -1, -1 ] ]
+  }, {
+    "filename" : "src/main/java/datadog/smoke/Calculator.java",
+    "segments" : [ [ 5, -1, 5, -1, -1 ] ]
+  } ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
new file mode 100644
index 00000000000..ec3aebdcd76
--- /dev/null
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
@@ -0,0 +1,227 @@
+[ {
+  "type" : "test_session_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_session",
+    "resource" : "Maven Smoke Tests Project",
+    "start" : ${content_start},
+    "duration" : ${content_duration},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id},
+      "test.itr.tests_skipping.count" : 1,
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_session_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.toolchain" : ${content_meta_test_toolchain},
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_module_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "service" : "test-maven-service",
+    "name" : "maven.test_module",
+    "resource" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+    "start" : ${content_start_2},
+    "duration" : ${content_duration_2},
+    "error" : 0,
+    "metrics" : {
+      "test.itr.tests_skipping.count" : 1,
+      "test.code_coverage.lines_pct" : 57
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
+      "test.status" : "pass",
+      "_dd.ci.itr.tests_skipped" : "true",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_module_end",
+      "runtime.version" : ${content_meta_runtime_version},
+      "test.itr.tests_skipping.enabled" : "true",
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "maven",
+      "test.code_coverage.enabled" : "true",
+      "test.execution" : "maven-surefire-plugin:test:default-test",
+      "test.itr.tests_skipping.type" : "test",
+      "test.command" : "mvn -B test",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test_suite_end",
+  "version" : 1,
+  "content" : {
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test_suite",
+    "resource" : "datadog.smoke.TestSucceed",
+    "start" : ${content_start_3},
+    "duration" : ${content_duration_3},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "span.kind" : "test_suite_end",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id},
+    "span_id" : ${content_span_id},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_succeed",
+    "start" : ${content_start_4},
+    "duration" : ${content_duration_4},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 12,
+      "test.source.start" : 9
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_4},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_succeed()V",
+      "test.status" : "pass",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_succeed",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+}, {
+  "type" : "test",
+  "version" : 2,
+  "content" : {
+    "trace_id" : ${content_trace_id_2},
+    "span_id" : ${content_span_id_2},
+    "parent_id" : ${content_parent_id},
+    "test_session_id" : ${content_test_session_id},
+    "test_module_id" : ${content_test_module_id},
+    "test_suite_id" : ${content_test_suite_id},
+    "service" : "test-maven-service",
+    "name" : "junit.test",
+    "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr",
+    "start" : ${content_start_5},
+    "duration" : ${content_duration_5},
+    "error" : 0,
+    "metrics" : {
+      "process_id" : ${content_metrics_process_id_2},
+      "_dd.profiling.enabled" : 0,
+      "_dd.trace_span_attribute_schema" : 0,
+      "test.source.end" : 17,
+      "test.source.start" : 14
+    },
+    "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_5},
+      "os.architecture" : ${content_meta_os_architecture},
+      "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
+      "test.source.method" : "test_to_skip_with_itr()V",
+      "test.status" : "skip",
+      "ci.workspace_path" : ${content_meta_ci_workspace_path},
+      "language" : "jvm",
+      "runtime.name" : ${content_meta_runtime_name},
+      "os.platform" : ${content_meta_os_platform},
+      "os.version" : ${content_meta_os_version},
+      "library_version" : ${content_meta_library_version},
+      "test.name" : "test_to_skip_with_itr",
+      "span.kind" : "test",
+      "test.suite" : "datadog.smoke.TestSucceed",
+      "runtime.version" : ${content_meta_runtime_version},
+      "runtime-id" : ${content_meta_runtime_id_2},
+      "test.type" : "test",
+      "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner",
+      "env" : "integration-test",
+      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "component" : "junit",
+      "test.skipped_by_itr" : "true",
+      "test.framework_version" : "4.13.2",
+      "test.framework" : "junit4"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/osgi/build.gradle b/dd-smoke-tests/osgi/build.gradle
index ff38b6b35ee..957784df557 100644
--- a/dd-smoke-tests/osgi/build.gradle
+++ b/dd-smoke-tests/osgi/build.gradle
@@ -2,12 +2,19 @@ plugins {
   id 'biz.aQute.bnd.builder' version '6.1.0' apply false
 }
 
+repositories {
+  maven {
+    url 'https://resources.knopflerfish.org/repo/maven2/release'
+  }
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 description = 'OSGi Application Smoke Tests.'
 
 configurations {
   equinox
   felix
+  knopflerfish
   bundles
 }
 
@@ -24,6 +31,7 @@ dependencies {
 
   equinox 'org.eclipse.platform:org.eclipse.osgi:3.15.300'
   felix 'org.apache.felix:org.apache.felix.framework:6.0.5'
+  knopflerfish 'org.knopflerfish.kf6:framework:8.0.11'
 
   bundles 'org.ops4j.pax.logging:pax-logging-api:1.11.0'
   bundles 'com.google.guava:guava:20.0'
@@ -91,6 +99,7 @@ tasks.withType(Test).configureEach {
   jvmArgs "-Ddatadog.smoketest.osgi.appJar.path=${tasks.jar.archiveFile.get()}"
   jvmArgs "-Ddatadog.smoketest.osgi.equinoxJar.path=${configurations.equinox.first().path}"
   jvmArgs "-Ddatadog.smoketest.osgi.felixJar.path=${configurations.felix.first().path}"
+  jvmArgs "-Ddatadog.smoketest.osgi.knopflerfishJar.path=${configurations.knopflerfish.first().path}"
 
   jvmArgs "-Ddatadog.smoketest.osgi.bundle.paths=" +
     "${tasks.commonBundle.archiveFile.get()}," +
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
index cf4b000acaa..c50f1203752 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
@@ -69,5 +69,8 @@ public static void main(final String[] args) throws Exception {
     framework.stop();
 
     framework.waitForStop(1_000);
+
+    // XXX: Knopflerfish will leave some dangling non-daemon thread and prevent shutdown here.
+    System.exit(0);
   }
 }
diff --git a/dd-smoke-tests/osgi/src/test/groovy/datadog/smoketest/KnopflerfishSmokeTest.groovy b/dd-smoke-tests/osgi/src/test/groovy/datadog/smoketest/KnopflerfishSmokeTest.groovy
new file mode 100644
index 00000000000..32afc369d3d
--- /dev/null
+++ b/dd-smoke-tests/osgi/src/test/groovy/datadog/smoketest/KnopflerfishSmokeTest.groovy
@@ -0,0 +1,12 @@
+package datadog.smoketest
+
+class KnopflerfishSmokeTest extends AbstractOSGiSmokeTest {
+
+  String frameworkJar() {
+    return System.getProperty("datadog.smoketest.osgi.knopflerfishJar.path")
+  }
+
+  List<String> frameworkArguments() {
+    return ["-Dframework.factory=org.knopflerfish.framework.FrameworkFactoryImpl",]
+  }
+}
diff --git a/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy b/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy
index 261fd6fdf47..b480466d9df 100644
--- a/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy
+++ b/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy
@@ -75,6 +75,10 @@ class PlayNettySmokeTest extends AbstractServerSmokeTest {
     def allowed = /|\[netty.request\[filter1(\[filter\d])?(\[filter\d])?(\[filter\d])?
                    |\[play.request\[action1\[action2\[do-get\[netty.client.request]]]]]
                    |(\[filter\d])?(\[filter\d])?(\[filter\d])?]]/.stripMargin().replaceAll("[\n\r]", "")
+
+    // Ignore [command_execution], which can be generated by hostname calls from Config/Telemetry in some systems.
+    traceCounts = traceCounts.findAll { it.key != "[command_execution]" }
+
     traceCounts.entrySet().each {
       def matcher = (it.key =~ allowed).findAll()
       assert matcher.size() == 1 : """\
diff --git a/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
index 3d56e52cadd..9e27a2421f4 100644
--- a/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
@@ -9,16 +9,16 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+  private final String spanName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
+  protected AbstractAction(String spanName) {
+    this.spanName = spanName;
   }
 
   @Override
   public CompletionStage<Result> call(Http.Request req) {
     Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
-    Span span = tracer.spanBuilder(operationName).startSpan();
+    Span span = tracer.spanBuilder(spanName).startSpan();
     Scope scope = span.makeCurrent();
     try {
       return delegate.call(req);
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
index f9e28b8f6b8..b52223036aa 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
@@ -12,17 +12,16 @@
 
 public abstract class AbstractFilter extends Filter {
   private final HttpExecutionContext ec;
-  private final String operationName;
+  private final String spanName;
   private final boolean wrap;
 
-  public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
-    this(operationName, false, mat, ec);
+  public AbstractFilter(String spanName, Materializer mat, HttpExecutionContext ec) {
+    this(spanName, false, mat, ec);
   }
 
-  public AbstractFilter(
-      String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+  public AbstractFilter(String spanName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
     super(mat);
-    this.operationName = operationName;
+    this.spanName = spanName;
     this.wrap = wrap;
     this.ec = ec;
   }
@@ -32,14 +31,14 @@ public CompletionStage<Result> apply(
       Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
       Http.RequestHeader requestHeader) {
     final Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
-    final Span startedSpan = wrap ? tracer.spanBuilder(operationName).startSpan() : null;
+    final Span startedSpan = wrap ? tracer.spanBuilder(spanName).startSpan() : null;
     Scope outerScope = wrap ? startedSpan.makeCurrent() : null;
     try {
       return nextFilter
           .apply(requestHeader)
           .thenApplyAsync(
               result -> {
-                Span span = wrap ? startedSpan : tracer.spanBuilder(operationName).startSpan();
+                Span span = wrap ? startedSpan : tracer.spanBuilder(spanName).startSpan();
                 try (Scope innerScope = span.makeCurrent()) {
                   // Yes this does no real work
                   return result;
diff --git a/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy b/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy
index b2a09396abe..2f8655ac7c4 100644
--- a/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy
+++ b/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy
@@ -52,8 +52,8 @@ abstract class Play28OTelSmokeTest extends AbstractServerSmokeTest {
       + " -Dhttp.port=${httpPort}"
       + " -Dhttp.address=127.0.0.1"
       + " -Dplay.server.provider=${serverProvider()}"
-      + " -Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter"
-      + " -Ddd.integration.opentelemetry.experimental.enabled=true"
+      + " -Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()}:includeresource,DDAgentWriter"
+      + " -Ddd.integration.opentelemetry-1.enabled=true"
       + " -Dclient.request.base=${clientServer.address}/hello/")
     return processBuilder
   }
@@ -77,14 +77,14 @@ abstract class Play28OTelSmokeTest extends AbstractServerSmokeTest {
     // that is completed is completed before the span is finished, the order of those filters and the request processing
     // is undefined.
     boolean isOk = true
-    def allowed = /|^\[${serverProviderName()}.request
-                   |(\[filter1(\[filter\d])(\[filter\d])(\[filter\d])])?
-                   |\[play.request\[action1\[action2\[do-get\[play-ws.request]]]]]
-                   |(\[filter1(\[filter\d])(\[filter\d])(\[filter\d])])?
+    def allowed = /|^\[${serverProviderName()}.request:GET \/welcome[sj]
+                   |(\[internal:filter1(\[internal:filter\d])(\[internal:filter\d])(\[internal:filter\d])])?
+                   |\[play.request:GET \/welcome[sj]\[internal:action1\[internal:action2\[internal:do-get\[play-ws.request:GET \/hello\/\?]]]]]
+                   |(\[internal:filter1(\[internal:filter\d])(\[internal:filter\d])(\[internal:filter\d])])?
                    |]$/.stripMargin().replaceAll("[\n\r]", "")
 
     // Ignore [command_execution], which can be generated by hostname calls from Config/Telemetry on some systems.
-    traceCounts = traceCounts.findAll { it.key != "[command_execution]" }
+    traceCounts = traceCounts.findAll { it.key != "[command_execution:hostname]" }
 
     traceCounts.entrySet().each {
       def matcher = (it.key =~ allowed).findAll()
@@ -94,9 +94,9 @@ abstract class Play28OTelSmokeTest extends AbstractServerSmokeTest {
            |traceCounts=${traceCounts}""".stripMargin()
       def matches = matcher.head().findAll{ it != null }
       isOk &= matches.size() == 5
-      isOk &= matches.contains("[filter2]")
-      isOk &= matches.contains("[filter3]")
-      isOk &= matches.contains("[filter4]")
+      isOk &= matches.contains("[internal:filter2]")
+      isOk &= matches.contains("[internal:filter3]")
+      isOk &= matches.contains("[internal:filter4]")
       assert isOk :  """\
            |Trace ${it.key} does not match allowed pattern:
            |pattern=${allowed}
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
index abb4140aa8f..f1889962b51 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
@@ -35,6 +35,7 @@ dependencies {
   implementation group: 'com.h2database', name: 'h2', version: '2.1.214'
   implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.3'
   implementation group: 'com.sun.xml.bind', name: 'jaxb-ri', version: '2.3.3'
+  implementation group: 'com.google.code.gson', name: 'gson', version: '2.10'
 
 
   testImplementation project(':dd-smoke-tests')
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/test/groovy/GsonIastSpringBootSmokeTest.groovy b/dd-smoke-tests/spring-boot-2.6-webmvc/src/test/groovy/GsonIastSpringBootSmokeTest.groovy
new file mode 100644
index 00000000000..4671156ada2
--- /dev/null
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/test/groovy/GsonIastSpringBootSmokeTest.groovy
@@ -0,0 +1,9 @@
+import datadog.smoketest.AbstractGsonIastSpringBootSmokeTest
+
+class GsonIastSpringBootSmokeTest extends  AbstractGsonIastSpringBootSmokeTest{
+
+  @Override
+  String[] getCustomSpringProperties(){
+    return ['-Dspring.mvc.converters.preferred-json-mapper=gson']
+  }
+}
diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle
index d3bd0fd4f3a..69a74f24284 100644
--- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle
+++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '3.0.0'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'org.graalvm.buildtools.native' version '0.9.23'
+  id 'org.graalvm.buildtools.native' version '0.9.28'
   id 'com.diffplug.spotless' version "6.11.0"
 }
 
@@ -13,6 +13,8 @@ rootProject.ext.sharedConfigDirectory = sharedConfigDirectory
 apply from: "$sharedConfigDirectory/repositories.gradle"
 apply from: "$sharedConfigDirectory/spotless.gradle"
 
+ext.withProfiler = hasProperty('profiler')
+
 if (hasProperty('appBuildDir')) {
   buildDir = property('appBuildDir')
 }
@@ -27,11 +29,21 @@ dependencies {
 }
 
 if (hasProperty('agentPath')) {
+  final agentPath = property('agentPath')
   graalvmNative {
     binaries {
       main {
-        buildArgs.add("-J-javaagent:${property('agentPath')}")
+        // quick build mode, enough for smoke test
+        buildArgs.add("-Ob")
+        buildArgs.add("-J-javaagent:$agentPath")
+        if (withProfiler && property('profiler') == 'true') {
+          buildArgs.add("-J-Ddd.profiling.enabled=true")
+          buildArgs.add("--enable-monitoring=jfr")
+        }
       }
     }
   }
+  tasks.named('nativeCompile') {
+    inputs.file(agentPath).withPropertyName('agentJar')
+  }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-native/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/build.gradle
index 4b10b9e1e7b..ecd02639128 100644
--- a/dd-smoke-tests/spring-boot-3.0-native/build.gradle
+++ b/dd-smoke-tests/spring-boot-3.0-native/build.gradle
@@ -6,27 +6,32 @@ dependencies {
   testImplementation project(':dd-smoke-tests')
 }
 
-// Check 'testJvm' gradle command parameter to be at least GraalVM 17
 def testJvm = gradle.startParameter.projectProperties.getOrDefault('testJvm', '')
-def matcher = testJvm.toLowerCase(Locale.ROOT) =~ /graalvm([0-9]+)/
-if (matcher.size() == 1 && Integer.parseInt(matcher[0][1]) >= 17) {
+// In order to support GraalVM 21 we need at least Java 17 for Gradle
+def java17Home = System.getenv('JAVA_17_HOME')
+// Check 'testJvm' gradle command parameter to be at least GraalVM 17
+def matcher = testJvm?.toLowerCase(Locale.ROOT) =~ /graalvm([0-9]+)/
+def version = matcher?.size() == 1 ? Integer.parseInt(matcher[0][1]) : -1
+if (version >= 17) {
   // Retrieve GRAALVM_HOME from JVM environment variables
   def testJvmEnv = "JAVA_${testJvm}_HOME"
   def testJvmHome = System.getenv(testJvmEnv)
   if (!testJvmHome) {
     throw new GradleException("Unable to find launcher for Java '$testJvm'. Have you set '$testJvmEnv'?")
   }
+  def javaHome = version >= 21 ? java17Home : testJvmHome
   // Configure build directory for application
   def appDir = "$projectDir/application"
   def appBuildDir = "$buildDir/application"
   def isWindows = System.getProperty('os.name').toLowerCase().contains('win')
   def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
+
   // Define the task that builds the project
   tasks.register('springNativeBuild', Exec) {
     workingDir "$appDir"
     environment += [
       'GRADLE_OPTS': "-Dorg.gradle.jvmargs='-Xmx512M'",
-      'JAVA_HOME': testJvmHome,
+      'JAVA_HOME': javaHome,
       'GRAALVM_HOME': testJvmHome,
       'DD_TRACE_METHODS' : 'datadog.smoketest.springboot.controller.WebController[sayHello]',
       'NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION' : 'true'
@@ -38,7 +43,8 @@ if (matcher.size() == 1 && Integer.parseInt(matcher[0][1]) >= 17) {
       '--max-workers=4',
       "-PappBuildDir=$appBuildDir",
       "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}",
-      "-PagentPath=${project(':dd-java-agent').tasks.shadowJar.archiveFile.get()}"
+      "-PagentPath=${project(':dd-java-agent').tasks.shadowJar.archiveFile.get()}",
+      "-Pprofiler=true"
       )
     outputs.cacheIf { true }
     outputs.dir(appBuildDir)
@@ -48,6 +54,8 @@ if (matcher.size() == 1 && Integer.parseInt(matcher[0][1]) >= 17) {
       exclude '.gradle/**'
     }).withPropertyName('application')
     .withPathSensitivity(PathSensitivity.RELATIVE)
+    inputs.file(project(':dd-trace-api').tasks.jar.archiveFile.get()).withPropertyName('apiJar')
+    inputs.file(project(':dd-java-agent').tasks.shadowJar.archiveFile.get()).withPropertyName('agentJar')
   }
 
   springNativeBuild {
@@ -64,6 +72,7 @@ if (matcher.size() == 1 && Integer.parseInt(matcher[0][1]) >= 17) {
 
   tasks.withType(Test).configureEach {
     jvmArgs "-Ddatadog.smoketest.spring.native.executable=$appBuildDir/native/nativeCompile/native-3.0-smoketest"
+    jvmArgs "-Ddd.profiling.enabled=true"
   }
 } else {
   tasks.withType(Test).configureEach {
diff --git a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy
index 20b284348bd..2306bc62a3b 100644
--- a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy
+++ b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy
@@ -1,7 +1,20 @@
 import datadog.smoketest.AbstractServerSmokeTest
 import okhttp3.Request
+import spock.lang.Shared
+import spock.lang.TempDir
+
+import java.nio.file.FileVisitResult
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
+import java.util.concurrent.atomic.AtomicInteger
 
 class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest {
+  @Shared
+  @TempDir
+  def testJfrDir
+
   @Override
   ProcessBuilder createProcessBuilder() {
     String springNativeExecutable = System.getProperty('datadog.smoketest.spring.native.executable')
@@ -16,7 +29,10 @@ class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest {
       '-Ddd.span.sampling.rules=[]',
       // enable improved trace.annotation span names
       '-Ddd.trace.annotations.legacy.tracing.enabled=false',
-      "--server.port=${httpPort}"
+      "--server.port=${httpPort}",
+      '-Ddd.profiling.upload.period=1',
+      '-Ddd.profiling.start-force-first=true',
+      "-Ddd.profiling.debug.dump_path=${testJfrDir}"
     ])
     ProcessBuilder processBuilder = new ProcessBuilder(command)
     processBuilder.directory(new File(buildDirectory))
@@ -44,5 +60,39 @@ class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest {
     responseBodyStr != null
     responseBodyStr.contains("Hello world")
     waitForTraceCount(1)
+
+    // sanity test for profiler generating JFR files
+    countJfrs() > 0
+
+    when:
+    checkLogPostExit {
+      // Check that there are no ClassNotFound errors printed from bad reflect-config.json
+      if (it.contains("ClassNotFoundException")) {
+        println "Found ClassNotFoundException in log: ${it}"
+        logHasErrors = true
+      }
+    }
+
+    then:
+    !logHasErrors
+  }
+
+  int countJfrs() {
+    AtomicInteger jfrCount = new AtomicInteger(0)
+    Files.walkFileTree(testJfrDir, new SimpleFileVisitor<Path>() {
+        @Override
+        FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+          return FileVisitResult.CONTINUE
+        }
+
+        @Override
+        FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+          if (file.toString().endsWith(".jfr")) {
+            jfrCount.incrementAndGet()
+          }
+          return FileVisitResult.CONTINUE
+        }
+      })
+    return jfrCount.get()
   }
 }
diff --git a/dd-smoke-tests/springboot/build.gradle b/dd-smoke-tests/springboot/build.gradle
index de5cc97237c..40e4a7acb68 100644
--- a/dd-smoke-tests/springboot/build.gradle
+++ b/dd-smoke-tests/springboot/build.gradle
@@ -24,6 +24,7 @@ dependencies {
   implementation group: 'com.auth0', name: 'java-jwt', version: '4.0.0-beta.0'
   implementation group: 'com.auth0', name: 'jwks-rsa', version: '0.21.1'
   implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.22'
+  implementation group: 'com.google.code.gson', name: 'gson', version: '2.10'
 
   implementation group: 'org.springframework', name: 'spring-web', version: '1.5.18.RELEASE'
 
diff --git a/dd-smoke-tests/springboot/src/test/groovy/datadog/smoketest/GsonIastSpringBootSmokeTest.groovy b/dd-smoke-tests/springboot/src/test/groovy/datadog/smoketest/GsonIastSpringBootSmokeTest.groovy
new file mode 100644
index 00000000000..3ffe512bf27
--- /dev/null
+++ b/dd-smoke-tests/springboot/src/test/groovy/datadog/smoketest/GsonIastSpringBootSmokeTest.groovy
@@ -0,0 +1,9 @@
+package datadog.smoketest
+
+class GsonIastSpringBootSmokeTest extends  AbstractGsonIastSpringBootSmokeTest{
+
+  @Override
+  String[] getCustomSpringProperties(){
+    return ['-Dspring.http.converters.preferred-json-mapper=gson']
+  }
+}
diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy
index a88dccdab73..e8d30b7ab31 100644
--- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy
+++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy
@@ -102,7 +102,8 @@ abstract class AbstractSmokeTest extends ProcessManager {
     "-Ddd.profiling.ddprof.enabled=true",
     "-Ddd.profiling.ddprof.alloc.enabled=true",
     "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=${logLevel()}",
-    "-Dorg.slf4j.simpleLogger.defaultLogLevel=${logLevel()}"
+    "-Dorg.slf4j.simpleLogger.defaultLogLevel=${logLevel()}",
+    "-Ddd.site="
   ]
 
   @Shared
diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy
index 3240620fd70..2229f7f0067 100644
--- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy
+++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy
@@ -185,7 +185,7 @@ abstract class ProcessManager extends Specification {
       ProcessBuilder processBuilder = createProcessBuilder(idx)
 
 
-      processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"))
+      processBuilder.environment().put("JAVA_HOME", javaHome())
       processBuilder.environment().put("DD_API_KEY", apiKey())
 
       processBuilder.redirectErrorStream(true)
@@ -200,7 +200,11 @@ abstract class ProcessManager extends Specification {
 
   String javaPath() {
     final String separator = System.getProperty("file.separator")
-    return System.getProperty("java.home") + separator + "bin" + separator + "java"
+    return javaHome() + separator + "bin" + separator + "java"
+  }
+
+  String javaHome() {
+    return System.getProperty("java.home")
   }
 
   def cleanupSpec() {
diff --git a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
index a87415bf6e0..51f7696bae0 100644
--- a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
+++ b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
@@ -8,6 +8,7 @@
 import io.vertx.ext.web.Cookie;
 import io.vertx.ext.web.RoutingContext;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.Vector;
 
@@ -26,6 +27,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("header"));
     }
   },
+  HEADER_NAMES("/headernames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().headers().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   PARAM("/param") {
     @Override
     public void handle(final RoutingContext rc) {
@@ -40,6 +48,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("param"));
     }
   },
+  PARAM_NAMES("/paramnames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().params().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   FORM_ATTRIBUTE("/form_attribute") {
     @Override
     public void handle(final RoutingContext rc) {
diff --git a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
index 3c57dfe6ff6..afd0bca7075 100644
--- a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
+++ b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
@@ -8,6 +8,7 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.RoutingContext;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.Vector;
 
@@ -27,6 +28,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("header"));
     }
   },
+  HEADER_NAMES("/headernames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().headers().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   PARAM("/param") {
     @Override
     public void handle(final RoutingContext rc) {
@@ -41,6 +49,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("param"));
     }
   },
+  PARAM_NAMES("/paramnames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().params().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   FORM_ATTRIBUTE("/form_attribute") {
     @Override
     public void handle(final RoutingContext rc) {
diff --git a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
index 1b89130275c..13ef2a064ea 100644
--- a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
+++ b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
@@ -9,6 +9,7 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.RoutingContext;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.Vector;
 
@@ -28,6 +29,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("header"));
     }
   },
+  HEADER_NAMES("/headernames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().headers().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   PARAM("/param") {
     @Override
     public void handle(final RoutingContext rc) {
@@ -42,6 +50,13 @@ public void handle(final RoutingContext rc) {
       rc.response().end("Received " + value.get("param"));
     }
   },
+  PARAM_NAMES("/paramnames") {
+    @Override
+    public void handle(final RoutingContext rc) {
+      final Collection<String> names = rc.request().params().names();
+      rc.response().end("Received " + String.join(",", names));
+    }
+  },
   FORM_ATTRIBUTE("/form_attribute") {
     @Override
     public void handle(final RoutingContext rc) {
diff --git a/dd-trace-api/build.gradle b/dd-trace-api/build.gradle
index 0341c91c2e7..228298c5cf6 100644
--- a/dd-trace-api/build.gradle
+++ b/dd-trace-api/build.gradle
@@ -19,6 +19,10 @@ excludedClassesCoverage += [
   'datadog.trace.api.internal.TraceSegment.NoOp',
   'datadog.trace.api.civisibility.CIVisibility',
   'datadog.trace.api.civisibility.DDTestModule',
+  'datadog.trace.api.civisibility.noop.NoOpDDTest',
+  'datadog.trace.api.civisibility.noop.NoOpDDTestModule',
+  'datadog.trace.api.civisibility.noop.NoOpDDTestSession',
+  'datadog.trace.api.civisibility.noop.NoOpDDTestSuite',
   'datadog.trace.api.config.ProfilingConfig',
   'datadog.trace.api.interceptor.MutableSpan',
   'datadog.trace.api.profiling.Profiling',
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
index c7b1c3f1c82..f089c004b62 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -1,8 +1,13 @@
 package datadog.trace.api;
 
-import java.util.Arrays;
+import static datadog.trace.api.TracePropagationStyle.DATADOG;
+import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
+import static java.util.Arrays.asList;
+
 import java.util.BitSet;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 public final class ConfigDefaults {
@@ -64,6 +69,10 @@ public final class ConfigDefaults {
   static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds
   static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;
   static final boolean DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED = false;
+  static final Set<TracePropagationStyle> DEFAULT_TRACE_PROPAGATION_STYLE =
+      new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT));
+  static final Set<PropagationStyle> DEFAULT_PROPAGATION_STYLE =
+      new LinkedHashSet<>(asList(PropagationStyle.DATADOG));
   static final boolean DEFAULT_JMX_FETCH_ENABLED = true;
   static final boolean DEFAULT_TRACE_AGENT_V05_ENABLED = false;
 
@@ -71,6 +80,8 @@ public final class ConfigDefaults {
 
   static final int DEFAULT_CLOCK_SYNC_PERIOD = 30; // seconds
 
+  static final boolean DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST = false;
+
   static final boolean DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED = false;
   static final int DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT = 10;
 
@@ -96,7 +107,7 @@ public final class ConfigDefaults {
   public static final int DEFAULT_IAST_VULNERABILITIES_PER_REQUEST = 2;
   public static final int DEFAULT_IAST_REQUEST_SAMPLING = 33;
   static final Set<String> DEFAULT_IAST_WEAK_HASH_ALGORITHMS =
-      new HashSet<>(Arrays.asList("SHA1", "SHA-1", "MD2", "MD5", "RIPEMD128", "MD4"));
+      new HashSet<>(asList("SHA1", "SHA-1", "MD2", "MD5", "RIPEMD128", "MD4"));
   static final String DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS =
       "^(?:PBEWITH(?:HMACSHA(?:2(?:24ANDAES_(?:128|256)|56ANDAES_(?:128|256))|384ANDAES_(?:128|256)|512ANDAES_(?:128|256)|1ANDAES_(?:128|256))|SHA1AND(?:RC(?:2_(?:128|40)|4_(?:128|40))|DESEDE)|MD5AND(?:TRIPLEDES|DES))|DES(?:EDE(?:WRAP)?)?|BLOWFISH|ARCFOUR|RC2).*$";
   static final boolean DEFAULT_IAST_REDACTION_ENABLED = true;
@@ -105,6 +116,7 @@ public final class ConfigDefaults {
   static final String DEFAULT_IAST_REDACTION_VALUE_PATTERN =
       "(?:bearer\\s+[a-z0-9\\._\\-]+|glpat-[\\w\\-]{20}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=\\-]+\\.ey[I-L][\\w=\\-]+(?:\\.[\\w.+/=\\-]+)?|(?:[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY[\\-]{5}|ssh-rsa\\s*[a-z0-9/\\.+]{100,}))";
   public static final int DEFAULT_IAST_MAX_RANGE_COUNT = 10;
+  static final boolean DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS = false;
 
   static final int DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH = 250;
   public static final boolean DEFAULT_IAST_DEDUPLICATION_ENABLED = true;
@@ -118,8 +130,8 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED = true;
   static final boolean DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED = true;
   static final boolean DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED = true;
-  static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.1.7";
-  static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION = "0.8.10";
+  static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.1.8";
+  static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION = "0.8.11";
   static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES =
       "datadog.trace.*:org.apache.commons.*:org.mockito.*";
   static final boolean DEFAULT_CIVISIBILITY_GIT_UPLOAD_ENABLED = true;
@@ -130,6 +142,8 @@ public final class ConfigDefaults {
   static final String DEFAULT_CIVISIBILITY_GIT_REMOTE_NAME = "origin";
   static final String DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST = "127.0.0.1";
   static final int DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT = 0;
+  static final List<String> DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES =
+      asList("/resources/", "/java/", "/groovy/", "/kotlin/", "/scala/");
 
   static final boolean DEFAULT_REMOTE_CONFIG_ENABLED = true;
   static final boolean DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED = false;
@@ -152,6 +166,9 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_DEBUGGER_VERIFY_BYTECODE = true;
   static final boolean DEFAULT_DEBUGGER_INSTRUMENT_THE_WORLD = false;
   static final int DEFAULT_DEBUGGER_CAPTURE_TIMEOUT = 100; // milliseconds
+  static final boolean DEFAULT_DEBUGGER_SYMBOL_ENABLED = false;
+  static final boolean DEFAULT_DEBUGGER_SYMBOL_FORCE_UPLOAD = false;
+  static final int DEFAULT_DEBUGGER_SYMBOL_FLUSH_THRESHOLD = 100; // nb of classes
 
   static final boolean DEFAULT_TRACE_REPORT_HOSTNAME = false;
   static final String DEFAULT_TRACE_ANNOTATIONS = null;
@@ -174,10 +191,13 @@ public final class ConfigDefaults {
 
   static final boolean DEFAULT_TELEMETRY_ENABLED = true;
   static final int DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL = 60; // in seconds
+  static final int DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL =
+      24 * 60 * 60; // 24 hours in seconds
   static final int DEFAULT_TELEMETRY_METRICS_INTERVAL = 10; // in seconds
   static final boolean DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED = true;
+  static final boolean DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED = false;
 
-  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = false;
+  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
   static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = false;
   static final boolean DEFAULT_SECURE_RANDOM = false;
 
@@ -194,8 +214,8 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED = false;
 
   static final boolean DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED = true;
-
   static final boolean DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED = true;
+  static final boolean DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED = false;
 
   private ConfigDefaults() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
index c2a7397b4fb..4a3e7e1cc18 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
@@ -52,5 +52,7 @@ public class DDTags {
   public static final String INTERNAL_GIT_COMMIT_SHA = "_dd.git.commit.sha";
 
   public static final String PROFILING_ENABLED = "_dd.profiling.enabled";
+
+  public static final String PROFILING_CONTEXT_ENGINE = "_dd.profiling.ctx";
   public static final String BASE_SERVICE = "_dd.base_service";
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
index 7ef83fdc289..688036b4566 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility;
 
+import datadog.trace.api.civisibility.noop.NoOpDDTestSession;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import javax.annotation.Nullable;
@@ -7,10 +8,7 @@
 public class CIVisibility {
 
   private static volatile SessionFactory SESSION_FACTORY =
-      (projectName, projectRoot, component, startTime) -> {
-        throw new UnsupportedOperationException(
-            "session factory not registered, please ensure CI Visibility feature is enabled");
-      };
+      (projectName, projectRoot, component, startTime) -> NoOpDDTestSession.INSTANCE;
 
   /**
    * This a hook for injecting SessionFactory implementation. It should only be used internally by
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java
new file mode 100644
index 00000000000..00162a78860
--- /dev/null
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java
@@ -0,0 +1,20 @@
+package datadog.trace.api.civisibility.noop;
+
+import datadog.trace.api.civisibility.DDTest;
+import javax.annotation.Nullable;
+
+public class NoOpDDTest implements DDTest {
+  static final DDTest INSTANCE = new NoOpDDTest();
+
+  @Override
+  public void setTag(String key, Object value) {}
+
+  @Override
+  public void setErrorInfo(@Nullable Throwable error) {}
+
+  @Override
+  public void setSkipReason(@Nullable String skipReason) {}
+
+  @Override
+  public void end(@Nullable Long endTime) {}
+}
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java
new file mode 100644
index 00000000000..eb67b09514b
--- /dev/null
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java
@@ -0,0 +1,30 @@
+package datadog.trace.api.civisibility.noop;
+
+import datadog.trace.api.civisibility.DDTestModule;
+import datadog.trace.api.civisibility.DDTestSuite;
+import javax.annotation.Nullable;
+
+public class NoOpDDTestModule implements DDTestModule {
+  static final DDTestModule INSTANCE = new NoOpDDTestModule();
+
+  @Override
+  public void setTag(String key, Object value) {}
+
+  @Override
+  public void setErrorInfo(Throwable error) {}
+
+  @Override
+  public void setSkipReason(String skipReason) {}
+
+  @Override
+  public void end(@Nullable Long endTime) {}
+
+  @Override
+  public DDTestSuite testSuiteStart(
+      String testSuiteName,
+      @Nullable Class<?> testClass,
+      @Nullable Long startTime,
+      boolean parallelized) {
+    return NoOpDDTestSuite.INSTANCE;
+  }
+}
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java
new file mode 100644
index 00000000000..48f768cee93
--- /dev/null
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java
@@ -0,0 +1,26 @@
+package datadog.trace.api.civisibility.noop;
+
+import datadog.trace.api.civisibility.DDTestModule;
+import datadog.trace.api.civisibility.DDTestSession;
+import javax.annotation.Nullable;
+
+public class NoOpDDTestSession implements DDTestSession {
+  public static final DDTestSession INSTANCE = new NoOpDDTestSession();
+
+  @Override
+  public void setTag(String key, Object value) {}
+
+  @Override
+  public void setErrorInfo(Throwable error) {}
+
+  @Override
+  public void setSkipReason(String skipReason) {}
+
+  @Override
+  public void end(@Nullable Long endTime) {}
+
+  @Override
+  public DDTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
+    return NoOpDDTestModule.INSTANCE;
+  }
+}
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java
new file mode 100644
index 00000000000..4fb420de390
--- /dev/null
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java
@@ -0,0 +1,27 @@
+package datadog.trace.api.civisibility.noop;
+
+import datadog.trace.api.civisibility.DDTest;
+import datadog.trace.api.civisibility.DDTestSuite;
+import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
+public class NoOpDDTestSuite implements DDTestSuite {
+  static final DDTestSuite INSTANCE = new NoOpDDTestSuite();
+
+  @Override
+  public void setTag(String key, Object value) {}
+
+  @Override
+  public void setErrorInfo(Throwable error) {}
+
+  @Override
+  public void setSkipReason(String skipReason) {}
+
+  @Override
+  public void end(@Nullable Long endTime) {}
+
+  @Override
+  public DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
+    return NoOpDDTest.INSTANCE;
+  }
+}
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
index 1a3d861c3ac..ec67ce1ec24 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
@@ -42,6 +42,7 @@ public final class CiVisibilityConfig {
   public static final String CIVISIBILITY_GIT_UPLOAD_ENABLED = "civisibility.git.upload.enabled";
   public static final String CIVISIBILITY_GIT_UNSHALLOW_ENABLED =
       "civisibility.git.unshallow.enabled";
+  public static final String CIVISIBILITY_GIT_UNSHALLOW_DEFER = "civisibility.git.unshallow.defer";
   public static final String CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS =
       "civisibility.git.upload.timeout.millis";
   public static final String CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS =
@@ -58,8 +59,13 @@ public final class CiVisibilityConfig {
       "civisibility.repo.index.sharing.enabled";
   public static final String CIVISIBILITY_MODULE_EXECUTION_SETTINGS_CACHE_SIZE =
       "civisibility.module.execution.settings.cache.size";
+  public static final String CIVISIBILITY_JVM_INFO_CACHE_SIZE = "civisibility.jvm.info.cache.size";
   public static final String CIVISIBILITY_COVERAGE_SEGMENTS_ENABLED =
       "civisibility.coverage.segments.enabled";
+  public static final String CIVISIBILITY_INJECTED_TRACER_VERSION =
+      "civisibility.injected.tracer.version";
+  public static final String CIVISIBILITY_RESOURCE_FOLDER_NAMES =
+      "civisibility.resource.folder.names";
 
   private CiVisibilityConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
index 921568f4a95..4d81b8c5f75 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
@@ -25,6 +25,10 @@ public final class DebuggerConfig {
   public static final String DEBUGGER_REDACTED_IDENTIFIERS =
       "dynamic.instrumentation.redacted.identifiers";
   public static final String DEBUGGER_REDACTED_TYPES = "dynamic.instrumentation.redacted.types";
+  public static final String DEBUGGER_SYMBOL_ENABLED = "symbol.database.upload.enabled";
+  public static final String DEBUGGER_SYMBOL_FORCE_UPLOAD = "internal.force.symbol.database.upload";
+  public static final String DEBUGGER_SYMBOL_INCLUDES = "symbol.database.includes";
+  public static final String DEBUGGER_SYMBOL_FLUSH_THRESHOLD = "symbol.database.flush.threshold";
 
   private DebuggerConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
index 2ac336a40a9..753a15b3480 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
@@ -29,6 +29,7 @@ public final class GeneralConfig {
   public static final String GLOBAL_TAGS = "trace.global.tags";
 
   public static final String TRACE_DEBUG = "trace.debug";
+  public static final String TRACE_TRIAGE = "trace.triage";
 
   public static final String STARTUP_LOGS_ENABLED = "trace.startup.logs";
 
@@ -66,9 +67,15 @@ public final class GeneralConfig {
 
   public static final String TELEMETRY_ENABLED = "instrumentation.telemetry.enabled";
   public static final String TELEMETRY_HEARTBEAT_INTERVAL = "telemetry.heartbeat.interval";
+  public static final String TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL =
+      "telemetry.extended.heartbeat.interval";
   public static final String TELEMETRY_METRICS_INTERVAL = "telemetry.metrics.interval";
+  public static final String TELEMETRY_METRICS_ENABLED = "telemetry.metrics.enabled";
   public static final String TELEMETRY_DEPENDENCY_COLLECTION_ENABLED =
       "telemetry.dependency-collection.enabled";
+  public static final String TELEMETRY_LOG_COLLECTION_ENABLED = "telemetry.log-collection.enabled";
+
+  public static final String TELEMETRY_DEBUG_REQUESTS_ENABLED = "telemetry.debug.requests.enabled";
 
   private GeneralConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
index 3b6aa5c284c..e70a42becc6 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
@@ -16,9 +16,10 @@ public final class IastConfig {
   public static final String IAST_REDACTION_ENABLED = "iast.redaction.enabled";
   public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern";
   public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern";
+  public static final String IAST_STACKTRACE_LEAK_SUPPRESS = "iast.stacktrace-leak.suppress";
   public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count";
 
-  public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.trunctation.max.value.length";
+  public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.truncation.max.value.length";
 
   private IastConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
index 84218ad8e4b..0548cfdeca3 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
@@ -114,8 +114,10 @@ public final class ProfilingConfig {
   public static final String PROFILING_DATADOG_PROFILER_CSTACK = "profiling.ddprof.cstack";
   public static final String PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT = "fp";
   public static final String PROFILING_DATADOG_PROFILER_SAFEMODE = "profiling.ddprof.safemode";
-  public static final int PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT =
-      12; // POP_METHOD|UNWIND_NATIVE
+
+  private static final int POP_METHOD = 4;
+  private static final int LAST_JAVA_PC = 16;
+  public static final int PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT = POP_METHOD | LAST_JAVA_PC;
 
   public static final String PROFILING_DATADOG_PROFILER_LINE_NUMBERS =
       "profiling.ddprof.linenumbers";
@@ -170,6 +172,9 @@ public final class ProfilingConfig {
   public static final String PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED =
       "profiling.context.attributes.span.name.enabled";
 
+  public static final String PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED =
+      "profiling.context.attributes.resource.name.enabled";
+
   public static final String PROFILING_QUEUEING_TIME_ENABLED =
       "profiling.experimental.queueing.time.enabled";
 
@@ -185,5 +190,12 @@ public final class ProfilingConfig {
   public static final String PROFILING_HEAP_HISTOGRAM_ENABLED = "profiling.heap.histogram.enabled";
   public static final boolean PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT = false;
 
+  public static final String PROFILING_HEAP_HISTOGRAM_MODE = "profiling.heap.histogram.mode";
+  public static final String PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT = "aftergc";
+
+  public static final String PROFILING_TIMELINE_EVENTS_ENABLED =
+      "profiling.timeline.events.enabled";
+  public static final boolean PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT = false;
+
   private ProfilingConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
index 62456ac0109..3833509a78a 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
@@ -40,6 +40,8 @@ public final class TraceInstrumentationConfig {
   public static final String HTTP_SERVER_TAG_QUERY_STRING = "http.server.tag.query-string";
   public static final String HTTP_SERVER_RAW_QUERY_STRING = "http.server.raw.query-string";
   public static final String HTTP_SERVER_RAW_RESOURCE = "http.server.raw.resource";
+  public static final String HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES =
+      "http.server.decoded.resource.preserve-spaces";
   public static final String HTTP_SERVER_ROUTE_BASED_NAMING = "http.server.route-based-naming";
   public static final String HTTP_CLIENT_TAG_QUERY_STRING = "http.client.tag.query-string";
   public static final String HTTP_CLIENT_TAG_HEADERS = "http.client.tag.headers";
@@ -90,6 +92,9 @@ public final class TraceInstrumentationConfig {
 
   public static final String GRPC_IGNORED_INBOUND_METHODS = "trace.grpc.ignored.inbound.methods";
   public static final String GRPC_IGNORED_OUTBOUND_METHODS = "trace.grpc.ignored.outbound.methods";
+
+  public static final String GOOGLE_PUBSUB_IGNORED_GRPC_METHODS =
+      "trace.google-pubsub.ignored.grpc.methods";
   public static final String GRPC_SERVER_TRIM_PACKAGE_RESOURCE =
       "trace.grpc.server.trim-package-resource";
   public static final String GRPC_SERVER_ERROR_STATUSES = "grpc.server.error.statuses";
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
index 3971d64eaa4..a4600c314a1 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
@@ -84,6 +84,7 @@ public final class TracerConfig {
   public static final String TRACE_PROPAGATION_STYLE = "trace.propagation.style";
   public static final String TRACE_PROPAGATION_STYLE_EXTRACT = "trace.propagation.style.extract";
   public static final String TRACE_PROPAGATION_STYLE_INJECT = "trace.propagation.style.inject";
+  public static final String TRACE_PROPAGATION_EXTRACT_FIRST = "trace.propagation.extract.first";
 
   public static final String ENABLE_TRACE_AGENT_V05 = "trace.agent.v0.5.enabled";
 
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java b/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
index e14d72bdcb3..f4ee47c4b22 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
@@ -20,7 +20,9 @@ static Profiling get() {
    *
    * @return a profiling scope which can be closed to restore the current state.
    */
-  ProfilingScope newScope();
+  default ProfilingScope newScope() {
+    return ProfilingScope.NO_OP;
+  }
 
   /**
    * Creates a decorator for the attribute, which can be used to set and clear contexts slightly
@@ -29,20 +31,11 @@ static Profiling get() {
    * @param attribute the name of the attribute
    * @return a setter which can be used to set and clear profiling context
    */
-  ProfilingContextAttribute createContextAttribute(String attribute);
+  default ProfilingContextAttribute createContextAttribute(String attribute) {
+    return ProfilingContextAttribute.NoOp.INSTANCE;
+  }
 
   final class NoOp implements Profiling {
-
     public static final NoOp INSTANCE = new NoOp();
-
-    @Override
-    public ProfilingContextAttribute createContextAttribute(String attribute) {
-      return ProfilingContextAttribute.NoOp.INSTANCE;
-    }
-
-    @Override
-    public ProfilingScope newScope() {
-      return ProfilingScope.NO_OP;
-    }
   }
 }
diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle
index eb468a2ddac..84d746b79c9 100644
--- a/dd-trace-core/build.gradle
+++ b/dd-trace-core/build.gradle
@@ -29,6 +29,7 @@ excludedClassesCoverage += [
   'datadog.trace.core.DDSpan.1',
   'datadog.trace.core.tagprocessor.QueryObfuscator.1',
   'datadog.trace.common.writer.TraceProcessingWorker.NonDaemonTraceSerializingHandler',
+  'datadog.trace.core.flare.*',
   // FIXME(DSM): test coverage needed
   'datadog.trace.core.datastreams.DataStreamContextInjector'
 ]
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java b/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
index 2bb44a3ca1c..6f8d612159a 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
@@ -8,7 +8,7 @@ static DDSpan create(
       @Nonnull String instrumentationName,
       final long timestampMicro,
       @Nonnull DDSpanContext context) {
-    return DDSpan.create(instrumentationName, timestampMicro, context);
+    return DDSpan.create(instrumentationName, timestampMicro, context, null);
   }
 
   static void setAllTags(@Nonnull DDSpanContext context, Map<String, ?> map) {
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java b/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
index 6d1a3c75c47..78dd3a07d11 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
@@ -61,7 +61,8 @@ public void init(TraceCounters counters, Blackhole blackhole) {
                 null,
                 NoopPathwayContext.INSTANCE,
                 false,
-                null));
+                null),
+            null);
     span =
         DDSpan.create(
             "benchmark",
@@ -85,7 +86,8 @@ public void init(TraceCounters counters, Blackhole blackhole) {
                 null,
                 NoopPathwayContext.INSTANCE,
                 false,
-                null));
+                null),
+            null);
   }
 
   @Threads(4)
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java b/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
index f08709b5a9b..f8c979a2da8 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
@@ -119,6 +119,7 @@ private DDSpan createSpanWithOrigin(int iter, final String origin) {
             null,
             NoopPathwayContext.INSTANCE,
             false,
-            null));
+            null),
+        null);
   }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
index d19209585e2..74ef320b527 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
@@ -58,6 +58,9 @@ private CiTestCovMapperV2(int size) {
   public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
     List<TestReport> testReports =
         trace.stream()
+            // only consider top-level spans (tests), since children spans
+            // share test reports with their parents
+            .filter(CoreSpan::isTopLevel)
             .map(CiTestCovMapperV2::getTestReport)
             .filter(Objects::nonNull)
             .filter(TestReport::isNotEmpty)
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
index 78be5e7273b..580fce1a1c4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
@@ -52,8 +52,8 @@ public static RuleBasedTraceSampler build(
 
     final List<SamplingRule> samplingRules = new ArrayList<>();
 
-    if (traceSamplingRules != null) {
-      if ((!serviceRules.isEmpty() || !operationRules.isEmpty()) && !traceSamplingRules.isEmpty()) {
+    if (traceSamplingRules != null && !traceSamplingRules.isEmpty()) {
+      if ((!serviceRules.isEmpty() || !operationRules.isEmpty())) {
         log.warn(
             "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
             TracerConfig.TRACE_SAMPLING_SERVICE_RULES,
@@ -67,6 +67,7 @@ public static RuleBasedTraceSampler build(
             new TraceSamplingRule(
                 rule.getService(),
                 rule.getName(),
+                rule.getResource(),
                 new DeterministicSampler.TraceSampler(rule.getSampleRate()));
         samplingRules.add(samplingRule);
       }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
index b9307944e1d..63309af2b96 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
@@ -34,14 +34,13 @@ public static Sampler forConfig(final Config config, final TraceConfig traceConf
         final Map<String, String> serviceRules = config.getTraceSamplingServiceRules();
         final Map<String, String> operationRules = config.getTraceSamplingOperationRules();
         String traceSamplingRulesJson = config.getTraceSamplingRules();
-        TraceSamplingRules traceSamplingRules = null;
+        TraceSamplingRules traceSamplingRules = TraceSamplingRules.EMPTY;
         if (traceSamplingRulesJson != null) {
           traceSamplingRules = TraceSamplingRules.deserialize(traceSamplingRulesJson);
         }
         boolean serviceRulesDefined = serviceRules != null && !serviceRules.isEmpty();
         boolean operationRulesDefined = operationRules != null && !operationRules.isEmpty();
-        boolean jsonTraceSamplingRulesDefined =
-            traceSamplingRules != null && !traceSamplingRules.isEmpty();
+        boolean jsonTraceSamplingRulesDefined = !traceSamplingRules.isEmpty();
         if ((serviceRulesDefined || operationRulesDefined) && jsonTraceSamplingRulesDefined) {
           log.warn(
               "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SamplingRule.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SamplingRule.java
index e5fdbb9d8f7..59d1f47daed 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SamplingRule.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SamplingRule.java
@@ -1,7 +1,8 @@
 package datadog.trace.common.sampling;
 
 import datadog.trace.core.CoreSpan;
-import datadog.trace.core.util.GlobPattern;
+import datadog.trace.core.util.Matcher;
+import datadog.trace.core.util.Matchers;
 import datadog.trace.core.util.SimpleRateLimiter;
 import java.util.regex.Pattern;
 
@@ -74,28 +75,32 @@ protected <T extends CoreSpan<T>> CharSequence getRelevantString(final T span) {
   }
 
   public static final class TraceSamplingRule extends SamplingRule {
-    private final String serviceName;
-    private final String operationName;
+    private final Matcher serviceMatcher;
+    private final Matcher operationMatcher;
+    private final Matcher resourceMatcher;
 
     public TraceSamplingRule(
-        final String exactServiceName, final String exactOperationName, final RateSampler sampler) {
+        final String serviceGlob,
+        final String operationGlob,
+        final String resourceGlob,
+        final RateSampler sampler) {
       super(sampler);
-      this.serviceName = exactServiceName;
-      this.operationName = exactOperationName;
+      serviceMatcher = Matchers.compileGlob(serviceGlob);
+      operationMatcher = Matchers.compileGlob(operationGlob);
+      resourceMatcher = Matchers.compileGlob(resourceGlob);
     }
 
     @Override
     public <T extends CoreSpan<T>> boolean matches(T span) {
-      return (serviceName == null || serviceName.equals(span.getServiceName()))
-          && (operationName == null || operationName.contentEquals(span.getOperationName()));
+      return Matchers.matches(serviceMatcher, span.getServiceName())
+          && Matchers.matches(operationMatcher, span.getOperationName())
+          && Matchers.matches(resourceMatcher, span.getResourceName());
     }
   }
 
   public static final class SpanSamplingRule extends SamplingRule {
-    private final String serviceExactName;
-    private final Pattern servicePattern;
-    private final String operationExactName;
-    private final Pattern operationPattern;
+    private final Matcher serviceMatcher;
+    private final Matcher operationMatcher;
 
     private final SimpleRateLimiter rateLimiter;
 
@@ -106,43 +111,16 @@ public SpanSamplingRule(
         final SimpleRateLimiter rateLimiter) {
       super(sampler);
 
-      if (serviceName == null || "*".equals(serviceName)) {
-        this.serviceExactName = null;
-        this.servicePattern = null;
-      } else if (isExactMatcher(serviceName)) {
-        this.serviceExactName = serviceName;
-        this.servicePattern = null;
-      } else {
-        this.serviceExactName = null;
-        this.servicePattern = GlobPattern.globToRegexPattern(serviceName);
-      }
-
-      if (operationName == null || "*".equals(operationName)) {
-        this.operationExactName = null;
-        this.operationPattern = null;
-      } else if (isExactMatcher(operationName)) {
-        this.operationExactName = operationName;
-        this.operationPattern = null;
-      } else {
-        this.operationExactName = null;
-        this.operationPattern = GlobPattern.globToRegexPattern(operationName);
-      }
+      serviceMatcher = Matchers.compileGlob(serviceName);
+      operationMatcher = Matchers.compileGlob(operationName);
 
       this.rateLimiter = rateLimiter;
     }
 
-    private boolean isExactMatcher(String serviceNameGlob) {
-      return !serviceNameGlob.contains("*") && !serviceNameGlob.contains("?");
-    }
-
     @Override
     public <T extends CoreSpan<T>> boolean matches(T span) {
-      return (serviceExactName == null || serviceExactName.equals(span.getServiceName()))
-          && (servicePattern == null || servicePattern.matcher(span.getServiceName()).matches())
-          && (operationExactName == null
-              || operationExactName.contentEquals(span.getOperationName()))
-          && (operationPattern == null
-              || operationPattern.matcher(span.getOperationName()).matches());
+      return Matchers.matches(serviceMatcher, span.getServiceName())
+          && Matchers.matches(operationMatcher, span.getOperationName());
     }
 
     @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
index 63d7f58f2dd..2d01192465c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
@@ -36,12 +36,12 @@ public static SingleSpanSampler forConfig(Config config) {
 
       if (spanSamplingRulesDefined) {
         SpanSamplingRules rules = SpanSamplingRules.deserialize(spanSamplingRules);
-        if (rules != null) {
+        if (!rules.isEmpty()) {
           return new RuleBasedSingleSpanSampler(rules);
         }
       } else if (spanSamplingRulesFileDefined) {
         SpanSamplingRules rules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
-        if (rules != null) {
+        if (!rules.isEmpty()) {
           return new RuleBasedSingleSpanSampler(rules);
         }
       }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
index 132d30c2d9c..954ded54801 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
@@ -5,6 +5,7 @@
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
+import datadog.trace.api.sampling.SamplingRule;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -12,193 +13,195 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import okio.Okio;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Represents list of Span Sampling Rules read from JSON. See SPAN_SAMPLING_RULES */
 public class SpanSamplingRules {
-
+  public static final SpanSamplingRules EMPTY = new SpanSamplingRules(Collections.emptyList());
   private static final Logger log = LoggerFactory.getLogger(SpanSamplingRules.class);
+  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
+  private static final ParameterizedType LIST_OF_RULES =
+      Types.newParameterizedType(List.class, Rule.class);
+  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
+  private final List<Rule> rules;
 
-  public static final class Rule {
-    public static Rule create(
-        String service, String name, Double sampleRate, Integer maxPerSecond) {
-      if (sampleRate == null) {
-        sampleRate = 1.0;
-      } else if (sampleRate < 0 || sampleRate > 1.0) {
-        logError(
-            service,
-            name,
-            Double.toString(sampleRate),
-            maxPerSecond == null ? null : Double.toString(maxPerSecond),
-            "sample_rate must be between 0.0 and 1.0");
-        return null;
-      }
-      if (maxPerSecond == null) {
-        maxPerSecond = Integer.MAX_VALUE;
-      } else if (maxPerSecond < 1) {
-        logError(
-            service,
-            name,
-            Double.toString(sampleRate),
-            Double.toString(maxPerSecond),
-            "max_per_second must be greater than zero");
-        return null;
-      }
-      return new Rule(service, name, sampleRate, maxPerSecond);
+  public SpanSamplingRules(List<Rule> rules) {
+    this.rules = Collections.unmodifiableList(rules);
+  }
+
+  public static SpanSamplingRules deserialize(String json) {
+    SpanSamplingRules result = EMPTY;
+    try {
+      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
+    } catch (Throwable ex) {
+      log.error("Couldn't parse Span Sampling Rules from JSON: {}", json, ex);
     }
+    return result;
+  }
 
-    public static Rule create(String service, String name, String sampleRate, String maxPerSecond) {
-      double sampleRateParsed = 1.0;
-      if (sampleRate != null) {
-        try {
-          sampleRateParsed = Double.parseDouble(sampleRate);
-        } catch (NumberFormatException ex) {
-          logError(
-              service,
-              name,
-              sampleRate,
-              maxPerSecond,
-              "sample_rate must be a number between 0.0 and 1.0");
-          return null;
-        }
-      }
-      Integer maxPerSecondParsed = null;
-      if (maxPerSecond != null) {
-        try {
-          maxPerSecondParsed = Integer.parseInt(maxPerSecond);
-        } catch (NumberFormatException ex) {
-          logError(
-              service, name, sampleRate, maxPerSecond, "max_per_second must be greater than zero");
-          return null;
-        }
-      }
-      return create(service, name, sampleRateParsed, maxPerSecondParsed);
+  public static SpanSamplingRules deserializeFile(String jsonFile) {
+    SpanSamplingRules result = EMPTY;
+    try (JsonReader reader = JsonReader.of(Okio.buffer(Okio.source(new File(jsonFile))))) {
+      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(reader));
+    } catch (FileNotFoundException e) {
+      log.warn("Span Sampling Rules file {} doesn't exist", jsonFile);
+    } catch (IOException e) {
+      log.error("Couldn't read Span Sampling Rules file {}.", jsonFile, e);
+    } catch (Throwable ex) {
+      log.error("Couldn't parse Span Sampling Rules from JSON file {}.", jsonFile, ex);
     }
+    return result;
+  }
 
-    private static void logError(
-        String service, String name, String sampleRate, String maxPerSecond, String error) {
-      log.error(
-          "Skipping invalid Trace Sampling Rule: { \"service\": \""
-              + service
-              + "\", \"name\": \""
-              + name
-              + "\", \"sample_rate\": "
-              + sampleRate
-              + "\", \"max_per_second\": "
-              + maxPerSecond
-              + " } - "
-              + error);
+  private static SpanSamplingRules filterOutNullRules(List<Rule> rules) {
+    if (rules == null || rules.isEmpty()) {
+      return EMPTY;
+    }
+    List<Rule> notNullRules = new ArrayList<>(rules.size());
+    for (Rule rule : rules) {
+      if (rule != null) {
+        notNullRules.add(rule);
+      }
     }
+    if (notNullRules.isEmpty()) {
+      return EMPTY;
+    }
+    return new SpanSamplingRules(notNullRules);
+  }
 
-    private final String service;
+  public List<Rule> getRules() {
+    return rules;
+  }
 
-    private final String name;
+  public boolean isEmpty() {
+    return rules.isEmpty();
+  }
 
+  public static final class Rule implements SamplingRule.SpanSamplingRule {
+    private final String service;
+    private final String name;
+    private final String resource;
+    private final Map<String, String> tags;
     private final double sampleRate;
     private final int maxPerSecond;
 
-    private Rule(String service, String name, double sampleRate, int maxPerSecond) {
+    private Rule(
+        String service,
+        String name,
+        String resource,
+        Map<String, String> tags,
+        double sampleRate,
+        int maxPerSecond) {
       this.service = service;
       this.name = name;
+      this.resource = resource;
+      this.tags = tags;
       this.sampleRate = sampleRate;
       this.maxPerSecond = maxPerSecond;
     }
 
+    /**
+     * Validate and create a {@link Rule} from its {@link JsonRule} representation.
+     *
+     * @param jsonRule The {@link JsonRule} to validate.
+     * @return A {@link Rule} if the {@link JsonRule} is valid, {@code null} otherwise.
+     */
+    public static Rule create(JsonRule jsonRule) {
+      String service = SamplingRule.normalizeGlob(jsonRule.service);
+      String name = SamplingRule.normalizeGlob(jsonRule.name);
+      String resource = SamplingRule.normalizeGlob(jsonRule.resource);
+      Map<String, String> tags = jsonRule.tags;
+      if (tags == null) {
+        tags = Collections.emptyMap();
+      }
+      double sampleRate = 1D;
+      if (jsonRule.sample_rate != null) {
+        try {
+          sampleRate = Double.parseDouble(jsonRule.sample_rate);
+        } catch (NumberFormatException ex) {
+          logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
+          return null;
+        }
+        if (sampleRate < 0D || sampleRate > 1D) {
+          logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
+          return null;
+        }
+      }
+      int maxPerSecond = Integer.MAX_VALUE;
+      if (jsonRule.max_per_second != null) {
+        try {
+          double parsedMaxPerSeconds = Double.parseDouble(jsonRule.max_per_second);
+          if (parsedMaxPerSeconds <= 0) {
+            logRuleError(jsonRule, "max_per_second must be greater than 0.0");
+            return null;
+          }
+          maxPerSecond = Math.max((int) parsedMaxPerSeconds, 1);
+        } catch (NumberFormatException ex) {
+          logRuleError(jsonRule, "max_per_second must be a number greater than 0.0");
+          return null;
+        }
+      }
+      return new Rule(service, name, resource, tags, sampleRate, maxPerSecond);
+    }
+
+    private static void logRuleError(JsonRule rule, String error) {
+      log.error("Skipping invalid Span Sampling Rule: {} - {}", rule, error);
+    }
+
+    @Override
     public String getService() {
       return service;
     }
 
+    @Override
     public String getName() {
       return name;
     }
 
-    public double getSampleRate() {
-      return sampleRate;
+    @Override
+    public String getResource() {
+      return resource;
     }
 
-    public int getMaxPerSecond() {
-      return maxPerSecond;
-    }
-  }
-
-  public static SpanSamplingRules deserialize(String json) {
-    try {
-      List<Rule> rules = LIST_OF_RULES_ADAPTER.fromJson(json);
-      return filterOutNullRules(rules);
-    } catch (Throwable ex) {
-      log.error("Couldn't parse Span Sampling Rules from JSON: {}", json, ex);
-      return null;
+    @Override
+    public Map<String, String> getTags() {
+      return tags;
     }
-  }
 
-  public static SpanSamplingRules deserializeFile(String jsonFile) {
-    try (JsonReader reader = JsonReader.of(Okio.buffer(Okio.source(new File(jsonFile))))) {
-      List<Rule> rules = LIST_OF_RULES_ADAPTER.fromJson(reader);
-      return filterOutNullRules(rules);
-    } catch (FileNotFoundException e) {
-      log.warn("Span sampling rules file {} doesn't exit", jsonFile);
-    } catch (IOException e) {
-      log.error("Couldn't read Span sampling rules file {}. Failed with {}", jsonFile, e);
-    } catch (Throwable ex) {
-      log.error(
-          "Couldn't parse Span Sampling Rules from JSON file {}. Failed with {}", jsonFile, ex);
+    @Override
+    public double getSampleRate() {
+      return sampleRate;
     }
-    return null;
-  }
 
-  private static SpanSamplingRules filterOutNullRules(List<Rule> rules) {
-    if (rules == null) {
-      return null;
-    }
-    List<Rule> notNullRules = new ArrayList<>(rules.size());
-    for (Rule rule : rules) {
-      if (rule != null) {
-        notNullRules.add(rule);
-      }
-    }
-    if (notNullRules.isEmpty()) {
-      return null;
+    @Override
+    public int getMaxPerSecond() {
+      return maxPerSecond;
     }
-    return new SpanSamplingRules(notNullRules);
   }
 
   private static final class JsonRule {
+    private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
+
     String service;
     String name;
-    String sample_rate;
-    String max_per_second;
-
-    private Rule toRule() {
-      return Rule.create(service, name, sample_rate, max_per_second);
+    String resource;
+    Map<String, String> tags;
+    String sample_rate; // Use String to be able to map int as double
+    String max_per_second; // Use String to be able to map int as double
+
+    @Override
+    public String toString() {
+      return jsonAdapter.toJson(this);
     }
   }
 
   private static final class RuleAdapter {
     @FromJson
     Rule fromJson(JsonRule jsonRule) {
-      return jsonRule.toRule();
+      return Rule.create(jsonRule);
     }
   }
-
-  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
-
-  private static final ParameterizedType LIST_OF_RULES =
-      Types.newParameterizedType(List.class, Rule.class);
-  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
-
-  private final List<Rule> rules;
-
-  public SpanSamplingRules(List<Rule> rules) {
-    this.rules = rules;
-  }
-
-  public List<Rule> getRules() {
-    return Collections.unmodifiableList(rules);
-  }
-
-  public boolean isEmpty() {
-    return rules.isEmpty();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
index ebba4c1929c..22ef8263de6 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
@@ -4,127 +4,182 @@
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
+import datadog.trace.api.sampling.SamplingRule;
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Represents list of Trace Sampling Rules read from JSON. See TRACE_SAMPLING_RULES */
 public class TraceSamplingRules {
 
+  public static final TraceSamplingRules EMPTY = new TraceSamplingRules(Collections.emptyList());
   private static final Logger log = LoggerFactory.getLogger(TraceSamplingRules.class);
+  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
+  private static final ParameterizedType LIST_OF_RULES =
+      Types.newParameterizedType(List.class, Rule.class);
+  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
+  private final List<Rule> rules;
 
-  public static final class Rule {
-    public static Rule create(String service, String name, double sampleRate) {
-      if (sampleRate < 0 || sampleRate > 1.0) {
-        logError(
-            service, name, Double.toString(sampleRate), "sample_rate must be between 0.0 and 1.0");
-        return null;
-      }
-      return new Rule(service, name, sampleRate);
+  public TraceSamplingRules(List<Rule> rules) {
+    this.rules = Collections.unmodifiableList(rules);
+  }
+
+  public static TraceSamplingRules deserialize(String json) {
+    TraceSamplingRules result = EMPTY;
+    try {
+      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
+    } catch (Throwable ex) {
+      log.error("Couldn't parse Trace Sampling Rules from JSON: {}", json, ex);
     }
+    return result;
+  }
 
-    public static Rule create(String service, String name, String sample_rate) {
-      if (sample_rate == null) {
-        logError(service, name, null, "missing mandatory sample_rate");
-        return null;
-      }
-      try {
-        return create(service, name, Double.parseDouble(sample_rate));
-      } catch (NumberFormatException ex) {
-        logError(service, name, sample_rate, "sample_rate must be a number between 0.0 and 1.0");
-        return null;
+  private static TraceSamplingRules filterOutNullRules(List<Rule> rules) {
+    if (rules == null || rules.isEmpty()) {
+      return EMPTY;
+    }
+    List<Rule> notNullRules = new ArrayList<>(rules.size());
+    for (Rule rule : rules) {
+      if (rule != null) {
+        notNullRules.add(rule);
       }
     }
-
-    private static void logError(String service, String name, String sample_rate, String error) {
-      log.error(
-          "Skipping invalid Trace Sampling Rule: { \"service\": \""
-              + service
-              + "\", \"name\": \""
-              + name
-              + "\", \"sample_rate\": "
-              + sample_rate
-              + " } - "
-              + error);
+    if (notNullRules.isEmpty()) {
+      return EMPTY;
     }
+    return new TraceSamplingRules(notNullRules);
+  }
 
-    private final String service;
+  public List<Rule> getRules() {
+    return rules;
+  }
 
-    private final String name;
+  public boolean isEmpty() {
+    return this.rules.isEmpty();
+  }
 
+  public static final class Rule implements SamplingRule.TraceSamplingRule {
+    private final String service;
+    private final String name;
+    private final String resource;
+    private final Map<String, String> tags;
+    private final TargetSpan targetSpan;
     private final double sampleRate;
 
-    private Rule(String service, String name, double sampleRate) {
+    private Rule(
+        String service,
+        String name,
+        String resource,
+        Map<String, String> tags,
+        TargetSpan targetSpan,
+        double sampleRate) {
       this.service = service;
       this.name = name;
+      this.resource = resource;
+      this.tags = tags;
+      this.targetSpan = targetSpan;
       this.sampleRate = sampleRate;
     }
 
+    /**
+     * Validate and create a {@link Rule} from its {@link JsonRule} representation.
+     *
+     * @param jsonRule The {@link JsonRule} to validate.
+     * @return A {@link Rule} if the {@link JsonRule} is valid, {@code null} otherwise.
+     */
+    public static Rule create(JsonRule jsonRule) {
+      String service = SamplingRule.normalizeGlob(jsonRule.service);
+      String name = SamplingRule.normalizeGlob(jsonRule.name);
+      String resource = SamplingRule.normalizeGlob(jsonRule.resource);
+      Map<String, String> tags = jsonRule.tags;
+      if (tags == null) {
+        tags = Collections.emptyMap();
+      }
+      TargetSpan targetSpan = TargetSpan.ROOT;
+      if (jsonRule.target_span != null) {
+        try {
+          targetSpan = TargetSpan.valueOf(jsonRule.target_span.toUpperCase(Locale.ROOT));
+        } catch (IllegalArgumentException ex) {
+          logRuleError(jsonRule, "target_span must be either \"root\" or \"any\"");
+          return null;
+        }
+      }
+      double sampleRate = 1D;
+      if (jsonRule.sample_rate != null) {
+        try {
+          sampleRate = Double.parseDouble(jsonRule.sample_rate);
+        } catch (NumberFormatException ex) {
+          logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
+          return null;
+        }
+        if (sampleRate < 0D || sampleRate > 1D) {
+          logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
+          return null;
+        }
+      }
+      return new Rule(service, name, resource, tags, targetSpan, sampleRate);
+    }
+
+    private static void logRuleError(JsonRule rule, String error) {
+      log.error("Skipping invalid Trace Sampling Rule: {} - {}", rule, error);
+    }
+
+    @Override
     public String getService() {
       return service;
     }
 
+    @Override
     public String getName() {
       return name;
     }
 
-    public double getSampleRate() {
-      return sampleRate;
+    @Override
+    public String getResource() {
+      return resource;
     }
-  }
 
-  public static TraceSamplingRules deserialize(String json) {
-    try {
-      return new TraceSamplingRules(LIST_OF_RULES_ADAPTER.fromJson(json));
-    } catch (Throwable ex) {
-      log.error("Couldn't parse Trace Sampling Rules from JSON: {}", json, ex);
-      return null;
+    @Override
+    public Map<String, String> getTags() {
+      return tags;
+    }
+
+    @Override
+    public TargetSpan getTargetSpan() {
+      return targetSpan;
+    }
+
+    @Override
+    public double getSampleRate() {
+      return sampleRate;
     }
   }
 
   private static final class JsonRule {
+    private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
+
     String service;
     String name;
+    String resource;
+    Map<String, String> tags;
+    String target_span;
     String sample_rate;
 
-    private Rule toRule() {
-      return Rule.create(service, name, sample_rate);
+    @Override
+    public String toString() {
+      return jsonAdapter.toJson(this);
     }
   }
 
   private static final class RuleAdapter {
     @FromJson
     Rule fromJson(JsonRule jsonRule) {
-      return jsonRule.toRule();
+      return Rule.create(jsonRule);
     }
   }
-
-  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
-
-  private static final ParameterizedType LIST_OF_RULES =
-      Types.newParameterizedType(List.class, Rule.class);
-  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
-
-  private final List<Rule> rules;
-
-  public TraceSamplingRules(List<Rule> rules) {
-    List<Rule> notNullRules = new ArrayList<>(rules.size());
-    for (Rule rule : rules) {
-      if (rule != null) {
-        notNullRules.add(rule);
-      }
-    }
-    this.rules = notNullRules;
-  }
-
-  public List<Rule> getRules() {
-    return Collections.unmodifiableList(rules);
-  }
-
-  public boolean isEmpty() {
-    return rules.isEmpty();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
index d7395c1f936..a563695ee6e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
@@ -164,6 +164,7 @@ private static RemoteApi createDDIntakeRemoteApi(
       TrackType trackType) {
     if (featuresDiscovery.supportsEvpProxy() && !config.isCiVisibilityAgentlessEnabled()) {
       return DDEvpProxyApi.builder()
+          .httpClient(commObjects.okHttpClient)
           .agentUrl(commObjects.agentUrl)
           .evpProxyEndpoint(featuresDiscovery.getEvpProxyEndpoint())
           .trackType(trackType)
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
index e0c0d8f69e8..6823a7b55a2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
@@ -64,7 +64,7 @@ public DDEvpProxyApiBuilder agentUrl(final HttpUrl agentUrl) {
       return this;
     }
 
-    DDEvpProxyApiBuilder httpClient(final OkHttpClient httpClient) {
+    public DDEvpProxyApiBuilder httpClient(final OkHttpClient httpClient) {
       this.httpClient = httpClient;
       return this;
     }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
index 8fda7bacb56..67fa8d3fca1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -2,7 +2,7 @@
 
 import static datadog.communication.monitor.DDAgentStatsDClientManager.statsDClientManager;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
-import static datadog.trace.api.DDTags.SPAN_LINKS;
+import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
 import static datadog.trace.common.metrics.MetricsAggregatorFactory.createMetricsAggregator;
 import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableMap;
@@ -62,6 +62,8 @@
 import datadog.trace.common.metrics.MetricsAggregator;
 import datadog.trace.common.sampling.Sampler;
 import datadog.trace.common.sampling.SingleSpanSampler;
+import datadog.trace.common.sampling.SpanSamplingRules;
+import datadog.trace.common.sampling.TraceSamplingRules;
 import datadog.trace.common.writer.DDAgentWriter;
 import datadog.trace.common.writer.Writer;
 import datadog.trace.common.writer.WriterFactory;
@@ -69,6 +71,7 @@
 import datadog.trace.core.datastreams.DataStreamContextInjector;
 import datadog.trace.core.datastreams.DataStreamsMonitoring;
 import datadog.trace.core.datastreams.DefaultDataStreamsMonitoring;
+import datadog.trace.core.flare.TracerFlarePoller;
 import datadog.trace.core.histogram.Histograms;
 import datadog.trace.core.monitor.HealthMetrics;
 import datadog.trace.core.monitor.MonitoringImpl;
@@ -141,6 +144,8 @@ public static CoreTracerBuilder builder() {
   /** Nanosecond offset to counter clock drift */
   private volatile long counterDrift;
 
+  private final TracerFlarePoller tracerFlarePoller;
+
   private final TracingConfigPoller tracingConfigPoller;
 
   private final PendingTraceBuffer pendingTraceBuffer;
@@ -266,6 +271,7 @@ public static class CoreTracerBuilder {
     private DataStreamsMonitoring dataStreamsMonitoring;
     private ProfilingContextIntegration profilingContextIntegration =
         ProfilingContextIntegration.NoOp.INSTANCE;
+    private boolean pollForTracerFlareRequests;
     private boolean pollForTracingConfiguration;
     private boolean injectBaggageAsTags;
 
@@ -386,6 +392,11 @@ public CoreTracerBuilder profilingContextIntegration(
       return this;
     }
 
+    public CoreTracerBuilder pollForTracerFlareRequests() {
+      this.pollForTracerFlareRequests = true;
+      return this;
+    }
+
     public CoreTracerBuilder pollForTracingConfiguration() {
       this.pollForTracingConfiguration = true;
       return this;
@@ -454,6 +465,7 @@ public CoreTracer build() {
           timeSource,
           dataStreamsMonitoring,
           profilingContextIntegration,
+          pollForTracerFlareRequests,
           pollForTracingConfiguration,
           injectBaggageAsTags);
     }
@@ -484,6 +496,7 @@ private CoreTracer(
       final TimeSource timeSource,
       final DataStreamsMonitoring dataStreamsMonitoring,
       final ProfilingContextIntegration profilingContextIntegration,
+      final boolean pollForTracerFlareRequests,
       final boolean pollForTracingConfiguration,
       final boolean injectBaggageAsTags) {
 
@@ -505,9 +518,25 @@ private CoreTracer(
     this.initialConfig = config;
     this.initialSampler = sampler;
 
+    // Get initial Trace Sampling Rules from config
+    TraceSamplingRules traceSamplingRules =
+        config.getTraceSamplingRules() == null
+            ? TraceSamplingRules.EMPTY
+            : TraceSamplingRules.deserialize(config.getTraceSamplingRules());
+    // Get initial Span Sampling Rules from config
+    String spanSamplingRulesJson = config.getSpanSamplingRules();
+    String spanSamplingRulesFile = config.getSpanSamplingRulesFile();
+    SpanSamplingRules spanSamplingRules = SpanSamplingRules.EMPTY;
+    if (spanSamplingRulesJson != null) {
+      spanSamplingRules = SpanSamplingRules.deserialize(spanSamplingRulesJson);
+    } else if (spanSamplingRulesFile != null) {
+      spanSamplingRules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
+    }
+
     this.dynamicConfig =
         DynamicConfig.create(ConfigSnapshot::new)
             .setDebugEnabled(config.isDebugEnabled())
+            .setTriageEnabled(config.isTriageEnabled())
             .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
             .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
             .setDataStreamsEnabled(config.isDataStreamsEnabled())
@@ -515,10 +544,11 @@ private CoreTracer(
             .setHeaderTags(taggedHeaders)
             .setBaggageMapping(baggageMapping)
             .setTraceSampleRate(config.getTraceSampleRate())
+            .setSpanSamplingRules(spanSamplingRules.getRules())
+            .setTraceSamplingRules(traceSamplingRules.getRules())
             .apply();
 
     this.logs128bTraceIdEnabled = InstrumenterConfig.get().isLogs128bTraceIdEnabled();
-    this.localRootSpanTags = localRootSpanTags;
     this.defaultSpanTags = defaultSpanTags;
     this.partialFlushMinSpans = partialFlushMinSpans;
     this.idGenerationStrategy =
@@ -572,6 +602,11 @@ private CoreTracer(
     sharedCommunicationObjects.monitoring = monitoring;
     sharedCommunicationObjects.createRemaining(config);
 
+    tracerFlarePoller = new TracerFlarePoller(dynamicConfig);
+    if (pollForTracerFlareRequests) {
+      tracerFlarePoller.start(config, sharedCommunicationObjects);
+    }
+
     tracingConfigPoller = new TracingConfigPoller(dynamicConfig);
     if (pollForTracingConfiguration) {
       tracingConfigPoller.start(config, sharedCommunicationObjects);
@@ -669,6 +704,13 @@ private CoreTracer(
     this.profilingContextIntegration = profilingContextIntegration;
     this.injectBaggageAsTags = injectBaggageAsTags;
     this.allowInferredServices = SpanNaming.instance().namingSchema().allowInferredServices();
+    if (profilingContextIntegration != ProfilingContextIntegration.NoOp.INSTANCE) {
+      Map<String, Object> tmp = new HashMap<>(localRootSpanTags);
+      tmp.put(PROFILING_CONTEXT_ENGINE, profilingContextIntegration.name());
+      this.localRootSpanTags = tryMakeImmutableMap(tmp);
+    } else {
+      this.localRootSpanTags = localRootSpanTags;
+    }
   }
 
   /** Used by AgentTestRunner to inject configuration into the test tracer. */
@@ -676,6 +718,7 @@ public void rebuildTraceConfig(Config config) {
     dynamicConfig
         .initial()
         .setDebugEnabled(config.isDebugEnabled())
+        .setTriageEnabled(config.isTriageEnabled())
         .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
         .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
         .setDataStreamsEnabled(config.isDataStreamsEnabled())
@@ -1042,6 +1085,7 @@ public void close() {
     metricsAggregator.close();
     dataStreamsMonitoring.close();
     externalAgentLauncher.close();
+    tracerFlarePoller.stop();
   }
 
   @Override
@@ -1192,7 +1236,8 @@ public CoreSpanBuilder ignoreActiveSpan() {
     }
 
     private DDSpan buildSpan() {
-      DDSpan span = DDSpan.create(instrumentationName, timestampMicro, buildSpanContext());
+      addTerminatedContextAsLinks();
+      DDSpan span = DDSpan.create(instrumentationName, timestampMicro, buildSpanContext(), links);
       if (span.isLocalRootSpan()) {
         EndpointTracker tracker = tracer.onRootSpanStarted(span);
         span.setEndpointTracker(tracker);
@@ -1200,6 +1245,19 @@ private DDSpan buildSpan() {
       return span;
     }
 
+    private void addTerminatedContextAsLinks() {
+      if (this.parent instanceof TagContext) {
+        List<AgentSpanLink> terminatedContextLinks =
+            ((TagContext) this.parent).getTerminatedContextLinks();
+        if (!terminatedContextLinks.isEmpty()) {
+          if (this.links == null) {
+            this.links = new ArrayList<>();
+          }
+          this.links.addAll(terminatedContextLinks);
+        }
+      }
+    }
+
     @Override
     public AgentSpan start() {
       return buildSpan();
@@ -1298,10 +1356,12 @@ public <T> AgentTracer.SpanBuilder withRequestContextData(RequestContextSlot slo
 
     @Override
     public AgentTracer.SpanBuilder withLink(AgentSpanLink link) {
-      if (this.links == null) {
-        this.links = new ArrayList<>();
+      if (link != null) {
+        if (this.links == null) {
+          this.links = new ArrayList<>();
+        }
+        this.links.add(link);
       }
-      this.links.add(link);
       return this;
     }
 
@@ -1455,8 +1515,7 @@ private DDSpanContext buildSpanContext() {
           (null == tags ? 0 : tags.size())
               + defaultSpanTags.size()
               + (null == coreTags ? 0 : coreTags.size())
-              + (null == rootSpanTags ? 0 : rootSpanTags.size())
-              + (null == links ? 0 : 1);
+              + (null == rootSpanTags ? 0 : rootSpanTags.size());
 
       if (builderRequestContextDataAppSec != null) {
         requestContextDataAppSec = builderRequestContextDataAppSec;
@@ -1501,9 +1560,6 @@ private DDSpanContext buildSpanContext() {
       context.setAllTags(tags);
       context.setAllTags(coreTags);
       context.setAllTags(rootSpanTags);
-      if (links != null) {
-        context.setTag(SPAN_LINKS, DDSpanLink.toTag(links));
-      }
       return context;
     }
   }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
index d999aef84c6..dfa76bf0975 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
@@ -23,13 +23,16 @@
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
 import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper;
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import javax.annotation.Nonnull;
@@ -50,8 +53,11 @@ public class DDSpan
   public static final String CHECKPOINTED_TAG = "checkpointed";
 
   static DDSpan create(
-      final String instrumentationName, final long timestampMicro, @Nonnull DDSpanContext context) {
-    final DDSpan span = new DDSpan(instrumentationName, timestampMicro, context);
+      final String instrumentationName,
+      final long timestampMicro,
+      @Nonnull DDSpanContext context,
+      final List<AgentSpanLink> links) {
+    final DDSpan span = new DDSpan(instrumentationName, timestampMicro, context, links);
     log.debug("Started span: {}", span);
     context.getTrace().registerSpan(span);
     return span;
@@ -105,6 +111,8 @@ static DDSpan create(
    */
   private volatile int longRunningVersion = 0;
 
+  private final List<AgentSpanLink> links;
+
   /**
    * Spans should be constructed using the builder, not by calling the constructor directly.
    *
@@ -115,7 +123,8 @@ static DDSpan create(
   private DDSpan(
       @Nonnull String instrumentationName,
       final long timestampMicro,
-      @Nonnull DDSpanContext context) {
+      @Nonnull DDSpanContext context,
+      final List<AgentSpanLink> links) {
     this.context = context;
     this.metrics = SpanMetricRegistry.getInstance().get(instrumentationName);
     this.metrics.onSpanCreated();
@@ -129,6 +138,8 @@ private DDSpan(
       externalClock = true;
       context.getTrace().touch(); // external clock: explicitly update lastReferenced
     }
+
+    this.links = links == null ? new CopyOnWriteArrayList<>() : new CopyOnWriteArrayList<>(links);
   }
 
   public boolean isFinished() {
@@ -685,7 +696,7 @@ public CharSequence getType() {
 
   @Override
   public void processTagsAndBaggage(final MetadataConsumer consumer) {
-    context.processTagsAndBaggage(consumer, longRunningVersion);
+    context.processTagsAndBaggage(consumer, longRunningVersion, links);
   }
 
   @Override
@@ -768,7 +779,13 @@ public Map<String, String> getBaggage() {
 
   @Override
   public String toString() {
-    return context.toString() + ", duration_ns=" + durationNano + ", forceKeep=" + forceKeep;
+    return context.toString()
+        + ", duration_ns="
+        + durationNano
+        + ", forceKeep="
+        + forceKeep
+        + ", links="
+        + links;
   }
 
   @Override
@@ -793,6 +810,13 @@ public TraceConfig traceConfig() {
     return context.getTrace().getTraceConfig();
   }
 
+  @Override
+  public void addLink(AgentSpanLink link) {
+    if (link != null) {
+      this.links.add(link);
+    }
+  }
+
   // to be accessible in Spock spies, which the field wouldn't otherwise be
   public long getStartTimeNano() {
     return startTimeNano;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
index 0bb366b38a0..c7763468e2c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
@@ -1,5 +1,6 @@
 package datadog.trace.core;
 
+import static datadog.trace.api.DDTags.SPAN_LINKS;
 import static datadog.trace.api.cache.RadixTreeCache.HTTP_STATUSES;
 import static datadog.trace.bootstrap.instrumentation.api.ErrorPriorities.UNSET;
 
@@ -16,6 +17,7 @@
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
 import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
@@ -30,6 +32,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -134,8 +137,9 @@ public class DDSpanContext
   private volatile BlockResponseFunction blockResponseFunction;
 
   private final ProfilingContextIntegration profilingContextIntegration;
-  private boolean injectBaggageAsTags;
+  private final boolean injectBaggageAsTags;
   private volatile int encodedOperationName;
+  private volatile int encodedResourceName;
 
   public DDSpanContext(
       final DDTraceId traceId,
@@ -329,7 +333,7 @@ public DDSpanContext(
     // as fast as we can try to make this operation, we still might need to activate/deactivate
     // contexts at alarming rates in unpredictable async applications, so we'll try
     // to get away with doing this just once per span
-    this.encodedOperationName = profilingContextIntegration.encode(operationName);
+    this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
 
     setServiceName(serviceName);
     this.operationName = operationName;
@@ -381,6 +385,11 @@ public int getEncodedOperationName() {
     return encodedOperationName;
   }
 
+  @Override
+  public int getEncodedResourceName() {
+    return encodedResourceName;
+  }
+
   public String getServiceName() {
     return serviceName;
   }
@@ -410,6 +419,7 @@ public void setResourceName(final CharSequence resourceName, byte priority) {
     if (priority >= this.resourceNamePriority) {
       this.resourceNamePriority = priority;
       this.resourceName = resourceName;
+      this.encodedResourceName = profilingContextIntegration.encodeResourceName(resourceName);
     }
   }
 
@@ -423,7 +433,7 @@ public CharSequence getOperationName() {
 
   public void setOperationName(final CharSequence operationName) {
     this.operationName = operationName;
-    this.encodedOperationName = profilingContextIntegration.encode(operationName);
+    this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
   }
 
   public boolean getErrorFlag() {
@@ -770,8 +780,17 @@ public Map<String, Object> getTags() {
     }
   }
 
-  public void processTagsAndBaggage(final MetadataConsumer consumer, int longRunningVersion) {
+  public void processTagsAndBaggage(
+      final MetadataConsumer consumer, int longRunningVersion, List<AgentSpanLink> links) {
     synchronized (unsafeTags) {
+      // Tags
+      Map<String, Object> tags =
+          TagsPostProcessorFactory.instance().processTagsWithContext(unsafeTags, this);
+      String linksTag = DDSpanLink.toTag(links);
+      if (linksTag != null) {
+        tags.put(SPAN_LINKS, linksTag);
+      }
+      // Baggage
       Map<String, String> baggageItemsWithPropagationTags;
       if (injectBaggageAsTags) {
         baggageItemsWithPropagationTags = new HashMap<>(baggageItems);
@@ -779,11 +798,12 @@ public void processTagsAndBaggage(final MetadataConsumer consumer, int longRunni
       } else {
         baggageItemsWithPropagationTags = propagationTags.createTagMap();
       }
+
       consumer.accept(
           new Metadata(
               threadId,
               threadName,
-              TagsPostProcessorFactory.instance().processTagsWithContext(unsafeTags, this),
+              tags,
               baggageItemsWithPropagationTags,
               samplingPriority != PrioritySampling.UNSET ? samplingPriority : getSamplingPriority(),
               measured,
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
index 168b5ad2486..07880172cdd 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
@@ -1,29 +1,34 @@
 package datadog.trace.core;
 
+import static datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes.EMPTY;
+
 import com.squareup.moshi.FromJson;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.ToJson;
-import com.squareup.moshi.Types;
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
 import datadog.trace.bootstrap.instrumentation.api.SpanLink;
+import datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes;
 import datadog.trace.core.propagation.ExtractedContext;
 import datadog.trace.core.propagation.PropagationTags;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** This class holds helper methods to encode span links into span context. */
 public class DDSpanLink extends SpanLink {
-  private static final Moshi MOSHI = new Moshi.Builder().add(new SpanLinkAdapter()).build();
-  private static final JsonAdapter<List<AgentSpanLink>> SPAN_LINKS_ADAPTER =
-      MOSHI.adapter(Types.newParameterizedType(List.class, AgentSpanLink.class));
+  private static final Logger LOGGER = LoggerFactory.getLogger(DDSpanLink.class);
+  /** The maximum of characters a span tag value can hold. */
+  private static final int TAG_MAX_LENGTH = 25_000;
+  /** JSON encoder (lazily initialized) */
+  private static JsonAdapter<AgentSpanLink> encoder;
 
   protected DDSpanLink(
-      DDTraceId traceId, long spanId, String traceState, Map<String, String> attributes) {
-    super(traceId, spanId, traceState, attributes);
+      DDTraceId traceId, long spanId, byte traceFlags, String traceState, Attributes attributes) {
+    super(traceId, spanId, traceFlags, traceState, attributes);
   }
 
   /**
@@ -34,7 +39,7 @@ protected DDSpanLink(
    * @return A span link to the given context.
    */
   public static SpanLink from(ExtractedContext context) {
-    return from(context, Collections.emptyMap());
+    return from(context, EMPTY);
   }
 
   /**
@@ -45,12 +50,14 @@ public static SpanLink from(ExtractedContext context) {
    * @param attributes The span link attributes.
    * @return A span link to the given context with custom attributes.
    */
-  public static SpanLink from(ExtractedContext context, Map<String, String> attributes) {
+  public static SpanLink from(ExtractedContext context, Attributes attributes) {
+    byte traceFlags = context.getSamplingPriority() > 0 ? SAMPLED_FLAG : DEFAULT_FLAGS;
     String traceState =
         context.getPropagationTags() == null
             ? ""
             : context.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    return new DDSpanLink(context.getTraceId(), context.getSpanId(), traceState, attributes);
+    return new DDSpanLink(
+        context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
   }
 
   /**
@@ -63,7 +70,36 @@ public static String toTag(List<AgentSpanLink> links) {
     if (links == null || links.isEmpty()) {
       return null;
     }
-    return SPAN_LINKS_ADAPTER.toJson(links);
+    // Manually encode as JSON array
+    StringBuilder builder = new StringBuilder("[");
+    int index = 0;
+    while (index < links.size()) {
+      String linkAsJson = getEncoder().toJson(links.get(index));
+      int arrayCharsNeeded = index == 0 ? 1 : 2; // Closing bracket and comma separator if needed
+      if (linkAsJson.length() + builder.length() + arrayCharsNeeded >= TAG_MAX_LENGTH) {
+        // Do no more fit inside a span tag, stop adding span links
+        break;
+      }
+      if (index > 0) {
+        builder.append(',');
+      }
+      builder.append(linkAsJson);
+      index++;
+    }
+    // Notify of dropped links
+    while (index < links.size()) {
+      LOGGER.debug("Span tag full. Dropping span links {}", links.get(index));
+      index++;
+    }
+    return builder.append(']').toString();
+  }
+
+  private static JsonAdapter<AgentSpanLink> getEncoder() {
+    if (encoder == null) {
+      Moshi moshi = new Moshi.Builder().add(new SpanLinkAdapter()).build();
+      encoder = moshi.adapter(AgentSpanLink.class);
+    }
+    return encoder;
   }
 
   private static class SpanLinkAdapter {
@@ -72,9 +108,10 @@ SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
       SpanLinkJson json = new SpanLinkJson();
       json.traceId = link.traceId().toHexString();
       json.spanId = DDSpanId.toHexString(link.spanId());
-      json.traceState = link.traceState();
+      json.traceFlags = link.traceFlags() == 0 ? null : link.traceFlags();
+      json.traceState = link.traceState().isEmpty() ? null : link.traceState();
       if (!link.attributes().isEmpty()) {
-        json.attributes = link.attributes();
+        json.attributes = link.attributes().asMap();
       }
       return json;
     }
@@ -84,14 +121,16 @@ AgentSpanLink fromSpanLinkJson(SpanLinkJson json) {
       return new DDSpanLink(
           DDTraceId.fromHex(json.traceId),
           DDSpanId.fromHex(json.spanId),
+          json.traceFlags,
           json.traceState,
-          json.attributes);
+          SpanLinkAttributes.fromMap(json.attributes));
     }
   }
 
   private static class SpanLinkJson {
     String traceId;
     String spanId;
+    Byte traceFlags;
     String traceState;
     Map<String, String> attributes;
   }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
index 4f822f43e44..cf9609cb1c2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
@@ -122,6 +122,10 @@ public void toJson(JsonWriter writer, Config config) throws IOException {
     writer.value(config.getAppSecRulesFile());
     writer.name("telemetry_enabled");
     writer.value(config.isTelemetryEnabled());
+    writer.name("telemetry_dependency_collection_enabled");
+    writer.value(config.isTelemetryDependencyServiceEnabled());
+    writer.name("telemetry_log_collection_enabled");
+    writer.value(config.isTelemetryLogCollectionEnabled());
     writer.name("dd_version");
     writer.value(config.getVersion());
     writer.name("health_checks_enabled");
@@ -146,6 +150,8 @@ public void toJson(JsonWriter writer, Config config) throws IOException {
       writer.name("iast_enabled");
       writer.value(config.getIastActivation().toString());
     }
+    writer.name("data_streams_enabled");
+    writer.value(config.isDataStreamsEnabled());
     writer.endObject();
   }
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
index 8373ed9750a..be0cc1eeddc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
@@ -48,10 +48,12 @@ public void stop() {
   }
 
   final class Updater implements ProductListener {
-    private final Moshi MOSHI = new Moshi.Builder().build();
+    private final JsonAdapter<ConfigOverrides> CONFIG_OVERRIDES_ADAPTER;
 
-    private final JsonAdapter<ConfigOverrides> CONFIG_OVERRIDES_ADAPTER =
-        MOSHI.adapter(ConfigOverrides.class);
+    {
+      Moshi MOSHI = new Moshi.Builder().build();
+      CONFIG_OVERRIDES_ADAPTER = MOSHI.adapter(ConfigOverrides.class);
+    }
 
     private boolean receivedOverrides = false;
 
@@ -103,8 +105,10 @@ void applyConfigOverrides(LibConfig libConfig) {
     DynamicConfig<?>.Builder builder = dynamicConfig.initial();
 
     maybeOverride(builder::setDebugEnabled, libConfig.debugEnabled);
+
     if (libConfig.debugEnabled != null) {
       if (Boolean.TRUE.equals(libConfig.debugEnabled)) {
+        builder.setTriageEnabled(true); // debug implies triage
         GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
       } else {
         // Disable debugEnabled when it was set to true at startup
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextInjector.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextInjector.java
index 838c50159e6..2858facd4b9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextInjector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextInjector.java
@@ -24,13 +24,24 @@ public <C> void injectPathwayContext(
       C carrier,
       AgentPropagation.Setter<C> setter,
       LinkedHashMap<String, String> sortedTags) {
+    injectPathwayContext(span, carrier, setter, sortedTags, 0, 0);
+  }
+
+  public <C> void injectPathwayContext(
+      AgentSpan span,
+      C carrier,
+      AgentPropagation.Setter<C> setter,
+      LinkedHashMap<String, String> sortedTags,
+      long defaultTimestamp,
+      long payloadSizeBytes) {
     PathwayContext pathwayContext = span.context().getPathwayContext();
 
     if (pathwayContext == null
         || (span.traceConfig() != null && !span.traceConfig().isDataStreamsEnabled())) {
       return;
     }
-    pathwayContext.setCheckpoint(sortedTags, dataStreamsMonitoring::add);
+    pathwayContext.setCheckpoint(
+        sortedTags, dataStreamsMonitoring::add, defaultTimestamp, payloadSizeBytes);
 
     boolean injected =
         setter instanceof AgentPropagation.BinarySetter
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
index c1e6b465606..c1106e52114 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
@@ -52,9 +52,10 @@ public class DefaultDataStreamsMonitoring implements DataStreamsMonitoring, Even
   static final long DEFAULT_BUCKET_DURATION_NANOS = TimeUnit.SECONDS.toNanos(10);
   static final long FEATURE_CHECK_INTERVAL_NANOS = TimeUnit.MINUTES.toNanos(5);
 
-  private static final StatsPoint REPORT = new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0);
+  private static final StatsPoint REPORT =
+      new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0);
   private static final StatsPoint POISON_PILL =
-      new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0);
+      new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0);
 
   private final Map<Long, StatsBucket> timeToBucket = new HashMap<>();
   private final BlockingQueue<InboxItem> inbox = new MpscBlockingConsumerArrayQueue<>(1024);
@@ -204,10 +205,13 @@ public void trackBacklog(LinkedHashMap<String, String> sortedTags, long value) {
 
   @Override
   public void setCheckpoint(
-      AgentSpan span, LinkedHashMap<String, String> sortedTags, long defaultTimestamp) {
+      AgentSpan span,
+      LinkedHashMap<String, String> sortedTags,
+      long defaultTimestamp,
+      long payloadSizeBytes) {
     PathwayContext pathwayContext = span.context().getPathwayContext();
     if (pathwayContext != null) {
-      pathwayContext.setCheckpoint(sortedTags, this::add, defaultTimestamp);
+      pathwayContext.setCheckpoint(sortedTags, this::add, defaultTimestamp, payloadSizeBytes);
       if (pathwayContext.getHash() != 0) {
         span.setTag(PATHWAY_HASH, Long.toUnsignedString(pathwayContext.getHash()));
       }
@@ -233,7 +237,7 @@ public void setConsumeCheckpoint(String type, String source, DataStreamsContextC
     sortedTags.put(TOPIC_TAG, source);
     sortedTags.put(TYPE_TAG, type);
 
-    setCheckpoint(span, sortedTags, 0);
+    setCheckpoint(span, sortedTags, 0, 0);
   }
 
   @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
index eac3d1a310e..7e4beb835fc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
@@ -95,7 +95,7 @@ public long getHash() {
   @Override
   public void setCheckpoint(
       LinkedHashMap<String, String> sortedTags, Consumer<StatsPoint> pointConsumer) {
-    setCheckpoint(sortedTags, pointConsumer, 0);
+    setCheckpoint(sortedTags, pointConsumer, 0, 0);
   }
 
   @Override
@@ -103,6 +103,15 @@ public void setCheckpoint(
       LinkedHashMap<String, String> sortedTags,
       Consumer<StatsPoint> pointConsumer,
       long defaultTimestamp) {
+    setCheckpoint(sortedTags, pointConsumer, defaultTimestamp, 0);
+  }
+
+  @Override
+  public void setCheckpoint(
+      LinkedHashMap<String, String> sortedTags,
+      Consumer<StatsPoint> pointConsumer,
+      long defaultTimestamp,
+      long payloadSizeBytes) {
     long startNanos = timeSource.getCurrentTimeNanos();
     long nanoTicks = timeSource.getNanoTicks();
     lock.lock();
@@ -167,7 +176,8 @@ public void setCheckpoint(
               hash,
               timeSource.getCurrentTimeNanos(),
               pathwayLatencyNano,
-              edgeLatencyNano);
+              edgeLatencyNano,
+              payloadSizeBytes);
       edgeStartNanoTicks = nanoTicks;
       hash = newHash;
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
index 0c31e52fa08..461e5457673 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
@@ -23,6 +23,7 @@ public class MsgPackDatastreamsPayloadWriter implements DatastreamsPayloadWriter
   private static final byte[] DURATION = "Duration".getBytes(ISO_8859_1);
   private static final byte[] PATHWAY_LATENCY = "PathwayLatency".getBytes(ISO_8859_1);
   private static final byte[] EDGE_LATENCY = "EdgeLatency".getBytes(ISO_8859_1);
+  private static final byte[] PAYLOAD_SIZE = "PayloadSize".getBytes(ISO_8859_1);
   private static final byte[] SERVICE = "Service".getBytes(ISO_8859_1);
   private static final byte[] EDGE_TAGS = "EdgeTags".getBytes(ISO_8859_1);
   private static final byte[] BACKLOGS = "Backlogs".getBytes(ISO_8859_1);
@@ -118,7 +119,7 @@ private void writeBucket(StatsBucket bucket, Writable packer) {
     for (StatsGroup group : groups) {
       boolean firstNode = group.getEdgeTags().isEmpty();
 
-      packer.startMap(firstNode ? 4 : 5);
+      packer.startMap(firstNode ? 5 : 6);
 
       /* 1 */
       packer.writeUTF8(PATHWAY_LATENCY);
@@ -129,15 +130,19 @@ private void writeBucket(StatsBucket bucket, Writable packer) {
       packer.writeBinary(group.getEdgeLatency().serialize());
 
       /* 3 */
+      packer.writeUTF8(PAYLOAD_SIZE);
+      packer.writeBinary(group.getPayloadSize().serialize());
+
+      /* 4 */
       packer.writeUTF8(HASH);
       packer.writeUnsignedLong(group.getHash());
 
-      /* 4 */
+      /* 5 */
       packer.writeUTF8(PARENT_HASH);
       packer.writeUnsignedLong(group.getParentHash());
 
       if (!firstNode) {
-        /* 5 */
+        /* 6 */
         packer.writeUTF8(EDGE_TAGS);
         packer.startArray(group.getEdgeTags().size());
         for (String tag : group.getEdgeTags()) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
index 59fe6149547..de58e3cccf2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
@@ -29,7 +29,10 @@ public void addPoint(StatsPoint statsPoint) {
       hashToGroup.put(statsPoint.getHash(), statsGroup);
     }
 
-    statsGroup.add(statsPoint.getPathwayLatencyNano(), statsPoint.getEdgeLatencyNano());
+    statsGroup.add(
+        statsPoint.getPathwayLatencyNano(),
+        statsPoint.getEdgeLatencyNano(),
+        statsPoint.getPayloadSizeBytes());
   }
 
   public void addBacklog(Backlog backlog) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
index 4034758e936..bbdb7dcc4e2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
@@ -12,6 +12,7 @@ public class StatsGroup {
   private final long parentHash;
   private final Histogram pathwayLatency;
   private final Histogram edgeLatency;
+  private final Histogram payloadSize;
 
   public StatsGroup(List<String> edgeTags, long hash, long parentHash) {
     this.edgeTags = edgeTags;
@@ -19,11 +20,15 @@ public StatsGroup(List<String> edgeTags, long hash, long parentHash) {
     this.parentHash = parentHash;
     pathwayLatency = Histograms.newHistogram();
     edgeLatency = Histograms.newHistogram();
+    payloadSize = Histograms.newHistogram();
   }
 
-  public void add(long pathwayLatencyNano, long edgeLatencyNano) {
+  public void add(long pathwayLatencyNano, long edgeLatencyNano, long payloadSizeBytes) {
     pathwayLatency.accept(((double) pathwayLatencyNano) / NANOSECONDS_TO_SECOND);
     edgeLatency.accept(((double) edgeLatencyNano) / NANOSECONDS_TO_SECOND);
+    // payload size is set to zero when we cannot compute it
+    // in that case, it's probably better to have an empty histogram than filling it with zeros
+    if (payloadSizeBytes != 0) payloadSize.accept((double) payloadSizeBytes);
   }
 
   public List<String> getEdgeTags() {
@@ -46,6 +51,10 @@ public Histogram getEdgeLatency() {
     return edgeLatency;
   }
 
+  public Histogram getPayloadSize() {
+    return payloadSize;
+  }
+
   @Override
   public String toString() {
     return "StatsGroup{"
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TagsProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TagsProcessor.java
index 945f30dfe18..57a87ce2248 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TagsProcessor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TagsProcessor.java
@@ -48,7 +48,11 @@ public String apply(String key) {
   private static final Function<String, String> GROUP_TAG_PREFIX = new StringPrefix("group:");
   private static final Function<String, String> CONSUMER_GROUP_TAG_PREFIX =
       new StringPrefix("consumer_group:");
-
+  public static final String SUBSCRIPTION_TAG = "subscription";
+  private static final DDCache<String, String> SUBSCRIPTION_TAG_CACHE =
+      DDCaches.newFixedSizeCache(32);
+  private static final Function<String, String> SUBSCRIPTION_TAG_PREFIX =
+      new StringPrefix("subscription:");
   public static final String EXCHANGE_TAG = "exchange";
   private static final DDCache<String, String> EXCHANGE_TAG_CACHE = DDCaches.newFixedSizeCache(32);
   private static final Function<String, String> EXCHANGE_TAG_PREFIX = new StringPrefix("exchange:");
@@ -70,6 +74,7 @@ private static Map<String, DDCache<String, String>> createTagToCacheMap() {
     result.put(PARTITION_TAG, PARTITION_TAG_CACHE);
     result.put(GROUP_TAG, GROUP_TAG_CACHE);
     result.put(CONSUMER_GROUP_TAG, CONSUMER_GROUP_TAG_CACHE);
+    result.put(SUBSCRIPTION_TAG, SUBSCRIPTION_TAG_CACHE);
     result.put(EXCHANGE_TAG, EXCHANGE_TAG_CACHE);
     result.put(HAS_ROUTING_KEY_TAG, HAS_ROUTING_KEY_TAG_CACHE);
     return result;
@@ -83,6 +88,7 @@ private static Map<String, Function<String, String>> createTagToPrefixMap() {
     result.put(PARTITION_TAG, PARTITION_TAG_PREFIX);
     result.put(GROUP_TAG, GROUP_TAG_PREFIX);
     result.put(CONSUMER_GROUP_TAG, CONSUMER_GROUP_TAG_PREFIX);
+    result.put(SUBSCRIPTION_TAG, SUBSCRIPTION_TAG_PREFIX);
     result.put(EXCHANGE_TAG, EXCHANGE_TAG_PREFIX);
     result.put(HAS_ROUTING_KEY_TAG, HAS_ROUTING_KEY_TAG_PREFIX);
     return result;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlarePoller.java b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlarePoller.java
new file mode 100644
index 00000000000..3b166d1be17
--- /dev/null
+++ b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlarePoller.java
@@ -0,0 +1,175 @@
+package datadog.trace.core.flare;
+
+import com.squareup.moshi.Json;
+import com.squareup.moshi.JsonAdapter;
+import com.squareup.moshi.Moshi;
+import datadog.communication.ddagent.SharedCommunicationObjects;
+import datadog.remoteconfig.ConfigurationChangesListener.PollingRateHinter;
+import datadog.remoteconfig.ConfigurationPoller;
+import datadog.remoteconfig.Product;
+import datadog.remoteconfig.state.ParsedConfigKey;
+import datadog.remoteconfig.state.ProductListener;
+import datadog.trace.api.Config;
+import datadog.trace.api.DynamicConfig;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import okio.Okio;
+
+public final class TracerFlarePoller {
+  private static final String FLARE_LOG_LEVEL_PREFIX = "flare-log-level.";
+
+  private final DynamicConfig dynamicConfig;
+
+  private Runnable stopPreparer;
+  private Runnable stopSubmitter;
+
+  private TracerFlareService tracerFlareService;
+
+  public TracerFlarePoller(DynamicConfig dynamicConfig) {
+    this.dynamicConfig = dynamicConfig;
+  }
+
+  public void start(Config config, SharedCommunicationObjects sco) {
+    stopPreparer = new Preparer().register(config, sco);
+    stopSubmitter = new Submitter().register(config, sco);
+
+    tracerFlareService = new TracerFlareService(dynamicConfig, sco.okHttpClient, sco.agentUrl);
+  }
+
+  public void stop() {
+    if (null != stopPreparer) {
+      stopPreparer.run();
+    }
+    if (null != stopSubmitter) {
+      stopSubmitter.run();
+    }
+  }
+
+  final class Preparer implements ProductListener {
+    private final JsonAdapter<AgentConfigLayer> AGENT_CONFIG_LAYER_ADAPTER;
+
+    {
+      Moshi MOSHI = new Moshi.Builder().build();
+      AGENT_CONFIG_LAYER_ADAPTER = MOSHI.adapter(AgentConfigLayer.class);
+    }
+
+    public Runnable register(Config config, SharedCommunicationObjects sco) {
+      ConfigurationPoller poller = sco.configurationPoller(config);
+      if (null != poller) {
+        poller.addListener(Product.AGENT_CONFIG, this);
+        return poller::stop;
+      } else {
+        return null;
+      }
+    }
+
+    @Override
+    public void accept(ParsedConfigKey configKey, byte[] content, PollingRateHinter hinter)
+        throws IOException {
+      if (configKey.getConfigId().startsWith(FLARE_LOG_LEVEL_PREFIX)) {
+        AgentConfigLayer agentConfigLayer =
+            AGENT_CONFIG_LAYER_ADAPTER.fromJson(
+                Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+        if (null != agentConfigLayer
+            && null != agentConfigLayer.config
+            && null != agentConfigLayer.config.logLevel) {
+          prepareTracerFlare(agentConfigLayer.config.logLevel);
+        } else {
+          cancelTracerFlare();
+        }
+      }
+    }
+
+    @Override
+    public void remove(ParsedConfigKey configKey, PollingRateHinter hinter) {
+      if (configKey.getConfigId().startsWith(FLARE_LOG_LEVEL_PREFIX)) {
+        cancelTracerFlare();
+      }
+    }
+
+    @Override
+    public void commit(PollingRateHinter hinter) {}
+  }
+
+  final class Submitter implements ProductListener {
+    private final JsonAdapter<AgentTask> AGENT_TASK_ADAPTER;
+
+    {
+      Moshi MOSHI = new Moshi.Builder().build();
+      AGENT_TASK_ADAPTER = MOSHI.adapter(AgentTask.class);
+    }
+
+    public Runnable register(Config config, SharedCommunicationObjects sco) {
+      ConfigurationPoller poller = sco.configurationPoller(config);
+      if (null != poller) {
+        poller.addListener(Product.AGENT_TASK, this);
+        return poller::stop;
+      } else {
+        return null;
+      }
+    }
+
+    @Override
+    public void accept(ParsedConfigKey configKey, byte[] content, PollingRateHinter hinter)
+        throws IOException {
+      AgentTask agentTask =
+          AGENT_TASK_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+
+      if (null != agentTask
+          && null != agentTask.args
+          && "tracer_flare".equals(agentTask.taskType)) {
+        submitTracerFlare(agentTask.args);
+      }
+    }
+
+    @Override
+    public void remove(ParsedConfigKey configKey, PollingRateHinter hinter) {}
+
+    @Override
+    public void commit(PollingRateHinter hinter) {}
+  }
+
+  void prepareTracerFlare(String logLevel) {
+    tracerFlareService.prepareTracerFlare(logLevel);
+  }
+
+  void cancelTracerFlare() {
+    tracerFlareService.cancelTracerFlare();
+  }
+
+  void submitTracerFlare(AgentTaskArgs args) {
+    tracerFlareService.sendFlare(args.caseId, args.userHandle, args.hostname);
+  }
+
+  static final class AgentConfigLayer {
+    @Json(name = "name")
+    public String name;
+
+    @Json(name = "config")
+    public AgentConfig config;
+  }
+
+  static final class AgentConfig {
+    @Json(name = "log_level")
+    public String logLevel;
+  }
+
+  static final class AgentTask {
+    @Json(name = "task_type")
+    public String taskType;
+
+    @Json(name = "args")
+    public AgentTaskArgs args;
+  }
+
+  static final class AgentTaskArgs {
+    @Json(name = "case_id")
+    public String caseId;
+
+    @Json(name = "user_handle")
+    public String userHandle;
+
+    @Json(name = "hostname")
+    public String hostname;
+  }
+}
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java
new file mode 100644
index 00000000000..96d3b546455
--- /dev/null
+++ b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java
@@ -0,0 +1,104 @@
+package datadog.trace.core.flare;
+
+import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACER_FLARE;
+
+import datadog.communication.http.OkHttpUtils;
+import datadog.trace.api.DynamicConfig;
+import datadog.trace.util.AgentTaskScheduler;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class TracerFlareService {
+  private static final Logger log = LoggerFactory.getLogger(TracerFlareService.class);
+
+  private static final String FLARE_ENDPOINT = "tracer_flare/v1";
+
+  private static final MediaType OCTET_STREAM = MediaType.get("application/octet-stream");
+
+  private final AgentTaskScheduler scheduler = new AgentTaskScheduler(TRACER_FLARE);
+
+  private final DynamicConfig dynamicConfig;
+  private final OkHttpClient okHttpClient;
+  private final HttpUrl flareUrl;
+
+  private AtomicBoolean preparingTracerFlare = new AtomicBoolean();
+
+  TracerFlareService(DynamicConfig dynamicConfig, OkHttpClient okHttpClient, HttpUrl agentUrl) {
+    this.dynamicConfig = dynamicConfig;
+    this.okHttpClient = okHttpClient;
+    this.flareUrl = agentUrl.newBuilder().addPathSegments(FLARE_ENDPOINT).build();
+  }
+
+  public void prepareTracerFlare(String logLevel) {
+    if (preparingTracerFlare.compareAndSet(false, true)) {
+      log.debug("Preparing tracer flare, logLevel={}", logLevel);
+    }
+  }
+
+  public void sendFlare(String caseId, String email, String hostname) {
+    log.debug("Sending tracer flare");
+    scheduler.execute(() -> doSendFlare(caseId, email, hostname));
+  }
+
+  public void cancelTracerFlare() {
+    if (preparingTracerFlare.compareAndSet(true, false)) {
+      log.debug("Canceling tracer flare");
+    }
+  }
+
+  private void doSendFlare(String caseId, String email, String hostname) {
+    RequestBody report = RequestBody.create(OCTET_STREAM, placeholderZip());
+
+    RequestBody form =
+        new MultipartBody.Builder()
+            .setType(MultipartBody.FORM)
+            .addFormDataPart("source", "tracer_java")
+            .addFormDataPart("case_id", caseId)
+            .addFormDataPart("email", email)
+            .addFormDataPart("hostname", hostname)
+            .addFormDataPart("flare_file", "java-flare.zip", report)
+            .build();
+
+    Request flareRequest =
+        OkHttpUtils.prepareRequest(flareUrl, Collections.emptyMap()).post(form).build();
+
+    try (Response response = okHttpClient.newCall(flareRequest).execute()) {
+      if (response.code() == 404) {
+        log.debug("Tracer flare endpoint is disabled, ignoring request");
+      } else if (!response.isSuccessful()) {
+        log.warn("Tracer flare failed with: {} {}", response.code(), response.message());
+      } else {
+        log.debug("Tracer flare sent successfully");
+      }
+    } catch (IOException e) {
+      log.warn("Tracer flare failed with exception: {}", e.toString());
+    } finally {
+      preparingTracerFlare.set(false);
+    }
+  }
+
+  private static byte[] placeholderZip() {
+    try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(bytes)) {
+      zip.putNextEntry(new ZipEntry("tracer.txt"));
+      zip.closeEntry();
+      zip.finish();
+      return bytes.toByteArray();
+    } catch (IOException e) {
+      return new byte[0]; // never called
+    }
+  }
+}
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
index 5748c6a72d7..e39f0745851 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
@@ -1,5 +1,7 @@
 package datadog.trace.core.propagation;
 
+import static datadog.trace.api.TracePropagationStyle.B3MULTI;
+import static datadog.trace.api.TracePropagationStyle.B3SINGLE;
 import static datadog.trace.core.propagation.HttpCodec.firstHeaderValue;
 
 import datadog.trace.api.Config;
@@ -7,6 +9,7 @@
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.core.DDSpanContext;
@@ -161,7 +164,7 @@ static HttpCodec.Extractor newExtractor(
     final List<HttpCodec.Extractor> extractors = new ArrayList<>(2);
     extractors.add(newSingleExtractor(config, traceConfigSupplier));
     extractors.add(newMultiExtractor(config, traceConfigSupplier));
-    return new HttpCodec.CompoundExtractor(extractors);
+    return new HttpCodec.CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
   }
 
   public static HttpCodec.Extractor newMultiExtractor(
@@ -212,6 +215,11 @@ private B3MultiContextInterpreter(Config config) {
       super(config);
     }
 
+    @Override
+    public TracePropagationStyle style() {
+      return B3MULTI;
+    }
+
     @Override
     public boolean accept(final String key, final String value) {
       if (null == key || key.isEmpty() || null == value || value.isEmpty()) {
@@ -267,6 +275,11 @@ public B3SingleContextInterpreter(Config config) {
       super(config);
     }
 
+    @Override
+    public TracePropagationStyle style() {
+      return B3SINGLE;
+    }
+
     @Override
     public boolean accept(String key, String value) {
       try {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
index 8897339d9f6..7e2368bbc76 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
@@ -21,6 +21,7 @@
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.Functions;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.sampling.PrioritySampling;
@@ -47,6 +48,7 @@ public abstract class ContextInterpreter implements AgentPropagation.KeyClassifi
   protected long endToEndStartTime;
   protected boolean valid;
   protected boolean fullContext;
+  protected final PropagationTags.Factory propagationTagsFactory;
   protected PropagationTags propagationTags;
 
   private TagContext.HttpHeaders httpHeaders;
@@ -58,7 +60,7 @@ public abstract class ContextInterpreter implements AgentPropagation.KeyClassifi
   protected static final boolean LOG_EXTRACT_HEADER_NAMES = Config.get().isLogExtractHeaderNames();
   private static final DDCache<String, String> CACHE = DDCaches.newFixedSizeCache(64);
 
-  protected String toLowerCase(String key) {
+  protected static String toLowerCase(String key) {
     return CACHE.computeIfAbsent(key, Functions.LowerCase.INSTANCE);
   }
 
@@ -66,11 +68,15 @@ protected ContextInterpreter(Config config) {
     this.customIpHeaderName = config.getTraceClientIpHeader();
     this.clientIpResolutionEnabled = config.isTraceClientIpResolverEnabled();
     this.clientIpWithoutAppSec = config.isClientIpEnabled();
+    this.propagationTagsFactory = PropagationTags.factory(config);
   }
 
-  public interface Factory {
-    ContextInterpreter create();
-  }
+  /**
+   * Gets the propagation style handled by the context interpreter.
+   *
+   * @return The propagation style handled.
+   */
+  public abstract TracePropagationStyle style();
 
   protected final boolean handledForwarding(String key, String value) {
     if (value == null || !collectIpHeaders) {
@@ -229,20 +235,21 @@ public ContextInterpreter reset(TraceConfig traceConfig) {
   protected TagContext build() {
     if (valid) {
       if (fullContext && !DDTraceId.ZERO.equals(traceId)) {
-        final ExtractedContext context;
-        context =
-            new ExtractedContext(
-                traceId,
-                spanId,
-                samplingPriorityOrDefault(traceId, samplingPriority),
-                origin,
-                endToEndStartTime,
-                baggage,
-                tags,
-                httpHeaders,
-                propagationTags,
-                traceConfig);
-        return context;
+        if (propagationTags == null) {
+          propagationTags = propagationTagsFactory.empty();
+        }
+        return new ExtractedContext(
+            traceId,
+            spanId,
+            samplingPriorityOrDefault(traceId, samplingPriority),
+            origin,
+            endToEndStartTime,
+            baggage,
+            tags,
+            httpHeaders,
+            propagationTags,
+            traceConfig,
+            style());
       } else if (origin != null
           || !tags.isEmpty()
           || httpHeaders != null
@@ -254,7 +261,8 @@ protected TagContext build() {
             httpHeaders,
             baggage,
             samplingPriorityOrDefault(traceId, samplingPriority),
-            traceConfig);
+            traceConfig,
+            style());
       }
     }
     return null;
@@ -284,4 +292,8 @@ private int samplingPriorityOrDefault(DDTraceId traceId, int samplingPriority) {
         ? defaultSamplingPriority()
         : samplingPriority;
   }
+
+  public interface Factory {
+    ContextInterpreter create();
+  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/CorePropagation.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/CorePropagation.java
index 8453e20446d..01d882020d1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/CorePropagation.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/CorePropagation.java
@@ -71,6 +71,18 @@ public <C> void injectPathwayContext(
     this.dataStreamContextInjector.injectPathwayContext(span, carrier, setter, sortedTags);
   }
 
+  @Override
+  public <C> void injectPathwayContext(
+      AgentSpan span,
+      C carrier,
+      Setter<C> setter,
+      LinkedHashMap<String, String> sortedTags,
+      long defaultTimestamp,
+      long payloadSizeBytes) {
+    this.dataStreamContextInjector.injectPathwayContext(
+        span, carrier, setter, sortedTags, defaultTimestamp, payloadSizeBytes);
+  }
+
   @Override
   public <C> AgentSpan.Context.Extracted extract(final C carrier, final ContextVisitor<C> getter) {
     return extractor.extract(carrier, getter);
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
index a2162875fd6..9624a54a50a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
@@ -1,5 +1,6 @@
 package datadog.trace.core.propagation;
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG;
 import static datadog.trace.core.propagation.HttpCodec.firstHeaderValue;
 import static datadog.trace.core.propagation.XRayHttpCodec.XRayContextInterpreter.handleXRayTraceHeader;
 import static datadog.trace.core.propagation.XRayHttpCodec.X_AMZN_TRACE_ID;
@@ -12,9 +13,11 @@
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.core.DDSpanContext;
+import datadog.trace.core.propagation.PropagationTags.HeaderType;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.function.Supplier;
@@ -75,8 +78,7 @@ public <C> void inject(
       }
 
       // inject x-datadog-tags
-      String datadogTags =
-          context.getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG);
+      String datadogTags = context.getPropagationTags().headerValue(HeaderType.DATADOG);
       if (datadogTags != null) {
         setter.set(carrier, DATADOG_TAGS_KEY, datadogTags);
       }
@@ -101,12 +103,15 @@ private static class DatadogContextInterpreter extends ContextInterpreter {
     private static final int IGNORE = -1;
 
     private final boolean isAwsPropagationEnabled;
-    private final PropagationTags.Factory datadogTagsFactory;
 
     private DatadogContextInterpreter(Config config) {
       super(config);
       isAwsPropagationEnabled = config.isAwsPropagationEnabled();
-      datadogTagsFactory = PropagationTags.factory(config);
+    }
+
+    @Override
+    public TracePropagationStyle style() {
+      return DATADOG;
     }
 
     @Override
@@ -180,8 +185,7 @@ public boolean accept(String key, String value) {
                 endToEndStartTime = extractEndToEndStartTime(firstHeaderValue(value));
                 break;
               case DD_TAGS:
-                propagationTags =
-                    datadogTagsFactory.fromHeaderValue(PropagationTags.HeaderType.DATADOG, value);
+                propagationTags = propagationTagsFactory.fromHeaderValue(HeaderType.DATADOG, value);
                 break;
               case OT_BAGGAGE:
                 {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
index 0cfe87e6911..d164eec30b9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
@@ -2,6 +2,7 @@
 
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import java.util.Map;
@@ -20,8 +21,20 @@ public ExtractedContext(
       final long spanId,
       final int samplingPriority,
       final CharSequence origin,
-      final PropagationTags propagationTags) {
-    this(traceId, spanId, samplingPriority, origin, 0, null, null, null, propagationTags, null);
+      final PropagationTags propagationTags,
+      final TracePropagationStyle propagationStyle) {
+    this(
+        traceId,
+        spanId,
+        samplingPriority,
+        origin,
+        0,
+        null,
+        null,
+        null,
+        propagationTags,
+        null,
+        propagationStyle);
   }
 
   public ExtractedContext(
@@ -34,8 +47,9 @@ public ExtractedContext(
       final Map<String, String> tags,
       final HttpHeaders httpHeaders,
       final PropagationTags propagationTags,
-      final TraceConfig traceConfig) {
-    super(origin, tags, httpHeaders, baggage, samplingPriority, traceConfig);
+      final TraceConfig traceConfig,
+      final TracePropagationStyle propagationStyle) {
+    super(origin, tags, httpHeaders, baggage, samplingPriority, traceConfig, propagationStyle);
     this.traceId = traceId;
     this.spanId = spanId;
     this.endToEndStartTime = endToEndStartTime;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
index af293ec42c3..0d349a4a858 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
@@ -1,5 +1,6 @@
 package datadog.trace.core.propagation;
 
+import static datadog.trace.api.TracePropagationStyle.HAYSTACK;
 import static datadog.trace.core.propagation.HttpCodec.firstHeaderValue;
 
 import datadog.trace.api.Config;
@@ -7,6 +8,7 @@
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.core.DDSpanContext;
@@ -139,6 +141,11 @@ private HaystackContextInterpreter(Config config) {
       super(config);
     }
 
+    @Override
+    public TracePropagationStyle style() {
+      return HAYSTACK;
+    }
+
     @Override
     public boolean accept(String key, String value) {
       if (null == key || key.isEmpty()) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
index 2e2172c9665..9d8c99530af 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
@@ -1,11 +1,17 @@
 package datadog.trace.core.propagation;
 
+import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
+
 import datadog.trace.api.Config;
+import datadog.trace.api.DD128bTraceId;
+import datadog.trace.api.DD64bTraceId;
+import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
 import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.core.DDSpanContext;
+import datadog.trace.core.DDSpanLink;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -46,7 +52,17 @@ <C> void inject(
         final DDSpanContext context, final C carrier, final AgentPropagation.Setter<C> setter);
   }
 
+  /** This interface defines propagated context extractor. */
   public interface Extractor {
+    /**
+     * Extracts a propagated context from the given carrier using the provided getter.
+     *
+     * @param carrier The carrier containing the propagated context.
+     * @param getter The getter used to extract data from the carrier.
+     * @param <C> The type of the carrier.
+     * @return {@code null} for failed context extraction, a {@link TagContext} instance for partial
+     *     context extraction or an {@link ExtractedContext} for complete context extraction.
+     */
     <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter);
   }
 
@@ -136,7 +152,14 @@ public static Extractor createExtractor(
           break;
       }
     }
-    return new CompoundExtractor(extractors);
+    switch (extractors.size()) {
+      case 0:
+        return StubExtractor.INSTANCE;
+      case 1:
+        return extractors.get(0);
+      default:
+        return new CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
+    }
   }
 
   public static class CompoundInjector implements Injector {
@@ -157,29 +180,122 @@ public <C> void inject(
     }
   }
 
+  private static class StubExtractor implements Extractor {
+    private static final StubExtractor INSTANCE = new StubExtractor();
+
+    @Override
+    public <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
+      return null;
+    }
+  }
+
   public static class CompoundExtractor implements Extractor {
     private final List<Extractor> extractors;
+    private final boolean extractFirst;
 
-    public CompoundExtractor(final List<Extractor> extractors) {
+    public CompoundExtractor(final List<Extractor> extractors, boolean extractFirst) {
       this.extractors = extractors;
+      this.extractFirst = extractFirst;
     }
 
     @Override
     public <C> TagContext extract(
         final C carrier, final AgentPropagation.ContextVisitor<C> getter) {
-      TagContext context = null;
-
-      for (final Extractor extractor : extractors) {
-        context = extractor.extract(carrier, getter);
-        // Use incomplete TagContext only as last resort
-        if (context instanceof ExtractedContext) {
-          log.debug("Extract complete context {}", context);
-          return context;
+      ExtractedContext context = null;
+      TagContext partialContext = null;
+      // Extract and cache all headers in advance
+      ExtractionCache<C> extractionCache = new ExtractionCache<>(carrier, getter);
+
+      for (final Extractor extractor : this.extractors) {
+        TagContext extracted = extractor.extract(extractionCache, extractionCache);
+        // Check if context is valid
+        if (extracted instanceof ExtractedContext) {
+          ExtractedContext extractedContext = (ExtractedContext) extracted;
+          // If no prior valid context, store it as first valid context
+          if (context == null) {
+            context = extractedContext;
+            // Stop extraction if only extracting first valid context and drop everything else
+            if (this.extractFirst) {
+              break;
+            }
+          }
+          // If another valid context is extracted
+          else {
+            if (traceIdMatch(context.getTraceId(), extractedContext.getTraceId())) {
+              boolean comingFromTraceContext = extracted.getPropagationStyle() == TRACECONTEXT;
+              if (comingFromTraceContext) {
+                // Propagate newly extracted W3C tracestate to first valid context
+                String extractedTracestate =
+                    extractedContext.getPropagationTags().getW3CTracestate();
+                context.getPropagationTags().updateW3CTracestate(extractedTracestate);
+              }
+            } else {
+              // Terminate extracted context and add it as span link
+              context.addTerminatedContextLink(DDSpanLink.from((ExtractedContext) extracted));
+              // TODO Note: Other vendor tracestate will be lost here
+            }
+          }
         }
+        // Check if context is at least partial to keep it as first valid partial context found
+        else if (extracted != null && partialContext == null) {
+          partialContext = extracted;
+        }
+      }
+
+      if (context != null) {
+        log.debug("Extract complete context {}", context);
+        return context;
+      } else if (partialContext != null) {
+        log.debug("Extract incomplete context {}", partialContext);
+        return partialContext;
+      } else {
+        log.debug("Extract no context");
+        return null;
+      }
+    }
+  }
+
+  private static class ExtractionCache<C>
+      implements AgentPropagation.KeyClassifier,
+          AgentPropagation.ContextVisitor<ExtractionCache<?>> {
+    /** Cached context key-values (even indexes are header names, odd indexes are header values). */
+    private final List<String> keysAndValues;
+
+    public ExtractionCache(C carrier, AgentPropagation.ContextVisitor<C> getter) {
+      this.keysAndValues = new ArrayList<>(32);
+      getter.forEachKey(carrier, this);
+    }
+
+    @Override
+    public boolean accept(String key, String value) {
+      this.keysAndValues.add(key);
+      this.keysAndValues.add(value);
+      return true;
+    }
+
+    @Override
+    public void forEachKey(ExtractionCache<?> carrier, AgentPropagation.KeyClassifier classifier) {
+      List<String> keysAndValues = carrier.keysAndValues;
+      for (int i = 0; i < keysAndValues.size(); i += 2) {
+        classifier.accept(keysAndValues.get(i), keysAndValues.get(i + 1));
       }
+    }
+  }
 
-      log.debug("Extract incomplete context {}", context);
-      return context;
+  /**
+   * Checks if trace identifier matches, even if they are not encoded using the same size (64-bit vs
+   * 128-bit).
+   *
+   * @param a A trace identifier to check.
+   * @param b Another trace identifier to check.
+   * @return {@code true} if the trace identifiers matches, {@code false} otherwise.
+   */
+  private static boolean traceIdMatch(DDTraceId a, DDTraceId b) {
+    if (a instanceof DD128bTraceId && b instanceof DD128bTraceId
+        || a instanceof DD64bTraceId && b instanceof DD64bTraceId) {
+      return a.equals(b);
+    } else {
+      return a.toLong() == b.toLong();
     }
   }
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
index 79bbd3eb342..00ed3d0f53d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
@@ -66,6 +66,22 @@ public interface Factory {
 
   public abstract void updateTraceIdHighOrderBits(long highOrderBits);
 
+  /**
+   * Gets the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
+   * tracestate header</a> value.
+   *
+   * @return The original W3C tracestate header value.
+   */
+  public abstract String getW3CTracestate();
+
+  /**
+   * Stores the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
+   * tracestate header</a> value.
+   *
+   * @param tracestate The original W3C tracestate header value.
+   */
+  public abstract void updateW3CTracestate(String tracestate);
+
   /**
    * Constructs a header value that includes valid propagated _dd.p.* tags and possibly a new
    * sampling decision tag _dd.p.dm based on the current state. Returns null if the value length
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
index 13258b270f9..76ca949e228 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
@@ -1,8 +1,10 @@
 package datadog.trace.core.propagation;
 
+import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP;
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP;
 import static datadog.trace.core.propagation.HttpCodec.firstHeaderValue;
+import static datadog.trace.core.propagation.PropagationTags.HeaderType.W3C;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -12,6 +14,7 @@
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.internal.util.LongStringUtils;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;
@@ -61,6 +64,13 @@ public Injector(Map<String, String> invertedBaggageMapping) {
     @Override
     public <C> void inject(
         final DDSpanContext context, final C carrier, final AgentPropagation.Setter<C> setter) {
+      injectTraceParent(context, carrier, setter);
+      injectTraceState(context, carrier, setter);
+      injectBaggage(context, carrier, setter);
+    }
+
+    private <C> void injectTraceParent(
+        DDSpanContext context, C carrier, AgentPropagation.Setter<C> setter) {
       StringBuilder sb = new StringBuilder(TRACE_PARENT_LENGTH);
       sb.append("00-");
       sb.append(context.getTraceId().toHexString());
@@ -68,11 +78,19 @@ public <C> void inject(
       sb.append(DDSpanId.toHexStringPadded(context.getSpanId()));
       sb.append(context.getSamplingPriority() > 0 ? "-01" : "-00");
       setter.set(carrier, TRACE_PARENT_KEY, sb.toString());
-      String tracestate = context.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+    }
+
+    private <C> void injectTraceState(
+        DDSpanContext context, C carrier, AgentPropagation.Setter<C> setter) {
+      PropagationTags propagationTags = context.getPropagationTags();
+      String tracestate = propagationTags.headerValue(W3C);
       if (tracestate != null && !tracestate.isEmpty()) {
         setter.set(carrier, TRACE_STATE_KEY, tracestate);
       }
+    }
 
+    private <C> void injectBaggage(
+        DDSpanContext context, C carrier, AgentPropagation.Setter<C> setter) {
       long e2eStart = context.getEndToEndStartTime();
       if (e2eStart > 0) {
         setter.set(carrier, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)));
@@ -99,15 +117,17 @@ private static class W3CContextInterpreter extends ContextInterpreter {
     private static final int E2E_START = 3;
     private static final int IGNORE = -1;
 
-    private final PropagationTags.Factory datadogTagsFactory;
-
     // We need to delay handling of the tracestate header until after traceparent
     private String tracestateHeader = null;
     private String traceparentHeader = null;
 
     private W3CContextInterpreter(Config config) {
       super(config);
-      datadogTagsFactory = PropagationTags.factory(config);
+    }
+
+    @Override
+    public TracePropagationStyle style() {
+      return TRACECONTEXT;
     }
 
     @Override
@@ -241,7 +261,7 @@ private boolean storeTraceState(String value) {
      */
     @Override
     protected TagContext build() {
-      // If there is neither a traceparent or a tracestate header, then ignore this
+      // If there is neither a traceparent nor a tracestate header, then ignore this
       if (traceparentHeader == null && tracestateHeader == null) {
         onlyTagContext();
       }
@@ -252,8 +272,8 @@ protected TagContext build() {
                 "Found no traceparent header but tracestate header '" + tracestateHeader + "'");
           }
           // Now we know that we have at least a traceparent header
-          parseTraceParentHeader(traceparentHeader, this);
-          parseTraceStateHeader(tracestateHeader, this, datadogTagsFactory);
+          parseTraceParentHeader(traceparentHeader);
+          parseTraceStateHeader(tracestateHeader);
         } catch (RuntimeException e) {
           onlyTagContext();
           log.debug("Exception when building context", e);
@@ -262,7 +282,7 @@ protected TagContext build() {
       return super.build();
     }
 
-    static void parseTraceParentHeader(String tp, ContextInterpreter context) {
+    void parseTraceParentHeader(String tp) {
       int length = tp == null ? 0 : tp.length();
       if (length < TRACE_PARENT_LENGTH) {
         throw new IllegalStateException("The length of traceparent '" + tp + "' is too short");
@@ -279,9 +299,9 @@ static void parseTraceParentHeader(String tp, ContextInterpreter context) {
             "Illegal all zero 64 bit trace id "
                 + tp.substring(TRACE_PARENT_TID_START, TRACE_PARENT_TID_END));
       }
-      context.traceId = traceId;
-      context.spanId = DDSpanId.fromHex(tp, TRACE_PARENT_SID_START, 16, true);
-      if (context.spanId == 0) {
+      this.traceId = traceId;
+      this.spanId = DDSpanId.fromHex(tp, TRACE_PARENT_SID_START, 16, true);
+      if (this.spanId == 0) {
         throw new IllegalStateException(
             "Illegal all zero span id "
                 + tp.substring(TRACE_PARENT_SID_START, TRACE_PARENT_SID_END));
@@ -291,35 +311,34 @@ static void parseTraceParentHeader(String tp, ContextInterpreter context) {
       }
       long flags = LongStringUtils.parseUnsignedLongHex(tp, TRACE_PARENT_FLAGS_START, 2, true);
       if ((flags & TRACE_PARENT_FLAGS_SAMPLED) != 0) {
-        context.samplingPriority = SAMPLER_KEEP;
+        this.samplingPriority = SAMPLER_KEEP;
       } else {
-        context.samplingPriority = SAMPLER_DROP;
+        this.samplingPriority = SAMPLER_DROP;
       }
     }
 
-    static void parseTraceStateHeader(
-        String ts, ContextInterpreter context, PropagationTags.Factory factory) {
-      if (ts == null || ts.isEmpty()) {
-        context.propagationTags = factory.empty();
+    void parseTraceStateHeader(String tracestate) {
+      if (tracestate == null || tracestate.isEmpty()) {
+        this.propagationTags = this.propagationTagsFactory.empty();
       } else {
-        context.propagationTags = factory.fromHeaderValue(PropagationTags.HeaderType.W3C, ts);
+        this.propagationTags = this.propagationTagsFactory.fromHeaderValue(W3C, tracestate);
       }
-      int ptagsPriority = context.propagationTags.getSamplingPriority();
-      int contextPriority = context.samplingPriority;
+      int ptagsPriority = this.propagationTags.getSamplingPriority();
+      int contextPriority = this.samplingPriority;
       if ((contextPriority == SAMPLER_DROP && ptagsPriority > 0)
           || (contextPriority == SAMPLER_KEEP && ptagsPriority <= 0)
           || ptagsPriority == PrioritySampling.UNSET) {
         // Override Datadog sampling priority with W3C one
-        context.propagationTags.updateTraceSamplingPriority(
+        this.propagationTags.updateTraceSamplingPriority(
             contextPriority, SamplingMechanism.EXTERNAL_OVERRIDE);
       } else {
         // Use more detailed Datadog sampling priority in context
-        context.samplingPriority = ptagsPriority;
+        this.samplingPriority = ptagsPriority;
       }
       // Use the origin
-      context.origin = context.propagationTags.getOrigin();
+      this.origin = this.propagationTags.getOrigin();
       // Ensure TraceId high-order bits match
-      context.propagationTags.updateTraceIdHighOrderBits(context.traceId.toHighOrderLong());
+      this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
     }
 
     private static String trim(String input) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
index 489e12abe1e..15e7d54e476 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
@@ -1,6 +1,7 @@
 package datadog.trace.core.propagation;
 
 import static datadog.trace.api.DDTags.ORIGIN_KEY;
+import static datadog.trace.api.TracePropagationStyle.XRAY;
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP;
 import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -12,6 +13,7 @@
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.core.DDSpanContext;
@@ -136,6 +138,11 @@ private XRayContextInterpreter(Config config) {
       super(config);
     }
 
+    @Override
+    public TracePropagationStyle style() {
+      return XRAY;
+    }
+
     @Override
     public boolean accept(String key, String value) {
       if (null == key || key.isEmpty()) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
index 22c7f58cb7b..21ab986a16b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
@@ -88,7 +88,15 @@ static class PTags extends PropagationTags {
      * of the trace id, wrapped into a {@link TagValue}, <code>null</code> if not set.
      */
     private volatile TagValue traceIdHighOrderBitsHexTagValue;
-
+    /**
+     * The original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C tracestate
+     * header</a> value.
+     */
+    protected volatile String tracestate;
+    /**
+     * The {@link PTagsFactory#PROPAGATION_ERROR_TAG_KEY propagation tag error} value, {@code null
+     * if no error while parsing header}.
+     */
     protected volatile String error;
 
     public PTags(
@@ -292,6 +300,16 @@ TagValue getDecisionMakerTagValue() {
       return decisionMakerTagValue;
     }
 
+    @Override
+    public String getW3CTracestate() {
+      return this.tracestate;
+    }
+
+    @Override
+    public void updateW3CTracestate(String tracestate) {
+      this.tracestate = tracestate;
+    }
+
     String getError() {
       return this.error;
     }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
index 94c84d656d5..c88f1e6a95f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
@@ -16,12 +16,14 @@ public class W3CPTagsCodec extends PTagsCodec {
   private static final Logger log = LoggerFactory.getLogger(W3CPTagsCodec.class);
 
   private static final int MAX_HEADER_SIZE = 256;
-  private static final int EMPTY_SIZE = 3; // 'dd='
+  private static final String DATADOG_MEMBER_KEY = "dd=";
+  private static final int EMPTY_SIZE = DATADOG_MEMBER_KEY.length(); // 3
   private static final char MEMBER_SEPARATOR = ',';
   private static final char ELEMENT_SEPARATOR = ';';
   private static final char KEY_VALUE_SEPARATOR = ':';
   private static final int MIN_ALLOWED_CHAR = 32;
   private static final int MAX_ALLOWED_CHAR = 126;
+  private static final int MAX_MEMBER_COUNT = 32;
 
   @Override
   PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
@@ -44,12 +46,12 @@ PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
     int memberIndex = 0;
     int ddMemberIndex = -1;
     while (memberStart < len) {
-      if (memberIndex == 32) {
+      if (memberIndex == MAX_MEMBER_COUNT) {
         // TODO should we return one with an error?
         // TODO should we try to pick up the `dd` member anyway?
         return tagsFactory.empty();
       }
-      if (ddMemberIndex == -1 && value.startsWith("dd=", memberStart)) {
+      if (ddMemberIndex == -1 && value.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
         ddMemberStart = memberStart;
         ddMemberIndex = memberIndex;
       }
@@ -196,19 +198,25 @@ protected int estimateHeaderSize(PTags pTags) {
       W3CPTags w3CPTags = (W3CPTags) pTags;
       size += w3CPTags.maxUnknownSize;
       if (w3CPTags.ddMemberStart != -1) {
-        size += (w3CPTags.original.length() - (w3CPTags.ddMemberValueEnd - w3CPTags.ddMemberStart));
+        size +=
+            (w3CPTags.tracestate.length() - (w3CPTags.ddMemberValueEnd - w3CPTags.ddMemberStart));
       }
+    } else if (pTags.tracestate != null) {
+      // We assume there is no Datadog list-member
+      size += pTags.tracestate.length();
     }
     return size;
   }
 
   @Override
   protected int appendPrefix(StringBuilder sb, PTags ptags) {
-    sb.append("dd=");
+    sb.append(DATADOG_MEMBER_KEY);
+    // Append sampling priority (s)
     if (ptags.getSamplingPriority() != PrioritySampling.UNSET) {
       sb.append("s:");
       sb.append(ptags.getSamplingPriority());
     }
+    // Append origin (o)
     CharSequence origin = ptags.getOrigin();
     if (origin != null) {
       if (sb.length() > EMPTY_SIZE) {
@@ -231,24 +239,24 @@ protected int appendTag(StringBuilder sb, TagElement key, TagElement value, int
 
   @Override
   protected int appendSuffix(StringBuilder sb, PTags ptags, int size) {
-    if (size >= MAX_HEADER_SIZE || !(ptags instanceof W3CPTags)) {
-      return size;
+    // If there is room for appending unknown from W3CPTags
+    if (size < MAX_HEADER_SIZE && ptags instanceof W3CPTags) {
+      W3CPTags w3cPTags = (W3CPTags) ptags;
+      size = cleanUpAndAppendUnknown(sb, w3cPTags, size);
     }
-    W3CPTags w3cPTags = (W3CPTags) ptags;
-    size = cleanUpAndAppendUnknown(sb, w3cPTags, size);
+    // Check empty Datadog list-member only tracestate
     if (size == EMPTY_SIZE) {
       // If we haven't written anything but the 'dd=', then reset the StringBuilder
       sb.setLength(0);
       size = 0;
     }
-    // TODO we need to ensure that there are only 32 segments including our own :(
-    int newSize = cleanUpAndAppendSuffix(sb, w3cPTags, size);
+    // Append all other non-Datadog list-members
+    int newSize = cleanUpAndAppendSuffix(sb, ptags, size);
     if (newSize != size) {
       // We don't care about the total size in bytes here, but only the fact that we added something
       // that should be returned
       size = Math.max(size, EMPTY_SIZE + 1);
     }
-
     return size;
   }
 
@@ -584,7 +592,7 @@ private static int cleanUpAndAppendUnknown(StringBuilder sb, W3CPTags w3CPTags,
         || w3CPTags.ddMemberStart >= w3CPTags.ddMemberValueEnd) {
       return size;
     }
-    String original = w3CPTags.original;
+    String original = w3CPTags.tracestate;
     int elementStart = w3CPTags.ddMemberStart + EMPTY_SIZE; // skip over 'dd='
     int okSize = size;
     while (elementStart < w3CPTags.ddMemberValueEnd && size < MAX_HEADER_SIZE) {
@@ -619,16 +627,29 @@ private static int cleanUpAndAppendUnknown(StringBuilder sb, W3CPTags w3CPTags,
     return size;
   }
 
-  private static int cleanUpAndAppendSuffix(StringBuilder sb, W3CPTags w3CPTags, int size) {
-    String original = w3CPTags.original;
+  private static int cleanUpAndAppendSuffix(StringBuilder sb, PTags ptags, int size) {
+    String original = ptags.tracestate;
+    if (original == null) {
+      return size;
+    }
+    int ddMemberStart = (ptags instanceof W3CPTags) ? ((W3CPTags) ptags).ddMemberStart : -1;
+    int remainingMemberAllowed = size == 0 ? MAX_MEMBER_COUNT : MAX_MEMBER_COUNT - 1;
     int len = original.length();
     int memberStart = findNextMember(original, 0);
     while (memberStart < len) {
+      // Look for member end position
       int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
       if (memberEnd < 0) {
         memberEnd = len;
       }
-      if (memberStart != w3CPTags.ddMemberStart) {
+      // Try to define Datadog member start if not already found
+      if (ddMemberStart == -1) {
+        if (original.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
+          ddMemberStart = memberStart;
+        }
+      }
+      // Skip Datadog member (already added with prefix and tags)
+      if (memberStart != ddMemberStart) {
         if (sb.length() > 0) {
           sb.append(MEMBER_SEPARATOR);
           size++;
@@ -636,8 +657,14 @@ private static int cleanUpAndAppendSuffix(StringBuilder sb, W3CPTags w3CPTags, i
         int end = stripTrailingOWC(original, memberStart, memberEnd);
         sb.append(original, memberStart, end);
         size += (end - memberStart);
+        remainingMemberAllowed--;
+      }
+      // Check if remaining members are allowed
+      if (remainingMemberAllowed == 0) {
+        memberStart = len;
+      } else {
+        memberStart = findNextMember(original, memberEnd + 1);
       }
-      memberStart = findNextMember(original, memberEnd + 1);
     }
     return size;
   }
@@ -667,12 +694,20 @@ private static W3CPTags empty(
   }
 
   private static class W3CPTags extends PTags {
-    private final String original;
+    /** The index of the first tracestate list-member position in {@link #tracestate}. */
     private final int firstMemberStart;
+    /**
+     * The index of the Datadog tracestate list-member (dd=) position in {@link #tracestate}, {@code
+     * -1 if Datadog list-member not found}.
+     */
     private final int ddMemberStart;
+    /**
+     * The index of the end Datadog tracestate list-member (dd=) in {@link #tracestate}, {@code -1
+     * if Datadog list-member not found}.
+     */
     private final int ddMemberValueEnd;
+
     private final int maxUnknownSize;
-    private String error;
 
     public W3CPTags(
         PTagsFactory factory,
@@ -687,20 +722,11 @@ public W3CPTags(
         int ddMemberValueEnd,
         int maxUnknownSize) {
       super(factory, tagPairs, decisionMakerTagValue, traceIdTagValue, samplingPriority, origin);
-      this.original = original;
+      this.tracestate = original;
       this.firstMemberStart = firstMemberStart;
       this.ddMemberStart = ddMemberStart;
       this.ddMemberValueEnd = ddMemberValueEnd;
       this.maxUnknownSize = maxUnknownSize;
-      this.error = null;
-    }
-
-    @Override
-    String getError() {
-      if (this.error != null) {
-        return this.error;
-      }
-      return super.getError();
     }
 
     @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
index 4f5fa1e0414..86667d5a240 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
@@ -1,5 +1,6 @@
 package datadog.trace.core.scopemanager;
 
+import datadog.trace.api.Stateful;
 import datadog.trace.api.scopemanager.ExtendedScopeListener;
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -25,15 +26,19 @@ class ContinuableScope implements AgentScope, AttachableWrapper {
   private static final AtomicReferenceFieldUpdater<ContinuableScope, Object> WRAPPER_FIELD_UPDATER =
       AtomicReferenceFieldUpdater.newUpdater(ContinuableScope.class, Object.class, "wrapper");
 
+  private final Stateful scopeState;
+
   ContinuableScope(
       final ContinuableScopeManager scopeManager,
       final AgentSpan span,
       final byte source,
-      final boolean isAsyncPropagating) {
+      final boolean isAsyncPropagating,
+      final Stateful scopeState) {
     this.scopeManager = scopeManager;
     this.span = span;
     this.flags = source;
     this.isAsyncPropagating = isAsyncPropagating;
+    this.scopeState = scopeState;
   }
 
   @Override
@@ -59,6 +64,7 @@ public final void close() {
     if (!alive) {
       cleanup(scopeStack);
     }
+    scopeState.close();
   }
 
   void cleanup(final ScopeStack scopeStack) {
@@ -152,6 +158,15 @@ public final String toString() {
     return super.toString() + "->" + span;
   }
 
+  public final void beforeActivated() {
+    try {
+      scopeState.activate(span.context());
+    } catch (Throwable e) {
+      ContinuableScopeManager.ratelimitedLog.warn(
+          "ScopeState {} threw exception in beforeActivated()", scopeState.getClass(), e);
+    }
+  }
+
   public final void afterActivated() {
     for (final ScopeListener listener : scopeManager.scopeListeners) {
       try {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
index cd1a1dc9d2e..c3cf116b97c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
@@ -7,12 +7,14 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.Stateful;
 import datadog.trace.api.scopemanager.ExtendedScopeListener;
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentScopeManager;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
 import datadog.trace.bootstrap.instrumentation.api.ScopeState;
@@ -48,6 +50,7 @@ public final class ContinuableScopeManager implements AgentScopeManager {
   private final int depthLimit;
   private final boolean inheritAsyncPropagation;
   final HealthMetrics healthMetrics;
+  private final ProfilingContextIntegration profilingContextIntegration;
 
   /**
    * Constructor with NOOP Profiling and HealthMetrics implementations.
@@ -88,6 +91,7 @@ public ContinuableScopeManager(
     this.extendedScopeListeners = new CopyOnWriteArrayList<>();
     this.healthMetrics = healthMetrics;
     this.tlsScopeStack = new ScopeStackThreadLocal(profilingContextIntegration);
+    this.profilingContextIntegration = profilingContextIntegration;
   }
 
   @Override
@@ -141,7 +145,8 @@ private AgentScope activate(
                 ? top.isAsyncPropagating()
                 : DEFAULT_ASYNC_PROPAGATING;
 
-    final ContinuableScope scope = new ContinuableScope(this, span, source, asyncPropagation);
+    final ContinuableScope scope =
+        new ContinuableScope(this, span, source, asyncPropagation, createScopeState(span));
     scopeStack.push(scope);
     healthMetrics.onActivateScope();
 
@@ -168,11 +173,12 @@ ContinuableScope continueSpan(
       return top;
     }
 
+    Stateful scopeState = createScopeState(span);
     final ContinuableScope scope;
     if (continuation != null) {
-      scope = new ContinuingScope(this, span, source, true, continuation);
+      scope = new ContinuingScope(this, span, source, true, continuation, scopeState);
     } else {
-      scope = new ContinuableScope(this, span, source, true);
+      scope = new ContinuableScope(this, span, source, true, scopeState);
     }
     scopeStack.push(scope);
 
@@ -219,7 +225,8 @@ public AgentScope activateNext(final AgentSpan span) {
             : DEFAULT_ASYNC_PROPAGATING;
 
     final ContinuableScope scope =
-        new ContinuableScope(this, span, ScopeSource.ITERATION.id(), asyncPropagation);
+        new ContinuableScope(
+            this, span, ScopeSource.ITERATION.id(), asyncPropagation, createScopeState(span));
 
     if (iterationKeepAlive > 0 && currentDepth == 0) {
       // no surrounding scope to aid cleanup, so use background task instead
@@ -271,6 +278,16 @@ private void addExtendedScopeListener(final ExtendedScopeListener listener) {
     }
   }
 
+  private Stateful createScopeState(AgentSpan span) {
+    // currently this just manages things the profiler has to do per scope, but could be expanded
+    // to encapsulate other scope lifecycle activities
+    // FIXME DDSpanContext is always a ProfilerContext anyway...
+    if (span.context() instanceof ProfilerContext) {
+      return profilingContextIntegration.newScopeState((ProfilerContext) span.context());
+    }
+    return Stateful.DEFAULT;
+  }
+
   ScopeStack scopeStack() {
     return this.tlsScopeStack.get();
   }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
index 19500fa747b..f929fdb5df1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
@@ -1,5 +1,6 @@
 package datadog.trace.core.scopemanager;
 
+import datadog.trace.api.Stateful;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 final class ContinuingScope extends ContinuableScope {
@@ -11,8 +12,9 @@ final class ContinuingScope extends ContinuableScope {
       final AgentSpan span,
       final byte source,
       final boolean isAsyncPropagating,
-      final AbstractContinuation continuation) {
-    super(scopeManager, span, source, isAsyncPropagating);
+      final AbstractContinuation continuation,
+      final Stateful scopeState) {
+    super(scopeManager, span, source, isAsyncPropagating, scopeState);
     this.continuation = continuation;
   }
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
index 08d5efb691f..78ea56d7d8a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
@@ -1,7 +1,5 @@
 package datadog.trace.core.scopemanager;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
 import java.util.ArrayDeque;
@@ -47,19 +45,18 @@ void cleanup() {
     } else if (changedTop) {
       top = curScope;
       if (curScope != null) {
+        curScope.beforeActivated();
         curScope.afterActivated();
       }
     }
     if (top == null) {
       onBecomeEmpty();
-    } else {
-      onTopChanged(top);
     }
   }
 
   /** Marks a new scope as current, pushing the previous onto the stack */
   void push(final ContinuableScope scope) {
-    onTopChanged(scope);
+    scope.beforeActivated();
     if (top != null) {
       stack.push(top);
     } else {
@@ -110,17 +107,6 @@ void clear() {
     top = null;
   }
 
-  private void onTopChanged(ContinuableScope top) {
-    AgentSpan.Context context = top.span.context();
-    if (context instanceof ProfilerContext) {
-      try {
-        profilingContextIntegration.setContext((ProfilerContext) context);
-      } catch (Throwable e) {
-        ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
-      }
-    }
-  }
-
   /** Notifies profiler that this thread has a context now */
   private void onBecomeNonEmpty() {
     try {
@@ -133,7 +119,6 @@ private void onBecomeNonEmpty() {
   /** Notifies profiler that this thread no longer has a context */
   private void onBecomeEmpty() {
     try {
-      profilingContextIntegration.clearContext();
       profilingContextIntegration.onDetach();
     } catch (Throwable e) {
       ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
index 110053d7dcd..07e4a03db7e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
@@ -15,7 +15,7 @@ public class QueryObfuscator implements TagsPostProcessor {
   private static final Logger log = LoggerFactory.getLogger(QueryObfuscator.class);
 
   private static final String DEFAULT_OBFUSCATION_PATTERN =
-      "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
+      "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
 
   private final Pattern pattern;
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
index 393b0e4d5ca..c0fd0499b95 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
@@ -5,20 +5,11 @@
 public final class GlobPattern {
 
   public static Pattern globToRegexPattern(String globPattern) {
-    if (globPattern == null) {
-      return null;
-    }
     String regex = globToRegex(globPattern);
-    if (regex == null) {
-      return null;
-    }
     return Pattern.compile(regex);
   }
 
   private static String globToRegex(String globPattern) {
-    if ("*".equals(globPattern)) {
-      return null;
-    }
     StringBuilder sb = new StringBuilder(64);
     sb.append('^');
     for (int i = 0; i < globPattern.length(); i++) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java b/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java
new file mode 100644
index 00000000000..42cd2f71c97
--- /dev/null
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java
@@ -0,0 +1,7 @@
+package datadog.trace.core.util;
+
+public interface Matcher {
+  public boolean matches(String str);
+
+  public boolean matches(CharSequence charSeq);
+}
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java b/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java
new file mode 100644
index 00000000000..a3e590c6b93
--- /dev/null
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java
@@ -0,0 +1,69 @@
+package datadog.trace.core.util;
+
+import java.util.regex.Pattern;
+
+public final class Matchers {
+  private Matchers() {}
+
+  public static final Matcher compileGlob(String glob) {
+    if (glob == null || glob.equals("*")) {
+      // DQH - Decided not to an anyMatcher because that's likely to
+      // cause our call site to go megamorphic
+      return null;
+    } else if (isExact(glob)) {
+      return new ExactMatcher(glob);
+    } else {
+      // DQH - not sure about the error handling here
+      Pattern pattern = GlobPattern.globToRegexPattern(glob);
+      return pattern == null ? null : new PatternMatcher(pattern);
+    }
+  }
+
+  public static boolean matches(Matcher matcher, String str) {
+    return (matcher == null) || matcher.matches(str);
+  }
+
+  public static boolean matches(Matcher matcher, CharSequence charSeq) {
+    return (matcher == null) || matcher.matches(charSeq);
+  }
+
+  static boolean isExact(String glob) {
+    return (glob.indexOf('*') == -1) && (glob.indexOf('?') == -1);
+  }
+
+  static final class ExactMatcher implements Matcher {
+    private final String exact;
+
+    ExactMatcher(String exact) {
+      this.exact = exact;
+    }
+
+    @Override
+    public boolean matches(String str) {
+      return exact.equals(str);
+    }
+
+    @Override
+    public boolean matches(CharSequence charSeq) {
+      return exact.contentEquals(charSeq);
+    }
+  }
+
+  static final class PatternMatcher implements Matcher {
+    private final Pattern pattern;
+
+    PatternMatcher(Pattern pattern) {
+      this.pattern = pattern;
+    }
+
+    @Override
+    public boolean matches(CharSequence charSeq) {
+      return pattern.matcher(charSeq).matches();
+    }
+
+    @Override
+    public boolean matches(String str) {
+      return pattern.matcher(str).matches();
+    }
+  }
+}
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
index bcf0ffc8834..e0e824b3d1b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
@@ -1,16 +1,20 @@
 package datadog.trace.lambda;
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import datadog.trace.api.DDSpanId;
+import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.core.propagation.ExtractedContext;
 import datadog.trace.core.propagation.PropagationTags;
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -36,6 +40,9 @@ public class LambdaHandler {
   private static final String DATADOG_SPAN_ID = "x-datadog-span-id";
   private static final String DATADOG_SAMPLING_PRIORITY = "x-datadog-sampling-priority";
   private static final String DATADOG_INVOCATION_ERROR = "x-datadog-invocation-error";
+  private static final String DATADOG_INVOCATION_ERROR_MSG = "x-datadog-invocation-error-msg";
+  private static final String DATADOG_INVOCATION_ERROR_TYPE = "x-datadog-invocation-error-type";
+  private static final String DATADOG_INVOCATION_ERROR_STACK = "x-datadog-invocation-error-stack";
   private static final String DATADOG_TAGS_KEY = "x-datadog-tags";
 
   private static final String START_INVOCATION = "/lambda/start-invocation";
@@ -92,7 +99,12 @@ public static AgentSpan.Context notifyStartInvocation(
               propagationTagsFactory.fromHeaderValue(
                   PropagationTags.HeaderType.DATADOG, response.headers().get(DATADOG_TAGS_KEY));
           return new ExtractedContext(
-              DDTraceId.from(traceID), DDSpanId.ZERO, samplingPriority, null, propagationTags);
+              DDTraceId.from(traceID),
+              DDSpanId.ZERO,
+              samplingPriority,
+              null,
+              propagationTags,
+              DATADOG);
         } else {
           log.debug(
               "could not find traceID or sampling priority in notifyStartInvocation, not injecting the context");
@@ -115,12 +127,30 @@ public static boolean notifyEndInvocation(AgentSpan span, Object result, boolean
     Request.Builder builder =
         new Request.Builder()
             .url(EXTENSION_BASE_URL + END_INVOCATION)
-            .addHeader(DATADOG_META_LANG, "java")
             .addHeader(DATADOG_TRACE_ID, span.getTraceId().toString())
             .addHeader(DATADOG_SPAN_ID, DDSpanId.toString(span.getSpanId()))
             .addHeader(DATADOG_SAMPLING_PRIORITY, span.getSamplingPriority().toString())
             .addHeader(DATADOG_META_LANG, "java")
             .post(body);
+
+    Object errorMessage = span.getTag(DDTags.ERROR_MSG);
+    if (errorMessage != null) {
+      builder.addHeader(DATADOG_INVOCATION_ERROR_MSG, errorMessage.toString());
+    }
+
+    Object errorType = span.getTag(DDTags.ERROR_TYPE);
+    if (errorType != null) {
+      builder.addHeader(DATADOG_INVOCATION_ERROR_TYPE, errorType.toString());
+    }
+
+    Object errorStack = span.getTag(DDTags.ERROR_STACK);
+    if (errorStack != null) {
+      String encodedErrStack =
+          Base64.getEncoder()
+              .encodeToString(errorStack.toString().getBytes(StandardCharsets.UTF_8));
+      builder.addHeader(DATADOG_INVOCATION_ERROR_STACK, encodedErrStack);
+    }
+
     if (isError) {
       builder.addHeader(DATADOG_INVOCATION_ERROR, "true");
     }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy
index 7b470784310..3bde48912c6 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy
@@ -159,7 +159,9 @@ class RuleBasedSamplingTest extends DDCoreSpecification {
     DDSpan span = tracer.buildSpan("operation")
       .withServiceName("service")
       .withTag("env", "bar")
-      .ignoreActiveSpan().start()
+      .withResourceName("resource")
+      .ignoreActiveSpan()
+      .start()
     ((PrioritySampler) sampler).setSamplingPriority(span)
 
     then:
@@ -214,6 +216,20 @@ class RuleBasedSamplingTest extends DDCoreSpecification {
     "[{\"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]"                                                           | null        | 1.0              | 50                | null              | USER_KEEP
     "[{\"name\": \"xxx\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]"                                                           | null        | 0                | null              | null              | USER_DROP
 
+    // Matching resource : keep
+    "[{\"resource\": \"resource\", \"sample_rate\": 1}]"                                                                                                 | null        | 1.0              | 50                | null              | USER_KEEP
+
+    // Matching operation: drop
+    "[{\"resource\": \"resource\", \"sample_rate\": 0}]"                                                                                                 | null        | 0                | null              | null              | USER_DROP
+
+    // Matching operation overrides default rate
+    "[{\"resource\": \"resource\", \"sample_rate\": 1}]"                                                                                                 | "0"         | 1.0              | 50                | null              | USER_KEEP
+    "[{\"resource\": \"resource\", \"sample_rate\": 0}]"                                                                                                 | "1"         | 0                | null              | null              | USER_DROP
+
+    // multiple operation combinations
+    "[{\"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]"                                                    | null        | 1.0              | 50                | null              | USER_KEEP
+    "[{\"resource\": \"xxx\", \"sample_rate\": 1}, {\"resource\": \"resource\", \"sample_rate\": 0}]"                                                    | null        | 0                | null              | null              | USER_DROP
+
     // Service and operation name rules
     "[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]"                                                    | null        | 1.0              | 50                | null              | USER_KEEP
     "[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"xxx\", \"sample_rate\": 0}]"                                                          | null        | 1.0              | 50                | null              | USER_KEEP
@@ -227,6 +243,7 @@ class RuleBasedSamplingTest extends DDCoreSpecification {
     "[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]"       | null        | 1.0              | 50                | null              | USER_KEEP
     "[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"sample_rate\": 1}]"                                | null        | 1.0              | 50                | null              | USER_KEEP
     "[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]"                                 | null        | 1.0              | 50                | null              | USER_KEEP
+    "[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]"                          | null        | 1.0              | 50                | null              | USER_KEEP
     "[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]" | null        | 0                | null              | null              | USER_DROP
     "[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}]"                                                                          | null        | 0                | null              | null              | USER_DROP
   }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesFileTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesFileTest.groovy
deleted file mode 100644
index dc30503ec84..00000000000
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesFileTest.groovy
+++ /dev/null
@@ -1,93 +0,0 @@
-package datadog.trace.common.sampling
-
-import datadog.trace.core.test.DDCoreSpecification
-
-import java.nio.file.Files
-import java.nio.file.Path
-
-class SpanSamplingRulesFileTest extends DDCoreSpecification {
-
-  static createRulesFile(String rules) {
-    Path p = Files.createTempFile('single-span-sampling-rules', '.json')
-    p.toFile() << rules
-    return p.toString()
-  }
-
-  def "Deserialize empty list of Span Sampling rules from JSON"() {
-    when:
-    def rules = SpanSamplingRules.deserializeFile(createRulesFile('[]'))
-
-    then:
-    rules == null
-  }
-
-  def "Deserialize Span Sampling rules from JSON"() {
-    when:
-    def rules = SpanSamplingRules.deserializeFile(createRulesFile("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 0.0}, 
-      {\"service\": \"service-name\", \"sample_rate\": 0.5}, 
-      {\"name\": \"operation-name\", \"sample_rate\": 0.75, \"max_per_second\": 10}, 
-      {\"sample_rate\": 0.25}
-    ]"""))
-
-    then:
-    rules.rules.size() == 4
-
-    rules.rules[0].service == "usersvc"
-    rules.rules[0].name == "healthcheck"
-    rules.rules[0].sampleRate == 0.0d
-    rules.rules[0].maxPerSecond == Integer.MAX_VALUE
-
-    rules.rules[1].service == "service-name"
-    rules.rules[1].name == null
-    rules.rules[1].sampleRate == 0.5d
-    rules.rules[1].maxPerSecond == Integer.MAX_VALUE
-
-    rules.rules[2].service == null
-    rules.rules[2].name == "operation-name"
-    rules.rules[2].sampleRate == 0.75d
-    rules.rules[2].maxPerSecond == 10
-
-    rules.rules[3].service == null
-    rules.rules[3].name == null
-    rules.rules[3].sampleRate == 0.25d
-    rules.rules[3].maxPerSecond == Integer.MAX_VALUE
-  }
-
-  def "Skip Span Sampling Rules with invalid sample_rate values"() {
-    when:
-    def rules = SpanSamplingRules.deserializeFile(createRulesFile("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": $rate}
-    ]"""))
-
-    then:
-    rules == null
-
-    where:
-    rate << ["-0.1", "-11", "1.2", "100", "\"zero\"", "\"\""]
-  }
-
-  def "Skip Span Sampling Rules with invalid max_per_second values"() {
-    when:
-    def rules = SpanSamplingRules.deserializeFile(createRulesFile("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"max_per_second\": $limit}
-    ]"""))
-
-    then:
-    rules == null
-
-    where:
-    limit << ["0", "-11", "\"zero\"", "\"\""]
-  }
-
-  def "Skip Span Sampling Rules when incorrect JSON provided"() {
-    when:
-    def rules = SpanSamplingRules.deserializeFile(createRulesFile(jsonRules))
-
-    then:
-    rules == null
-
-    where:
-    jsonRules << ["[", "{\\\"service\\\": \\\"usersvc\\\",}", ""]
-  }
-}
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesTest.groovy
index 884445f4b27..412134cf564 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SpanSamplingRulesTest.groovy
@@ -1,84 +1,169 @@
 package datadog.trace.common.sampling
 
+import com.squareup.moshi.Moshi
 import datadog.trace.core.test.DDCoreSpecification
 
+import java.nio.file.Files
+import java.nio.file.Path
+
+import static datadog.trace.api.sampling.SamplingRule.MATCH_ALL
+
 class SpanSamplingRulesTest extends DDCoreSpecification {
 
-  def "Deserialize empty list of Span Sampling rules from JSON"() {
+  def deserializeRules(String jsonRules) {
+    return SpanSamplingRules.deserialize(jsonRules)
+  }
+
+  def "Deserialize empty list of Span Sampling Rules from JSON"() {
     when:
-    def rules = SpanSamplingRules.deserialize("[]")
+    def rules = deserializeRules('[]')
 
     then:
-    rules == null
+    rules.empty
   }
 
-  def "Deserialize Span Sampling rules from JSON"() {
+  def "Deserialize Span Sampling Rules from JSON"() {
     when:
-    def rules = SpanSamplingRules.deserialize("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 0.0}, 
-      {\"service\": \"service-name\", \"sample_rate\": 0.5}, 
-      {\"name\": \"operation-name\", \"sample_rate\": 0.75, \"max_per_second\": 10}, 
-      {\"sample_rate\": 0.25}
-    ]""")
+    def rules = deserializeRules("""[
+      {"service": "service-name", "name": "operation-name", "resource": "resource-name", "tags":
+        {"tag-name1": "tag-pattern1",
+         "tag-name2": "tag-pattern2"},
+        "sample_rate": 0.0, "max_per_second": 10.0},
+      {},
+      {"service": "", "name": "", "resource": "", "tags": {}},
+      {"service": null, "name": null, "resource": null, "tags": null, "sample_rate": null, "sample_rate": null, "max_per_second": null},
+
+      {"sample_rate": 0.25},
+      {"sample_rate": 0.5},
+      {"sample_rate": 0.75},
+      {"sample_rate": 1},
+
+      {"max_per_second": 0.2},
+      {"max_per_second": 1.0},
+      {"max_per_second": 10},
+      {"max_per_second": 10.123},
+      {"max_per_second": 10000}
+    ]""").rules
+    def ruleIndex = 0
 
     then:
-    rules.rules.size() == 4
-
-    rules.rules[0].service == "usersvc"
-    rules.rules[0].name == "healthcheck"
-    rules.rules[0].sampleRate == 0.0d
-    rules.rules[0].maxPerSecond == Integer.MAX_VALUE
-
-    rules.rules[1].service == "service-name"
-    rules.rules[1].name == null
-    rules.rules[1].sampleRate == 0.5d
-    rules.rules[1].maxPerSecond == Integer.MAX_VALUE
-
-    rules.rules[2].service == null
-    rules.rules[2].name == "operation-name"
-    rules.rules[2].sampleRate == 0.75d
-    rules.rules[2].maxPerSecond == 10
-
-    rules.rules[3].service == null
-    rules.rules[3].name == null
-    rules.rules[3].sampleRate == 0.25d
-    rules.rules[3].maxPerSecond == Integer.MAX_VALUE
+    rules.size() == 13
+
+    // Test a complete rule
+    rules[ruleIndex].service == "service-name"
+    rules[ruleIndex].name == "operation-name"
+    rules[ruleIndex].resource == "resource-name"
+    rules[ruleIndex].tags == ["tag-name1": "tag-pattern1", "tag-name2": "tag-pattern2"]
+    rules[ruleIndex].sampleRate == 0.0d
+    rules[ruleIndex++].maxPerSecond == 10
+
+    // Test default values with an empty rule
+    rules[ruleIndex].service == MATCH_ALL
+    rules[ruleIndex].name == MATCH_ALL
+    rules[ruleIndex].resource == MATCH_ALL
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].sampleRate == 1d
+    rules[ruleIndex++].maxPerSecond == Integer.MAX_VALUE
+
+    // Test rule with empty values
+    rules[ruleIndex].service == ""
+    rules[ruleIndex].name == ""
+    rules[ruleIndex].resource == ""
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].sampleRate == 1d
+    rules[ruleIndex++].maxPerSecond == Integer.MAX_VALUE
+
+    // Test rule with null values
+    rules[ruleIndex].service == MATCH_ALL
+    rules[ruleIndex].name == MATCH_ALL
+    rules[ruleIndex].resource == MATCH_ALL
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].sampleRate == 1d
+    rules[ruleIndex++].maxPerSecond == Integer.MAX_VALUE
+
+    // Test different sample rate values
+    rules[ruleIndex++].sampleRate == 0.25d
+    rules[ruleIndex++].sampleRate == 0.5d
+    rules[ruleIndex++].sampleRate == 0.75d
+    rules[ruleIndex++].sampleRate == 1d
+
+    // Test different max per second values
+    rules[ruleIndex++].maxPerSecond == 1
+    rules[ruleIndex++].maxPerSecond == 1
+    rules[ruleIndex++].maxPerSecond == 10
+    rules[ruleIndex++].maxPerSecond == 10
+    rules[ruleIndex++].maxPerSecond == 10000
   }
 
   def "Skip Span Sampling Rules with invalid sample_rate values"() {
     when:
-    def rules = SpanSamplingRules.deserialize("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": $rate}
+    def rules = deserializeRules("""[
+      {"service": "usersvc", "name": "healthcheck", "sample_rate": $rate}
     ]""")
 
     then:
-    rules == null
+    rules.empty
 
     where:
-    rate << ["-0.1", "-11", "1.2", "100", "\"zero\"", "\"\""]
+    rate << ['-0.1', '-11', '1.2', '100', '"zero"', '""']
   }
 
   def "Skip Span Sampling Rules with invalid max_per_second values"() {
     when:
-    def rules = SpanSamplingRules.deserialize("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"max_per_second\": $limit}
+    def rules = deserializeRules("""[
+      {"service": "usersvc", "name": "healthcheck", "max_per_second": $limit}
     ]""")
 
     then:
-    rules == null
+    rules.empty
 
     where:
-    limit << ["0", "-11", "\"zero\"", "\"\""]
+    limit << ['0', '-11', '"zero"', '""']
   }
 
   def "Skip Span Sampling Rules when incorrect JSON provided"() {
     when:
-    def rules = SpanSamplingRules.deserialize(jsonRules)
+    def rules = deserializeRules(jsonRules)
 
     then:
-    rules == null
+    rules.empty
 
     where:
-    jsonRules << ["[", "{\\\"service\\\": \\\"usersvc\\\",}", ""]
+    jsonRules << ['[', '{"service": "usersvc",}', '']
+  }
+
+  def "Render JsonRule correctly when toString() is called"() {
+    when:
+    def jsonRule = new Moshi.Builder().build().adapter(SpanSamplingRules.JsonRule).fromJson(json)
+
+    then:
+    jsonRule.toString() == json
+
+    where:
+    json = '{"max_per_second":"10","name":"name","resource":"resource","sample_rate":"0.5","service":"service","tags":{"a":"b","foo":"bar"}}'
+  }
+
+  def "Keep only valid rules when invalid rules are present"() {
+    when:
+    def rules = SpanSamplingRules.deserialize("""[
+      {"service": "usersvc", "name": "healthcheck", "sample_rate": 0.5},
+      {"service": "usersvc", "name": "healthcheck2", "sample_rate": 200}
+    ]""")
+
+    then:
+    rules.rules.size() == 1
+  }
+}
+
+class SpanSamplingRulesFileTest extends SpanSamplingRulesTest {
+  static createRulesFile(String rules) {
+    Path p = Files.createTempFile('single-span-sampling-rules', '.json')
+    p.toFile() << rules
+    return p.toString()
+  }
+
+  @Override
+  def deserializeRules(String jsonRules) {
+    return SpanSamplingRules.deserializeFile(createRulesFile(jsonRules))
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/TraceSamplingRulesTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/TraceSamplingRulesTest.groovy
index 7962e2d42b8..d4ca17aa773 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/TraceSamplingRulesTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/TraceSamplingRulesTest.groovy
@@ -1,57 +1,117 @@
 package datadog.trace.common.sampling
 
+import com.squareup.moshi.Moshi
 import datadog.trace.core.test.DDCoreSpecification
 
+import static datadog.trace.api.sampling.SamplingRule.MATCH_ALL
+import static datadog.trace.api.sampling.SamplingRule.TraceSamplingRule.TargetSpan.*
+
 class TraceSamplingRulesTest extends DDCoreSpecification {
 
-  def "Deserialize empty list of Trace Sampling rules from JSON"() {
+  def "Deserialize empty list of Trace Sampling Rules from JSON"() {
     when:
     def rules = TraceSamplingRules.deserialize("[]")
 
     then:
-    rules.rules.size() == 0
+    rules.empty
   }
 
-  def "Deserialize Trace Sampling rules from JSON"() {
+  def "Deserialize Trace Sampling Rules from JSON"() {
     when:
     def rules = TraceSamplingRules.deserialize("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 0.0}, 
-      {\"service\": \"service-name\", \"sample_rate\": 0.5}, 
-      {\"name\": \"operation-name\", \"sample_rate\": 0.75}, 
-      {\"sample_rate\": 0.25}
-    ]""")
+      {"service": "service-name", "name": "operation-name", "resource": "resource-name", "tags":
+        {"tag-name1": "tag-pattern1", 
+         "tag-name2": "tag-pattern2"},
+        "target_span": "root", "sample_rate": 0.0},
+      {},
+      {"service": "", "name": "", "resource": "", "tags": {}}, 
+      {"service": null, "name": null, "resource": null, "tags": null, "target_span": null, "sample_rate": null}, 
+      
+      {"target_span": "root"},
+      {"target_span": "ROOT"},
+      {"target_span": "any"},
+      {"target_span": "ANY"},
+      
+      {"sample_rate": 0.25},
+      {"sample_rate": 0.5}, 
+      {"sample_rate": 0.75},
+      {"sample_rate": 1}
+    ]""").rules
+    def ruleIndex = 0
 
     then:
-    rules.rules.size() == 4
-
-    rules.rules[0].service == "usersvc"
-    rules.rules[0].name == "healthcheck"
-    rules.rules[0].sampleRate == 0.0d
+    rules.size() == 12
+
+    // Test a complete rule
+    rules[ruleIndex].service == "service-name"
+    rules[ruleIndex].name == "operation-name"
+    rules[ruleIndex].resource == "resource-name"
+    rules[ruleIndex].tags == ["tag-name1": "tag-pattern1", "tag-name2": "tag-pattern2"]
+    rules[ruleIndex].targetSpan == ROOT
+    rules[ruleIndex++].sampleRate == 0d
+
+    // Test default values with an empty rule
+    rules[ruleIndex].service == MATCH_ALL
+    rules[ruleIndex].name == MATCH_ALL
+    rules[ruleIndex].resource == MATCH_ALL
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].targetSpan == ROOT
+    rules[ruleIndex++].sampleRate == 1d
+
+    // Test rule with empty values
+    rules[ruleIndex].service == ""
+    rules[ruleIndex].name == ""
+    rules[ruleIndex].resource == ""
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].targetSpan == ROOT
+    rules[ruleIndex++].sampleRate == 1d
+
+    // Test rule with null values
+    rules[ruleIndex].service == MATCH_ALL
+    rules[ruleIndex].name == MATCH_ALL
+    rules[ruleIndex].resource == MATCH_ALL
+    rules[ruleIndex].tags == [:]
+    rules[ruleIndex].targetSpan == ROOT
+    rules[ruleIndex++].sampleRate == 1d
+
+    // Test different target span values
+    rules[ruleIndex++].targetSpan == ROOT
+    rules[ruleIndex++].targetSpan == ROOT
+    rules[ruleIndex++].targetSpan == ANY
+    rules[ruleIndex++].targetSpan == ANY
+
+    // Test different sample rate values
+    rules[ruleIndex++].sampleRate == 0.25d
+    rules[ruleIndex++].sampleRate == 0.5d
+    rules[ruleIndex++].sampleRate == 0.75d
+    rules[ruleIndex++].sampleRate == 1d
+  }
 
-    rules.rules[1].service == "service-name"
-    rules.rules[1].name == null
-    rules.rules[1].sampleRate == 0.5d
+  def "Skip Trace Sampling Rules with invalid target span values: #targetSpan"() {
+    when:
+    def rules = TraceSamplingRules.deserialize("""[
+      {"target_span": $targetSpan}
+    ]""")
 
-    rules.rules[2].service == null
-    rules.rules[2].name == "operation-name"
-    rules.rules[2].sampleRate == 0.75d
+    then:
+    rules.empty
 
-    rules.rules[3].service == null
-    rules.rules[3].name == null
-    rules.rules[3].sampleRate == 0.25d
+    where:
+    targetSpan << ['"invalid-string"', '1.2', '""', '{}', '[]']
   }
 
-  def "Skip Trace Sampling Rules with invalid rate values"() {
+
+  def "Skip Trace Sampling Rules with invalid sample rate values: #rate"() {
     when:
     def rules = TraceSamplingRules.deserialize("""[
-      {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": $rate}
+      {"service": "usersvc", "name": "healthcheck", "sample_rate": $rate}
     ]""")
 
     then:
-    rules.rules.size() == 0
+    rules.empty
 
     where:
-    rate << ["-0.1", "-11", "1.2", "100", null, "\"zero\"", "\"\""]
+    rate << ['-0.1', '-11', '1.2', '100', '"zero"', '""', '{}', '[]']
   }
 
   def "Skip Trace Sampling Rules when incorrect JSON provided"() {
@@ -59,9 +119,31 @@ class TraceSamplingRulesTest extends DDCoreSpecification {
     def rules = TraceSamplingRules.deserialize(jsonRules)
 
     then:
-    rules == null
+    rules.empty
+
+    where:
+    jsonRules << ['[', '{"service": "usersvc",}', '']
+  }
+
+  def "Render JsonRule correctly when toString() is called"() {
+    when:
+    def jsonRule = new Moshi.Builder().build().adapter(TraceSamplingRules.JsonRule).fromJson(json)
+
+    then:
+    jsonRule.toString() == json
 
     where:
-    jsonRules << ["[", "{\\\"service\\\": \\\"usersvc\\\",}", ""]
+    json = '{"name":"name","resource":"resource","sample_rate":"0.5","service":"service","tags":{"a":"b","foo":"bar"},"target_span":"root"}'
+  }
+
+  def "Keep only valid rules when invalid rules are present"() {
+    when:
+    def rules = TraceSamplingRules.deserialize("""[
+      {"service": "usersvc", "name": "healthcheck", "sample_rate": 0.5},
+      {"service": "usersvc", "name": "healthcheck", "sample_rate": 200}
+    ]""")
+
+    then:
+    rules.rules.size() == 1
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy
index e4a3561f5ff..453fa72bbcf 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy
@@ -290,7 +290,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
 
   def createMinimalTrace() {
     def context = createMinimalContext()
-    def minimalSpan = new DDSpan("test", 0, context)
+    def minimalSpan = new DDSpan("test", 0, context, null)
     context.getTrace().getRootSpan() >> minimalSpan
     def minimalTrace = [minimalSpan]
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy
index 6ff82cecb5b..bfe690a8666 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy
@@ -217,6 +217,6 @@ class DDAgentWriterTest extends DDCoreSpecification {
       NoopPathwayContext.INSTANCE,
       false,
       PropagationTags.factory().empty())
-    return new DDSpan("test", 0, context)
+    return new DDSpan("test", 0, context, null)
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy
index 10d01efe86f..e5bd12620b5 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy
@@ -745,7 +745,7 @@ class DDIntakeWriterCombinedTest extends DDCoreSpecification {
 
   def createMinimalTrace() {
     def context = createMinimalContext()
-    def minimalSpan = new DDSpan("test", 0, context)
+    def minimalSpan = new DDSpan("test", 0, context, null)
     context.getTrace().getRootSpan() >> minimalSpan
     def minimalTrace = [minimalSpan]
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy
index f9e4034e3ba..7bf7831d548 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy
@@ -210,7 +210,7 @@ class DDIntakeWriterTest extends DDCoreSpecification {
       AgentTracer.NoopPathwayContext.INSTANCE,
       false,
       PropagationTags.factory().empty())
-    return new DDSpan("test", 0, context)
+    return new DDSpan("test", 0, context, null)
   }
 
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy
index e3afc55c643..2f34ead68d8 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy
@@ -172,6 +172,6 @@ class PayloadDispatcherImplTest extends DDSpecification {
       NoopPathwayContext.INSTANCE,
       false,
       PropagationTags.factory().empty())
-    return new DDSpan("test", 0, context)
+    return new DDSpan("test", 0, context, null)
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/CoreSpanBuilderTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/CoreSpanBuilderTest.groovy
index 735b6d313cc..f01640a5997 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/CoreSpanBuilderTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/CoreSpanBuilderTest.groovy
@@ -25,6 +25,7 @@ import static datadog.trace.api.DDTags.PID_TAG
 import static datadog.trace.api.DDTags.RUNTIME_ID_TAG
 import static datadog.trace.api.DDTags.THREAD_ID
 import static datadog.trace.api.DDTags.THREAD_NAME
+import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class CoreSpanBuilderTest extends DDCoreSpecification {
@@ -335,9 +336,9 @@ class CoreSpanBuilderTest extends DDCoreSpecification {
     span.context().propagationTags.headerValue(PropagationTags.HeaderType.DATADOG) == extractedContext.propagationTags.headerValue(PropagationTags.HeaderType.DATADOG)
 
     where:
-    extractedContext                                                                                                                                                                                                                | _
-    new ExtractedContext(DDTraceId.ONE, 2, PrioritySampling.SAMPLER_DROP, null, 0, [:], [:], null, PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=934086a686-4,_dd.p.anytag=value"), null) | _
-    new ExtractedContext(DDTraceId.from(3), 4, PrioritySampling.SAMPLER_KEEP, "some-origin", 0, ["asdf": "qwer"], [(ORIGIN_KEY): "some-origin", "zxcv": "1234"], null, PropagationTags.factory().empty(), null)                     | _
+    extractedContext                                                                                                                                                                                                                         | _
+    new ExtractedContext(DDTraceId.ONE, 2, PrioritySampling.SAMPLER_DROP, null, 0, [:], [:], null, PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=934086a686-4,_dd.p.anytag=value"), null, DATADOG) | _
+    new ExtractedContext(DDTraceId.from(3), 4, PrioritySampling.SAMPLER_KEEP, "some-origin", 0, ["asdf": "qwer"], [(ORIGIN_KEY): "some-origin", "zxcv": "1234"], null, PropagationTags.factory().empty(), null, DATADOG)                     | _
   }
 
   def "TagContext should populate default span details"() {
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextPropagationTagsTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextPropagationTagsTest.groovy
index fc56a3377c2..50ef4ff544f 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextPropagationTagsTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextPropagationTagsTest.groovy
@@ -7,6 +7,7 @@ import datadog.trace.core.propagation.ExtractedContext
 import datadog.trace.core.propagation.PropagationTags
 import datadog.trace.core.test.DDCoreSpecification
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static datadog.trace.api.sampling.PrioritySampling.*
 import static datadog.trace.api.sampling.SamplingMechanism.*
 
@@ -23,7 +24,7 @@ class DDSpanContextPropagationTagsTest extends DDCoreSpecification {
     setup:
     tracer = tracerBuilder().writer(writer).build()
     def propagationTags = tracer.propagationTagsFactory.fromHeaderValue(PropagationTags.HeaderType.DATADOG, header)
-    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags)
+    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
       .withRequestContextDataAppSec("dummy")
     def span = (DDSpan) tracer.buildSpan("top")
       .asChildOf((AgentSpan.Context) extracted)
@@ -52,7 +53,7 @@ class DDSpanContextPropagationTagsTest extends DDCoreSpecification {
     setup:
     tracer = tracerBuilder().writer(writer).build()
     def propagationTags = tracer.propagationTagsFactory.fromHeaderValue(PropagationTags.HeaderType.DATADOG, header)
-    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags)
+    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
       .withRequestContextDataAppSec("dummy")
     def rootSpan = (DDSpan) tracer.buildSpan("top")
       .asChildOf((AgentSpan.Context) extracted)
@@ -82,7 +83,7 @@ class DDSpanContextPropagationTagsTest extends DDCoreSpecification {
     setup:
     tracer = tracerBuilder().writer(writer).build()
     def propagationTags = tracer.propagationTagsFactory.fromHeaderValue(PropagationTags.HeaderType.DATADOG, header)
-    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags)
+    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
       .withRequestContextDataAppSec("dummy")
     def span = (DDSpan) tracer.buildSpan("top")
       .asChildOf((AgentSpan.Context) extracted)
@@ -109,7 +110,7 @@ class DDSpanContextPropagationTagsTest extends DDCoreSpecification {
     setup:
     tracer = tracerBuilder().writer(writer).build()
     def propagationTags = tracer.propagationTagsFactory.fromHeaderValue(PropagationTags.HeaderType.DATADOG, header)
-    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags)
+    def extracted = new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
       .withRequestContextDataAppSec("dummy")
     def rootSpan = (DDSpan) tracer.buildSpan("top")
       .asChildOf((AgentSpan.Context) extracted)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy
index 35f8fc58d83..bcd62a08b6d 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy
@@ -9,6 +9,7 @@ import datadog.trace.common.writer.ListWriter
 import datadog.trace.core.propagation.ExtractedContext
 import datadog.trace.core.test.DDCoreSpecification
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static datadog.trace.api.sampling.PrioritySampling.*
 import static datadog.trace.api.sampling.SamplingMechanism.*
 import static datadog.trace.core.DDSpanContext.SPAN_SAMPLING_MECHANISM_TAG
@@ -181,7 +182,7 @@ class DDSpanContextTest extends DDCoreSpecification {
 
   def "set TraceSegment tags and data on correct span"() {
     setup:
-    def extracted = new ExtractedContext(DDTraceId.from(123), 456, SAMPLER_KEEP, "789", tracer.getPropagationTagsFactory().empty())
+    def extracted = new ExtractedContext(DDTraceId.from(123), 456, SAMPLER_KEEP, "789", tracer.getPropagationTagsFactory().empty(), DATADOG)
       .withRequestContextDataAppSec("dummy")
 
     def top = tracer.buildSpan("top").asChildOf((AgentSpan.Context) extracted).start()
@@ -264,15 +265,24 @@ class DDSpanContextTest extends DDCoreSpecification {
       .start()
 
     then: "encoded operation name matches operation name"
-    1 * profilingContextIntegration.encode("fakeOperation") >> 1
+    1 * profilingContextIntegration.encodeOperationName("fakeOperation") >> 1
+    1 * profilingContextIntegration.encodeResourceName("fakeResource") >> -1
     span.context.encodedOperationName == 1
+    span.context.encodedResourceName == -1
 
     when:
     span.setOperationName("newOperationName")
 
     then:
-    1 * profilingContextIntegration.encode("newOperationName") >> 2
+    1 * profilingContextIntegration.encodeOperationName("newOperationName") >> 2
     span.context.encodedOperationName == 2
+
+    when:
+    span.setResourceName("newResourceName")
+
+    then:
+    1 * profilingContextIntegration.encodeResourceName("newResourceName") >> -2
+    span.context.encodedResourceName == -2
   }
 
   private static String dataTag(String tag) {
@@ -288,6 +298,7 @@ class DDSpanContextTest extends DDCoreSpecification {
     sourceWithoutCommonTags.remove("process_id")
     sourceWithoutCommonTags.remove("_dd.trace_span_attribute_schema")
     sourceWithoutCommonTags.remove(DDTags.PROFILING_ENABLED)
+    sourceWithoutCommonTags.remove(DDTags.PROFILING_CONTEXT_ENGINE)
     if (removeThread) {
       sourceWithoutCommonTags.remove(DDTags.THREAD_ID)
       sourceWithoutCommonTags.remove(DDTags.THREAD_NAME)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy
new file mode 100644
index 00000000000..c35bea2c02a
--- /dev/null
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy
@@ -0,0 +1,197 @@
+package datadog.trace.core
+
+import datadog.trace.api.Config
+import datadog.trace.api.DDSpanId
+import datadog.trace.api.DDTraceId
+import datadog.trace.api.DynamicConfig
+import datadog.trace.bootstrap.instrumentation.api.ContextVisitors
+import datadog.trace.bootstrap.instrumentation.api.SpanLink
+import datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes
+import datadog.trace.common.writer.ListWriter
+import datadog.trace.core.propagation.ExtractedContext
+import datadog.trace.core.propagation.W3CHttpCodec
+import datadog.trace.core.test.DDCoreSpecification
+import groovy.json.JsonSlurper
+import spock.lang.Shared
+
+import java.util.stream.IntStream
+
+import static datadog.trace.api.DDTags.SPAN_LINKS
+import static datadog.trace.bootstrap.instrumentation.api.AgentSpanLink.DEFAULT_FLAGS
+import static datadog.trace.bootstrap.instrumentation.api.AgentSpanLink.SAMPLED_FLAG
+import static datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes.EMPTY
+import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_PARENT_KEY
+import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_STATE_KEY
+import static java.util.stream.Collectors.toList
+
+class DDSpanLinkTest extends DDCoreSpecification {
+  @Shared def writer = new ListWriter()
+  @Shared def tracer = tracerBuilder().writer(writer).build()
+
+  def cleanup() {
+    tracer?.close()
+  }
+
+  def "create span link from extracted context"() {
+    setup:
+    def traceId = "11223344556677889900aabbccddeeff"
+    def spanId = "123456789abcdef0"
+    def traceState = "dd=s:$sample;o:some;t.dm:-4"
+    Map<String, String> headers = [
+      (TRACE_PARENT_KEY.toUpperCase()): "00-$traceId-$spanId-$traceFlags",
+      (TRACE_STATE_KEY.toUpperCase()) : "$traceState"
+    ]
+    def extractor = W3CHttpCodec.newExtractor(Config.get(), { DynamicConfig.create().apply().captureTraceConfig() })
+
+    when:
+    ExtractedContext context = extractor.extract(headers, ContextVisitors.stringValuesMap()) as ExtractedContext
+    def link = DDSpanLink.from(context)
+
+    then:
+    link.traceId() == DDTraceId.fromHex(traceId)
+    link.spanId() == DDSpanId.fromHex(spanId)
+    link.traceFlags() == (sampled ? SAMPLED_FLAG : DEFAULT_FLAGS)
+    link.traceState() == "$traceState;t.tid:${traceId.substring(0, 16)}"
+
+    where:
+    sampled << [true, false]
+    traceFlags = sampled ? '01' : '00'
+    sample = sampled ? '1' : '-1'
+  }
+
+  def "test span link encoding - tag max size"() {
+    setup:
+    def tooManyLinkCount = 300
+    def builder = tracer.buildSpan("test", "operation")
+    def links = IntStream.range(0, tooManyLinkCount).mapToObj {createLink(it)}.collect(toList())
+    def slurper = new JsonSlurper()
+
+    when:
+    for (def link : links) {
+      builder.withLink(link)
+    }
+    def span = builder.start()
+    span.finish()
+    // Wait for flush and get the first trace / first span links from tags
+    writer.waitForTraces(1)
+    def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
+    // Parse span links JSON data
+    def decodedSpanLinks = slurper.parseText(spanLinksTag) as List
+
+    then:
+    spanLinksTag.length() < DDSpanLink.TAG_MAX_LENGTH
+    decodedSpanLinks.size() < tooManyLinkCount
+    spanLinksTag.length() / decodedSpanLinks.size() * (decodedSpanLinks.size() + 1) > DDSpanLink.TAG_MAX_LENGTH
+    for (i in 0..<decodedSpanLinks.size()) {
+      assertLink(links[i], decodedSpanLinks[i] as DDSpanLink.SpanLinkJson)
+    }
+  }
+
+  def "test span links encoding - omitted empty keys"() {
+    setup:
+    def builder = tracer.buildSpan("test", "operation")
+    def link = new SpanLink(
+      DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
+      DDSpanId.fromHex("123456789abcdef0"),
+      DEFAULT_FLAGS,
+      "",
+      EMPTY
+      )
+
+    when:
+    def span = builder.withLink(link).start()
+    span.finish()
+    // Wait for flush and get the first trace / first span links from tags
+    writer.waitForTraces(1)
+    def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
+
+    then:
+    spanLinksTag == '[{"spanId":"123456789abcdef0","traceId":"11223344556677889900aabbccddeeff"}]'
+  }
+
+  def "add span link at any time"() {
+    setup:
+    def builder = tracer.buildSpan("test", "operation")
+    def links = []
+    def slurper = new JsonSlurper()
+
+    when:
+    if (beforeStart) {
+      def link = createLink(0)
+      builder.withLink(link)
+      links += link
+    }
+    def span = builder.start()
+    if (afterStart) {
+      def link = createLink(1)
+      span.addLink(link)
+      links += link
+    }
+    span.finish()
+    // Wait for flush and get the first trace / first span links from tags
+    writer.waitForTraces(1)
+    def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
+    // Parse span links JSON data
+    def decodedSpanLinks = spanLinksTag == null ? [] : slurper.parseText(spanLinksTag) as List
+
+    then:
+    decodedSpanLinks.size() == (beforeStart ? 1 : 0) + (afterStart ? 1 : 0)
+    for (i in 0..<decodedSpanLinks.size()) {
+      assertLink(links[i], decodedSpanLinks[i] as DDSpanLink.SpanLinkJson)
+    }
+
+    where:
+    beforeStart | afterStart
+    false       | false
+    true        | false
+    false       | true
+    true        | true
+  }
+
+  def "filter null links"() {
+    setup:
+    def builder = tracer.buildSpan("test", "operation")
+
+    when:
+    def span = builder.withLink(null).start()
+    span.addLink(null)
+    span.finish()
+    // Wait for flush and get the first trace / first span links from tags
+    writer.waitForTraces(1)
+    def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
+
+    then:
+    spanLinksTag == null
+  }
+
+  def createLink(int index) {
+    def attributes = ['link-index': Integer.toString(index)]
+
+    return new SpanLink(
+      DDTraceId.fromHex(String.format("11223344556677889900aabbccdd%04d", index)),
+      DDSpanId.fromHex(String.format("123456789abc%04d", index)),
+      index % 2 == 0 ? SAMPLED_FLAG : DEFAULT_FLAGS,
+      "",
+      SpanLinkAttributes.fromMap(attributes))
+  }
+
+  def assertLink(SpanLink expected, DDSpanLink.SpanLinkJson actual) {
+    assert expected.traceId().toHexString() == actual.traceId
+    assert DDSpanId.toHexString(expected.spanId()) == actual.spanId
+    if (expected.traceFlags() == DEFAULT_FLAGS) {
+      assert null == actual.traceFlags
+    } else {
+      assert expected.traceFlags() == actual.traceFlags
+    }
+    if (expected.traceState().isEmpty()) {
+      assert null == actual.traceState
+    } else {
+      assert expected.traceState() == actual.traceState
+    }
+    if (expected.attributes().isEmpty()) {
+      assert null == actual.attributes
+    } else {
+      assert expected.attributes().asMap() == actual.attributes
+    }
+  }
+}
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanSerializationTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanSerializationTest.groovy
index a40e2ab6797..94b9fb4c22b 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanSerializationTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanSerializationTest.groovy
@@ -27,7 +27,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
     def traceId = DDTraceId.from(value)
     def spanId = DDSpanId.from(value)
     def context = createContext(spanType, tracer, traceId, spanId)
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
     packer.format(Collections.singletonList(span), new TraceMapperV0_4())
@@ -88,7 +88,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
     def traceId = DDTraceId.from(value)
     def spanId = DDSpanId.from(value)
     def context = createContext(spanType, tracer, traceId, spanId)
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
     def traceMapper = new TraceMapperV0_5()
@@ -173,7 +173,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
       null,
       injectBaggage)
     context.setAllTags(tags)
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
     packer.format(Collections.singletonList(span), new TraceMapperV0_4())
@@ -249,7 +249,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
       null,
       injectBaggage)
     context.setAllTags(tags)
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
     def mapper = new TraceMapperV0_5()
@@ -327,7 +327,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
       'sub1': 'v1',
       'sub2': 'v2'
     ])
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
 
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
@@ -397,7 +397,7 @@ class DDSpanSerializationTest extends DDCoreSpecification {
       'sub1': 'v1',
       'sub2': 'v2'
     ])
-    def span = DDSpan.create("test", 0, context)
+    def span = DDSpan.create("test", 0, context, null)
 
     CaptureBuffer capture = new CaptureBuffer()
     def packer = new MsgPackWriter(new FlushingBuffer(1024, capture))
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy
index dcc8a5a6d37..8fbcd58005d 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy
@@ -1,36 +1,29 @@
 package datadog.trace.core
 
-import datadog.trace.api.Config
 import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
-import datadog.trace.api.DynamicConfig
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext
-import datadog.trace.bootstrap.instrumentation.api.ContextVisitors
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities
-import datadog.trace.bootstrap.instrumentation.api.SpanLink
 import datadog.trace.bootstrap.instrumentation.api.TagContext
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString
 import datadog.trace.common.sampling.RateByServiceTraceSampler
 import datadog.trace.common.writer.ListWriter
 import datadog.trace.core.propagation.ExtractedContext
-import datadog.trace.core.propagation.W3CHttpCodec
 import datadog.trace.core.test.DDCoreSpecification
-import groovy.json.JsonSlurper
 import spock.lang.Shared
 
 import java.util.concurrent.TimeUnit
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static datadog.trace.api.sampling.PrioritySampling.UNSET
 import static datadog.trace.api.sampling.SamplingMechanism.SPAN_SAMPLING_RATE
 import static datadog.trace.core.DDSpanContext.SPAN_SAMPLING_MAX_PER_SECOND_TAG
 import static datadog.trace.core.DDSpanContext.SPAN_SAMPLING_MECHANISM_TAG
 import static datadog.trace.core.DDSpanContext.SPAN_SAMPLING_RULE_RATE_TAG
-import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_PARENT_KEY
-import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_STATE_KEY
 
 class DDSpanTest extends DDCoreSpecification {
 
@@ -280,9 +273,9 @@ class DDSpanTest extends DDCoreSpecification {
     child.@origin == null // Access field directly instead of getter.
 
     where:
-    extractedContext                                                                                                                           | _
-    new TagContext("some-origin", [:])                                                                                                         | _
-    new ExtractedContext(DDTraceId.ONE, 2, PrioritySampling.SAMPLER_DROP, "some-origin", propagationTagsFactory.empty()) | _
+    extractedContext                                                                                                              | _
+    new TagContext("some-origin", [:])                                                                                            | _
+    new ExtractedContext(DDTraceId.ONE, 2, PrioritySampling.SAMPLER_DROP, "some-origin", propagationTagsFactory.empty(), DATADOG) | _
   }
 
   def "isRootSpan() in and not in the context of distributed tracing"() {
@@ -299,9 +292,9 @@ class DDSpanTest extends DDCoreSpecification {
     root.finish()
 
     where:
-    extractedContext                                                                                                                        | isTraceRootSpan
-    null                                                                                                                                    | true
-    new ExtractedContext(DDTraceId.from(123), 456, PrioritySampling.SAMPLER_KEEP, "789", propagationTagsFactory.empty()) | false
+    extractedContext                                                                                                              | isTraceRootSpan
+    null                                                                                                                          | true
+    new ExtractedContext(DDTraceId.from(123), 456, PrioritySampling.SAMPLER_KEEP, "789", propagationTagsFactory.empty(), DATADOG) | false
   }
 
   def "getApplicationRootSpan() in and not in the context of distributed tracing"() {
@@ -321,9 +314,9 @@ class DDSpanTest extends DDCoreSpecification {
     root.finish()
 
     where:
-    extractedContext                                                                                                                          | isTraceRootSpan
-    null                                                                                                                                      | true
-    new ExtractedContext(DDTraceId.from(123), 456, PrioritySampling.SAMPLER_KEEP, "789", propagationTagsFactory.empty()) | false
+    extractedContext                                                                                                              | isTraceRootSpan
+    null                                                                                                                          | true
+    new ExtractedContext(DDTraceId.from(123), 456, PrioritySampling.SAMPLER_KEEP, "789", propagationTagsFactory.empty(), DATADOG) | false
   }
 
   def 'publishing of root span closes the request context data'() {
@@ -468,60 +461,4 @@ class DDSpanTest extends DDCoreSpecification {
     then:
     span.isError()
   }
-
-  def "create span link from extracted context"() {
-    setup:
-    def traceId = "11223344556677889900aabbccddeeff"
-    def spanId = "123456789abcdef0"
-    def traceState = "dd=s:-1;o:some;t.dm:-4"
-    Map<String, String> headers = [
-      (TRACE_PARENT_KEY.toUpperCase()): "00-$traceId-$spanId-00",
-      (TRACE_STATE_KEY.toUpperCase()) : "$traceState"
-    ]
-    def extractor = W3CHttpCodec.newExtractor(Config.get(), { DynamicConfig.create().apply().captureTraceConfig() })
-
-    when:
-    final ExtractedContext context = extractor.extract(headers, ContextVisitors.stringValuesMap())
-    def link = DDSpanLink.from(context)
-
-    then:
-    link.traceId() == DDTraceId.fromHex(traceId)
-    link.spanId() == DDSpanId.fromHex(spanId)
-    link.traceState() == "$traceState;t.tid:${traceId.substring(0, 16)}"
-  }
-
-  def "test span link attributes encoding"() {
-    when:
-    def span = tracer.buildSpan("test", "operation").withLink(new SpanLink(
-      DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
-      DDSpanId.fromHex("1234567890abcdef"),
-      "",
-      ['key1': 'value1',
-        'key2': '',
-        'key3': '"',
-        'key4': 'value,key=value']
-      )).start()
-    def spanLinksJson = span.getTag(DDTags.SPAN_LINKS)
-
-    then:
-    spanLinksJson != null
-    spanLinksJson instanceof String
-
-    when:
-    def slurper = new JsonSlurper()
-    def spanLinks = slurper.parseText(spanLinksJson as String)
-
-    then:
-    spanLinks instanceof List
-    spanLinks.size == 1
-    spanLinks[0].attributes instanceof Map
-    spanLinks[0].attributes instanceof Map
-    spanLinks[0].attributes['key1'] == 'value1'
-    spanLinks[0].attributes['key2'] == ''
-    spanLinks[0].attributes['key3'] == '"'
-    spanLinks[0].attributes['key4'] == 'value,key=value'
-
-    cleanup:
-    span.finish()
-  }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy
index 3fddda9cca4..19f6a9c2a06 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy
@@ -467,7 +467,7 @@ class PendingTraceBufferTest extends DDSpecification {
       NoopPathwayContext.INSTANCE,
       false,
       PropagationTags.factory().empty())
-    return DDSpan.create("test", 0, context)
+    return DDSpan.create("test", 0, context, null)
   }
 
   static DDSpan newSpanOf(DDSpan parent) {
@@ -492,6 +492,6 @@ class PendingTraceBufferTest extends DDSpecification {
       NoopPathwayContext.INSTANCE,
       false,
       PropagationTags.factory().empty())
-    return DDSpan.create("test", 0, context)
+    return DDSpan.create("test", 0, context, null)
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceTest.groovy
index ce2e13a566c..6be4322e57c 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceTest.groovy
@@ -41,7 +41,8 @@ class PendingTraceTest extends PendingTraceTestBase {
       null,
       AgentTracer.NoopPathwayContext.INSTANCE,
       false,
-      PropagationTags.factory().empty()))
+      PropagationTags.factory().empty()),
+      null)
   }
 
   @Timeout(value = 60, unit = TimeUnit.SECONDS)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy
index e1ec2533b88..35b5a595754 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy
@@ -20,11 +20,10 @@ import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.util.concurrent.PollingConditions
 
-import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static DefaultDataStreamsMonitoring.DEFAULT_BUCKET_DURATION_NANOS
+import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static java.util.concurrent.TimeUnit.SECONDS
 
-
 /**
  * This test class exists because a real integration test is not possible. see DataStreamsIntegrationTest
  */
@@ -79,15 +78,15 @@ class DataStreamsWritingTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, { traceConfig })
     dataStreams.start()
-    dataStreams.add(new StatsPoint([], 9, 0, timeSource.currentTimeNanos, 0, 0))
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
-    dataStreams.trackBacklog(new LinkedHashMap<>(["partition":"1", "topic":"testTopic", "type":"kafka_produce"]), 100)
-    dataStreams.trackBacklog(new LinkedHashMap<>(["partition":"1", "topic":"testTopic", "type":"kafka_produce"]), 130)
+    dataStreams.add(new StatsPoint([], 9, 0, timeSource.currentTimeNanos, 0, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
+    dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 100)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130)
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10)))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5)))
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 2))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -132,15 +131,17 @@ class DataStreamsWritingTest extends DDCoreSpecification {
     assert unpacker.unpackString() == "Stats"
     assert unpacker.unpackArrayHeader() == 2 // 2 groups in first bucket
 
-    Set availableSizes = [4, 5] // we don't know the order the groups will be reported
+    Set availableSizes = [5, 6] // we don't know the order the groups will be reported
     2.times {
       int mapHeaderSize = unpacker.unpackMapHeader()
       assert availableSizes.remove(mapHeaderSize)
-      if (mapHeaderSize == 4) {  // empty topic group
+      if (mapHeaderSize == 5) {  // empty topic group
         assert unpacker.unpackString() == "PathwayLatency"
         unpacker.skipValue()
         assert unpacker.unpackString() == "EdgeLatency"
         unpacker.skipValue()
+        assert unpacker.unpackString() == "PayloadSize"
+        unpacker.skipValue()
         assert unpacker.unpackString() == "Hash"
         assert unpacker.unpackLong() == 9
         assert unpacker.unpackString() == "ParentHash"
@@ -150,6 +151,8 @@ class DataStreamsWritingTest extends DDCoreSpecification {
         unpacker.skipValue()
         assert unpacker.unpackString() == "EdgeLatency"
         unpacker.skipValue()
+        assert unpacker.unpackString() == "PayloadSize"
+        unpacker.skipValue()
         assert unpacker.unpackString() == "Hash"
         assert unpacker.unpackLong() == 1
         assert unpacker.unpackString() == "ParentHash"
@@ -185,11 +188,13 @@ class DataStreamsWritingTest extends DDCoreSpecification {
 
     Set<Long> availableHashes = [1L, 3L] // we don't know the order the groups will be reported
     2.times {
-      assert unpacker.unpackMapHeader() == 5
+      assert unpacker.unpackMapHeader() == 6
       assert unpacker.unpackString() == "PathwayLatency"
       unpacker.skipValue()
       assert unpacker.unpackString() == "EdgeLatency"
       unpacker.skipValue()
+      assert unpacker.unpackString() == "PayloadSize"
+      unpacker.skipValue()
       assert unpacker.unpackString() == "Hash"
       def hash = unpacker.unpackLong()
       assert availableHashes.remove(hash)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy
index 1a734ba9057..ce99bae9041 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy
@@ -38,7 +38,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 0, 0, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 0, 0, timeSource.currentTimeNanos, 0, 0, 0))
     dataStreams.report()
 
     then:
@@ -97,7 +97,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -143,7 +143,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, bucketDuration)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(bucketDuration)
 
     then:
@@ -186,9 +186,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 3, 4, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 3, 4, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l)
     dataStreams.report()
 
@@ -232,9 +232,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l)
     dataStreams.close()
 
@@ -288,11 +288,11 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.trackBacklog(new LinkedHashMap<>(["consumer_group":"testGroup", "partition":"2", "topic":"testTopic", "type":"kafka_commit"]), 23)
-    dataStreams.trackBacklog(new LinkedHashMap<>(["consumer_group":"testGroup", "partition":"2", "topic":"testTopic", "type":"kafka_commit"]), 24)
-    dataStreams.trackBacklog(new LinkedHashMap<>(["partition":"2", "topic":"testTopic", "type":"kafka_produce"]), 23)
-    dataStreams.trackBacklog(new LinkedHashMap<>(["partition":"2", "topic":"testTopic2", "type":"kafka_produce"]), 23)
-    dataStreams.trackBacklog(new LinkedHashMap<>(["partition":"2", "topic":"testTopic", "type":"kafka_produce"]), 45)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["consumer_group": "testGroup", "partition": "2", "topic": "testTopic", "type": "kafka_commit"]), 23)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["consumer_group": "testGroup", "partition": "2", "topic": "testTopic", "type": "kafka_commit"]), 24)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "2", "topic": "testTopic", "type": "kafka_produce"]), 23)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "2", "topic": "testTopic2", "type": "kafka_produce"]), 23)
+    dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "2", "topic": "testTopic", "type": "kafka_produce"]), 45)
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -343,9 +343,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -400,12 +400,12 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when:
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10)))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5)))
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -477,7 +477,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when: "reporting points when data streams is not supported"
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -507,7 +507,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS)
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -553,7 +553,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     dataStreams.start()
     supportsDataStreaming = false
     dataStreams.onEvent(EventListener.EventType.DOWNGRADED, "")
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -570,7 +570,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS)
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -615,7 +615,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when: "reporting points when data streams is not enabled"
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -631,7 +631,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     dsmEnabled = true
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -664,7 +664,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when: "submitting points after being disabled"
     payloadWriter.buckets.clear()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -698,7 +698,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when: "reporting points when data streams is not supported"
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -715,7 +715,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS)
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -729,7 +729,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     dsmEnabled = true
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -774,7 +774,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     when: "reporting points when data streams is not supported"
     def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.start()
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
@@ -790,7 +790,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification {
     dsmEnabled = true
     dataStreams.report()
 
-    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0))
+    dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, timeSource.currentTimeNanos, 0, 0, 0))
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
     dataStreams.report()
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy
index 7c94a829b97..8cb0d4338ae 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy
@@ -16,6 +16,7 @@ import datadog.trace.core.test.DDCoreSpecification
 
 import java.util.function.Consumer
 
+import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static datadog.trace.api.config.GeneralConfig.PRIMARY_TAG
 import static datadog.trace.core.datastreams.DefaultDataStreamsMonitoring.DEFAULT_BUCKET_DURATION_NANOS
 import static java.util.concurrent.TimeUnit.MILLISECONDS
@@ -36,6 +37,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification {
     assert point.parentHash == 0
     assert point.pathwayLatencyNano == 0
     assert point.edgeLatencyNano == 0
+    assert point.payloadSizeBytes == 0
   }
 
   def "First Set checkpoint starts the context."() {
@@ -79,6 +81,27 @@ class DefaultPathwayContextTest extends DDCoreSpecification {
     }
   }
 
+  def "Checkpoint with payload size"() {
+    given:
+    def timeSource = new ControllableTimeSource()
+    def context = new DefaultPathwayContext(timeSource, wellKnownTags)
+
+    when:
+    timeSource.advance(25)
+    context.setCheckpoint(
+      new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer, 0, 72)
+
+    then:
+    context.isStarted()
+    pointConsumer.points.size() == 1
+    with(pointConsumer.points[0]) {
+      edgeTags == ["group:group", "topic:topic", "type:kafka"]
+      edgeTags.size() == 3
+      hash != 0
+      payloadSizeBytes == 72
+    }
+  }
+
   def "Multiple checkpoints generated"() {
     given:
     def timeSource = new ControllableTimeSource()
@@ -695,7 +718,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification {
 
     @Override
     <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
-      return new ExtractedContext(DDTraceId.ONE, 1, 0, null, 0, null, null, null, null, traceConfig )
+      return new ExtractedContext(DDTraceId.ONE, 1, 0, null, 0, null, null, null, null, traceConfig, DATADOG)
     }
   }
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy
index 67ab99ac372..073908513e1 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy
@@ -293,7 +293,8 @@ class B3HttpExtractorTest extends DDSpecification {
     TagContext context = extractor.extract(headers, ContextVisitors.stringValuesMap())
 
     then:
-    context == null
+    !(context instanceof ExtractedContext)
+    context.getTags() == ["some-tag": "my-interesting-info"]
   }
 
   def "extract http headers with out of range span ID"() {
@@ -304,12 +305,12 @@ class B3HttpExtractorTest extends DDSpecification {
       SOME_HEADER                 : "my-interesting-info",
     ]
 
-
     when:
     TagContext context = extractor.extract(headers, ContextVisitors.stringValuesMap())
 
     then:
-    context == null
+    !(context instanceof ExtractedContext)
+    context.getTags() == ["some-tag": "my-interesting-info"]
   }
 
   def "extract ids while retaining the original string"() {
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpInjectorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpInjectorTest.groovy
index 3b2aef1b762..c45b32c7e1a 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpInjectorTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpInjectorTest.groovy
@@ -50,10 +50,10 @@ class W3CHttpInjectorTest extends DDCoreSpecification {
       PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, tracestate ? "_dd.p.usr=123" : ""))
     final Map<String, String> carrier = [:]
     Map<String, String> expected = [
-      (TRACE_PARENT_KEY): buildTraceParent(traceId, spanId, samplingPriority),
+      (TRACE_PARENT_KEY)        : buildTraceParent(traceId, spanId, samplingPriority),
       (OT_BAGGAGE_PREFIX + "k1"): "v1",
       (OT_BAGGAGE_PREFIX + "k2"): "v2",
-      "SOME_CUSTOM_HEADER": "some-value"
+      "SOME_CUSTOM_HEADER"      : "some-value",
     ]
     if (tracestate) {
       expected.put(TRACE_STATE_KEY, tracestate)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CPropagationTagsTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CPropagationTagsTest.groovy
index 1d03696c37c..4d725fb91c4 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CPropagationTagsTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CPropagationTagsTest.groovy
@@ -145,7 +145,7 @@ class W3CPropagationTagsTest extends DDCoreSpecification {
     valueChar << (' '..'ÿ') - ((' '..'~') - [',', '='])
   }
 
-  def "validate tracestate header number of members #memberCount"() {
+  def "validate tracestate header number of members #memberCount without Datadog member"() {
     setup:
     def config = Mock(Config)
     config.getxDatadogTagsMaxLength() >> 512
@@ -168,6 +168,57 @@ class W3CPropagationTagsTest extends DDCoreSpecification {
     memberCount << (1..37) // some arbitrary number larger than 32
   }
 
+  def "validate tracestate header number of members #memberCount with Datadog member"() {
+    setup:
+    def config = Mock(Config)
+    config.getxDatadogTagsMaxLength() >> 512
+    def propagationTagsFactory = PropagationTags.factory(config)
+    def header = 'dd=s:1,'+(1..memberCount).collect { "k$it=v$it" }.join(',')
+
+    when:
+    def headerPT = propagationTagsFactory.fromHeaderValue(HeaderType.W3C, header)
+
+    then:
+    if (memberCount + 1 <= 32) {
+      assert headerPT.headerValue(HeaderType.W3C) == header
+    } else {
+      assert headerPT.headerValue(HeaderType.W3C) == null
+    }
+    // we're not using any dd members in the tests
+    headerPT.createTagMap() == [:]
+
+    where:
+    memberCount << (1..37) // some arbitrary number larger than 32
+  }
+
+  def "validate tracestate header number of members #memberCount when propagating original tracestate"() {
+    setup:
+    def config = Mock(Config)
+    config.getxDatadogTagsMaxLength() >> 512
+    def propagationTagsFactory = PropagationTags.factory(config)
+    def header = (1..memberCount).collect { "k$it=v$it" }.join(',')
+    def expectedHeader = 'dd=t.dm:-4,' + (
+      memberCount > 32 ?
+      '' :
+      (1..Math.min(memberCount, 31)).collect { "k$it=v$it" }.join(','))
+
+    when:
+    def datadogHeaderPT = propagationTagsFactory.fromHeaderValue(HeaderType.DATADOG, '_dd.p.dm=-4')
+    def headerPT = propagationTagsFactory.fromHeaderValue(HeaderType.W3C, header)
+    datadogHeaderPT.updateW3CTracestate(headerPT.getW3CTracestate())
+
+    then:
+    if (memberCount <= 32) {
+      assert datadogHeaderPT.headerValue(HeaderType.W3C) == expectedHeader // 'dd=t.dm:-4,' + header
+    } else {
+      assert datadogHeaderPT.headerValue(HeaderType.W3C) == 'dd=t.dm:-4'
+    }
+    datadogHeaderPT.createTagMap() == ['_dd.p.dm':'-4']
+
+    where:
+    memberCount << (1..37) // some arbitrary number larger than 32
+  }
+
   def "create propagation tags from header value #headerValue"() {
     setup:
     def config = Mock(Config)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy
index 6af108b16fc..c6d4b59be62 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy
@@ -3,6 +3,7 @@ package datadog.trace.core.scopemanager
 import datadog.trace.agent.test.utils.ThreadUtils
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.EndpointCheckpointer
+import datadog.trace.api.Stateful
 import datadog.trace.api.StatsDClient
 import datadog.trace.api.TraceConfig
 import datadog.trace.api.interceptor.MutableSpan
@@ -54,7 +55,11 @@ class ScopeManagerTest extends DDCoreSpecification {
   ProfilingContextIntegration profilingContext
 
   def setup() {
-    profilingContext = Mock(ProfilingContextIntegration)
+    def state = Stub(Stateful)
+    profilingContext = Mock(ProfilingContextIntegration, {
+      newScopeState(_) >> state
+      name() >> "mock"
+    })
     rootSpanCheckpointer = Mock()
     writer = new ListWriter()
     statsDClient = Mock()
@@ -552,11 +557,10 @@ class ScopeManagerTest extends DDCoreSpecification {
     assertEvents([ACTIVATE, ACTIVATE])
     1 * statsDClient.incrementCounter("scope.close.error")
     1 * rootSpanCheckpointer.onRootSpanStarted(_)
-    3 * profilingContext.setContext(_)
     1 * profilingContext.onAttach()
-    1 * profilingContext.encode("foo")
-    1 * profilingContext.encode("bar")
-    _ * profilingContext._
+    1 * profilingContext.encodeOperationName("foo")
+    1 * profilingContext.encodeOperationName("bar")
+    2 * profilingContext.newScopeState(_) >> Stub(Stateful)
     0 * _
 
     when:
@@ -566,7 +570,6 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     1 * rootSpanCheckpointer.onRootSpanFinished(_, _)
     _ * statsDClient.close()
-    1 * profilingContext.clearContext()
     1 * profilingContext.onDetach()
     assertEvents([ACTIVATE, ACTIVATE, CLOSE, CLOSE])
     0 * _
@@ -589,15 +592,13 @@ class ScopeManagerTest extends DDCoreSpecification {
 
     then:
     assertEvents([ACTIVATE])
-
     tracer.activeSpan() == firstSpan
     tracer.activeScope() == firstScope
     assertEvents([ACTIVATE])
     1 * rootSpanCheckpointer.onRootSpanStarted(_)
     1 * profilingContext.onAttach()
-    1 * profilingContext.setContext(_)
-    1 * profilingContext.encode("foo")
-    _ * profilingContext._
+    1 * profilingContext.encodeOperationName("foo")
+    1 * profilingContext.newScopeState(_) >> Stub(Stateful)
     0 * _
 
     when:
@@ -609,9 +610,8 @@ class ScopeManagerTest extends DDCoreSpecification {
     tracer.activeSpan() == secondSpan
     tracer.activeScope() == secondScope
     assertEvents([ACTIVATE, ACTIVATE])
-    1 * profilingContext.setContext(_)
-    1 * profilingContext.encode("bar")
-    _ * profilingContext._
+    1 * profilingContext.encodeOperationName("bar")
+    1 * profilingContext.newScopeState(_) >> Stub(Stateful)
     0 * _
 
     when:
@@ -623,9 +623,8 @@ class ScopeManagerTest extends DDCoreSpecification {
     tracer.activeSpan() == thirdSpan
     tracer.activeScope() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
-    1 * profilingContext.setContext(_)
-    1 * profilingContext.encode("quux")
-    _ * profilingContext._
+    1 * profilingContext.encodeOperationName("quux")
+    1 * profilingContext.newScopeState(_) >> Stub(Stateful)
     0 * _
 
     when:
@@ -637,7 +636,6 @@ class ScopeManagerTest extends DDCoreSpecification {
     tracer.activeScope() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
     1 * statsDClient.incrementCounter("scope.close.error")
-    1 * profilingContext.setContext(_)
     0 * _
 
     when:
@@ -650,7 +648,6 @@ class ScopeManagerTest extends DDCoreSpecification {
 
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE])
     _ * statsDClient.close()
-    1 * profilingContext.setContext(_)
     0 * _
 
     when:
@@ -677,7 +674,6 @@ class ScopeManagerTest extends DDCoreSpecification {
       CLOSE
     ])
     _ * statsDClient.close()
-    1 * profilingContext.clearContext()
     1 * profilingContext.onDetach()
     0 * _
   }
@@ -708,9 +704,8 @@ class ScopeManagerTest extends DDCoreSpecification {
     tracer.activeSpan() == thirdSpan
     tracer.activeScope() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE])
-    1 * profilingContext.setContext(_)
-    1 * profilingContext.encode("quux")
-    _ * profilingContext._
+    1 * profilingContext.encodeOperationName("quux")
+    1 * profilingContext.newScopeState(_) >> Stub(Stateful)
     0 * _
 
     when:
@@ -727,7 +722,6 @@ class ScopeManagerTest extends DDCoreSpecification {
 
     then: 'Closing scope above multiple activated scope does not close it'
     assertEvents([ACTIVATE, ACTIVATE, CLOSE, ACTIVATE])
-    1 * profilingContext.setContext(_)
     _ * statsDClient.close()
     0 * _
 
@@ -1059,6 +1053,7 @@ class ScopeManagerTest extends DDCoreSpecification {
   def "context thread listener notified when scope activated on thread for the first time"() {
     setup:
     def numThreads = 5
+    def numTasks = 20
     ExecutorService executor = Executors.newFixedThreadPool(numThreads)
 
     when: "usage of an instrumented executor results in scopestack initialisation but not scope creation"
@@ -1070,15 +1065,18 @@ class ScopeManagerTest extends DDCoreSpecification {
 
     when: "scopes activate on threads"
     AgentSpan span = tracer.buildSpan("foo").start()
-    def futures = new Future[20]
-    for (int i = 0; i < 20; i++) {
+    def futures = new Future[numTasks]
+    for (int i = 0; i < numTasks; i++) {
       futures[i] = executor.submit({
         AgentScope scope = tracer.activateSpan(span)
+        def child = tracer.buildSpan("foo" + i).start()
+        def childScope = tracer.activateSpan(child)
         try {
           Thread.sleep(100)
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt()
         }
+        childScope.close()
         scope.close()
       })
     }
@@ -1086,9 +1084,8 @@ class ScopeManagerTest extends DDCoreSpecification {
       future.get()
     }
 
-    then: "the first activation notifies the listener"
-    numThreads * profilingContext.onAttach()
-    _ * _
+    then: "the activation notifies the listener whenever the stack becomes non-empty"
+    numTasks * profilingContext.onAttach()
 
     cleanup:
     executor.shutdown()
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/QueryObfuscatorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/QueryObfuscatorTest.groovy
index 9f57fdc7aa0..49ba0ba33d1 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/QueryObfuscatorTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/QueryObfuscatorTest.groovy
@@ -10,14 +10,19 @@ class QueryObfuscatorTest extends DDSpecification {
     def obfuscator = new QueryObfuscator()
     def tags = [
       (Tags.HTTP_URL): 'http://site.com/index',
-      (DDTags.HTTP_QUERY): 'key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2'
+      (DDTags.HTTP_QUERY): query
     ]
 
     when:
     def result = obfuscator.processTags(tags)
 
     then:
-    assert result.get(DDTags.HTTP_QUERY) == 'key1=val1&<redacted>&key2=val2'
-    assert result.get(Tags.HTTP_URL) == 'http://site.com/index?key1=val1&<redacted>&key2=val2'
+    assert result.get(DDTags.HTTP_QUERY) == expectedQuery
+    assert result.get(Tags.HTTP_URL) == 'http://site.com/index?' + expectedQuery
+
+    where:
+    query                                                               | expectedQuery
+    'key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2'    | 'key1=val1&<redacted>&key2=val2'
+    'app_key=1111&application_key=2222'                                 | '<redacted>&<redacted>'
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy
index a9b48d5454f..1adbec2ab04 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy
@@ -82,7 +82,7 @@ abstract class DDCoreSpecification extends DDSpecification {
       ProfilingContextIntegration.NoOp.INSTANCE,
       true)
 
-    def span = DDSpan.create("test", timestamp, context)
+    def span = DDSpan.create("test", timestamp, context, null)
     for (Map.Entry<String, Object> e : tags.entrySet()) {
       span.setTag(e.key, e.value)
     }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/util/GlobPatternTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/util/GlobPatternTest.groovy
index 497ac4a68fd..9af94dc894c 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/util/GlobPatternTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/util/GlobPatternTest.groovy
@@ -10,9 +10,13 @@ class GlobPatternTest extends DDSpecification {
 
     where:
     globPattern | expectedRegex
-    "*"         | null
+    "*"         | "^.*\$"
+    "?"         | "^.\$"
+    "??"        | "^..\$"
     "Foo*"      | "^Foo.*\$"
     "abc"       | "^abc\$"
     "?"         | "^.\$"
+    "F?o"       | "^F.o\$"
+    "Bar*"      | "^Bar.*\$"
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy
new file mode 100644
index 00000000000..88fd38d7ad6
--- /dev/null
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy
@@ -0,0 +1,54 @@
+package datadog.trace.core.util
+
+import datadog.trace.test.util.DDSpecification
+
+class MatchersTest extends DDSpecification {
+
+  def "match-all scenarios must return a null matcher"() {
+    expect:
+    Matchers.compileGlob(glob) == null
+
+    where:
+    glob << [null, "*"]
+  }
+
+  def "pattern without * or ? must be an ExactMatcher"() {
+    expect:
+    Matchers.compileGlob(glob) instanceof Matchers.ExactMatcher
+
+    where:
+    glob << ["a", "ogre", "bcoho34e2"]
+  }
+
+  def "pattern with either * or ? must be a PatternMatcher"() {
+    expect:
+    Matchers.compileGlob(glob) instanceof Matchers.PatternMatcher
+
+    where:
+    glob << ["?", "foo*", "*bar", "F?oB?r", "F?o*", "?*", "*?"]
+  }
+
+  def "an exact matcher is self matching"() {
+    expect:
+    Matchers.compileGlob(pattern).matches(pattern)
+
+    where:
+    pattern << ["", "a", "abc", "cde"]
+  }
+
+  def "a pattern matcher test"() {
+    when:
+    def matcher = Matchers.compileGlob(pattern)
+
+    then:
+    matcher.matches(matching)
+    !matcher.matches(nonMatching)
+
+    where:
+    pattern | matching | nonMatching
+    "Fo?"   | "Foo"    | "Fooo"
+    "Fo*"   | "Fo"     | "Fa"
+    "F*B?r" | "FooBar" | "FooFar"
+    ""      | ""       | "non-empty"
+  }
+}
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
index 53676ce0d11..bf2dc097f19 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
@@ -2,6 +2,7 @@ package datadog.trace.lambda
 
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanId
+import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.core.propagation.PropagationTags
 import datadog.trace.core.test.DDCoreSpecification
@@ -161,6 +162,40 @@ class LambdaHandlerTest extends DDCoreSpecification {
     false    | null        | "12345"      | false
   }
 
+  def "test end invocation success with error metadata"() {
+    given:
+    def server = httpServer {
+      handlers {
+        post("/lambda/end-invocation") {
+          response
+            .status(200)
+            .send()
+        }
+      }
+    }
+    LambdaHandler.setExtensionBaseUrl(server.address.toString())
+    DDSpan span = Mock(DDSpan) {
+      getTraceId() >> DDTraceId.from("1234")
+      getSpanId() >> DDSpanId.from("5678")
+      getSamplingPriority() >> 2
+      getTag(DDTags.ERROR_MSG) >> "custom error message"
+      getTag(DDTags.ERROR_TYPE) >> "java.lang.Throwable"
+      getTag(DDTags.ERROR_STACK) >> "errorStack\n \ttest"
+    }
+
+    when:
+    LambdaHandler.notifyEndInvocation(span, {}, true)
+
+    then:
+    server.lastRequest.headers.get("x-datadog-invocation-error") == "true"
+    server.lastRequest.headers.get("x-datadog-invocation-error-msg") == "custom error message"
+    server.lastRequest.headers.get("x-datadog-invocation-error-type") == "java.lang.Throwable"
+    server.lastRequest.headers.get("x-datadog-invocation-error-stack") == "ZXJyb3JTdGFjawogCXRlc3Q="
+
+    cleanup:
+    server.close()
+  }
+
   def "test moshi toJson SQSEvent"() {
     given:
     def myEvent = new SQSEvent()
diff --git a/dd-trace-ot/src/ot31CompatibilityTest/groovy/OT31ApiTest.groovy b/dd-trace-ot/src/ot31CompatibilityTest/groovy/OT31ApiTest.groovy
index 88135e62338..fc80375f786 100644
--- a/dd-trace-ot/src/ot31CompatibilityTest/groovy/OT31ApiTest.groovy
+++ b/dd-trace-ot/src/ot31CompatibilityTest/groovy/OT31ApiTest.groovy
@@ -1,4 +1,5 @@
 import datadog.opentracing.DDTracer
+import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.internal.util.LongStringUtils
 import io.opentracing.util.ThreadLocalScopeManager
@@ -108,17 +109,26 @@ class OT31ApiTest extends DDSpecification {
     tracer.inject(context, Format.Builtin.TEXT_MAP, adapter)
 
     then:
+    def traceId = span.delegate.context.traceId as DDTraceId
+    def spanId = span.delegate.context.spanId
+    def expectedTraceparent = "00-${traceId.toHexStringPadded(32)}" +
+      "-${DDSpanId.toHexStringPadded(spanId)}" +
+      "-" + (propagatedPriority > 0 ? "01" : "00")
+    def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
+    def expectedTracestate = "dd=s:${propagatedPriority}" +
+      (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "") +
+      ";t.tid:${traceId.toHexStringPadded(32).substring(0, 16)}"
     def expectedTextMap = [
       "x-datadog-trace-id"         : context.toTraceId(),
       "x-datadog-parent-id"        : context.toSpanId(),
       "x-datadog-sampling-priority": propagatedPriority.toString(),
+      "traceparent"                : expectedTraceparent,
+      "tracestate"                 : expectedTracestate,
     ]
     def datadogTags = []
     if (propagatedPriority > 0) {
-      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
       datadogTags << "_dd.p.dm=-$effectiveSamplingMechanism"
     }
-    def traceId = span.delegate.context.traceId as DDTraceId
     if (traceId.toHighOrderLong() != 0) {
       datadogTags << "_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16)
     }
diff --git a/dd-trace-ot/src/ot33CompatibilityTest/groovy/OT33ApiTest.groovy b/dd-trace-ot/src/ot33CompatibilityTest/groovy/OT33ApiTest.groovy
index 7edaa356dd2..a4cd6b38edd 100644
--- a/dd-trace-ot/src/ot33CompatibilityTest/groovy/OT33ApiTest.groovy
+++ b/dd-trace-ot/src/ot33CompatibilityTest/groovy/OT33ApiTest.groovy
@@ -1,4 +1,5 @@
 import datadog.opentracing.DDTracer
+import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.internal.util.LongStringUtils
 import datadog.trace.common.writer.ListWriter
@@ -97,17 +98,26 @@ class OT33ApiTest extends DDSpecification {
     tracer.inject(context, Format.Builtin.TEXT_MAP, adapter)
 
     then:
+    def traceId = span.delegate.context.traceId as DDTraceId
+    def spanId = span.delegate.context.spanId
+    def expectedTraceparent = "00-${traceId.toHexStringPadded(32)}" +
+      "-${DDSpanId.toHexStringPadded(spanId)}" +
+      "-" + (propagatedPriority > 0 ? "01" : "00")
+    def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
+    def expectedTracestate = "dd=s:${propagatedPriority}" +
+      (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "") +
+      ";t.tid:${traceId.toHexStringPadded(32).substring(0, 16)}"
     def expectedTextMap = [
       "x-datadog-trace-id"         : context.toTraceId(),
       "x-datadog-parent-id"        : context.toSpanId(),
       "x-datadog-sampling-priority": propagatedPriority.toString(),
+      "traceparent"                : expectedTraceparent,
+      "tracestate"                 : expectedTracestate,
     ]
     def datadogTags = []
     if (propagatedPriority > 0) {
-      def effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism
       datadogTags << "_dd.p.dm=-$effectiveSamplingMechanism"
     }
-    def traceId = span.delegate.context.traceId as DDTraceId
     if (traceId.toHighOrderLong() != 0) {
       datadogTags << "_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16)
     }
diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy
index 6c7001136d1..1e769a88abe 100644
--- a/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy
+++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy
@@ -26,8 +26,8 @@ class TypeConverterTest extends DDSpecification {
 
   def "should avoid extra allocation for a span wrapper"() {
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     expect:
     // return the same wrapper for the same span
     typeConverter.toSpan(span1) is typeConverter.toSpan(span1)
@@ -54,8 +54,8 @@ class TypeConverterTest extends DDSpecification {
   def "should avoid extra allocation for a scope wrapper"() {
     def scopeManager = new ContinuableScopeManager(0, false, true)
     def context = createTestSpanContext()
-    def span1 = new DDSpan("test", 0, context)
-    def span2 = new DDSpan("test", 0, context)
+    def span1 = new DDSpan("test", 0, context, null)
+    def span2 = new DDSpan("test", 0, context, null)
     def scope1 = scopeManager.activate(span1, ScopeSource.MANUAL)
     def scope2 = scopeManager.activate(span2, ScopeSource.MANUAL)
     expect:
diff --git a/gradle/configure_tests.gradle b/gradle/configure_tests.gradle
index aaab04a66f7..5ce179a48ea 100644
--- a/gradle/configure_tests.gradle
+++ b/gradle/configure_tests.gradle
@@ -2,7 +2,17 @@ import java.time.Duration
 import java.time.temporal.ChronoUnit
 
 def isTestingInstrumentation(Project project) {
-  return ["junit-4.10", "junit-5.3", "testng-6", "testng-7", "cucumber", "munit", "spock", "karate"].contains(project.name)
+  return [
+    "junit-4.10",
+    "cucumber-junit-4",
+    "munit-junit-4",
+    "junit-5.3",
+    "cucumber-junit-5",
+    "spock-junit-5",
+    "testng-6",
+    "testng-7",
+    "karate"
+  ].contains(project.name)
 }
 
 def forkedTestLimit = gradle.sharedServices.registerIfAbsent("forkedTestLimit", BuildService) {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 76579ee764d..75b69aada05 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -24,8 +24,8 @@ final class CachedData {
     kotlin        : "1.6.21",
     coroutines    : "1.3.0",
     dogstatsd     : "4.2.0",
-    jnr_unixsocket: "0.38.17",
-    jnr_posix     : '3.1.15',
+    jnr_unixsocket: "0.38.21",
+    jnr_posix     : '3.1.18',
     commons       : "3.2",
     mockito       : '4.4.0',
     jctools       : '3.3.0',
@@ -33,9 +33,10 @@ final class CachedData {
     testcontainers: '1.17.3',
     jmc           : "8.1.0",
     autoservice   : "1.0-rc7",
-    ddprof        : "0.81.0",
+    ddprof        : "0.90.0",
     asm           : "9.6",
-    cafe_crypto   : "0.1.0"
+    cafe_crypto   : "0.1.0",
+    lz4           : "1.7.1"
   ]
 
   static deps = [
@@ -61,6 +62,7 @@ final class CachedData {
       "cafe.cryptography:ed25519-elisabeth:${versions.cafe_crypto}",
       "cafe.cryptography:curve25519-elisabeth:${versions.cafe_crypto}"
     ],
+    lz4                  : "org.lz4:lz4-java:${versions.lz4}",
 
     // Testing
 
@@ -110,6 +112,7 @@ final class CachedData {
       "com.github.jnr:jnr-unixsocket:${versions.jnr_unixsocket}",
       "com.squareup.moshi:moshi:${versions.moshi}",
       "org.jctools:jctools-core:${versions.jctools}",
+      "org.lz4:lz4-java:${versions.lz4}",
     ],
 
     // Inverse of "shared".  These exclude directives are part of shadowJar's DSL
@@ -137,6 +140,7 @@ final class CachedData {
       exclude(dependency('com.squareup.okhttp3:okhttp'))
       exclude(dependency('com.datadoghq.okio:okio'))
       exclude(dependency('com.squareup.okio:okio'))
+      exclude(dependency('org.lz4:lz4-java'))
 
       // dogstatsd and its transitives
       exclude(dependency('com.datadoghq:java-dogstatsd-client'))
diff --git a/internal-api/build.gradle b/internal-api/build.gradle
index f800d2bea39..5c45e0f7778 100644
--- a/internal-api/build.gradle
+++ b/internal-api/build.gradle
@@ -39,9 +39,14 @@ excludedClassesCoverage += [
   // an enum
   "datadog.trace.api.sampling.AdaptiveSampler",
   "datadog.trace.api.sampling.ConstantSampler",
+  "datadog.trace.api.sampling.SamplingRule.TraceSamplingRule.TargetSpan",
   "datadog.trace.api.EndpointCheckpointerHolder",
   "datadog.trace.api.iast.IastAdvice.Kind",
   "datadog.trace.api.UserEventTrackingMode",
+  // This is almost fully abstract class so nothing to test
+  'datadog.trace.api.profiling.RecordingData',
+  // A plain enum
+  'datadog.trace.api.profiling.RecordingType',
   "datadog.trace.bootstrap.ActiveSubsystems",
   "datadog.trace.bootstrap.config.provider.ConfigProvider.Singleton",
   "datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers",
@@ -68,7 +73,6 @@ excludedClassesCoverage += [
   "datadog.trace.bootstrap.instrumentation.api.StatsPoint",
   "datadog.trace.bootstrap.instrumentation.api.ScopeSource",
   "datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes",
-  "datadog.trace.bootstrap.instrumentation.api.SpanLink",
   "datadog.trace.bootstrap.instrumentation.api.TagContext",
   "datadog.trace.bootstrap.instrumentation.api.TagContext.HttpHeaders",
   "datadog.trace.bootstrap.instrumentation.api.ForwardedTagContext",
@@ -108,8 +112,6 @@ excludedClassesCoverage += [
   "datadog.trace.util.PidHelper",
   "datadog.trace.util.PidHelper.Fallback",
   "datadog.trace.util.ProcessUtils",
-  "datadog.trace.api.IntegrationsCollector.Holder",
-  "datadog.trace.api.MetricCollector.Holder",
   "datadog.trace.api.ConfigCollector",
   "datadog.trace.api.Config.HostNameHolder",
   "datadog.trace.api.Config.RuntimeIdHolder",
@@ -124,6 +126,8 @@ excludedClassesCoverage += [
   // Interface with default method
   "datadog.trace.api.StatsDClientManager",
   "datadog.trace.api.iast.Taintable",
+  "datadog.trace.api.Stateful",
+  "datadog.trace.api.Stateful.1",
   // a stub
   "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration",
   "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration.NoOp",
@@ -132,6 +136,7 @@ excludedClassesCoverage += [
   // POJO
   'datadog.trace.api.iast.util.Cookie',
   'datadog.trace.api.iast.util.Cookie.Builder',
+  'datadog.trace.api.telemetry.LogCollector.RawLogMessage',
   // stubs
   'datadog.trace.api.profiling.Timing.NoOp',
   'datadog.trace.api.profiling.Timer.NoOp',
diff --git a/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
index ebcd555100b..a425c813f69 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
@@ -44,7 +44,8 @@ public void setup() {
             Duration.of(durationWindowMillis, ChronoUnit.MILLIS),
             samplesPerWindow,
             averageLookback,
-            BUDGET_LOOKBACK);
+            BUDGET_LOOKBACK,
+            true);
   }
 
   @Threads(4)
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
index 34a822790b9..e3fdb9a6dbd 100644
--- a/internal-api/src/main/java/datadog/trace/api/Config.java
+++ b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -23,6 +23,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED;
@@ -44,6 +45,9 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_MAX_PAYLOAD_SIZE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_METRICS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_POLL_INTERVAL;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_SYMBOL_ENABLED;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_SYMBOL_FLUSH_THRESHOLD;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_SYMBOL_FORCE_UPLOAD;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_UPLOAD_BATCH_SIZE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_UPLOAD_FLUSH_INTERVAL;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_UPLOAD_TIMEOUT;
@@ -65,6 +69,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_NAME_PATTERN;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_VALUE_PATTERN;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_WEAK_HASH_ALGORITHMS;
@@ -77,6 +82,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_PRIORITY_SAMPLING_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_PRIORITY_SAMPLING_FORCE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_PROPAGATION_STYLE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE;
@@ -91,7 +97,9 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_SITE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_STARTUP_LOGS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_METRICS_INTERVAL;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT;
@@ -99,6 +107,8 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_ANALYTICS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_PROPAGATION_STYLE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RATE_LIMIT;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_REPORT_HOSTNAME;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESOLVER_ENABLED;
@@ -147,17 +157,21 @@
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_DEBUG_PORT;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_REMOTE_NAME;
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_UNSHALLOW_DEFER;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_UNSHALLOW_ENABLED;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_UPLOAD_ENABLED;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS;
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_JACOCO_GRADLE_SOURCE_SETS;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_INCLUDES;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION;
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_JVM_INFO_CACHE_SIZE;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_MODULE_EXECUTION_SETTINGS_CACHE_SIZE;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_MODULE_ID;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_REPO_INDEX_SHARING_ENABLED;
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_RESOURCE_FOLDER_NAMES;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SESSION_ID;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT;
@@ -181,6 +195,10 @@
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_PROBE_FILE_LOCATION;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_REDACTED_IDENTIFIERS;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_REDACTED_TYPES;
+import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_SYMBOL_ENABLED;
+import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_SYMBOL_FLUSH_THRESHOLD;
+import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_SYMBOL_FORCE_UPLOAD;
+import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_SYMBOL_INCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_UPLOAD_BATCH_SIZE;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_UPLOAD_FLUSH_INTERVAL;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_UPLOAD_TIMEOUT;
@@ -214,7 +232,9 @@
 import static datadog.trace.api.config.GeneralConfig.STATSD_CLIENT_SOCKET_TIMEOUT;
 import static datadog.trace.api.config.GeneralConfig.TAGS;
 import static datadog.trace.api.config.GeneralConfig.TELEMETRY_DEPENDENCY_COLLECTION_ENABLED;
+import static datadog.trace.api.config.GeneralConfig.TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL;
 import static datadog.trace.api.config.GeneralConfig.TELEMETRY_HEARTBEAT_INTERVAL;
+import static datadog.trace.api.config.GeneralConfig.TELEMETRY_LOG_COLLECTION_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TELEMETRY_METRICS_INTERVAL;
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_BUFFERING_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_ENABLED;
@@ -222,12 +242,14 @@
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_AGGREGATES;
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_PENDING;
 import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG;
+import static datadog.trace.api.config.GeneralConfig.TRACE_TRIAGE;
 import static datadog.trace.api.config.GeneralConfig.VERSION;
 import static datadog.trace.api.config.IastConfig.IAST_DEBUG_ENABLED;
 import static datadog.trace.api.config.IastConfig.IAST_DETECTION_MODE;
 import static datadog.trace.api.config.IastConfig.IAST_REDACTION_ENABLED;
 import static datadog.trace.api.config.IastConfig.IAST_REDACTION_NAME_PATTERN;
 import static datadog.trace.api.config.IastConfig.IAST_REDACTION_VALUE_PATTERN;
+import static datadog.trace.api.config.IastConfig.IAST_STACKTRACE_LEAK_SUPPRESS;
 import static datadog.trace.api.config.IastConfig.IAST_TELEMETRY_VERBOSITY;
 import static datadog.trace.api.config.IastConfig.IAST_TRUNCATION_MAX_VALUE_LENGTH;
 import static datadog.trace.api.config.IastConfig.IAST_WEAK_CIPHER_ALGORITHMS;
@@ -297,6 +319,7 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.ELASTICSEARCH_BODY_AND_PARAMS_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.ELASTICSEARCH_BODY_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.ELASTICSEARCH_PARAMS_ENABLED;
+import static datadog.trace.api.config.TraceInstrumentationConfig.GOOGLE_PUBSUB_IGNORED_GRPC_METHODS;
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_CLIENT_ERROR_STATUSES;
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_IGNORED_INBOUND_METHODS;
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_IGNORED_OUTBOUND_METHODS;
@@ -305,6 +328,7 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_TAG_HEADERS;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_TAG_QUERY_STRING;
+import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_QUERY_STRING;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_RESOURCE;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_ROUTE_BASED_NAMING;
@@ -379,6 +403,7 @@
 import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_COMPONENT_OVERRIDES;
 import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_DEFAULTS_ENABLED;
 import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_MAPPING;
+import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_EXTRACT_FIRST;
 import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_STYLE;
 import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_STYLE_EXTRACT;
 import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_STYLE_INJECT;
@@ -401,6 +426,7 @@
 import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName;
 
 import datadog.trace.api.config.GeneralConfig;
+import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.api.config.TracerConfig;
 import datadog.trace.api.iast.IastDetectionMode;
 import datadog.trace.api.iast.telemetry.Verbosity;
@@ -465,7 +491,6 @@
  * @see InstrumenterConfig for pre-instrumentation configurations
  * @see DynamicConfig for configuration that can be dynamically updated via remote-config
  */
-@Deprecated
 public class Config {
 
   private static final Logger log = LoggerFactory.getLogger(Config.class);
@@ -475,6 +500,7 @@ public class Config {
   private final InstrumenterConfig instrumenterConfig;
 
   private final long startTimeMillis = System.currentTimeMillis();
+  private final boolean timelineEventsEnabled;
 
   /**
    * this is a random UUID that gets generated on JVM start up and is attached to every root span
@@ -540,6 +566,7 @@ static class HostNameHolder {
   private final boolean httpServerTagQueryString;
   private final boolean httpServerRawQueryString;
   private final boolean httpServerRawResource;
+  private final boolean httpServerDecodedResourcePreserveSpaces;
   private final boolean httpServerRouteBasedNaming;
   private final Map<String, String> httpServerPathResourceNameMapping;
   private final Map<String, String> httpClientPathResourceNameMapping;
@@ -563,6 +590,7 @@ static class HostNameHolder {
   private final boolean tracePropagationStyleB3PaddingEnabled;
   private final Set<TracePropagationStyle> tracePropagationStylesToExtract;
   private final Set<TracePropagationStyle> tracePropagationStylesToInject;
+  private final boolean tracePropagationExtractFirst;
   private final int clockSyncPeriod;
   private final boolean logsInjectionEnabled;
 
@@ -613,6 +641,7 @@ static class HostNameHolder {
   private final String spanSamplingRules;
   private final String spanSamplingRulesFile;
 
+  private final boolean profilingEnabled;
   private final boolean profilingAgentless;
   private final boolean isDatadogProfilerEnabled;
   @Deprecated private final String profilingUrl;
@@ -666,6 +695,7 @@ static class HostNameHolder {
   private final String iastRedactionValuePattern;
   private final int iastMaxRangeCount;
   private final int iastTruncationMaxValueLength;
+  private final boolean iastStacktraceLeakSuppress;
 
   private final boolean ciVisibilityTraceSanitationEnabled;
   private final boolean ciVisibilityAgentlessEnabled;
@@ -685,6 +715,7 @@ static class HostNameHolder {
   private final String ciVisibilityCodeCoverageReportDumpDir;
   private final String ciVisibilityCompilerPluginVersion;
   private final String ciVisibilityJacocoPluginVersion;
+  private final boolean ciVisibilityJacocoPluginVersionProvided;
   private final List<String> ciVisibilityJacocoPluginIncludes;
   private final List<String> ciVisibilityJacocoPluginExcludes;
   private final String[] ciVisibilityJacocoPluginExcludedClassnames;
@@ -692,6 +723,7 @@ static class HostNameHolder {
   private final Integer ciVisibilityDebugPort;
   private final boolean ciVisibilityGitUploadEnabled;
   private final boolean ciVisibilityGitUnshallowEnabled;
+  private final boolean ciVisibilityGitUnshallowDefer;
   private final long ciVisibilityGitCommandTimeoutMillis;
   private final String ciVisibilityGitRemoteName;
   private final long ciVisibilityBackendApiTimeoutMillis;
@@ -702,7 +734,10 @@ static class HostNameHolder {
   private final boolean ciVisibilityCiProviderIntegrationEnabled;
   private final boolean ciVisibilityRepoIndexSharingEnabled;
   private final int ciVisibilityModuleExecutionSettingsCacheSize;
+  private final int ciVisibilityJvmInfoCacheSize;
   private final boolean ciVisibilityCoverageSegmentsEnabled;
+  private final String ciVisibilityInjectedTracerVersion;
+  private final List<String> ciVisibilityResourceFolderNames;
 
   private final boolean remoteConfigEnabled;
   private final boolean remoteConfigIntegrityCheckEnabled;
@@ -730,6 +765,10 @@ static class HostNameHolder {
   private final int debuggerCaptureTimeout;
   private final String debuggerRedactedIdentifiers;
   private final String debuggerRedactedTypes;
+  private final boolean debuggerSymbolEnabled;
+  private final boolean debuggerSymbolForceUpload;
+  private final String debuggerSymbolIncludes;
+  private final int debuggerSymbolFlushThreshold;
 
   private final boolean awsPropagationEnabled;
   private final boolean sqsPropagationEnabled;
@@ -771,6 +810,7 @@ static class HostNameHolder {
   private final boolean traceAgentV05Enabled;
 
   private final boolean debugEnabled;
+  private final boolean triageEnabled;
   private final boolean startupLogsEnabled;
   private final String configFileStatus;
 
@@ -798,8 +838,11 @@ static class HostNameHolder {
   private final boolean iastDeduplicationEnabled;
 
   private final float telemetryHeartbeatInterval;
+  private final long telemetryExtendedHeartbeatInterval;
   private final float telemetryMetricsInterval;
   private final boolean isTelemetryDependencyServiceEnabled;
+  private final boolean telemetryMetricsEnabled;
+  private final boolean isTelemetryLogCollectionEnabled;
 
   private final boolean azureAppServices;
   private final String traceAgentPath;
@@ -823,6 +866,8 @@ static class HostNameHolder {
 
   private final float traceFlushIntervalSeconds;
 
+  private final boolean telemetryDebugRequestsEnabled;
+
   // Read order: System Properties -> Env Variables, [-> properties file], [-> default value]
   private Config() {
     this(ConfigProvider.createDefault());
@@ -1085,6 +1130,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
 
     httpServerRawResource = configProvider.getBoolean(HTTP_SERVER_RAW_RESOURCE, false);
 
+    httpServerDecodedResourcePreserveSpaces =
+        configProvider.getBoolean(HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES, true);
+
     httpServerRouteBasedNaming =
         configProvider.getBoolean(
             HTTP_SERVER_ROUTE_BASED_NAMING, DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING);
@@ -1217,21 +1265,20 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
       }
       // Now we can check if we should pick the default injection/extraction
       tracePropagationStylesToExtract =
-          extract.isEmpty() ? Collections.singleton(TracePropagationStyle.DATADOG) : extract;
-      tracePropagationStylesToInject =
-          inject.isEmpty() ? Collections.singleton(TracePropagationStyle.DATADOG) : inject;
+          extract.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : extract;
+      tracePropagationStylesToInject = inject.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : inject;
       // These setting are here for backwards compatibility until they can be removed in a major
       // release of the tracer
       propagationStylesToExtract =
-          deprecatedExtract.isEmpty()
-              ? Collections.singleton(PropagationStyle.DATADOG)
-              : deprecatedExtract;
+          deprecatedExtract.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedExtract;
       propagationStylesToInject =
-          deprecatedInject.isEmpty()
-              ? Collections.singleton(PropagationStyle.DATADOG)
-              : deprecatedInject;
+          deprecatedInject.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedInject;
     }
 
+    tracePropagationExtractFirst =
+        configProvider.getBoolean(
+            TRACE_PROPAGATION_EXTRACT_FIRST, DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST);
+
     clockSyncPeriod = configProvider.getInteger(CLOCK_SYNC_PERIOD, DEFAULT_CLOCK_SYNC_PERIOD);
 
     logsInjectionEnabled =
@@ -1325,6 +1372,13 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     spanSamplingRules = configProvider.getString(SPAN_SAMPLING_RULES);
     spanSamplingRulesFile = configProvider.getString(SPAN_SAMPLING_RULES_FILE);
 
+    // For the native image 'instrumenterConfig.isProfilingEnabled()' value will be 'baked-in' based
+    // on whether
+    // the profiler was enabled at build time or not.
+    // Otherwise just do the standard config lookup by key.
+    profilingEnabled =
+        configProvider.getBoolean(
+            ProfilingConfig.PROFILING_ENABLED, instrumenterConfig.isProfilingEnabled());
     profilingAgentless =
         configProvider.getBoolean(PROFILING_AGENTLESS, PROFILING_AGENTLESS_DEFAULT);
     isDatadogProfilerEnabled =
@@ -1423,6 +1477,10 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     }
     telemetryHeartbeatInterval = telemetryInterval;
 
+    telemetryExtendedHeartbeatInterval =
+        configProvider.getLong(
+            TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL);
+
     telemetryInterval =
         configProvider.getFloat(TELEMETRY_METRICS_INTERVAL, DEFAULT_TELEMETRY_METRICS_INTERVAL);
     if (telemetryInterval < 0.1 || telemetryInterval > 3600) {
@@ -1433,11 +1491,18 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     }
     telemetryMetricsInterval = telemetryInterval;
 
+    telemetryMetricsEnabled =
+        configProvider.getBoolean(GeneralConfig.TELEMETRY_METRICS_ENABLED, true);
+
     isTelemetryDependencyServiceEnabled =
         configProvider.getBoolean(
             TELEMETRY_DEPENDENCY_COLLECTION_ENABLED,
             DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED);
 
+    isTelemetryLogCollectionEnabled =
+        configProvider.getBoolean(
+            TELEMETRY_LOG_COLLECTION_ENABLED, DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED);
+
     clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED);
 
     appSecReportingInband =
@@ -1503,6 +1568,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
         configProvider.getInteger(
             IAST_TRUNCATION_MAX_VALUE_LENGTH, DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH);
     iastMaxRangeCount = iastDetectionMode.getIastMaxRangeCount(configProvider);
+    iastStacktraceLeakSuppress =
+        configProvider.getBoolean(
+            IAST_STACKTRACE_LEAK_SUPPRESS, DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS);
 
     ciVisibilityTraceSanitationEnabled =
         configProvider.getBoolean(CIVISIBILITY_TRACE_SANITATION_ENABLED, true);
@@ -1567,6 +1635,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     ciVisibilityJacocoPluginVersion =
         configProvider.getString(
             CIVISIBILITY_JACOCO_PLUGIN_VERSION, DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION);
+    ciVisibilityJacocoPluginVersionProvided =
+        configProvider.getString(CIVISIBILITY_JACOCO_PLUGIN_VERSION) != null;
     ciVisibilityJacocoPluginIncludes =
         Arrays.asList(
             COLON.split(configProvider.getString(CIVISIBILITY_JACOCO_PLUGIN_INCLUDES, ":")));
@@ -1588,6 +1658,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     ciVisibilityGitUnshallowEnabled =
         configProvider.getBoolean(
             CIVISIBILITY_GIT_UNSHALLOW_ENABLED, DEFAULT_CIVISIBILITY_GIT_UNSHALLOW_ENABLED);
+    ciVisibilityGitUnshallowDefer =
+        configProvider.getBoolean(CIVISIBILITY_GIT_UNSHALLOW_DEFER, true);
     ciVisibilityGitCommandTimeoutMillis =
         configProvider.getLong(
             CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS,
@@ -1615,8 +1687,14 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
         configProvider.getBoolean(CIVISIBILITY_REPO_INDEX_SHARING_ENABLED, true);
     ciVisibilityModuleExecutionSettingsCacheSize =
         configProvider.getInteger(CIVISIBILITY_MODULE_EXECUTION_SETTINGS_CACHE_SIZE, 16);
+    ciVisibilityJvmInfoCacheSize = configProvider.getInteger(CIVISIBILITY_JVM_INFO_CACHE_SIZE, 8);
     ciVisibilityCoverageSegmentsEnabled =
         configProvider.getBoolean(CIVISIBILITY_COVERAGE_SEGMENTS_ENABLED, false);
+    ciVisibilityInjectedTracerVersion =
+        configProvider.getString(CIVISIBILITY_INJECTED_TRACER_VERSION);
+    ciVisibilityResourceFolderNames =
+        configProvider.getList(
+            CIVISIBILITY_RESOURCE_FOLDER_NAMES, DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES);
 
     remoteConfigEnabled =
         configProvider.getBoolean(REMOTE_CONFIG_ENABLED, DEFAULT_REMOTE_CONFIG_ENABLED);
@@ -1671,6 +1749,15 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
         configProvider.getInteger(DEBUGGER_CAPTURE_TIMEOUT, DEFAULT_DEBUGGER_CAPTURE_TIMEOUT);
     debuggerRedactedIdentifiers = configProvider.getString(DEBUGGER_REDACTED_IDENTIFIERS, null);
     debuggerRedactedTypes = configProvider.getString(DEBUGGER_REDACTED_TYPES, null);
+    debuggerSymbolEnabled =
+        configProvider.getBoolean(DEBUGGER_SYMBOL_ENABLED, DEFAULT_DEBUGGER_SYMBOL_ENABLED);
+    debuggerSymbolForceUpload =
+        configProvider.getBoolean(
+            DEBUGGER_SYMBOL_FORCE_UPLOAD, DEFAULT_DEBUGGER_SYMBOL_FORCE_UPLOAD);
+    debuggerSymbolIncludes = configProvider.getString(DEBUGGER_SYMBOL_INCLUDES, null);
+    debuggerSymbolFlushThreshold =
+        configProvider.getInteger(
+            DEBUGGER_SYMBOL_FLUSH_THRESHOLD, DEFAULT_DEBUGGER_SYMBOL_FLUSH_THRESHOLD);
 
     awsPropagationEnabled = isPropagationEnabled(true, "aws", "aws-sdk");
     sqsPropagationEnabled = isPropagationEnabled(true, "sqs");
@@ -1701,8 +1788,23 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
 
     grpcIgnoredInboundMethods =
         tryMakeImmutableSet(configProvider.getList(GRPC_IGNORED_INBOUND_METHODS));
-    grpcIgnoredOutboundMethods =
-        tryMakeImmutableSet(configProvider.getList(GRPC_IGNORED_OUTBOUND_METHODS));
+    final List<String> tmpGrpcIgnoredOutboundMethods = new ArrayList<>();
+    tmpGrpcIgnoredOutboundMethods.addAll(configProvider.getList(GRPC_IGNORED_OUTBOUND_METHODS));
+    // When tracing shadowing will be possible we can instrument the stubs to silent tracing
+    // starting from interception points
+    if (InstrumenterConfig.get()
+        .isIntegrationEnabled(Collections.singleton("google-pubsub"), true)) {
+      tmpGrpcIgnoredOutboundMethods.addAll(
+          configProvider.getList(
+              GOOGLE_PUBSUB_IGNORED_GRPC_METHODS,
+              Arrays.asList(
+                  "google.pubsub.v1.Subscriber/ModifyAckDeadline",
+                  "google.pubsub.v1.Subscriber/Acknowledge",
+                  "google.pubsub.v1.Subscriber/Pull",
+                  "google.pubsub.v1.Subscriber/StreamingPull",
+                  "google.pubsub.v1.Publisher/Publish")));
+    }
+    grpcIgnoredOutboundMethods = tryMakeImmutableSet(tmpGrpcIgnoredOutboundMethods);
     grpcServerTrimPackageResource =
         configProvider.getBoolean(GRPC_SERVER_TRIM_PACKAGE_RESOURCE, false);
     grpcServerErrorStatuses =
@@ -1732,6 +1834,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     servletAsyncTimeoutError = configProvider.getBoolean(SERVLET_ASYNC_TIMEOUT_ERROR, true);
 
     debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
+    triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, debugEnabled); // debug implies triage
 
     startupLogsEnabled =
         configProvider.getBoolean(STARTUP_LOGS_ENABLED, DEFAULT_STARTUP_LOGS_ENABLED);
@@ -1812,6 +1915,16 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
               + "Please ensure that either an API key is configured, or the tracer is set up to work with the Agent");
     }
 
+    this.telemetryDebugRequestsEnabled =
+        configProvider.getBoolean(
+            GeneralConfig.TELEMETRY_DEBUG_REQUESTS_ENABLED,
+            ConfigDefaults.DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED);
+
+    timelineEventsEnabled =
+        configProvider.getBoolean(
+            ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED,
+            ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
+
     log.debug("New instance: {}", this);
   }
 
@@ -2022,6 +2135,10 @@ public boolean isHttpServerRawResource() {
     return httpServerRawResource;
   }
 
+  public boolean isHttpServerDecodedResourcePreserveSpaces() {
+    return httpServerDecodedResourcePreserveSpaces;
+  }
+
   public boolean isHttpServerRouteBasedNaming() {
     return httpServerRouteBasedNaming;
   }
@@ -2104,6 +2221,10 @@ public Set<TracePropagationStyle> getTracePropagationStylesToInject() {
     return tracePropagationStylesToInject;
   }
 
+  public boolean isTracePropagationExtractFirst() {
+    return tracePropagationExtractFirst;
+  }
+
   public int getClockSyncPeriod() {
     return clockSyncPeriod;
   }
@@ -2263,7 +2384,19 @@ public String getSpanSamplingRulesFile() {
   }
 
   public boolean isProfilingEnabled() {
-    return instrumenterConfig.isProfilingEnabled();
+    if (Platform.isNativeImage()) {
+      if (!instrumenterConfig.isProfilingEnabled() && profilingEnabled) {
+        log.warn(
+            "Profiling was not enabled during the native image build. "
+                + "Please set DD_PROFILING_ENABLED=true in your native image build configuration if you want"
+                + "to use profiling.");
+      }
+    }
+    return profilingEnabled && instrumenterConfig.isProfilingEnabled();
+  }
+
+  public boolean isProfilingTimelineEventsEnabled() {
+    return timelineEventsEnabled;
   }
 
   public boolean isProfilingAgentless() {
@@ -2365,6 +2498,10 @@ public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
         return false;
       }
     }
+    if (Platform.isGraalVM()) {
+      // let's be conservative about GraalVM and require opt-in from the users
+      return false;
+    }
     boolean result =
         Platform.isJ9()
             || !Platform.isJavaVersion(18) // missing AGCT fixes
@@ -2395,6 +2532,10 @@ public float getTelemetryHeartbeatInterval() {
     return telemetryHeartbeatInterval;
   }
 
+  public long getTelemetryExtendedHeartbeatInterval() {
+    return telemetryExtendedHeartbeatInterval;
+  }
+
   public float getTelemetryMetricsInterval() {
     return telemetryMetricsInterval;
   }
@@ -2403,6 +2544,14 @@ public boolean isTelemetryDependencyServiceEnabled() {
     return isTelemetryDependencyServiceEnabled;
   }
 
+  public boolean isTelemetryMetricsEnabled() {
+    return telemetryMetricsEnabled;
+  }
+
+  public boolean isTelemetryLogCollectionEnabled() {
+    return isTelemetryLogCollectionEnabled;
+  }
+
   public boolean isClientIpEnabled() {
     return clientIpEnabled;
   }
@@ -2508,6 +2657,10 @@ public int getIastMaxRangeCount() {
     return iastMaxRangeCount;
   }
 
+  public boolean isIastStacktraceLeakSuppress() {
+    return iastStacktraceLeakSuppress;
+  }
+
   public boolean isCiVisibilityEnabled() {
     return instrumenterConfig.isCiVisibilityEnabled();
   }
@@ -2597,6 +2750,10 @@ public String getCiVisibilityJacocoPluginVersion() {
     return ciVisibilityJacocoPluginVersion;
   }
 
+  public boolean isCiVisibilityJacocoPluginVersionProvided() {
+    return ciVisibilityJacocoPluginVersionProvided;
+  }
+
   public List<String> getCiVisibilityJacocoPluginIncludes() {
     return ciVisibilityJacocoPluginIncludes;
   }
@@ -2625,6 +2782,10 @@ public boolean isCiVisibilityGitUnshallowEnabled() {
     return ciVisibilityGitUnshallowEnabled;
   }
 
+  public boolean isCiVisibilityGitUnshallowDefer() {
+    return ciVisibilityGitUnshallowDefer;
+  }
+
   public long getCiVisibilityGitCommandTimeoutMillis() {
     return ciVisibilityGitCommandTimeoutMillis;
   }
@@ -2665,10 +2826,22 @@ public int getCiVisibilityModuleExecutionSettingsCacheSize() {
     return ciVisibilityModuleExecutionSettingsCacheSize;
   }
 
+  public int getCiVisibilityJvmInfoCacheSize() {
+    return ciVisibilityJvmInfoCacheSize;
+  }
+
   public boolean isCiVisibilityCoverageSegmentsEnabled() {
     return ciVisibilityCoverageSegmentsEnabled;
   }
 
+  public String getCiVisibilityInjectedTracerVersion() {
+    return ciVisibilityInjectedTracerVersion;
+  }
+
+  public List<String> getCiVisibilityResourceFolderNames() {
+    return ciVisibilityResourceFolderNames;
+  }
+
   public String getAppSecRulesFile() {
     return appSecRulesFile;
   }
@@ -2753,6 +2926,22 @@ public int getDebuggerCaptureTimeout() {
     return debuggerCaptureTimeout;
   }
 
+  public boolean isDebuggerSymbolEnabled() {
+    return debuggerSymbolEnabled;
+  }
+
+  public boolean isDebuggerSymbolForceUpload() {
+    return debuggerSymbolForceUpload;
+  }
+
+  public String getDebuggerSymbolIncludes() {
+    return debuggerSymbolIncludes;
+  }
+
+  public int getDebuggerSymbolFlushThreshold() {
+    return debuggerSymbolFlushThreshold;
+  }
+
   public String getFinalDebuggerProbeUrl() {
     // by default poll from datadog agent
     return "http://" + agentHost + ":" + agentPort;
@@ -2763,6 +2952,10 @@ public String getFinalDebuggerSnapshotUrl() {
     return agentUrl + "/debugger/v1/input";
   }
 
+  public String getFinalDebuggerSymDBUrl() {
+    return agentUrl + "/symdb/v1/input";
+  }
+
   public String getDebuggerProbeFileLocation() {
     return debuggerProbeFileLocation;
   }
@@ -2871,6 +3064,10 @@ public boolean isDebugEnabled() {
     return debugEnabled;
   }
 
+  public boolean isTriageEnabled() {
+    return triageEnabled;
+  }
+
   public boolean isStartupLogsEnabled() {
     return startupLogsEnabled;
   }
@@ -3398,6 +3595,10 @@ public static boolean traceAnalyticsIntegrationEnabled(
     return Config.get().isTraceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled);
   }
 
+  public boolean isTelemetryDebugRequestsEnabled() {
+    return telemetryDebugRequestsEnabled;
+  }
+
   private <T> Set<T> getSettingsSetFromEnvironment(
       String name, Function<String, T> mapper, boolean splitOnWS) {
     final String value = configProvider.getString(name, "");
@@ -3570,7 +3771,7 @@ private static boolean isWindowsOS() {
   private static String getEnv(String name) {
     String value = System.getenv(name);
     if (value != null) {
-      ConfigCollector.get().put(name, value);
+      ConfigCollector.get().put(name, value, ConfigOrigin.ENV);
     }
     return value;
   }
@@ -3593,7 +3794,7 @@ private static String getProp(String name) {
   private static String getProp(String name, String def) {
     String value = System.getProperty(name, def);
     if (value != null) {
-      ConfigCollector.get().put(name, value);
+      ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP);
     }
     return value;
   }
@@ -3749,6 +3950,8 @@ public String toString() {
         + tracePropagationStylesToExtract
         + ", tracePropagationStylesToInject="
         + tracePropagationStylesToInject
+        + ", tracePropagationExtractFirst="
+        + tracePropagationExtractFirst
         + ", clockSyncPeriod="
         + clockSyncPeriod
         + ", jmxFetchEnabled="
@@ -3931,6 +4134,8 @@ public String toString() {
         + traceAgentV05Enabled
         + ", debugEnabled="
         + debugEnabled
+        + ", triageEnabled="
+        + triageEnabled
         + ", startLogsEnabled="
         + startupLogsEnabled
         + ", configFile='"
@@ -3938,7 +4143,7 @@ public String toString() {
         + '\''
         + ", idGenerationStrategy="
         + idGenerationStrategy
-        + ", trace128bitTraceIdGenerationEnabled"
+        + ", trace128bitTraceIdGenerationEnabled="
         + trace128bitTraceIdGenerationEnabled
         + ", grpcIgnoredInboundMethods="
         + grpcIgnoredInboundMethods
@@ -3997,6 +4202,10 @@ public String toString() {
         + removeIntegrationServiceNamesEnabled
         + ", spanAttributeSchemaVersion="
         + spanAttributeSchemaVersion
+        + ", telemetryDebugRequestsEnabled="
+        + telemetryDebugRequestsEnabled
+        + ", telemetryMetricsEnabled="
+        + telemetryMetricsEnabled
         + '}';
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ConfigCollector.java b/internal-api/src/main/java/datadog/trace/api/ConfigCollector.java
index 223ac2905e6..c55f1f309b0 100644
--- a/internal-api/src/main/java/datadog/trace/api/ConfigCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/ConfigCollector.java
@@ -1,10 +1,7 @@
 package datadog.trace.api;
 
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
@@ -14,32 +11,32 @@
  * consumers. So this is based on a ConcurrentHashMap to deal with it.
  */
 public class ConfigCollector {
-
-  private static final Set<String> CONFIG_FILTER_LIST =
-      new HashSet<>(
-          Arrays.asList("DD_API_KEY", "dd.api-key", "dd.profiling.api-key", "dd.profiling.apikey"));
-
   private static final ConfigCollector INSTANCE = new ConfigCollector();
 
   private static final AtomicReferenceFieldUpdater<ConfigCollector, Map> COLLECTED_UPDATER =
       AtomicReferenceFieldUpdater.newUpdater(ConfigCollector.class, Map.class, "collected");
 
-  private volatile Map<String, Object> collected = new ConcurrentHashMap<>();
+  private volatile Map<String, ConfigSetting> collected = new ConcurrentHashMap<>();
 
   public static ConfigCollector get() {
     return INSTANCE;
   }
 
-  public void put(String key, Object value) {
-    collected.put(key, filterConfigEntry(key, value));
+  public void put(String key, Object value, ConfigOrigin origin) {
+    ConfigSetting setting = new ConfigSetting(key, value, origin);
+    collected.put(key, setting);
   }
 
-  public void putAll(Map<String, Object> keysAndValues) {
+  public void putAll(Map<String, Object> keysAndValues, ConfigOrigin origin) {
     // attempt merge+replace to avoid collector seeing partial update
-    Map<String, Object> merged = new ConcurrentHashMap<>(keysAndValues);
-    merged.replaceAll(ConfigCollector::filterConfigEntry);
+    Map<String, ConfigSetting> merged =
+        new ConcurrentHashMap<>(keysAndValues.size() + collected.size());
+    for (Map.Entry<String, Object> entry : keysAndValues.entrySet()) {
+      ConfigSetting setting = new ConfigSetting(entry.getKey(), entry.getValue(), origin);
+      merged.put(entry.getKey(), setting);
+    }
     while (true) {
-      Map<String, Object> current = collected;
+      Map<String, ConfigSetting> current = collected;
       current.forEach(merged::putIfAbsent);
       if (COLLECTED_UPDATER.compareAndSet(this, current, merged)) {
         break; // success
@@ -50,15 +47,11 @@ public void putAll(Map<String, Object> keysAndValues) {
   }
 
   @SuppressWarnings("unchecked")
-  public Map<String, Object> collect() {
+  public Map<String, ConfigSetting> collect() {
     if (!collected.isEmpty()) {
       return COLLECTED_UPDATER.getAndSet(this, new ConcurrentHashMap<>());
     } else {
       return Collections.emptyMap();
     }
   }
-
-  private static Object filterConfigEntry(String key, Object value) {
-    return CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ConfigOrigin.java b/internal-api/src/main/java/datadog/trace/api/ConfigOrigin.java
new file mode 100644
index 00000000000..3f46985758a
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/ConfigOrigin.java
@@ -0,0 +1,18 @@
+package datadog.trace.api;
+
+public enum ConfigOrigin {
+  /** configurations that are set through environment variables */
+  ENV("env_var"),
+  /** values that are set using remote config */
+  REMOTE("remote_config"),
+  /** configurations that are set through JVM properties */
+  JVM_PROP("jvm_prop"),
+  /** set when the user has not set any configuration for the key (defaults to a value) */
+  DEFAULT("default");
+
+  public final String value;
+
+  ConfigOrigin(String value) {
+    this.value = value;
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/ConfigSetting.java b/internal-api/src/main/java/datadog/trace/api/ConfigSetting.java
new file mode 100644
index 00000000000..ac4471fbae1
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/ConfigSetting.java
@@ -0,0 +1,52 @@
+package datadog.trace.api;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+public final class ConfigSetting {
+  public final String key;
+  public final Object value;
+  public final ConfigOrigin origin;
+
+  private static final Set<String> CONFIG_FILTER_LIST =
+      new HashSet<>(
+          Arrays.asList("DD_API_KEY", "dd.api-key", "dd.profiling.api-key", "dd.profiling.apikey"));
+
+  private static Object filterConfigEntry(String key, Object value) {
+    return CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
+  }
+
+  public ConfigSetting(String key, Object value, ConfigOrigin origin) {
+    this.key = key;
+    this.value = filterConfigEntry(key, value);
+    this.origin = origin;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ConfigSetting that = (ConfigSetting) o;
+    return key.equals(that.key) && Objects.equals(value, that.value) && origin == that.origin;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(key, value, origin);
+  }
+
+  @Override
+  public String toString() {
+    return "ConfigSetting{"
+        + "key='"
+        + key
+        + '\''
+        + ", value="
+        + value
+        + ", origin="
+        + origin
+        + '}';
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java b/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
index 6d5978604c5..8671eb32405 100644
--- a/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
@@ -3,6 +3,7 @@
 import static datadog.trace.api.config.GeneralConfig.DATA_STREAMS_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG;
+import static datadog.trace.api.config.GeneralConfig.TRACE_TRIAGE;
 import static datadog.trace.api.config.TraceInstrumentationConfig.LOGS_INJECTION_ENABLED;
 import static datadog.trace.api.config.TracerConfig.BAGGAGE_MAPPING;
 import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS;
@@ -11,10 +12,13 @@
 import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLE_RATE;
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableMap;
 
+import datadog.trace.api.sampling.SamplingRule.SpanSamplingRule;
+import datadog.trace.api.sampling.SamplingRule.TraceSamplingRule;
 import datadog.trace.util.Strings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.BiFunction;
@@ -83,6 +87,7 @@ public void resetTraceConfig() {
   public final class Builder {
 
     boolean debugEnabled;
+    boolean triageEnabled;
     boolean runtimeMetricsEnabled;
     boolean logsInjectionEnabled;
     boolean dataStreamsEnabled;
@@ -91,6 +96,8 @@ public final class Builder {
     Map<String, String> requestHeaderTags;
     Map<String, String> responseHeaderTags;
     Map<String, String> baggageMapping;
+    List<? extends SpanSamplingRule> spanSamplingRules;
+    List<? extends TraceSamplingRule> traceSamplingRules;
 
     Double traceSampleRate;
 
@@ -99,6 +106,7 @@ public final class Builder {
     Builder(Snapshot snapshot) {
 
       this.debugEnabled = snapshot.debugEnabled;
+      this.triageEnabled = snapshot.triageEnabled;
       this.runtimeMetricsEnabled = snapshot.runtimeMetricsEnabled;
       this.logsInjectionEnabled = snapshot.logsInjectionEnabled;
       this.dataStreamsEnabled = snapshot.dataStreamsEnabled;
@@ -116,6 +124,11 @@ public Builder setDebugEnabled(boolean debugEnabled) {
       return this;
     }
 
+    public Builder setTriageEnabled(boolean triageEnabled) {
+      this.triageEnabled = triageEnabled;
+      return this;
+    }
+
     public Builder setRuntimeMetricsEnabled(boolean runtimeMetricsEnabled) {
       this.runtimeMetricsEnabled = runtimeMetricsEnabled;
       return this;
@@ -175,6 +188,16 @@ public Builder setTraceSampleRate(Double traceSampleRate) {
       return this;
     }
 
+    public Builder setSpanSamplingRules(List<? extends SpanSamplingRule> spanSamplingRules) {
+      this.spanSamplingRules = spanSamplingRules;
+      return this;
+    }
+
+    public Builder setTraceSamplingRules(List<? extends TraceSamplingRule> traceSamplingRules) {
+      this.traceSamplingRules = traceSamplingRules;
+      return this;
+    }
+
     /** Overwrites the current configuration with a new snapshot. */
     public DynamicConfig<S> apply() {
       S oldSnapshot = currentSnapshot;
@@ -235,6 +258,7 @@ static void reportConfigChange(Snapshot newSnapshot) {
     Map<String, Object> update = new HashMap<>();
 
     update.put(TRACE_DEBUG, newSnapshot.debugEnabled);
+    update.put(TRACE_TRIAGE, newSnapshot.triageEnabled);
     update.put(RUNTIME_METRICS_ENABLED, newSnapshot.runtimeMetricsEnabled);
     update.put(LOGS_INJECTION_ENABLED, newSnapshot.logsInjectionEnabled);
     update.put(DATA_STREAMS_ENABLED, newSnapshot.dataStreamsEnabled);
@@ -246,7 +270,7 @@ static void reportConfigChange(Snapshot newSnapshot) {
 
     maybePut(update, TRACE_SAMPLE_RATE, newSnapshot.traceSampleRate);
 
-    ConfigCollector.get().putAll(update);
+    ConfigCollector.get().putAll(update, ConfigOrigin.REMOTE);
   }
 
   @SuppressWarnings("SameParameterValue")
@@ -260,6 +284,7 @@ private static void maybePut(Map<String, Object> update, String key, Object valu
   public static class Snapshot implements TraceConfig {
 
     final boolean debugEnabled;
+    final boolean triageEnabled;
     final boolean runtimeMetricsEnabled;
     final boolean logsInjectionEnabled;
     final boolean dataStreamsEnabled;
@@ -268,12 +293,15 @@ public static class Snapshot implements TraceConfig {
     final Map<String, String> requestHeaderTags;
     final Map<String, String> responseHeaderTags;
     final Map<String, String> baggageMapping;
+    final List<? extends SpanSamplingRule> spanSamplingRules;
+    final List<? extends TraceSamplingRule> traceSamplingRules;
 
     final Double traceSampleRate;
 
     protected Snapshot(DynamicConfig<?>.Builder builder, Snapshot oldSnapshot) {
 
       this.debugEnabled = builder.debugEnabled;
+      this.triageEnabled = builder.triageEnabled;
       this.runtimeMetricsEnabled = builder.runtimeMetricsEnabled;
       this.logsInjectionEnabled = builder.logsInjectionEnabled;
       this.dataStreamsEnabled = builder.dataStreamsEnabled;
@@ -284,6 +312,9 @@ protected Snapshot(DynamicConfig<?>.Builder builder, Snapshot oldSnapshot) {
       this.baggageMapping = nullToEmpty(builder.baggageMapping);
 
       this.traceSampleRate = builder.traceSampleRate;
+
+      this.spanSamplingRules = builder.spanSamplingRules;
+      this.traceSamplingRules = builder.traceSamplingRules;
     }
 
     private static <K, V> Map<K, V> nullToEmpty(Map<K, V> mapping) {
@@ -295,6 +326,11 @@ public boolean isDebugEnabled() {
       return debugEnabled;
     }
 
+    @Override
+    public boolean isTriageEnabled() {
+      return triageEnabled;
+    }
+
     @Override
     public boolean isRuntimeMetricsEnabled() {
       return runtimeMetricsEnabled;
@@ -334,5 +370,15 @@ public Map<String, String> getBaggageMapping() {
     public Double getTraceSampleRate() {
       return traceSampleRate;
     }
+
+    @Override
+    public List<? extends SpanSamplingRule> getSpanSamplingRules() {
+      return spanSamplingRules;
+    }
+
+    @Override
+    public List<? extends TraceSamplingRule> getTraceSamplingRules() {
+      return traceSamplingRules;
+    }
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
index 56838ad3067..dbe84e01626 100644
--- a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
@@ -145,9 +145,9 @@ private InstrumenterConfig() {
     logs128bTraceIdEnabled =
         configProvider.getBoolean(
             TRACE_128_BIT_TRACEID_LOGGING_ENABLED, DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED);
+    profilingEnabled = configProvider.getBoolean(PROFILING_ENABLED, PROFILING_ENABLED_DEFAULT);
 
     if (!Platform.isNativeImageBuilder()) {
-      profilingEnabled = configProvider.getBoolean(PROFILING_ENABLED, PROFILING_ENABLED_DEFAULT);
       ciVisibilityEnabled =
           configProvider.getBoolean(CIVISIBILITY_ENABLED, DEFAULT_CIVISIBILITY_ENABLED);
       appSecActivation =
@@ -160,7 +160,6 @@ private InstrumenterConfig() {
       telemetryEnabled = configProvider.getBoolean(TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENABLED);
     } else {
       // disable these features in native-image
-      profilingEnabled = false;
       ciVisibilityEnabled = false;
       appSecActivation = ProductActivation.FULLY_DISABLED;
       iastActivation = ProductActivation.FULLY_DISABLED;
diff --git a/internal-api/src/main/java/datadog/trace/api/Platform.java b/internal-api/src/main/java/datadog/trace/api/Platform.java
index 5e4da83fdbd..bda9b965e6b 100644
--- a/internal-api/src/main/java/datadog/trace/api/Platform.java
+++ b/internal-api/src/main/java/datadog/trace/api/Platform.java
@@ -7,6 +7,11 @@
 import java.util.Locale;
 
 public final class Platform {
+  // A helper class to capture whether the executable is a native image or not.
+  // This class needs to be iniatlized at build only during the AOT compilation and build.
+  private static class Captured {
+    public static final boolean isNativeImage = checkForNativeImageBuilder();
+  }
 
   public enum GC {
     SERIAL("marksweep"),
@@ -45,6 +50,7 @@ static GC current() {
 
   private static final boolean HAS_JFR = checkForJfr();
   private static final boolean IS_NATIVE_IMAGE_BUILDER = checkForNativeImageBuilder();
+  private static final boolean IS_NATIVE_IMAGE = Captured.isNativeImage;
 
   public static GC activeGarbageCollector() {
     return GARBAGE_COLLECTOR;
@@ -58,6 +64,10 @@ public static boolean isNativeImageBuilder() {
     return IS_NATIVE_IMAGE_BUILDER;
   }
 
+  public static boolean isNativeImage() {
+    return IS_NATIVE_IMAGE;
+  }
+
   private static boolean checkForJfr() {
     try {
       /* Check only for the open-sources JFR implementation.
@@ -186,6 +196,7 @@ static final class JvmRuntime {
 
     public final String vendor;
     public final String version;
+    public final String vendorVersion;
     public final String patches;
 
     public JvmRuntime() {
@@ -193,15 +204,17 @@ public JvmRuntime() {
           System.getProperty("java.version"),
           System.getProperty("java.runtime.version"),
           System.getProperty("java.runtime.name"),
-          System.getProperty("java.vm.vendor"));
+          System.getProperty("java.vm.vendor"),
+          System.getProperty("java.vendor.version"));
     }
 
     // Only visible for testing
-    JvmRuntime(String javaVer, String rtVer, String name, String vendor) {
+    JvmRuntime(String javaVer, String rtVer, String name, String vendor, String vendorVersion) {
       this.name = name == null ? "" : name;
       this.vendor = vendor == null ? "" : vendor;
       javaVer = javaVer == null ? "" : javaVer;
       this.version = javaVer;
+      this.vendorVersion = vendorVersion == null ? "" : vendorVersion;
       rtVer = javaVer.isEmpty() || rtVer == null ? javaVer : rtVer;
       int patchStart = javaVer.length() + 1;
       this.patches = (patchStart >= rtVer.length()) ? "" : rtVer.substring(javaVer.length() + 1);
@@ -304,6 +317,14 @@ public static boolean isJ9() {
     return System.getProperty("java.vm.name").contains("J9");
   }
 
+  public static boolean isIbm8() {
+    return isJavaVersion(8) && RUNTIME.vendor.contains("IBM");
+  }
+
+  public static boolean isGraalVM() {
+    return RUNTIME.vendorVersion.toLowerCase().contains("graalvm");
+  }
+
   public static String getLangVersion() {
     return String.valueOf(JAVA_VERSION.major);
   }
diff --git a/internal-api/src/main/java/datadog/trace/api/Stateful.java b/internal-api/src/main/java/datadog/trace/api/Stateful.java
new file mode 100644
index 00000000000..b9532ca6af3
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/Stateful.java
@@ -0,0 +1,18 @@
+package datadog.trace.api;
+
+public interface Stateful extends AutoCloseable {
+
+  Stateful DEFAULT =
+      new Stateful() {
+        @Override
+        public void close() {}
+
+        @Override
+        public void activate(Object context) {}
+      };
+
+  @Override
+  void close();
+
+  void activate(Object context);
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/TraceConfig.java b/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
index 660ac3bec27..d95b3dd4ecb 100644
--- a/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
@@ -1,5 +1,8 @@
 package datadog.trace.api;
 
+import datadog.trace.api.sampling.SamplingRule.SpanSamplingRule;
+import datadog.trace.api.sampling.SamplingRule.TraceSamplingRule;
+import java.util.List;
 import java.util.Map;
 
 /** Snapshot of dynamic configuration; valid for the duration of a trace. */
@@ -7,6 +10,8 @@ public interface TraceConfig {
 
   boolean isDebugEnabled();
 
+  boolean isTriageEnabled();
+
   boolean isRuntimeMetricsEnabled();
 
   boolean isLogsInjectionEnabled();
@@ -22,4 +27,18 @@ public interface TraceConfig {
   Map<String, String> getBaggageMapping();
 
   Double getTraceSampleRate();
+
+  /**
+   * Get the tracer sampler Span Sampling Rules.
+   *
+   * @return The tracer sampler Span Sampling Rules, or an empty collection if no rule is defined.
+   */
+  List<? extends SpanSamplingRule> getSpanSamplingRules();
+
+  /**
+   * Get the tracer sampler Trace Sampling Rules.
+   *
+   * @return The tracer sampler Trace Sampling Rules, or an empty collection if no rule is defined.
+   */
+  List<? extends TraceSamplingRule> getTraceSamplingRules();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
index 8278c735825..accb046c713 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
@@ -59,17 +59,28 @@ public static byte[] getCoverageData() {
   /* This method is referenced by name in bytecode added in the jacoco module */
   public static void currentCoverageProbeStoreRecord(
       long classId, String className, Class<?> clazz, int probeId) {
+    CoverageProbeStore probes = getCurrentCoverageProbeStore();
+    if (probes != null) {
+      probes.record(clazz, classId, className, probeId);
+    }
+  }
+
+  public static void currentCoverageProbeStoreRecordNonCode(String absolutePath) {
+    CoverageProbeStore probes = getCurrentCoverageProbeStore();
+    if (probes != null) {
+      probes.recordNonCodeResource(absolutePath);
+    }
+  }
+
+  private static CoverageProbeStore getCurrentCoverageProbeStore() {
     AgentSpan span = activeSpan();
     if (span == null) {
-      return;
+      return null;
     }
     RequestContext requestContext = span.getRequestContext();
     if (requestContext == null) {
-      return;
-    }
-    CoverageProbeStore probes = requestContext.getData(RequestContextSlot.CI_VISIBILITY);
-    if (probes != null) {
-      probes.record(clazz, classId, className, probeId);
+      return null;
     }
+    return requestContext.getData(RequestContextSlot.CI_VISIBILITY);
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
index 116d9bf800f..529598236de 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.config;
 
+import java.util.Map;
 import java.util.Objects;
 
 public final class Configurations {
@@ -11,6 +12,7 @@ public final class Configurations {
   private final String runtimeVendor;
   private final String runtimeArchitecture;
   private final String testBundle;
+  private final Map<String, String> custom;
 
   public Configurations(
       String osPlatform,
@@ -20,7 +22,8 @@ public Configurations(
       String runtimeVersion,
       String runtimeVendor,
       String runtimeArchitecture,
-      String testBundle) {
+      String testBundle,
+      Map<String, String> custom) {
     this.osPlatform = osPlatform;
     this.osArchitecture = osArchitecture;
     this.osVersion = osVersion;
@@ -29,6 +32,7 @@ public Configurations(
     this.runtimeVendor = runtimeVendor;
     this.runtimeArchitecture = runtimeArchitecture;
     this.testBundle = testBundle;
+    this.custom = custom;
   }
 
   public String getOsPlatform() {
@@ -63,6 +67,10 @@ public String getTestBundle() {
     return testBundle;
   }
 
+  public Map<String, String> getCustom() {
+    return custom;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -79,7 +87,8 @@ public boolean equals(Object o) {
         && Objects.equals(runtimeVersion, that.runtimeVersion)
         && Objects.equals(runtimeVendor, that.runtimeVendor)
         && Objects.equals(runtimeArchitecture, that.runtimeArchitecture)
-        && Objects.equals(testBundle, that.testBundle);
+        && Objects.equals(testBundle, that.testBundle)
+        && Objects.equals(custom, that.custom);
   }
 
   @Override
@@ -92,6 +101,7 @@ public int hashCode() {
         runtimeVersion,
         runtimeVendor,
         runtimeArchitecture,
-        testBundle);
+        testBundle,
+        custom);
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbeStore.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbeStore.java
index 89f70ab5530..8095842630d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbeStore.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbeStore.java
@@ -3,6 +3,8 @@
 public interface CoverageProbeStore extends TestReportHolder {
   void record(Class<?> clazz, long classId, String className, int probeId);
 
+  void recordNonCodeResource(String absolutePath);
+
   void report(Long testSessionId, Long testSuiteId, long spanId);
 
   interface Registry {
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
index da566843136..219529421c9 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
@@ -14,7 +14,8 @@ void onTestSessionStart(
       Path projectRoot,
       String startCommand,
       String buildSystemName,
-      String buildSystemVersion);
+      String buildSystemVersion,
+      Map<String, Object> additionalTags);
 
   void onTestSessionFail(T sessionKey, Throwable throwable);
 
@@ -34,6 +35,8 @@ ModuleInfo onTestModuleStart(
 
   ModuleExecutionSettings getModuleExecutionSettings(T sessionKey, Path jvmExecutablePath);
 
+  ModuleInfo getModuleInfo(T sessionKey, String moduleName);
+
   interface Factory {
     <U> BuildEventsHandler<U> create();
   }
diff --git a/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java b/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
index a61b892447e..5bbb2744531 100644
--- a/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
+++ b/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
@@ -8,7 +8,7 @@
 
 /**
  * The {@code CapturedEnvironment} instance keeps those {@code Config} values which are platform
- * dependant. Notice that this class must be consider internal. You should not depend on it
+ * dependant. Notice that this class must be considered internal. You should not depend on it
  * directly.
  */
 public class CapturedEnvironment {
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java b/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
index ed861b25f3c..ed47369743d 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
@@ -6,7 +6,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.regex.Pattern;
 import java.util.zip.DataFormatException;
@@ -83,6 +82,8 @@ private static String normalizeRef(final String rawRef) {
     return ref;
   }
 
+  private static final Pattern SSH_PROTOCOL_AND_USER_INFO = Pattern.compile("^(ssh://).*?@");
+
   /**
    * Removes the user info of a certain URL. E.g: https://user:password@host.com/path ->
    * https://host.com/path
@@ -94,12 +95,15 @@ public static String filterSensitiveInfo(final String urlStr) {
     if (urlStr == null || urlStr.isEmpty()) {
       return null;
     }
-
     try {
-      final URI url = new URI(urlStr);
-      final String userInfo = url.getRawUserInfo();
-      return Pattern.compile(userInfo + "@", Pattern.LITERAL).matcher(urlStr).replaceAll("");
-    } catch (final URISyntaxException ex) {
+      if (urlStr.startsWith("http")) {
+        final URI url = new URI(urlStr);
+        final String userInfo = url.getRawUserInfo();
+        return Pattern.compile(userInfo + "@", Pattern.LITERAL).matcher(urlStr).replaceAll("");
+      } else {
+        return SSH_PROTOCOL_AND_USER_INFO.matcher(urlStr).replaceAll("$1");
+      }
+    } catch (final Exception ex) {
       return urlStr;
     }
   }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java b/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
index bfd1df6a8e4..8cda3dd3728 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
@@ -14,10 +14,14 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.BiFunction;
 import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** @see StoredCharBody */
 public class StoredByteBody implements StoredBodySupplier {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(StoredByteBody.class);
+
   static final Charset UTF_8 = StandardCharsets.UTF_8;
   static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
 
@@ -41,18 +45,21 @@ public StoredByteBody(
   }
 
   public synchronized void appendData(byte[] bytes, int start, int end) {
-    if (storedCharBody.isLimitReached()) {
-      return;
-    }
-    for (int i = start; i < end; ) {
-      if (!undecodedData.hasRemaining()) {
-        commit(false);
+    try {
+      if (storedCharBody.isLimitReached()) {
+        return;
       }
-      int write = Math.min(end - i, undecodedData.remaining());
-      undecodedData.put(bytes, i, write);
-      i += write;
+      for (int i = start; i < end; ) {
+        if (!undecodedData.hasRemaining()) {
+          commit(false);
+        }
+        int write = Math.min(end - i, undecodedData.remaining());
+        undecodedData.put(bytes, i, write);
+        i += write;
+      }
+    } catch (final Throwable e) {
+      LOGGER.debug("Failed to append byte array chunk", e);
     }
-
     storedCharBody.maybeNotifyStart();
   }
 
@@ -66,41 +73,48 @@ public synchronized void appendData(byte[] bytes, int start, int end) {
    * @param len the amount of data available to write
    */
   public synchronized void appendData(ByteBufferWriteCallback cb, int len) {
-    for (int i = 0; i < len; ) {
-      if (storedCharBody.isLimitReached()) {
-        return;
-      }
-      if (!undecodedData.hasRemaining()) {
-        commit(false);
-      }
-      int left = len - i;
-      int remainingInUndecoded = undecodedData.remaining();
-      if (remainingInUndecoded > left) {
-        undecodedData.limit(left);
-        i += left;
-      } else {
-        i += remainingInUndecoded;
+    try {
+      for (int i = 0; i < len; ) {
+        if (storedCharBody.isLimitReached()) {
+          return;
+        }
+        if (!undecodedData.hasRemaining()) {
+          commit(false);
+        }
+        int left = len - i;
+        int remainingInUndecoded = undecodedData.remaining();
+        if (remainingInUndecoded > left) {
+          undecodedData.limit(left);
+          i += left;
+        } else {
+          i += remainingInUndecoded;
+        }
+        cb.put(undecodedData);
       }
-      cb.put(undecodedData);
-    }
-    undecodedData.limit(undecodedData.capacity());
+      undecodedData.limit(undecodedData.capacity());
 
+    } catch (final Throwable e) {
+      LOGGER.debug("Failed to append byte buffer callback", e);
+    }
     storedCharBody.maybeNotifyStart();
   }
 
   public synchronized void appendData(int byteValue) {
-    if (storedCharBody.isLimitReached()) {
-      return;
-    }
-    if (byteValue < 0 || byteValue > 255) {
-      return;
-    }
+    try {
+      if (storedCharBody.isLimitReached()) {
+        return;
+      }
+      if (byteValue < 0 || byteValue > 255) {
+        return;
+      }
 
-    if (!undecodedData.hasRemaining()) {
-      commit(false);
+      if (!undecodedData.hasRemaining()) {
+        commit(false);
+      }
+      undecodedData.put((byte) byteValue);
+    } catch (final Throwable e) {
+      LOGGER.debug("Failed to append byte", e);
     }
-    undecodedData.put((byte) byteValue);
-
     storedCharBody.maybeNotifyStart();
   }
 
@@ -109,14 +123,22 @@ public synchronized void setCharset(Charset charset) {
   }
 
   public Flow<Void> maybeNotify() {
-    commit(true);
+    try {
+      commit(true);
+    } catch (final Throwable e) {
+      LOGGER.debug("Failed to commit end of input", e);
+    }
     return storedCharBody.maybeNotify();
   }
 
   // may throw BlockingException. If used directly in advice, make use of @Advice.Throwable to
   // propagate
   public void maybeNotifyAndBlock() {
-    commit(true);
+    try {
+      commit(true);
+    } catch (final Throwable e) {
+      LOGGER.debug("Failed to commit end of input", e);
+    }
     storedCharBody.maybeNotifyAndBlock();
   }
 
@@ -137,6 +159,14 @@ private void commit(boolean endOfInput) {
 
     this.undecodedData.flip();
     CoderResult decode = charsetDecoder.decode(this.undecodedData, this.decodedData, endOfInput);
+    if (endOfInput) {
+      /**
+       * Ensure the decoder is at a proper state in case the original input stream is reset,
+       * otherwise we will face: java.lang.IllegalStateException: Current state = CODING_END, new
+       * state = CODING
+       */
+      charsetDecoder.reset();
+    }
 
     this.decodedData.flip();
     this.storedCharBody.appendData(this.decodedData);
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java b/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
index b09d8967a0e..1af4b1e2274 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
@@ -7,9 +7,14 @@
 import java.nio.CharBuffer;
 import java.util.Arrays;
 import java.util.function.BiFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Analogous to {@link StoredByteBody}, but Java doesn't support generics with scalar types. */
 public class StoredCharBody implements StoredBodySupplier {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(StoredCharBody.class);
+
   private static final int MIN_BUFFER_SIZE = 128; // chars
   private static final int MAX_BUFFER_SIZE = 128 * 1024; // 256k (char == 2 bytes)
   private static final int GROW_FACTOR = 4;
@@ -53,33 +58,41 @@ public StoredCharBody(
   }
 
   public synchronized void appendData(char[] chars, int start, int end) {
-    int newDataLen = end - start;
-    if (newDataLen <= 0) {
-      return;
-    }
-    if (!maybeExtendStorage(newDataLen)) {
-      return;
-    }
+    try {
+      int newDataLen = end - start;
+      if (newDataLen <= 0) {
+        return;
+      }
+      if (!maybeExtendStorage(newDataLen)) {
+        return;
+      }
 
-    int lenToCopy = Math.min(newDataLen, capacityLeft());
-    System.arraycopy(chars, start, this.storedBody, this.storedBodyLen, lenToCopy);
+      int lenToCopy = Math.min(newDataLen, capacityLeft());
+      System.arraycopy(chars, start, this.storedBody, this.storedBodyLen, lenToCopy);
 
-    this.storedBodyLen += lenToCopy;
+      this.storedBodyLen += lenToCopy;
+    } catch (final Throwable e) {
+      LOGGER.debug("Error appending char array chunk", e);
+    }
     maybeNotifyStart();
   }
 
   public synchronized void appendData(CharBuffer buffer) {
-    int inputLen = buffer.remaining();
-    if (inputLen == 0) {
-      return;
-    }
-    if (!maybeExtendStorage(inputLen)) {
-      return;
-    }
-    int lenToCopy = Math.min(inputLen, capacityLeft());
+    try {
+      int inputLen = buffer.remaining();
+      if (inputLen == 0) {
+        return;
+      }
+      if (!maybeExtendStorage(inputLen)) {
+        return;
+      }
+      int lenToCopy = Math.min(inputLen, capacityLeft());
 
-    buffer.get(this.storedBody, this.storedBodyLen, lenToCopy);
-    this.storedBodyLen += lenToCopy;
+      buffer.get(this.storedBody, this.storedBodyLen, lenToCopy);
+      this.storedBodyLen += lenToCopy;
+    } catch (final Throwable e) {
+      LOGGER.debug("Error appending char buffer", e);
+    }
     maybeNotifyStart();
   }
 
@@ -100,16 +113,20 @@ private boolean maybeExtendStorage(int newDataLen) {
   }
 
   public synchronized void appendData(String s) {
-    int newDataLen = s.length();
-    if (!maybeExtendStorage(newDataLen)) {
-      return;
-    }
+    try {
+      int newDataLen = s.length();
+      if (!maybeExtendStorage(newDataLen)) {
+        return;
+      }
 
-    int lenToCopy = Math.min(newDataLen, capacityLeft());
-    s.getChars(0, lenToCopy, this.storedBody, this.storedBodyLen);
+      int lenToCopy = Math.min(newDataLen, capacityLeft());
+      s.getChars(0, lenToCopy, this.storedBody, this.storedBodyLen);
 
-    this.storedBodyLen += lenToCopy;
+      this.storedBodyLen += lenToCopy;
 
+    } catch (final Throwable e) {
+      LOGGER.debug("Error appending string", e);
+    }
     maybeNotifyStart();
   }
 
@@ -119,15 +136,19 @@ private int capacityLeft() {
 
   /** @param utf16CodeUnit an int in the range 0-0xFFFF */
   public synchronized void appendData(int utf16CodeUnit) {
-    if (utf16CodeUnit < 0) {
-      return;
-    }
-    if (!maybeExtendStorage(1)) {
-      return;
-    }
-    this.storedBody[this.storedBodyLen] = (char) utf16CodeUnit;
-    this.storedBodyLen += 1;
+    try {
+      if (utf16CodeUnit < 0) {
+        return;
+      }
+      if (!maybeExtendStorage(1)) {
+        return;
+      }
+      this.storedBody[this.storedBodyLen] = (char) utf16CodeUnit;
+      this.storedBodyLen += 1;
 
+    } catch (final Throwable e) {
+      LOGGER.debug("Error appending code unit", e);
+    }
     maybeNotifyStart();
   }
 
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java
new file mode 100644
index 00000000000..85fdbc91764
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java
@@ -0,0 +1,44 @@
+package datadog.trace.api.iast;
+
+import datadog.trace.api.gateway.RequestContext;
+import datadog.trace.api.gateway.RequestContextSlot;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import javax.annotation.Nullable;
+
+/**
+ * Initial encapsulation of the IAST context to be able to isolate it from the request. Ideally we
+ * should move away from IastRequestContext and start using this interface as much as possible
+ */
+public interface IastContext {
+
+  /**
+   * Some scala instrumentations failed with public static methods inside an interface, that's the
+   * reason behind an inner class.
+   */
+  abstract class Provider {
+
+    private Provider() {}
+
+    @Nullable
+    public static IastContext get() {
+      return get(AgentTracer.activeSpan());
+    }
+
+    @Nullable
+    public static IastContext get(final AgentSpan span) {
+      if (span == null) {
+        return null;
+      }
+      return get(span.getRequestContext());
+    }
+
+    @Nullable
+    public static IastContext get(final RequestContext reqCtx) {
+      if (reqCtx == null) {
+        return null;
+      }
+      return reqCtx.getData(RequestContextSlot.IAST);
+    }
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
index a6693603991..459ba10196a 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
@@ -13,6 +13,7 @@
 import datadog.trace.api.iast.sink.PathTraversalModule;
 import datadog.trace.api.iast.sink.SqlInjectionModule;
 import datadog.trace.api.iast.sink.SsrfModule;
+import datadog.trace.api.iast.sink.StacktraceLeakModule;
 import datadog.trace.api.iast.sink.TrustBoundaryViolationModule;
 import datadog.trace.api.iast.sink.UnvalidatedRedirectModule;
 import datadog.trace.api.iast.sink.WeakCipherModule;
@@ -21,14 +22,12 @@
 import datadog.trace.api.iast.sink.XContentTypeModule;
 import datadog.trace.api.iast.sink.XPathInjectionModule;
 import datadog.trace.api.iast.sink.XssModule;
-import datadog.trace.api.iast.source.WebModule;
 
 /** Bridge between instrumentations and {@link IastModule} instances. */
 public abstract class InstrumentationBridge {
 
   public static volatile StringModule STRING;
   public static volatile CodecModule CODEC;
-  public static volatile WebModule WEB;
   public static volatile SqlInjectionModule SQL_INJECTION;
   public static volatile PathTraversalModule PATH_TRAVERSAL;
   public static volatile CommandInjectionModule COMMAND_INJECTION;
@@ -53,6 +52,8 @@ public abstract class InstrumentationBridge {
 
   public static volatile XssModule XSS;
 
+  public static volatile StacktraceLeakModule STACKTRACE_LEAK_MODULE;
+
   private InstrumentationBridge() {}
 
   public static void registerIastModule(final IastModule module) {
@@ -60,8 +61,6 @@ public static void registerIastModule(final IastModule module) {
       STRING = (StringModule) module;
     } else if (module instanceof CodecModule) {
       CODEC = (CodecModule) module;
-    } else if (module instanceof WebModule) {
-      WEB = (WebModule) module;
     } else if (module instanceof SqlInjectionModule) {
       SQL_INJECTION = (SqlInjectionModule) module;
     } else if (module instanceof PathTraversalModule) {
@@ -100,12 +99,15 @@ public static void registerIastModule(final IastModule module) {
       TRUST_BOUNDARY_VIOLATION = (TrustBoundaryViolationModule) module;
     } else if (module instanceof XssModule) {
       XSS = (XssModule) module;
+    } else if (module instanceof StacktraceLeakModule) {
+      STACKTRACE_LEAK_MODULE = (StacktraceLeakModule) module;
     } else {
       throw new UnsupportedOperationException("Module not yet supported: " + module);
     }
   }
 
   /** Mainly used for testing modules */
+  @SuppressWarnings("unchecked")
   public static <E extends IastModule> E getIastModule(final Class<E> type) {
     if (type == StringModule.class) {
       return (E) STRING;
@@ -113,9 +115,6 @@ public static <E extends IastModule> E getIastModule(final Class<E> type) {
     if (type == CodecModule.class) {
       return (E) CODEC;
     }
-    if (type == WebModule.class) {
-      return (E) WEB;
-    }
     if (type == SqlInjectionModule.class) {
       return (E) SQL_INJECTION;
     }
@@ -173,6 +172,9 @@ public static <E extends IastModule> E getIastModule(final Class<E> type) {
     if (type == XssModule.class) {
       return (E) XSS;
     }
+    if (type == StacktraceLeakModule.class) {
+      return (E) STACKTRACE_LEAK_MODULE;
+    }
     throw new UnsupportedOperationException("Module not yet supported: " + type);
   }
 
@@ -180,7 +182,6 @@ public static <E extends IastModule> E getIastModule(final Class<E> type) {
   public static void clearIastModules() {
     STRING = null;
     CODEC = null;
-    WEB = null;
     SQL_INJECTION = null;
     PATH_TRAVERSAL = null;
     COMMAND_INJECTION = null;
@@ -200,5 +201,6 @@ public static void clearIastModules() {
     XPATH_INJECTION = null;
     TRUST_BOUNDARY_VIOLATION = null;
     XSS = null;
+    STACKTRACE_LEAK_MODULE = null;
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
index 1b96c7e4b81..b28309b11c1 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
@@ -4,6 +4,8 @@ public class VulnerabilityMarks {
 
   private VulnerabilityMarks() {}
 
+  public static final int NOT_MARKED = 0;
+
   public static final int XPATH_INJECTION_MARK = 1;
   public static final int SQL_INJECTION_MARK = 1 << 1;
   public static final int COMMAND_INJECTION_MARK = 1 << 2;
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
index 74e5a8ce22b..1a21ce795e5 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
@@ -38,6 +38,8 @@ private VulnerabilityTypes() {}
   public static final String TRUST_BOUNDARY_VIOLATION_STRING = "TRUST_BOUNDARY_VIOLATION";
   public static final byte XSS = 16;
   public static final String XSS_STRING = "XSS";
+  public static final byte STACKTRACE_LEAK = 17;
+  public static final String STACKTRACE_LEAK_STRING = "STACKTRACE_LEAK";
 
   /**
    * Use for telemetry only, this is a special vulnerability type that is not reported, reported
@@ -78,7 +80,8 @@ private VulnerabilityTypes() {}
     HSTS_HEADER_MISSING,
     XCONTENTTYPE_HEADER_MISSING,
     NO_SAMESITE_COOKIE,
-    XSS
+    XSS,
+    STACKTRACE_LEAK
   };
 
   public static byte[] values() {
@@ -121,6 +124,8 @@ public static String toString(final byte sourceType) {
         return VulnerabilityTypes.NO_SAMESITE_COOKIE_STRING;
       case VulnerabilityTypes.XSS:
         return VulnerabilityTypes.XSS_STRING;
+      case VulnerabilityTypes.STACKTRACE_LEAK:
+        return VulnerabilityTypes.STACKTRACE_LEAK_STRING;
       default:
         return null;
     }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
index ecb9df8788a..fc72b58901c 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
@@ -1,73 +1,183 @@
 package datadog.trace.api.iast.propagation;
 
+import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.IastModule;
-import datadog.trace.api.iast.Taintable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import datadog.trace.api.iast.Taintable.Source;
 import java.util.function.Predicate;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+/** Main API for propagation of tainted values, */
+@SuppressWarnings("unused")
 public interface PropagationModule extends IastModule {
 
-  void taintIfInputIsTainted(@Nullable Object toTaint, @Nullable Object input);
+  /** @see #taint(IastContext, Object, byte) */
+  void taint(@Nullable Object target, byte origin);
 
-  void taintIfInputIsTainted(@Nullable String toTaint, @Nullable Object input);
+  /**
+   * Taints the object with a source with the selected origin and no name, if target is a char
+   * sequence it will be used as value
+   */
+  void taint(@Nullable IastContext ctx, @Nullable Object target, byte origin);
 
-  void taintIfInputIsTainted(
-      byte origin, @Nullable String name, @Nullable String toTaint, @Nullable Object input);
+  /** @see #taint(IastContext, Object, byte, CharSequence) */
+  void taint(@Nullable Object target, byte origin, @Nullable CharSequence name);
+
+  /**
+   * Taints the object with a source with the selected origin and name, if target is a char sequence
+   * it will be used as value
+   */
+  void taint(
+      @Nullable IastContext ctx, @Nullable Object target, byte origin, @Nullable CharSequence name);
+
+  /** @see #taint(IastContext, Object, byte, CharSequence, CharSequence) */
+  void taint(
+      @Nullable Object target,
+      byte origin,
+      @Nullable CharSequence name,
+      @Nullable CharSequence value);
 
-  void taintIfInputIsTainted(
+  /** Taints the object with a source with the selected origin, name and value */
+  void taint(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
       byte origin,
-      @Nullable String name,
-      @Nullable Collection<String> toTaint,
-      @Nullable Object input);
+      @Nullable CharSequence name,
+      @Nullable CharSequence value);
 
-  void taintIfInputIsTainted(
-      byte origin, @Nullable Collection<String> toTaint, @Nullable Object input);
+  /** @see #taintIfTainted(IastContext, Object, Object) */
+  void taintIfTainted(@Nullable Object target, @Nullable Object input);
+
+  /**
+   * Taints the object only if the input value is tainted. If tainted, it will use the highest
+   * priority source of the input to taint the object.
+   */
+  void taintIfTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object input);
+
+  /** @see #taintIfTainted(IastContext, Object, Object, boolean, int) */
+  void taintIfTainted(
+      @Nullable Object target, @Nullable Object input, boolean keepRanges, int mark);
+
+  /**
+   * Taints the object only if the input value is tainted. It will try to reuse sources from the
+   * input value according to:
+   *
+   * <ul>
+   *   <li>keepRanges=true will reuse the ranges from the input tainted value and mark them
+   *   <li>keepRanges=false will use the highest priority source from the input ranges and mark it
+   * </ul>
+   */
+  void taintIfTainted(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
+      @Nullable Object input,
+      boolean keepRanges,
+      int mark);
 
-  void taintIfInputIsTainted(
-      byte origin, @Nullable List<Map.Entry<String, String>> toTaint, @Nullable Object input);
+  /** @see #taintIfTainted(IastContext, Object, Object, byte) */
+  void taintIfTainted(@Nullable Object target, @Nullable Object input, byte origin);
 
-  void taintIfAnyInputIsTainted(@Nullable Object toTaint, @Nullable Object... inputs);
+  /**
+   * Taints the object only if the input value is tainted, the resulting value will be tainted using
+   * a source with the specified origin and no name, if target is a char sequence it will be used as
+   * value
+   */
+  void taintIfTainted(
+      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, byte origin);
 
-  void taint(byte source, @Nullable String name, @Nullable String value);
+  /** @see #taintIfTainted(IastContext, Object, Object, byte, CharSequence) */
+  void taintIfTainted(
+      @Nullable Object target, @Nullable Object input, byte origin, @Nullable CharSequence name);
 
-  void taint(@Nullable Object ctx_, byte source, @Nullable String name, @Nullable String value);
+  /**
+   * Taints the object only if the input value is tainted, the resulting value will be tainted using
+   * a source with the specified origin and name, if target is a char sequence it will be used as
+   * value
+   */
+  void taintIfTainted(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
+      @Nullable Object input,
+      byte origin,
+      @Nullable CharSequence name);
 
-  void taintDeeply(@Nullable Object ctx_, byte source, @Nonnull Object o);
+  /** @see #taintIfTainted(IastContext, Object, Object, byte, CharSequence, CharSequence) */
+  void taintIfTainted(
+      @Nullable Object target,
+      @Nullable Object input,
+      byte origin,
+      @Nullable CharSequence name,
+      @Nullable CharSequence value);
 
-  void taintDeeply(
-      @Nullable Object ctx_, byte source, @Nonnull Object o, @Nonnull Predicate<Class<?>> filter);
+  /**
+   * Taints the object only if the input value is tainted, the resulting value will be tainted using
+   * a source with the specified origin, name and value.
+   */
+  void taintIfTainted(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
+      @Nullable Object input,
+      byte origin,
+      @Nullable CharSequence name,
+      @Nullable CharSequence value);
 
-  void taintObjectIfInputIsTaintedKeepingRanges(
-      @Nullable final Object toTaint, @Nullable Object input);
+  /** @see #taintIfAnyTainted(IastContext, Object, Object[]) */
+  void taintIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs);
 
   /**
-   * Taint a non-String object. It might be {@link Taintable} or not. It is tainted with a source
-   * with no name or value.
+   * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
+   * the same as in {@link #taintIfTainted(IastContext, Object, Object)}
+   *
+   * @see #taintIfTainted(IastContext, Object, Object)
    */
-  void taintObject(byte origin, @Nullable Object toTaint);
+  void taintIfAnyTainted(
+      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object[] inputs);
+
+  /** @see #taintIfAnyTainted(IastContext, Object, Object[], boolean, int) */
+  void taintIfAnyTainted(
+      @Nullable Object target, @Nullable Object[] inputs, boolean keepRanges, int mark);
 
   /**
-   * Taint one or more non-String objects. They might be {@link Taintable} or not. These are tainted
-   * with source with no name or value.
+   * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
+   * the same as in {@link #taintIfTainted(IastContext, Object, Object, boolean, int)}
+   *
+   * @see #taintIfTainted(IastContext, Object, Object, boolean, int)
    */
-  void taintObjects(byte origin, @Nullable Object[] toTaint);
+  void taintIfAnyTainted(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
+      @Nullable Object[] inputs,
+      boolean keepRanges,
+      int mark);
+
+  /** @see #taintDeeply(IastContext, Object, byte, Predicate) */
+  int taintDeeply(@Nullable Object target, byte origin, Predicate<Class<?>> classFilter);
 
   /**
-   * Taint a non-String object. It might be {@link Taintable} or not. It is tainted with a source
-   * with the specified value.
+   * Visit the graph of the object and taints all the string properties found using a source with
+   * the selected origin and no name.
+   *
+   * @param classFilter filter for types that should be included in the visiting process
+   * @return number of tainted elements
    */
-  void taintObject(byte origin, @Nullable String name, @Nullable String value, @Nullable Object t);
+  int taintDeeply(
+      @Nullable IastContext ctx,
+      @Nullable Object target,
+      byte origin,
+      Predicate<Class<?>> classFilter);
 
-  void taintObjects(byte origin, @Nullable Collection<Object> toTaint);
+  /** @see #isTainted(IastContext, Object) */
+  boolean isTainted(@Nullable Object target);
 
-  void taintIfInputIsTaintedWithMarks(
-      @Nullable final String toTaint, @Nullable final Object input, int mark);
+  /** Checks if an arbitrary object is tainted */
+  boolean isTainted(@Nullable IastContext ctx, @Nullable Object target);
 
-  boolean isTainted(@Nullable Object obj);
+  /** @see #findSource(IastContext, Object) */
+  @Nullable
+  Source findSource(@Nullable Object target);
 
-  Taintable.Source firstTaintedSource(@Nullable Object input);
+  /**
+   * Returns the source with the highest priority if the object is tainted, {@code null} otherwise
+   */
+  @Nullable
+  Source findSource(@Nullable IastContext ctx, @Nullable Object target);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java
new file mode 100644
index 00000000000..2a6a668303c
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java
@@ -0,0 +1,9 @@
+package datadog.trace.api.iast.sink;
+
+import datadog.trace.api.iast.IastModule;
+import javax.annotation.Nullable;
+
+public interface StacktraceLeakModule extends IastModule {
+  void onStacktraceLeak(
+      @Nullable final Throwable expression, String moduleName, String className, String methodName);
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/source/WebModule.java b/internal-api/src/main/java/datadog/trace/api/iast/source/WebModule.java
deleted file mode 100644
index 3f319ffa220..00000000000
--- a/internal-api/src/main/java/datadog/trace/api/iast/source/WebModule.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package datadog.trace.api.iast.source;
-
-import datadog.trace.api.iast.IastModule;
-import java.util.Collection;
-import java.util.Map;
-import javax.annotation.Nullable;
-
-public interface WebModule extends IastModule {
-
-  /**
-   * An HTTP request parameter name is used. This should be used when it cannot be determined
-   * whether the parameter comes in the query string or body (e.g. servlet's getParameter).
-   */
-  void onParameterNames(@Nullable Collection<String> paramNames);
-
-  void onParameterValues(@Nullable String paramName, @Nullable String[] paramValue);
-
-  void onParameterValues(@Nullable String paramName, @Nullable Collection<String> paramValues);
-
-  void onParameterValues(@Nullable Map<String, String[]> values);
-
-  void onHeaderNames(@Nullable Collection<String> headerNames);
-
-  void onHeaderValues(@Nullable String headerName, @Nullable Collection<String> headerValue);
-
-  void onCookieNames(@Nullable Iterable<String> cookieNames);
-
-  void onMultipartNames(@Nullable final Collection<String> headerNames);
-
-  void onMultipartValues(
-      @Nullable String headerName, @Nullable final Collection<String> headerValues);
-
-  void onGetPathInfo(@Nullable String s);
-
-  void onGetRequestURI(@Nullable String s);
-}
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
index d5a7e535e2b..255c54ef9b2 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
@@ -79,7 +79,7 @@ public static void add(@Nonnull final IastMetric metric, final int value) {
 
   public static void add(
       @Nonnull final IastMetric metric, final int value, @Nullable final Object ctx) {
-    add(metric, (byte) -1, value, null);
+    add(metric, (byte) -1, value, ctx);
   }
 
   /** Prefer using {@link #add(IastMetric, byte, int, Object)} if possible */
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
index 78f980539f6..e086d9e91fe 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
@@ -10,6 +10,8 @@ private String normalizeForCloud(@Nonnull final String messagingSystem) {
       case "sns":
       case "sqs":
         return "aws." + messagingSystem;
+      case "google-pubsub":
+        return "gcp.pubsub";
       default:
         return messagingSystem;
     }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
index 8400b26cd60..d8bfd67f076 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
@@ -40,6 +40,10 @@ public final class SQLNormalizer {
     }
   }
 
+  public static UTF8BytesString normalizeCharSequence(CharSequence sql) {
+    return normalize(sql.toString());
+  }
+
   public static UTF8BytesString normalize(String sql) {
     byte[] utf8 = sql.getBytes(UTF_8);
     try {
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
index 7285ab1825b..d4857986ebe 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
@@ -1,5 +1,7 @@
 package datadog.trace.api.normalize;
 
+import datadog.trace.api.Config;
+
 // public because this is used in the testing module but groovy accesses it through Class.forName
 // which is banned
 public final class SimpleHttpPathNormalizer extends HttpPathNormalizer {
@@ -11,6 +13,8 @@ public String normalize(String path, boolean encoded) {
     if (null == path || path.isEmpty()) {
       return "/";
     }
+    final boolean preserveSpaces =
+        !encoded && Config.get().isHttpServerDecodedResourcePreserveSpaces();
     StringBuilder sb = null;
     int inEncoding = 0;
     for (int i = 0; i < path.length(); ) {
@@ -45,6 +49,9 @@ public String normalize(String path, boolean encoded) {
             if (!numeric) {
               if (Character.isWhitespace(c)) {
                 sb = ensureStringBuilder(sb, path, j);
+                if (preserveSpaces && sb.length() > 0) {
+                  sb.append(c);
+                }
               } else if (sb != null) {
                 sb.append(c);
               }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
similarity index 96%
rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java
rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
index 5b0836c4eec..c886ebcf81a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datadog.profiling.controller;
+package datadog.trace.api.profiling;
 
-import datadog.trace.api.profiling.ProfilingSnapshot;
 import java.io.IOException;
 import java.time.Instant;
 import javax.annotation.Nonnull;
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
similarity index 96%
rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java
rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
index f84f923d061..29a5e4951bf 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datadog.profiling.controller;
+package datadog.trace.api.profiling;
 
 /** Listener for getting notified when new recording data is becoming available. */
 public interface RecordingDataListener {
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
similarity index 82%
rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java
rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
index 5d584b73e09..0549635a027 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
@@ -1,11 +1,10 @@
-package com.datadog.profiling.controller;
+package datadog.trace.api.profiling;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-/** A wrapper stream implementation for the recording data. */
-public final class RecordingInputStream extends BufferedInputStream {
+public class RecordingInputStream extends BufferedInputStream {
   public RecordingInputStream(InputStream in) {
     super(in);
   }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
similarity index 82%
rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java
rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
index b8f6280b64d..639ccc39557 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
@@ -1,4 +1,4 @@
-package com.datadog.profiling.controller;
+package datadog.trace.api.profiling;
 
 public enum RecordingType {
   CONTINUOUS("continuous");
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java b/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
index c21c874f3d0..1158500204a 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
@@ -106,6 +106,9 @@ void onWindowRoll(
 
   private final ConfigListener listener;
 
+  private final Duration windowDuration;
+  private final AgentTaskScheduler taskScheduler;
+
   /**
    * Create a new sampler instance
    *
@@ -122,7 +125,8 @@ protected AdaptiveSampler(
       final int averageLookback,
       final int budgetLookback,
       final @Nullable ConfigListener listener,
-      final AgentTaskScheduler taskScheduler) {
+      final AgentTaskScheduler taskScheduler,
+      boolean startSampler) {
 
     if (averageLookback < 1) {
       throw new IllegalArgumentException("'averageLookback' argument must be at least 1");
@@ -141,12 +145,12 @@ protected AdaptiveSampler(
       listener.onWindowRoll(0, 0, samplesBudget, totalCountRunningAverage, probability);
     }
 
-    taskScheduler.weakScheduleAtFixedRate(
-        RollWindowTask.INSTANCE,
-        this,
-        windowDuration.toNanos(),
-        windowDuration.toNanos(),
-        TimeUnit.NANOSECONDS);
+    this.windowDuration = windowDuration;
+    this.taskScheduler = taskScheduler;
+
+    if (startSampler) {
+      start();
+    }
   }
 
   /**
@@ -161,12 +165,21 @@ public AdaptiveSampler(
       final Duration windowDuration,
       final int samplesPerWindow,
       final int averageLookback,
-      final int budgetLookback) {
-    this(windowDuration, samplesPerWindow, averageLookback, budgetLookback, null);
+      final int budgetLookback,
+      boolean startSampler) {
+    this(
+        windowDuration,
+        samplesPerWindow,
+        averageLookback,
+        budgetLookback,
+        null,
+        AgentTaskScheduler.INSTANCE,
+        startSampler);
   }
 
   /**
-   * Create a new sampler instance with automatic window roll.
+   * Create a new sampler instance with automatic window roll. The instance is automatically
+   * started.
    *
    * @param windowDuration the sampling window duration
    * @param samplesPerWindow the maximum number of samples in the sampling window
@@ -186,7 +199,17 @@ public AdaptiveSampler(
         averageLookback,
         budgetLookback,
         listener,
-        AgentTaskScheduler.INSTANCE);
+        AgentTaskScheduler.INSTANCE,
+        true);
+  }
+
+  public void start() {
+    taskScheduler.weakScheduleAtFixedRate(
+        RollWindowTask.INSTANCE,
+        this,
+        windowDuration.toNanos(),
+        windowDuration.toNanos(),
+        TimeUnit.NANOSECONDS);
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java
new file mode 100644
index 00000000000..e8f47eeef03
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java
@@ -0,0 +1,82 @@
+package datadog.trace.api.sampling;
+
+import java.util.Map;
+
+/** This interface describes the criteria for a sampling rule. */
+public interface SamplingRule {
+  static String normalizeGlob(String name) {
+    return name == null || MATCH_ALL.equals(name) ? MATCH_ALL : name;
+  }
+
+  /** The "match all" glob pattern . */
+  String MATCH_ALL = "*";
+
+  /**
+   * Gets the glob pattern the span service must match to validate the rule.
+   *
+   * @return The glob pattern the span service must match.
+   */
+  String getService();
+
+  /**
+   * Gets the glob pattern the span name must match to validate the rule.
+   *
+   * @return The glob pattern the span name must match.
+   */
+  String getName();
+
+  /**
+   * Gets the glob pattern the span resource must match to validate the rule.
+   *
+   * @return The glob pattern the span resource must match.
+   */
+  String getResource();
+
+  /**
+   * Gets the collection of all (tag name, glob pattern) pairs that span tags must match to validate
+   * the rules. If the collection is empty, the rule will be validated. If the collection has
+   * entries, each key must exactly match a span tag name, and its associated glob pattern must
+   * match the span tag value.
+   *
+   * @return The collection of all (tag name, glob pattern) pairs that span tags must match.
+   */
+  Map<String, String> getTags();
+
+  /**
+   * Gets the probability of keeping (sampling) the element matching the rule.
+   *
+   * @return The probability of sampling the element matching the rule, between {@code 0.0} and
+   *     {@code 1.0}.
+   */
+  double getSampleRate();
+
+  /** This interface describes the criteria of a sampling rule that can match against a trace. */
+  interface TraceSamplingRule extends SamplingRule {
+    /**
+     * Gets the span type the rule must match against. If {@link TargetSpan#ROOT}, only the root
+     * span of the trace will be evaluated to validate the rule. If {@link TargetSpan#ANY}, all
+     * spans from the trace might be evaluated, and only one need to match to validate the rule.
+     *
+     * @return The span type the rule must be validated against.
+     */
+    TargetSpan getTargetSpan();
+
+    /**
+     * This enumerate defines against which span of the trace must be validated the sampling rule.
+     */
+    enum TargetSpan {
+      ROOT,
+      ANY
+    }
+  }
+
+  /** This interface describes the criteria of a sampling rule that can match against a span. */
+  interface SpanSamplingRule extends SamplingRule {
+    /**
+     * Gets the limit applied to the rule, using a token bucket limiter.
+     *
+     * @return The limit applied to the rule, {@link Integer#MAX_VALUE} if no limit.
+     */
+    int getMaxPerSecond();
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/IntegrationsCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
similarity index 75%
rename from internal-api/src/main/java/datadog/trace/api/IntegrationsCollector.java
rename to internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
index 93512adace1..2b85a444e6e 100644
--- a/internal-api/src/main/java/datadog/trace/api/IntegrationsCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
@@ -1,4 +1,4 @@
-package datadog.trace.api;
+package datadog.trace.api.telemetry;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -8,21 +8,15 @@
 
 public class IntegrationsCollector {
 
-  public static class Holder {
-    public static final IntegrationsCollector INSTANCE = new IntegrationsCollector();
-  }
+  private static final IntegrationsCollector INSTANCE = new IntegrationsCollector();
+  private final Queue<Integration> integrations = new LinkedBlockingQueue<>();
 
-  public static IntegrationsCollector get() {
-    return Holder.INSTANCE;
-  }
+  private IntegrationsCollector() {}
 
-  protected static class Integration {
-    public Iterable<String> names;
-    public boolean enabled;
+  public static IntegrationsCollector get() {
+    return INSTANCE;
   }
 
-  private static final Queue<Integration> integrations = new LinkedBlockingQueue<>();
-
   public synchronized void update(Iterable<String> names, boolean enabled) {
     Integration i = new Integration();
     i.names = names;
@@ -48,4 +42,9 @@ public synchronized Map<String, Boolean> drain() {
 
     return map;
   }
+
+  private static class Integration {
+    public Iterable<String> names;
+    public boolean enabled;
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
new file mode 100644
index 00000000000..2ea78dba715
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
@@ -0,0 +1,106 @@
+package datadog.trace.api.telemetry;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+public class LogCollector {
+  public static final Marker SEND_TELEMETRY = MarkerFactory.getMarker("SEND_TELEMETRY");
+  private static final int DEFAULT_MAX_CAPACITY = 1024;
+  private static final LogCollector INSTANCE = new LogCollector();
+  private final Map<RawLogMessage, AtomicInteger> rawLogMessages;
+  private final int maxCapacity;
+
+  public static LogCollector get() {
+    return INSTANCE;
+  }
+
+  private LogCollector() {
+    this(DEFAULT_MAX_CAPACITY);
+  }
+
+  // For testing purpose
+  LogCollector(int maxCapacity) {
+    this.maxCapacity = maxCapacity;
+    this.rawLogMessages = new ConcurrentHashMap<>(maxCapacity);
+  }
+
+  public void addLogMessage(String logLevel, String message, Throwable throwable) {
+    RawLogMessage rawLogMessage =
+        new RawLogMessage(logLevel, message, throwable, System.currentTimeMillis());
+
+    if (rawLogMessages.size() < maxCapacity) {
+      AtomicInteger count = rawLogMessages.computeIfAbsent(rawLogMessage, k -> new AtomicInteger());
+      count.incrementAndGet();
+    }
+  }
+
+  public Collection<RawLogMessage> drain() {
+    if (rawLogMessages.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    List<RawLogMessage> list = new ArrayList<>();
+
+    Iterator<Map.Entry<RawLogMessage, AtomicInteger>> iterator =
+        rawLogMessages.entrySet().iterator();
+
+    while (iterator.hasNext()) {
+      Map.Entry<RawLogMessage, AtomicInteger> entry = iterator.next();
+
+      RawLogMessage logMessage = entry.getKey();
+      logMessage.count = entry.getValue().get();
+
+      iterator.remove();
+
+      list.add(logMessage);
+    }
+
+    return list;
+  }
+
+  public static class RawLogMessage {
+    public final String messageOriginal;
+    public final String logLevel;
+    public final Throwable throwable;
+    public final long timestamp;
+    public int count;
+
+    public RawLogMessage(String logLevel, String message, Throwable throwable, long timestamp) {
+      this.logLevel = logLevel;
+      this.messageOriginal = message;
+      this.throwable = throwable;
+      this.timestamp = timestamp;
+    }
+
+    public String message() {
+      if (count > 1) {
+        return messageOriginal + ", {" + count + "} additional messages skipped";
+      }
+      return messageOriginal;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      RawLogMessage that = (RawLogMessage) o;
+      return Objects.equals(logLevel, that.logLevel)
+          && Objects.equals(messageOriginal, that.messageOriginal)
+          && Objects.equals(throwable, that.throwable);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(logLevel, messageOriginal, throwable);
+    }
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
index f1d9175a47d..56bfb0ad547 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
@@ -1,5 +1,6 @@
 package datadog.trace.bootstrap.config.provider;
 
+import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.env.CapturedEnvironment;
 
 public final class CapturedEnvironmentConfigSource extends ConfigProvider.Source {
@@ -17,4 +18,9 @@ public CapturedEnvironmentConfigSource(CapturedEnvironment env) {
   protected String get(String key) {
     return env.getProperties().get(key);
   }
+
+  @Override
+  public ConfigOrigin origin() {
+    return ConfigOrigin.ENV;
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
index 1bd9422087f..fe431f15313 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
@@ -363,4 +363,30 @@ protected MethodHandle computeValue(Class<?> type) {
       }
     }
   }
+
+  public static String renderIntegerRange(BitSet bitset) {
+    StringBuilder sb = new StringBuilder();
+    int start = 0;
+    while (true) {
+      start = bitset.nextSetBit(start);
+      if (start < 0) {
+        break;
+      }
+      int end = bitset.nextClearBit(start);
+      if (sb.length() > 0) {
+        sb.append(',');
+      }
+      if (start < end - 1) {
+        // interval
+        sb.append(start);
+        sb.append('-');
+        sb.append(end);
+      } else {
+        // single value
+        sb.append(start);
+      }
+      start = end;
+    }
+    return sb.toString();
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
index 9638d498d8c..4d776da370c 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
@@ -3,6 +3,7 @@
 import static datadog.trace.api.config.GeneralConfig.CONFIGURATION_FILE;
 
 import datadog.trace.api.ConfigCollector;
+import datadog.trace.api.ConfigOrigin;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -64,6 +65,9 @@ public <T extends Enum<T>> T getEnum(String key, Class<T> enumType, T defaultVal
         log.debug("failed to parse {} for {}, defaulting to {}", value, key, defaultValue);
       }
     }
+    if (collectConfig) {
+      ConfigCollector.get().put(key, String.valueOf(defaultValue), ConfigOrigin.DEFAULT);
+    }
     return defaultValue;
   }
 
@@ -72,11 +76,14 @@ public String getString(String key, String defaultValue, String... aliases) {
       String value = source.get(key, aliases);
       if (value != null) {
         if (collectConfig) {
-          ConfigCollector.get().put(key, value);
+          ConfigCollector.get().put(key, value, source.origin());
         }
         return value;
       }
     }
+    if (collectConfig && defaultValue != null) {
+      ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+    }
     return defaultValue;
   }
 
@@ -89,11 +96,14 @@ public String getStringNotEmpty(String key, String defaultValue, String... alias
       String value = source.get(key, aliases);
       if (value != null && !value.trim().isEmpty()) {
         if (collectConfig) {
-          ConfigCollector.get().put(key, value);
+          ConfigCollector.get().put(key, value, source.origin());
         }
         return value;
       }
     }
+    if (collectConfig && defaultValue != null) {
+      ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+    }
     return defaultValue;
   }
 
@@ -110,11 +120,14 @@ public String getStringExcludingSource(
       String value = source.get(key, aliases);
       if (value != null) {
         if (collectConfig) {
-          ConfigCollector.get().put(key, value);
+          ConfigCollector.get().put(key, value, source.origin());
         }
         return value;
       }
     }
+    if (collectConfig && defaultValue != null) {
+      ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+    }
     return defaultValue;
   }
 
@@ -182,7 +195,7 @@ private <T> T get(String key, T defaultValue, Class<T> type, String... aliases)
         T value = ConfigConverter.valueOf(sourceValue, type);
         if (value != null) {
           if (collectConfig) {
-            ConfigCollector.get().put(key, sourceValue);
+            ConfigCollector.get().put(key, sourceValue, source.origin());
           }
           return value;
         }
@@ -190,6 +203,9 @@ private <T> T get(String key, T defaultValue, Class<T> type, String... aliases)
         // continue
       }
     }
+    if (collectConfig && defaultValue != null) {
+      ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+    }
     return defaultValue;
   }
 
@@ -200,6 +216,9 @@ public List<String> getList(String key) {
   public List<String> getList(String key, List<String> defaultValue) {
     String list = getString(key);
     if (null == list) {
+      if (collectConfig && defaultValue != null) {
+        ConfigCollector.get().put(key, String.join(",", defaultValue), ConfigOrigin.DEFAULT);
+      }
       return defaultValue;
     } else {
       return ConfigConverter.parseList(getString(key));
@@ -209,6 +228,10 @@ public List<String> getList(String key, List<String> defaultValue) {
   public Set<String> getSet(String key, Set<String> defaultValue) {
     String list = getString(key);
     if (null == list) {
+      if (collectConfig && defaultValue != null) {
+        String defaultValueStr = String.join(",", defaultValue);
+        ConfigCollector.get().put(key, defaultValueStr, ConfigOrigin.DEFAULT);
+      }
       return defaultValue;
     } else {
       return new HashSet(ConfigConverter.parseList(getString(key)));
@@ -221,35 +244,46 @@ public List<String> getSpacedList(String key) {
 
   public Map<String, String> getMergedMap(String key) {
     Map<String, String> merged = new HashMap<>();
+    ConfigOrigin origin = ConfigOrigin.DEFAULT;
     // System properties take precedence over env
     // prior art:
     // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
     // We reverse iterate to allow overrides
     for (int i = sources.length - 1; 0 <= i; i--) {
       String value = sources[i].get(key);
-      merged.putAll(ConfigConverter.parseMap(value, key));
+      Map<String, String> parsedMap = ConfigConverter.parseMap(value, key);
+      if (!parsedMap.isEmpty()) {
+        origin = sources[i].origin();
+      }
+      merged.putAll(parsedMap);
     }
-    collectMapSetting(key, merged);
+    collectMapSetting(key, merged, origin);
     return merged;
   }
 
   public Map<String, String> getOrderedMap(String key) {
     LinkedHashMap<String, String> merged = new LinkedHashMap<>();
+    ConfigOrigin origin = ConfigOrigin.DEFAULT;
     // System properties take precedence over env
     // prior art:
     // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
     // We reverse iterate to allow overrides
     for (int i = sources.length - 1; 0 <= i; i--) {
       String value = sources[i].get(key);
-      merged.putAll(ConfigConverter.parseOrderedMap(value, key));
+      Map<String, String> parsedMap = ConfigConverter.parseOrderedMap(value, key);
+      if (!parsedMap.isEmpty()) {
+        origin = sources[i].origin();
+      }
+      merged.putAll(parsedMap);
     }
-    collectMapSetting(key, merged);
+    collectMapSetting(key, merged, origin);
     return merged;
   }
 
   public Map<String, String> getMergedMapWithOptionalMappings(
       String defaultPrefix, boolean lowercaseKeys, String... keys) {
     Map<String, String> merged = new HashMap<>();
+    ConfigOrigin origin = ConfigOrigin.DEFAULT;
     // System properties take precedence over env
     // prior art:
     // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
@@ -257,10 +291,14 @@ public Map<String, String> getMergedMapWithOptionalMappings(
     for (String key : keys) {
       for (int i = sources.length - 1; 0 <= i; i--) {
         String value = sources[i].get(key);
-        merged.putAll(
-            ConfigConverter.parseMapWithOptionalMappings(value, key, defaultPrefix, lowercaseKeys));
+        Map<String, String> parsedMap =
+            ConfigConverter.parseMapWithOptionalMappings(value, key, defaultPrefix, lowercaseKeys);
+        if (!parsedMap.isEmpty()) {
+          origin = sources[i].origin();
+        }
+        merged.putAll(parsedMap);
       }
-      collectMapSetting(key, merged);
+      collectMapSetting(key, merged, origin);
     }
     return merged;
   }
@@ -268,11 +306,17 @@ public Map<String, String> getMergedMapWithOptionalMappings(
   public BitSet getIntegerRange(final String key, final BitSet defaultValue) {
     final String value = getString(key);
     try {
-      return value == null ? defaultValue : ConfigConverter.parseIntegerRangeSet(value, key);
+      if (value != null) {
+        return ConfigConverter.parseIntegerRangeSet(value, key);
+      }
     } catch (final NumberFormatException e) {
       log.warn("Invalid configuration for {}", key, e);
-      return defaultValue;
     }
+    if (collectConfig) {
+      String defaultValueStr = ConfigConverter.renderIntegerRange(defaultValue);
+      ConfigCollector.get().put(key, defaultValueStr, ConfigOrigin.DEFAULT);
+    }
+    return defaultValue;
   }
 
   public boolean isEnabled(
@@ -363,7 +407,7 @@ public static ConfigProvider withPropertiesOverride(Properties properties) {
     }
   }
 
-  private void collectMapSetting(String key, Map<String, String> merged) {
+  private void collectMapSetting(String key, Map<String, String> merged, ConfigOrigin origin) {
     if (!collectConfig || merged.isEmpty()) {
       return;
     }
@@ -376,9 +420,7 @@ private void collectMapSetting(String key, Map<String, String> merged) {
       mergedValue.append(':');
       mergedValue.append(entry.getValue());
     }
-    if (mergedValue.length() > 0) {
-      ConfigCollector.get().put(key, mergedValue.toString());
-    }
+    ConfigCollector.get().put(key, mergedValue.toString(), origin);
   }
 
   /**
@@ -439,5 +481,7 @@ public final String get(String key, String... aliases) {
     }
 
     protected abstract String get(String key);
+
+    public abstract ConfigOrigin origin();
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
index c69caf719fc..6719693fd86 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
@@ -2,10 +2,17 @@
 
 import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName;
 
+import datadog.trace.api.ConfigOrigin;
+
 final class EnvironmentConfigSource extends ConfigProvider.Source {
 
   @Override
   protected String get(String key) {
     return System.getenv(propertyNameToEnvironmentVariableName(key));
   }
+
+  @Override
+  public ConfigOrigin origin() {
+    return ConfigOrigin.ENV;
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
index 9f5e77a9cbe..a3391a54ef6 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
@@ -2,6 +2,7 @@
 
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 
+import datadog.trace.api.ConfigOrigin;
 import java.util.Properties;
 
 final class PropertiesConfigSource extends ConfigProvider.Source {
@@ -25,4 +26,9 @@ public String getConfigFileStatus() {
   protected String get(String key) {
     return props.getProperty(useSystemPropertyFormat ? propertyNameToSystemPropertyName(key) : key);
   }
+
+  @Override
+  public ConfigOrigin origin() {
+    return ConfigOrigin.JVM_PROP;
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
index fc6dba8c6f5..08aaf487027 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
@@ -2,10 +2,17 @@
 
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 
+import datadog.trace.api.ConfigOrigin;
+
 public final class SystemPropertiesConfigSource extends ConfigProvider.Source {
 
   @Override
   protected String get(String key) {
     return System.getProperty(propertyNameToSystemPropertyName(key));
   }
+
+  @Override
+  public ConfigOrigin origin() {
+    return ConfigOrigin.JVM_PROP;
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java
index afc3730e577..97185d488a5 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java
@@ -15,9 +15,14 @@ public interface AgentDataStreamsMonitoring extends DataStreamsCheckpointer {
    *     checkpoint in the chain. Zero should be passed if we can't extract the timestamp from the
    *     message / payload itself (for instance: produce operations; http produce / consume etc).
    *     Value will be ignored for checkpoints happening not at the start of the pipeline.
+   * @param payloadSizeBytes size of the message (body + headers) in bytes. Zero should be passed if
+   *     the size cannot be evaluated.
    */
   void setCheckpoint(
-      AgentSpan span, LinkedHashMap<String, String> sortedTags, long defaultTimestamp);
+      AgentSpan span,
+      LinkedHashMap<String, String> sortedTags,
+      long defaultTimestamp,
+      long payloadSizeBytes);
 
   PathwayContext newPathwayContext();
 
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
index 285e6ef4763..1a084bee969 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
@@ -14,6 +14,14 @@ public interface AgentPropagation {
   <C> void injectPathwayContext(
       AgentSpan span, C carrier, Setter<C> setter, LinkedHashMap<String, String> sortedTags);
 
+  <C> void injectPathwayContext(
+      AgentSpan span,
+      C carrier,
+      Setter<C> setter,
+      LinkedHashMap<String, String> sortedTags,
+      long defaultTimestamp,
+      long payloadSizeBytes);
+
   interface Setter<C> {
     void set(C carrier, String key, String value);
   }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
index 1df4e1a54bf..463cfc4920e 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
@@ -6,6 +6,7 @@
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.api.sampling.PrioritySampling;
+import java.util.List;
 import java.util.Map;
 
 public interface AgentSpan extends MutableSpan, IGSpanInfo {
@@ -136,6 +137,8 @@ public interface AgentSpan extends MutableSpan, IGSpanInfo {
 
   TraceConfig traceConfig();
 
+  void addLink(AgentSpanLink link);
+
   interface Context {
     /**
      * Gets the TraceId of the span's trace.
@@ -176,6 +179,13 @@ interface Context {
     default void mergePathwayContext(PathwayContext pathwayContext) {}
 
     interface Extracted extends Context {
+      /**
+       * Gets the span links related to the other terminated context.
+       *
+       * @return The span links to other extracted contexts found but terminated.
+       */
+      List<AgentSpanLink> getTerminatedContextLinks();
+
       String getForwarded();
 
       String getFastlyClientIp();
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
index 3be83b67473..470a0736af2 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
@@ -8,6 +8,11 @@
  * or not.
  */
 public interface AgentSpanLink {
+  /** The default trace flags (no flag enabled). */
+  byte DEFAULT_FLAGS = 0;
+  /** The sampled flag denotes that the caller may have recorded trace data. */
+  byte SAMPLED_FLAG = 1;
+
   /**
    * Gets the trace identifier of the linked span.
    *
@@ -22,6 +27,15 @@ public interface AgentSpanLink {
    */
   long spanId();
 
+  /**
+   * Gets the 8-bit field that controls tracing flags such as sampling, trace level, etc.
+   *
+   * @return The 8-bit field that controls tracing flags such as sampling, trace level, etc.
+   * @see <a href="https://www.w3.org/TR/trace-context/#trace-flags">Trace flag header W3C
+   *     Specification</a>
+   */
+  byte traceFlags();
+
   /**
    * Gets the vendor-specific trace information as defined per W3C standard.
    *
@@ -32,9 +46,25 @@ public interface AgentSpanLink {
   String traceState();
 
   /**
-   * Gets an immutable collection of the link attributes.
+   * Gets the link attributes.
    *
-   * @return The link attributes, wrapped into an immutable collection.
+   * @return The link attributes.
    */
-  Map<String, String> attributes();
+  Attributes attributes();
+
+  interface Attributes {
+    /**
+     * Gets the attributes as an immutable map.
+     *
+     * @return The attributes as an immutable map.
+     */
+    Map<String, String> asMap();
+
+    /**
+     * Checks whether the attributes are empty.
+     *
+     * @return {@code true} if the attributes are empty, {@code false} otherwise.
+     */
+    boolean isEmpty();
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
index e1fc08400b4..b0aaed6e808 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
@@ -1,6 +1,7 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
+import static java.util.Collections.emptyList;
 
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
@@ -20,11 +21,13 @@
 import datadog.trace.api.internal.TraceSegment;
 import datadog.trace.api.profiling.Timer;
 import datadog.trace.api.sampling.PrioritySampling;
+import datadog.trace.api.sampling.SamplingRule;
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context;
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -519,7 +522,7 @@ public AgentHistogram newHistogram(double relativeAccuracy, int maxNumBins) {
   public static final class NoopAgentSpan implements AgentSpan {
     public static final NoopAgentSpan INSTANCE = new NoopAgentSpan();
 
-    protected NoopAgentSpan() {}
+    private NoopAgentSpan() {}
 
     @Override
     public DDTraceId getTraceId() {
@@ -806,6 +809,9 @@ public byte getResourceNamePriority() {
     public TraceConfig traceConfig() {
       return NoopTraceConfig.INSTANCE;
     }
+
+    @Override
+    public void addLink(AgentSpanLink link) {}
   }
 
   public static final class NoopAgentScope implements AgentScope {
@@ -862,6 +868,15 @@ public <C> void inject(
     public <C> void injectPathwayContext(
         AgentSpan span, C carrier, Setter<C> setter, LinkedHashMap<String, String> sortedTags) {}
 
+    @Override
+    public <C> void injectPathwayContext(
+        AgentSpan span,
+        C carrier,
+        Setter<C> setter,
+        LinkedHashMap<String, String> sortedTags,
+        long defaultTimestamp,
+        long payloadSizeBytes) {}
+
     @Override
     public <C> Context.Extracted extract(final C carrier, final ContextVisitor<C> getter) {
       return NoopContext.INSTANCE;
@@ -912,7 +927,7 @@ public int getSamplingPriority() {
 
     @Override
     public Iterable<Map.Entry<String, String>> baggageItems() {
-      return Collections.emptyList();
+      return emptyList();
     }
 
     @Override
@@ -920,6 +935,11 @@ public PathwayContext getPathwayContext() {
       return NoopPathwayContext.INSTANCE;
     }
 
+    @Override
+    public List<AgentSpanLink> getTerminatedContextLinks() {
+      return emptyList();
+    }
+
     @Override
     public String getForwarded() {
       return null;
@@ -1020,7 +1040,10 @@ public void trackBacklog(LinkedHashMap<String, String> sortedTags, long value) {
 
     @Override
     public void setCheckpoint(
-        AgentSpan span, LinkedHashMap<String, String> sortedTags, long defaultTimestamp) {}
+        AgentSpan span,
+        LinkedHashMap<String, String> sortedTags,
+        long defaultTimestamp,
+        long payloadSizeBytes) {}
 
     @Override
     public PathwayContext newPathwayContext() {
@@ -1052,6 +1075,13 @@ public long getHash() {
       return 0L;
     }
 
+    @Override
+    public void setCheckpoint(
+        LinkedHashMap<String, String> sortedTags,
+        Consumer<StatsPoint> pointConsumer,
+        long defaultTimestamp,
+        long payloadSizeBytes) {}
+
     @Override
     public void setCheckpoint(
         LinkedHashMap<String, String> sortedTags,
@@ -1125,6 +1155,11 @@ public boolean isDebugEnabled() {
       return false;
     }
 
+    @Override
+    public boolean isTriageEnabled() {
+      return false;
+    }
+
     @Override
     public boolean isRuntimeMetricsEnabled() {
       return false;
@@ -1164,5 +1199,15 @@ public Map<String, String> getBaggageMapping() {
     public Double getTraceSampleRate() {
       return null;
     }
+
+    @Override
+    public List<? extends SamplingRule.SpanSamplingRule> getSpanSamplingRules() {
+      return Collections.emptyList();
+    }
+
+    @Override
+    public List<? extends SamplingRule.TraceSamplingRule> getTraceSamplingRules() {
+      return Collections.emptyList();
+    }
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/PathwayContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/PathwayContext.java
index 38ad2dc4d43..0419c6f7844 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/PathwayContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/PathwayContext.java
@@ -13,6 +13,12 @@ public interface PathwayContext {
 
   long getHash();
 
+  void setCheckpoint(
+      LinkedHashMap<String, String> sortedTags,
+      Consumer<StatsPoint> pointConsumer,
+      long defaultTimestamp,
+      long payloadSizeBytes);
+
   void setCheckpoint(
       LinkedHashMap<String, String> sortedTags,
       Consumer<StatsPoint> pointConsumer,
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
index bdfd2005e22..1001b1c0a80 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
@@ -8,4 +8,10 @@ public interface ProfilerContext {
   long getRootSpanId();
 
   int getEncodedOperationName();
+
+  CharSequence getOperationName();
+
+  int getEncodedResourceName();
+
+  CharSequence getResourceName();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
index 1bee6e1c48e..303411289cc 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
@@ -1,30 +1,40 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
+import datadog.trace.api.Stateful;
 import datadog.trace.api.profiling.Profiling;
 import datadog.trace.api.profiling.ProfilingContextAttribute;
 import datadog.trace.api.profiling.ProfilingScope;
 
 public interface ProfilingContextIntegration extends Profiling {
+  /**
+   * invoked when the profiler is started, implementations must not initialise JFR before this is
+   * called.
+   */
+  default void onStart() {}
   /** Invoked when a trace first propagates to a thread */
-  void onAttach();
+  default void onAttach() {}
 
   /** Invoked when a thread exits */
-  void onDetach();
+  default void onDetach() {}
 
-  void setContext(ProfilerContext profilerContext);
-
-  void clearContext();
-
-  void setContext(long rootSpanId, long spanId);
+  default Stateful newScopeState(ProfilerContext profilerContext) {
+    return Stateful.DEFAULT;
+  }
 
-  boolean isQueuingTimeEnabled();
+  default int encode(CharSequence constant) {
+    return 0;
+  }
 
-  void recordQueueingTime(long duration);
+  default int encodeOperationName(CharSequence constant) {
+    return 0;
+  }
 
-  default int encode(CharSequence constant) {
+  default int encodeResourceName(CharSequence constant) {
     return 0;
   }
 
+  String name();
+
   final class NoOp implements ProfilingContextIntegration {
 
     public static final ProfilingContextIntegration INSTANCE =
@@ -47,20 +57,8 @@ public void onAttach() {}
     public void onDetach() {}
 
     @Override
-    public void setContext(ProfilerContext profilerContext) {}
-
-    @Override
-    public void clearContext() {}
-
-    @Override
-    public void setContext(long rootSpanId, long spanId) {}
-
-    @Override
-    public boolean isQueuingTimeEnabled() {
-      return false;
+    public String name() {
+      return "none";
     }
-
-    @Override
-    public void recordQueueingTime(long duration) {}
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
index 7ed140e1503..4a0e28b272b 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
@@ -1,22 +1,24 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
+import static datadog.trace.bootstrap.instrumentation.api.SpanLinkAttributes.EMPTY;
+
 import datadog.trace.api.DDTraceId;
-import java.util.Collections;
-import java.util.Map;
 
 /** This class is a base implementation of {@link AgentSpanLink}. */
 public class SpanLink implements AgentSpanLink {
   private final DDTraceId traceId;
   private final long spanId;
+  private final byte traceFlags;
   private final String traceState;
-  private final Map<String, String> attributes;
+  private final Attributes attributes;
 
   protected SpanLink(
-      DDTraceId traceId, long spanId, String traceState, Map<String, String> attributes) {
+      DDTraceId traceId, long spanId, byte traceFlags, String traceState, Attributes attributes) {
     this.traceId = traceId;
     this.spanId = spanId;
+    this.traceFlags = traceFlags;
     this.traceState = traceState;
-    this.attributes = attributes == null ? Collections.emptyMap() : attributes;
+    this.attributes = attributes;
   }
 
   /**
@@ -27,7 +29,7 @@ protected SpanLink(
    * @return A span link to the given context.
    */
   public static SpanLink from(AgentSpan.Context context) {
-    return from(context, "", Collections.emptyMap());
+    return from(context, DEFAULT_FLAGS, "", EMPTY);
   }
 
   /**
@@ -35,13 +37,18 @@ public static SpanLink from(AgentSpan.Context context) {
    * trace and span identifiers from the given instance.
    *
    * @param context The context of the span to get the link to.
+   * @param traceFlags The W3C formatted trace flags.
    * @param traceState The W3C formatted trace state.
    * @param attributes The link attributes.
    * @return A span link to the given context.
    */
   public static SpanLink from(
-      AgentSpan.Context context, String traceState, Map<String, String> attributes) {
-    return new SpanLink(context.getTraceId(), context.getSpanId(), traceState, attributes);
+      AgentSpan.Context context, byte traceFlags, String traceState, Attributes attributes) {
+    if (context.getSamplingPriority() > 0) {
+      traceFlags = (byte) (traceFlags | SAMPLED_FLAG);
+    }
+    return new SpanLink(
+        context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
   }
 
   @Override
@@ -54,13 +61,35 @@ public long spanId() {
     return this.spanId;
   }
 
+  @Override
+  public byte traceFlags() {
+    return this.traceFlags;
+  }
+
   @Override
   public String traceState() {
     return this.traceState;
   }
 
   @Override
-  public Map<String, String> attributes() {
+  public Attributes attributes() {
     return this.attributes;
   }
+
+  @Override
+  public String toString() {
+    return "SpanLink{"
+        + "traceId="
+        + this.traceId
+        + ", spanId="
+        + this.spanId
+        + ", traceFlags="
+        + this.traceFlags
+        + ", traceState='"
+        + this.traceState
+        + '\''
+        + ", attributes="
+        + this.attributes
+        + '}';
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLinkAttributes.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLinkAttributes.java
new file mode 100644
index 00000000000..87a2ce05f6b
--- /dev/null
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLinkAttributes.java
@@ -0,0 +1,122 @@
+package datadog.trace.bootstrap.instrumentation.api;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** This class is a base implementation of {@link AgentSpanLink.Attributes}. */
+public class SpanLinkAttributes implements AgentSpanLink.Attributes {
+  /** An empty span links attributes. */
+  public static final AgentSpanLink.Attributes EMPTY =
+      new SpanLinkAttributes(Collections.emptyMap());
+
+  private final Map<String, String> attributes;
+
+  protected SpanLinkAttributes(Map<String, String> attributes) {
+    this.attributes = attributes;
+  }
+
+  /**
+   * Gets a builder to create span link attributes.
+   *
+   * @return A builder to create span link attributes.
+   */
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  /**
+   * Create span link attributes from its map representation.
+   *
+   * @param map A map representing the span link attributes.
+   * @return The related span link attributes.
+   */
+  public static SpanLinkAttributes fromMap(Map<String, String> map) {
+    return new SpanLinkAttributes(new HashMap<>(map));
+  }
+
+  @Override
+  public Map<String, String> asMap() {
+    return this.attributes;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return this.attributes.isEmpty();
+  }
+
+  @Override
+  public String toString() {
+    return "SpanLinkAttributes{" + this.attributes + '}';
+  }
+
+  public static class Builder {
+    private final Map<String, String> attributes;
+
+    protected Builder() {
+      this.attributes = new HashMap<>();
+    }
+
+    public Builder put(String key, String value) {
+      requireNonNull(key, "key must not be null");
+      if (value != null) {
+        this.attributes.put(key, value);
+      }
+      return this;
+    }
+
+    public Builder put(String key, boolean value) {
+      requireNonNull(key, "key must not be null");
+      this.attributes.put(key, Boolean.toString(value));
+      return this;
+    }
+
+    public Builder put(String key, long value) {
+      requireNonNull(key, "key must not be null");
+      this.attributes.put(key, Long.toString(value));
+      return this;
+    }
+
+    public Builder put(String key, double value) {
+      requireNonNull(key, "key must not be null");
+      this.attributes.put(key, Double.toString(value));
+      return this;
+    }
+
+    public Builder putStringArray(String key, List<String> array) {
+      return putArray(key, array);
+    }
+
+    public Builder putBooleanArray(String key, List<Boolean> array) {
+      return putArray(key, array);
+    }
+
+    public Builder putLongArray(String key, List<Long> array) {
+      return putArray(key, array);
+    }
+
+    public Builder putDoubleArray(String key, List<Double> array) {
+      return putArray(key, array);
+    }
+
+    protected <T> Builder putArray(String key, List<T> array) {
+      requireNonNull(key, "key must not be null");
+      if (array != null) {
+        for (int index = 0; index < array.size(); index++) {
+          Object value = array.get(index);
+          if (value != null) {
+            this.attributes.put(key + "." + index, value.toString());
+          }
+        }
+      }
+      return this;
+    }
+
+    public AgentSpanLink.Attributes build() {
+      return new SpanLinkAttributes(this.attributes);
+    }
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java
index 024b315df09..caa6540699b 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java
@@ -9,6 +9,7 @@ public class StatsPoint implements InboxItem {
   private final long timestampNanos;
   private final long pathwayLatencyNano;
   private final long edgeLatencyNano;
+  private final long payloadSizeBytes;
 
   public StatsPoint(
       List<String> edgeTags,
@@ -16,13 +17,15 @@ public StatsPoint(
       long parentHash,
       long timestampNanos,
       long pathwayLatencyNano,
-      long edgeLatencyNano) {
+      long edgeLatencyNano,
+      long payloadSizeBytes) {
     this.edgeTags = edgeTags;
     this.hash = hash;
     this.parentHash = parentHash;
     this.timestampNanos = timestampNanos;
     this.pathwayLatencyNano = pathwayLatencyNano;
     this.edgeLatencyNano = edgeLatencyNano;
+    this.payloadSizeBytes = payloadSizeBytes;
   }
 
   public List<String> getEdgeTags() {
@@ -49,6 +52,10 @@ public long getEdgeLatencyNano() {
     return edgeLatencyNano;
   }
 
+  public long getPayloadSizeBytes() {
+    return payloadSizeBytes;
+  }
+
   @Override
   public String toString() {
     return "StatsPoint{"
@@ -65,6 +72,8 @@ public String toString() {
         + pathwayLatencyNano
         + ", edgeLatencyNano="
         + edgeLatencyNano
+        + ", payloadSizeBytes="
+        + payloadSizeBytes
         + '}';
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
index 4c730abfdfc..303b78a9ebd 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
@@ -1,10 +1,16 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
+import static datadog.trace.api.TracePropagationStyle.NONE;
+import static java.util.Collections.emptyList;
+
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
+import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,6 +23,7 @@ public class TagContext implements AgentSpan.Context.Extracted {
 
   private final CharSequence origin;
   private final Map<String, String> tags;
+  private List<AgentSpanLink> terminatedContextLinks;
   private Object requestContextDataAppSec;
   private Object requestContextDataIast;
   private Object ciVisibilityContextData;
@@ -25,13 +32,14 @@ public class TagContext implements AgentSpan.Context.Extracted {
   private final Map<String, String> baggage;
   private final int samplingPriority;
   private final TraceConfig traceConfig;
+  private final TracePropagationStyle propagationStyle;
 
   public TagContext() {
     this(null, null);
   }
 
   public TagContext(final String origin, final Map<String, String> tags) {
-    this(origin, tags, null, null, PrioritySampling.UNSET, null);
+    this(origin, tags, null, null, PrioritySampling.UNSET, null, NONE);
   }
 
   public TagContext(
@@ -40,23 +48,42 @@ public TagContext(
       final HttpHeaders httpHeaders,
       final Map<String, String> baggage,
       final int samplingPriority,
-      final TraceConfig traceConfig) {
+      final TraceConfig traceConfig,
+      final TracePropagationStyle propagationStyle) {
     this.origin = origin;
     this.tags = tags;
+    this.terminatedContextLinks = null;
     this.httpHeaders = httpHeaders == null ? EMPTY_HTTP_HEADERS : httpHeaders;
     this.baggage = baggage == null ? Collections.emptyMap() : baggage;
     this.samplingPriority = samplingPriority;
     this.traceConfig = traceConfig;
+    this.propagationStyle = propagationStyle;
   }
 
   public TraceConfig getTraceConfig() {
     return traceConfig;
   }
 
+  public TracePropagationStyle getPropagationStyle() {
+    return this.propagationStyle;
+  }
+
   public final CharSequence getOrigin() {
     return origin;
   }
 
+  @Override
+  public List<AgentSpanLink> getTerminatedContextLinks() {
+    return this.terminatedContextLinks == null ? emptyList() : this.terminatedContextLinks;
+  }
+
+  public void addTerminatedContextLink(AgentSpanLink link) {
+    if (this.terminatedContextLinks == null) {
+      this.terminatedContextLinks = new ArrayList<>();
+    }
+    this.terminatedContextLinks.add(link);
+  }
+
   @Override
   public String getForwarded() {
     return httpHeaders.forwarded;
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
index 4c824529b36..cfe43ff6df0 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
@@ -62,6 +62,7 @@ public class Tags {
   public static final String TEST_COMMAND = "test.command";
   public static final String TEST_TOOLCHAIN = "test.toolchain";
   public static final String TEST_EXECUTION = "test.execution";
+  public static final String TEST_GRADLE_NESTED_BUILD = "test.gradle.nested_build";
 
   public static final String TEST_SESSION_ID = "test_session_id";
   public static final String TEST_MODULE_ID = "test_module_id";
diff --git a/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java b/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
index 807068cfcdb..400772b7f2d 100644
--- a/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
+++ b/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
@@ -43,4 +43,11 @@ public void restore() {
       delegate.restore();
     }
   }
+
+  @Override
+  public void reinitialize() {
+    if (delegate != null) {
+      delegate.reinitialize();
+    }
+  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java b/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
index 6cf1f1dde13..3e1adfe12fe 100644
--- a/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
+++ b/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
@@ -12,4 +12,7 @@ public interface LogLevelSwitcher {
 
   /** Restore the LogLevel to the original setting. */
   void restore();
+
+  /** Re-execute logging settings initialization */
+  void reinitialize();
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java b/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
index 7eff0a89217..a860b35b833 100644
--- a/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
+++ b/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
@@ -36,6 +36,8 @@ public enum AgentThread {
     FLEET_MANAGEMENT_POLLER("dd-fleet-management-poller"),
     REMOTE_CONFIG("dd-remote-config"),
 
+    TRACER_FLARE("dd-tracer-flare"),
+
     CWS_TLS("dd-cws-tls"),
 
     PROCESS_SUPERVISOR("dd-process-supervisor"),
@@ -104,7 +106,7 @@ public static Thread newAgentThread(
           @Override
           public void uncaughtException(final Thread thread, final Throwable e) {
             LoggerFactory.getLogger(runnable.getClass())
-                .error("Uncaught exception in {}", agentThread.threadName, e);
+                .error("Uncaught exception {} in {}", e, agentThread.threadName, e);
           }
         });
     return thread;
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
index 7aafe8636c0..5f3cc6a22c8 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
@@ -49,6 +49,21 @@ public static <E extends Throwable> E filterUntil(
         });
   }
 
+  public static <E extends Throwable> E filterPackagesIn(
+      final E exception, final String[] packages) {
+    return filter(
+        exception,
+        ste -> {
+          final String clazz = ste.getClassName();
+          for (String p : packages) {
+            if (clazz.startsWith(p)) {
+              return true;
+            }
+          }
+          return false;
+        });
+  }
+
   private static class OneTimePredicate<T> implements Predicate<T> {
 
     private final Predicate<T> delegate;
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy
index 2b7b0d709f5..ad450be364b 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy
@@ -8,9 +8,16 @@ import datadog.trace.api.config.JmxFetchConfig
 import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.api.config.TracerConfig
 import datadog.trace.api.iast.telemetry.Verbosity
+import datadog.trace.api.naming.SpanNaming
+import datadog.trace.bootstrap.config.provider.ConfigConverter
 import datadog.trace.test.util.DDSpecification
 import datadog.trace.util.Strings
 
+import static datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_CLIENT_ERROR_STATUSES
+import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_WEAK_HASH_ALGORITHMS
+import static datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL
+import static datadog.trace.api.UserEventTrackingMode.SAFE
+
 class ConfigCollectorTest extends DDSpecification {
 
   def "non-default config settings get collected"() {
@@ -18,7 +25,9 @@ class ConfigCollectorTest extends DDSpecification {
     injectEnvConfig(Strings.toEnvVar(configKey), configValue)
 
     expect:
-    ConfigCollector.get().collect().get(configKey) == configValue
+    def setting = ConfigCollector.get().collect().get(configKey)
+    setting.value == configValue
+    setting.origin == ConfigOrigin.ENV
 
     where:
     configKey                                                  | configValue
@@ -53,7 +62,7 @@ class ConfigCollectorTest extends DDSpecification {
     // ConfigProvider.getMergedMapWithOptionalMappings
     TracerConfig.HEADER_TAGS                                   | "e:five"
     // ConfigProvider.getIntegerRange
-    TracerConfig.HTTP_CLIENT_ERROR_STATUSES                    | "1:1"
+    TracerConfig.HTTP_CLIENT_ERROR_STATUSES                    | "400-402"
   }
 
   def "should collect merged data from multiple sources"() {
@@ -62,7 +71,9 @@ class ConfigCollectorTest extends DDSpecification {
     injectSysConfig(configKey, configValue2)
 
     expect:
-    ConfigCollector.get().collect().get(configKey) == expectedValue
+    def setting = ConfigCollector.get().collect().get(configKey)
+    setting.value == expectedValue
+    setting.origin == ConfigOrigin.JVM_PROP
 
     where:
     configKey                                                 | configValue1                                   | configValue2              | expectedValue
@@ -74,27 +85,68 @@ class ConfigCollectorTest extends DDSpecification {
     TracerConfig.HEADER_TAGS                                  | "j:ten"                                        | "e:five,b:six"            | "e:five,j:ten,b:six"
   }
 
-  def "default config settings are NOT collected"() {
+  def "default not-null config settings are collected"() {
     expect:
-    !ConfigCollector.get().collect().containsKey(configKey)
+    def setting = ConfigCollector.get().collect().get(configKey)
+    setting.origin == ConfigOrigin.DEFAULT
+    setting.value == defaultValue
+
+    where:
+    configKey                                                  | defaultValue
+    IastConfig.IAST_TELEMETRY_VERBOSITY                        | Verbosity.INFORMATION.toString()
+    TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA                   | "v" + SpanNaming.SCHEMA_MIN_VERSION
+    AppSecConfig.APPSEC_AUTOMATED_USER_EVENTS_TRACKING         | SAFE.toString()
+    GeneralConfig.TELEMETRY_HEARTBEAT_INTERVAL                 | DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL
+    CiVisibilityConfig.CIVISIBILITY_JACOCO_GRADLE_SOURCE_SETS  | "main"
+    IastConfig.IAST_WEAK_HASH_ALGORITHMS                       | DEFAULT_IAST_WEAK_HASH_ALGORITHMS.join(",")
+    TracerConfig.HTTP_CLIENT_ERROR_STATUSES                    | ConfigConverter.renderIntegerRange(DEFAULT_HTTP_CLIENT_ERROR_STATUSES)
+  }
+
+  def "default NULL config settings are NOT collected"() {
+    expect:
+    ConfigCollector.get().collect().get(configKey) == null
 
     where:
     configKey                                                  | _
-    IastConfig.IAST_TELEMETRY_VERBOSITY                        | _
-    TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA                   | _
-    AppSecConfig.APPSEC_AUTOMATED_USER_EVENTS_TRACKING         | _
     GeneralConfig.APPLICATION_KEY                              | _
     TraceInstrumentationConfig.RESOLVER_USE_URL_CACHES         | _
     JmxFetchConfig.JMX_FETCH_CHECK_PERIOD                      | _
     CiVisibilityConfig.CIVISIBILITY_MODULE_ID                  | _
-    GeneralConfig.TELEMETRY_HEARTBEAT_INTERVAL                 | _
     TracerConfig.TRACE_SAMPLE_RATE                             | _
     TraceInstrumentationConfig.JMS_PROPAGATION_DISABLED_TOPICS | _
-    IastConfig.IAST_WEAK_HASH_ALGORITHMS                       | _
     TracerConfig.PROXY_NO_PROXY                                | _
     TracerConfig.TRACE_PEER_SERVICE_MAPPING                    | _
     TracerConfig.TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING  | _
     TracerConfig.HEADER_TAGS                                   | _
-    TracerConfig.HTTP_CLIENT_ERROR_STATUSES                    | _
+  }
+
+  def "put-get configurations"() {
+    setup:
+    ConfigCollector.get().collect()
+
+    when:
+    ConfigCollector.get().put('key1', 'value1', ConfigOrigin.DEFAULT)
+    ConfigCollector.get().put('key2', 'value2', ConfigOrigin.ENV)
+    ConfigCollector.get().put('key1', 'replaced', ConfigOrigin.REMOTE)
+    ConfigCollector.get().put('key3', 'value3', ConfigOrigin.JVM_PROP)
+
+    then:
+    ConfigCollector.get().collect().values().toSet() == [
+      new ConfigSetting('key1', 'replaced', ConfigOrigin.REMOTE),
+      new ConfigSetting('key2', 'value2', ConfigOrigin.ENV),
+      new ConfigSetting('key3', 'value3', ConfigOrigin.JVM_PROP)
+    ] as Set
+  }
+
+
+  def "hide pii configuration data"() {
+    setup:
+    ConfigCollector.get().collect()
+
+    when:
+    ConfigCollector.get().put('DD_API_KEY', 'sensitive data', ConfigOrigin.ENV)
+
+    then:
+    ConfigCollector.get().collect().get('DD_API_KEY').value == '<hidden>'
   }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigSettingTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigSettingTest.groovy
new file mode 100644
index 00000000000..fa2d17230b5
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigSettingTest.groovy
@@ -0,0 +1,45 @@
+package datadog.trace.api
+
+import spock.lang.Specification
+
+class ConfigSettingTest extends Specification {
+
+  def "supports equality check"() {
+    when:
+    def cs1 = new ConfigSetting(key1, value1, origin1)
+    def cs2 = new ConfigSetting(key2, value2, origin2)
+
+    then:
+    if (key1 == key2 && value1 == value2 && origin1 == origin2) {
+      assert cs1.hashCode() == cs2.hashCode()
+      assert cs1 == cs2
+      assert cs2 == cs1
+      assert cs1.toString() == cs2.toString()
+    } else {
+      assert cs1.hashCode() != cs2.hashCode()
+      assert cs1 != cs2
+      assert cs2 != cs1
+      assert cs1.toString() != cs2.toString()
+    }
+
+    where:
+    key1  | key2   | value1   | value2  | origin1               | origin2
+    "key" | "key"  | "value"  | "value" | ConfigOrigin.DEFAULT  | ConfigOrigin.DEFAULT
+    "key" | "key2" | "value"  | "value" | ConfigOrigin.ENV      | ConfigOrigin.ENV
+    "key" | "key"  | "value2" | "value" | ConfigOrigin.JVM_PROP | ConfigOrigin.JVM_PROP
+    "key" | "key"  | "value"  | "value" | ConfigOrigin.ENV      | ConfigOrigin.DEFAULT
+  }
+
+  def "filters key values"() {
+    expect:
+    new ConfigSetting(key, value, ConfigOrigin.DEFAULT).value == filteredValue
+
+    where:
+    key                    | value       | filteredValue
+    "DD_API_KEY"           | "somevalue" | "<hidden>"
+    "dd.api-key"           | "somevalue" | "<hidden>"
+    "dd.profiling.api-key" | "somevalue" | "<hidden>"
+    "dd.profiling.apikey"  | "somevalue" | "<hidden>"
+    "some.other.key"       | "somevalue" | "somevalue"
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
index 78d96bcbf5b..5793b4d2b1b 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
@@ -25,6 +25,7 @@ import static datadog.trace.api.TracePropagationStyle.B3MULTI
 import static datadog.trace.api.TracePropagationStyle.B3SINGLE
 import static datadog.trace.api.TracePropagationStyle.DATADOG
 import static datadog.trace.api.TracePropagationStyle.HAYSTACK
+import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_ENABLED
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_CLASSFILE_DUMP_ENABLED
@@ -113,6 +114,7 @@ import static datadog.trace.api.config.TracerConfig.SPAN_TAGS
 import static datadog.trace.api.config.TracerConfig.SPLIT_BY_TAGS
 import static datadog.trace.api.config.TracerConfig.TRACE_AGENT_PORT
 import static datadog.trace.api.config.TracerConfig.TRACE_AGENT_URL
+import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_EXTRACT_FIRST
 import static datadog.trace.api.config.TracerConfig.TRACE_RATE_LIMIT
 import static datadog.trace.api.config.TracerConfig.TRACE_REPORT_HOSTNAME
 import static datadog.trace.api.config.TracerConfig.TRACE_RESOLVER_ENABLED
@@ -144,6 +146,7 @@ class ConfigTest extends DDSpecification {
   private static final DD_JMX_TAGS_ENV = "DD_TRACE_JMX_TAGS"
   private static final DD_PROPAGATION_STYLE_EXTRACT = "DD_PROPAGATION_STYLE_EXTRACT"
   private static final DD_PROPAGATION_STYLE_INJECT = "DD_PROPAGATION_STYLE_INJECT"
+  private static final DD_TRACE_PROPAGATION_EXTRACT_FIRST = "DD_TRACE_PROPAGATION_EXTRACT_FIRST"
   private static final DD_JMXFETCH_METRICS_CONFIGS_ENV = "DD_JMXFETCH_METRICS_CONFIGS"
   private static final DD_TRACE_AGENT_PORT_ENV = "DD_TRACE_AGENT_PORT"
   private static final DD_AGENT_PORT_LEGACY_ENV = "DD_AGENT_PORT"
@@ -190,6 +193,7 @@ class ConfigTest extends DDSpecification {
     prop.setProperty(RUNTIME_CONTEXT_FIELD_INJECTION, "false")
     prop.setProperty(PROPAGATION_STYLE_EXTRACT, "Datadog, B3")
     prop.setProperty(PROPAGATION_STYLE_INJECT, "B3, Datadog")
+    prop.setProperty(TRACE_PROPAGATION_EXTRACT_FIRST, "false")
     prop.setProperty(JMX_FETCH_ENABLED, "false")
     prop.setProperty(JMX_FETCH_METRICS_CONFIGS, "/foo.yaml,/bar.yaml")
     prop.setProperty(JMX_FETCH_CHECK_PERIOD, "100")
@@ -278,6 +282,7 @@ class ConfigTest extends DDSpecification {
     config.propagationStylesToInject.toList() == [PropagationStyle.B3, PropagationStyle.DATADOG]
     config.tracePropagationStylesToExtract.toList() == [DATADOG, B3SINGLE, B3MULTI]
     config.tracePropagationStylesToInject.toList() == [B3SINGLE, B3MULTI, DATADOG]
+    config.tracePropagationExtractFirst == false
     config.jmxFetchEnabled == false
     config.jmxFetchMetricsConfigs == ["/foo.yaml", "/bar.yaml"]
     config.jmxFetchCheckPeriod == 100
@@ -367,6 +372,7 @@ class ConfigTest extends DDSpecification {
     System.setProperty(PREFIX + RUNTIME_CONTEXT_FIELD_INJECTION, "false")
     System.setProperty(PREFIX + PROPAGATION_STYLE_EXTRACT, "Datadog, B3")
     System.setProperty(PREFIX + PROPAGATION_STYLE_INJECT, "B3, Datadog")
+    System.setProperty(PREFIX + TRACE_PROPAGATION_EXTRACT_FIRST, "false")
     System.setProperty(PREFIX + JMX_FETCH_ENABLED, "false")
     System.setProperty(PREFIX + JMX_FETCH_METRICS_CONFIGS, "/foo.yaml,/bar.yaml")
     System.setProperty(PREFIX + JMX_FETCH_CHECK_PERIOD, "100")
@@ -455,6 +461,7 @@ class ConfigTest extends DDSpecification {
     config.propagationStylesToInject.toList() == [PropagationStyle.B3, PropagationStyle.DATADOG]
     config.tracePropagationStylesToExtract.toList() == [DATADOG, B3SINGLE, B3MULTI]
     config.tracePropagationStylesToInject.toList() == [B3SINGLE, B3MULTI, DATADOG]
+    config.tracePropagationExtractFirst == false
     config.jmxFetchEnabled == false
     config.jmxFetchMetricsConfigs == ["/foo.yaml", "/bar.yaml"]
     config.jmxFetchCheckPeriod == 100
@@ -521,6 +528,7 @@ class ConfigTest extends DDSpecification {
     environmentVariables.set(DD_PRIORITIZATION_TYPE_ENV, "EnsureTrace")
     environmentVariables.set(DD_PROPAGATION_STYLE_EXTRACT, "B3 Datadog")
     environmentVariables.set(DD_PROPAGATION_STYLE_INJECT, "Datadog B3")
+    environmentVariables.set(DD_TRACE_PROPAGATION_EXTRACT_FIRST, "false")
     environmentVariables.set(DD_JMXFETCH_METRICS_CONFIGS_ENV, "some/file")
     environmentVariables.set(DD_TRACE_REPORT_HOSTNAME, "true")
     environmentVariables.set(DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH, "42")
@@ -539,6 +547,7 @@ class ConfigTest extends DDSpecification {
     config.propagationStylesToInject.toList() == [PropagationStyle.DATADOG, PropagationStyle.B3]
     config.tracePropagationStylesToExtract.toList() == [B3SINGLE, B3MULTI, DATADOG]
     config.tracePropagationStylesToInject.toList() == [DATADOG, B3SINGLE, B3MULTI]
+    config.tracePropagationExtractFirst == false
     config.jmxFetchMetricsConfigs == ["some/file"]
     config.reportHostName == true
     config.xDatadogTagsMaxLength == 42
@@ -624,8 +633,8 @@ class ConfigTest extends DDSpecification {
     config.splitByTags == [].toSet()
     config.propagationStylesToExtract.toList() == [PropagationStyle.DATADOG]
     config.propagationStylesToInject.toList() == [PropagationStyle.DATADOG]
-    config.tracePropagationStylesToExtract.toList() == [DATADOG]
-    config.tracePropagationStylesToInject.toList() == [DATADOG]
+    config.tracePropagationStylesToExtract.toList() == [DATADOG, TRACECONTEXT]
+    config.tracePropagationStylesToInject.toList() == [DATADOG, TRACECONTEXT]
     config.longRunningTraceEnabled == false
   }
 
@@ -2200,7 +2209,7 @@ class ConfigTest extends DDSpecification {
     return bs
   }
 
-  def "check trace propagation style overrides for "() {
+  def "check trace propagation style overrides for"() {
     setup:
     if (pse) {
       environmentVariables.set('DD_PROPAGATION_STYLE_EXTRACT', pse.toString())
@@ -2228,21 +2237,21 @@ class ConfigTest extends DDSpecification {
 
     where:
     // spotless:off
-    pse                      | psi                      | tps      | tpse               | tpsi    | ePSE                       | ePSI                       | eTPSE               | eTPSI
-    PropagationStyle.DATADOG | PropagationStyle.B3      | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.B3]      | [DATADOG]           | [B3SINGLE, B3MULTI]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | null     | null               | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE, B3MULTI] | [DATADOG]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | null               | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [HAYSTACK]          | [HAYSTACK]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | B3SINGLE           | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]          | [HAYSTACK]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | null               | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [HAYSTACK]          | [B3MULTI]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | B3SINGLE           | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]          | [B3MULTI]
-    PropagationStyle.B3      | PropagationStyle.DATADOG | null     | B3SINGLE           | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]          | [B3MULTI]
-    null                     | null                     | HAYSTACK | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [HAYSTACK]          | [HAYSTACK]
-    null                     | null                     | HAYSTACK | B3SINGLE           | B3MULTI | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]          | [B3MULTI]
-    null                     | null                     | null     | B3SINGLE           | B3MULTI | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]          | [B3MULTI]
-    null                     | null                     | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [DATADOG]           | [DATADOG]
-    null                     | null                     | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [DATADOG]           | [DATADOG]
-    null                     | null                     | null     | "b3 single header" | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]          | [DATADOG]
-    null                     | null                     | null     | "b3"               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3MULTI]           | [DATADOG]
+    pse                      | psi                      | tps      | tpse               | tpsi    | ePSE                       | ePSI                       | eTPSE                   | eTPSI
+    PropagationStyle.DATADOG | PropagationStyle.B3      | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.B3]      | [DATADOG]               | [B3SINGLE, B3MULTI]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | null     | null               | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE, B3MULTI]     | [DATADOG]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | null               | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [HAYSTACK]              | [HAYSTACK]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | B3SINGLE           | null    | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]              | [HAYSTACK]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | null               | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [HAYSTACK]              | [B3MULTI]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | HAYSTACK | B3SINGLE           | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]              | [B3MULTI]
+    PropagationStyle.B3      | PropagationStyle.DATADOG | null     | B3SINGLE           | B3MULTI | [PropagationStyle.B3]      | [PropagationStyle.DATADOG] | [B3SINGLE]              | [B3MULTI]
+    null                     | null                     | HAYSTACK | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [HAYSTACK]              | [HAYSTACK]
+    null                     | null                     | HAYSTACK | B3SINGLE           | B3MULTI | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]              | [B3MULTI]
+    null                     | null                     | null     | B3SINGLE           | B3MULTI | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]              | [B3MULTI]
+    null                     | null                     | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [DATADOG, TRACECONTEXT] | [DATADOG, TRACECONTEXT]
+    null                     | null                     | null     | null               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [DATADOG, TRACECONTEXT] | [DATADOG, TRACECONTEXT]
+    null                     | null                     | null     | "b3 single header" | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3SINGLE]              | [DATADOG, TRACECONTEXT]
+    null                     | null                     | null     | "b3"               | null    | [PropagationStyle.DATADOG] | [PropagationStyle.DATADOG] | [B3MULTI]               | [DATADOG, TRACECONTEXT]
     // spotless:on
   }
 
@@ -2347,7 +2356,7 @@ class ConfigTest extends DDSpecification {
     "450"         | 450
   }
 
-  def "partial flush and min spans interaction #"() {
+  def "partial flush and min spans interaction"() {
     when:
     def prop = new Properties()
     if (configuredPartialEnabled != null) {
diff --git a/internal-api/src/test/groovy/datadog/trace/api/PlatformTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/PlatformTest.groovy
index f3ab7d47130..12777977d4c 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/PlatformTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/PlatformTest.groovy
@@ -97,7 +97,7 @@ class PlatformTest extends DDSpecification {
 
   def "JVMRuntime is at least a bit resilient against weird version properties"() {
     when:
-    def runtime = new Platform.JvmRuntime(propVersion, rtVersion, propName, propVendor)
+    def runtime = new Platform.JvmRuntime(propVersion, rtVersion, propName, propVendor, null)
 
     then:
     runtime.version == version
diff --git a/internal-api/src/test/groovy/datadog/trace/api/git/GitUtilsTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/git/GitUtilsTest.groovy
index 6a0a1e0dc8c..1d1d3e500c9 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/git/GitUtilsTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/git/GitUtilsTest.groovy
@@ -39,4 +39,31 @@ class GitUtilsTest extends Specification {
     "1234567890123456789012345678901234ABCDEF" | true
     "1234567890123456789012345678901234ABCDEX" | false
   }
+
+  def "test sensitive info filtering in URL: #url"() {
+    when:
+    def result = GitUtils.filterSensitiveInfo(url)
+
+    then:
+    result == expectedResult
+
+    where:
+    url                                                       | expectedResult
+    null                                                      | null
+    ""                                                        | null
+    "http://host.com/path"                                    | "http://host.com/path"
+    "https://host.com/path"                                   | "https://host.com/path"
+    "ssh://host.com/path"                                     | "ssh://host.com/path"
+    "http://user@host.com/path"                               | "http://host.com/path"
+    "https://user@host.com/path"                              | "https://host.com/path"
+    "ssh://user@host.com/path"                                | "ssh://host.com/path"
+    "http://user:password@host.com/path"                      | "http://host.com/path"
+    "https://user:password@host.com/path"                     | "https://host.com/path"
+    "ssh://user:password@host.com/path"                       | "ssh://host.com/path"
+    "ssh://host.com:2222/path"                                | "ssh://host.com:2222/path"
+    "https://example.com/user/repo@version.git"               | "https://example.com/user/repo@version.git"
+    "https://user@example.com/user/repo@version.git"          | "https://example.com/user/repo@version.git"
+    "https://user:password@example.com/user/repo@version.git" | "https://example.com/user/repo@version.git"
+    "git@example.com:repo.git"                                | "git@example.com:repo.git"
+  }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/http/StoredByteBodyTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/http/StoredByteBodyTest.groovy
index 43ea3d61e4d..fc993003a34 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/http/StoredByteBodyTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/http/StoredByteBodyTest.groovy
@@ -26,7 +26,7 @@ class StoredByteBodyTest extends Specification {
     1 * startCb.apply(requestContext, storedByteBody)
 
     when:
-    storedByteBody.appendData([(int)'a']* 127 as byte[], 0, 127)
+    storedByteBody.appendData([(int) 'a'] * 127 as byte[], 0, 127)
     def flow = storedByteBody.maybeNotify()
 
     then:
@@ -46,7 +46,7 @@ class StoredByteBodyTest extends Specification {
 
     when:
     // last byte ignored
-    storedByteBody.appendData([(int)'a']* 128 * 1024 as byte[], 0, 128 * 1024)
+    storedByteBody.appendData([(int) 'a'] * 128 * 1024 as byte[], 0, 128 * 1024)
     // ignored
     storedByteBody.appendData(0)
     // ignored
@@ -203,11 +203,27 @@ class StoredByteBodyTest extends Specification {
     StoredByteBody.ByteBufferWriteCallback mockCb = Mock()
 
     when:
-    storedByteBody.appendData([(int)'a']* 128 * 1024 as byte[], 0, 128 * 1024)
+    storedByteBody.appendData([(int) 'a'] * 128 * 1024 as byte[], 0, 128 * 1024)
     storedByteBody.get() // force commit
     storedByteBody.appendData(mockCb, 1)
 
     then:
     0 * mockCb._(*_)
   }
+
+  void 'does not fail on double commit'() {
+    given:
+    final charset = Charset.defaultCharset()
+    final body = (1..100).collect {'hello world'}.join().getBytes(charset)
+    storedByteBody = new StoredByteBody(requestContext, startCb, endCb, charset, 0)
+    storedByteBody.appendData(body, 0, body.length)
+    storedByteBody.maybeNotify()
+
+    when:
+    storedByteBody.appendData(body, 0, body.length)
+    storedByteBody.maybeNotify()
+
+    then:
+    noExceptionThrown()
+  }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/iast/IastContextTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/iast/IastContextTest.groovy
new file mode 100644
index 00000000000..ce543e10376
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/iast/IastContextTest.groovy
@@ -0,0 +1,67 @@
+package datadog.trace.api.iast
+
+import datadog.trace.api.gateway.RequestContext
+import datadog.trace.api.gateway.RequestContextSlot
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
+import datadog.trace.test.util.DDSpecification
+import spock.lang.Shared
+
+class IastContextTest extends DDSpecification {
+
+  @Shared
+  protected static final AgentTracer.TracerAPI ORIGINAL_TRACER = AgentTracer.get()
+
+  protected AgentTracer.TracerAPI tracer = Mock(AgentTracer.TracerAPI)
+
+  protected IastContext iastCtx = Mock(IastContext)
+
+  protected RequestContext reqCtx = Mock(RequestContext) {
+    getData(RequestContextSlot.IAST) >> iastCtx
+  }
+
+  protected AgentSpan span = Mock(AgentSpan) {
+    getRequestContext() >> reqCtx
+  }
+
+  void setup() {
+    AgentTracer.forceRegister(tracer)
+  }
+
+  void cleanup() {
+    AgentTracer.forceRegister(ORIGINAL_TRACER)
+  }
+
+  void 'test get context'() {
+    when:
+    final context = IastContext.Provider.get()
+
+    then:
+    1 * tracer.activeSpan() >> span
+    context == iastCtx
+
+    when:
+    final nullContext = IastContext.Provider.get()
+
+    then:
+    1 * tracer.activeSpan() >> null
+    nullContext == null
+  }
+
+
+  void 'test get context with span'() {
+    when:
+    final context = IastContext.Provider.get(span)
+
+    then:
+    context == iastCtx
+  }
+
+  void 'test get context with request context'() {
+    when:
+    final context = IastContext.Provider.get(reqCtx)
+
+    then:
+    context == iastCtx
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/iast/InstrumentationBridgeTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/iast/InstrumentationBridgeTest.groovy
index 044c47c51d3..ab3a4ebc8ed 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/iast/InstrumentationBridgeTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/iast/InstrumentationBridgeTest.groovy
@@ -12,7 +12,6 @@ import datadog.trace.api.iast.sink.WeakCipherModule
 import datadog.trace.api.iast.sink.WeakHashModule
 import datadog.trace.api.iast.sink.WeakRandomnessModule
 import datadog.trace.api.iast.sink.XPathInjectionModule
-import datadog.trace.api.iast.source.WebModule
 import datadog.trace.test.util.DDSpecification
 
 class InstrumentationBridgeTest extends DDSpecification {
@@ -20,7 +19,6 @@ class InstrumentationBridgeTest extends DDSpecification {
   private final static BRIDGE_MODULES = [
     WeakCipherModule,
     WeakHashModule,
-    WebModule,
     StringModule,
     CodecModule,
     SqlInjectionModule,
diff --git a/internal-api/src/test/groovy/datadog/trace/api/normalize/SimpleHttpPathNormalizerTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/normalize/SimpleHttpPathNormalizerTest.groovy
index b7055704307..12b1e3bdf68 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/normalize/SimpleHttpPathNormalizerTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/normalize/SimpleHttpPathNormalizerTest.groovy
@@ -31,6 +31,14 @@ class SimpleHttpPathNormalizerTest extends DDSpecification {
     "\t/:userId"     | "/:userId"
   }
 
+  def 'does not suppress whitespace in non-initial position of decoded strings'() {
+    String input = ' /a b/'
+    String output = simplePathNormalizer.normalize(input, false)
+
+    expect:
+    output == '/a b/'
+  }
+
   def "should replace all digits"() {
     when:
     def norm = simplePathNormalizer.normalize(input) as String
diff --git a/internal-api/src/test/groovy/datadog/trace/api/sampling/SamplingRuleTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/sampling/SamplingRuleTest.groovy
new file mode 100644
index 00000000000..e098d3497ad
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/sampling/SamplingRuleTest.groovy
@@ -0,0 +1,22 @@
+package datadog.trace.api.sampling
+
+import spock.lang.Specification
+
+class SamplingRuleTest extends Specification {
+
+  def "test normalizeGlob"() {
+    expect:
+    SamplingRule.normalizeGlob(glob) == normalized
+
+    where:
+    glob  | normalized
+    null  | SamplingRule.MATCH_ALL
+    "*"   | SamplingRule.MATCH_ALL
+    "**"  | "**"
+    "a"   | "a"
+    "a*"  | "a*"
+    "a**" | "a**"
+    "a*b" | "a*b"
+    ""    | ""
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/CoreMetricCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/CoreMetricCollectorTest.groovy
new file mode 100644
index 00000000000..205da2bd0f5
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/CoreMetricCollectorTest.groovy
@@ -0,0 +1,56 @@
+package datadog.trace.api.telemetry
+
+import datadog.trace.api.metrics.SpanMetricRegistryImpl
+import datadog.trace.test.util.DDSpecification
+
+class CoreMetricCollectorTest extends DDSpecification {
+  def "update-drain span core metrics"() {
+    setup:
+    def spanMetrics = SpanMetricRegistryImpl.getInstance().get('datadog')
+    spanMetrics.onSpanCreated()
+    spanMetrics.onSpanCreated()
+    spanMetrics.onSpanFinished()
+    def collector = CoreMetricCollector.getInstance()
+
+    when:
+    collector.prepareMetrics()
+    def metrics = collector.drain()
+
+    then:
+    metrics.size() == 2
+
+    def spanCreatedMetric = metrics[0]
+    spanCreatedMetric.type == 'count'
+    spanCreatedMetric.value == 2
+    spanCreatedMetric.namespace == 'tracers'
+    spanCreatedMetric.metricName == 'spans_created'
+    spanCreatedMetric.tags == ['integration_name:datadog']
+
+    def spanFinishedMetric = metrics[1]
+    spanFinishedMetric.type == 'count'
+    spanFinishedMetric.value == 1
+    spanFinishedMetric.namespace == 'tracers'
+    spanFinishedMetric.metricName == 'spans_finished'
+    spanFinishedMetric.tags == ['integration_name:datadog']
+  }
+
+  def "overflowing core metrics"() {
+    setup:
+    def registry = SpanMetricRegistryImpl.getInstance()
+    def collector = CoreMetricCollector.getInstance()
+    final limit = 1024
+
+    when:
+    (0..limit*2).each {
+      def spanMetrics = registry.get('instr-' + it)
+      spanMetrics.onSpanCreated()
+      spanMetrics.onSpanCreated()
+      spanMetrics.onSpanFinished()
+    }
+
+    then:
+    noExceptionThrown()
+    collector.prepareMetrics()
+    collector.drain().size() == limit
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/IntegrationsCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/IntegrationsCollectorTest.groovy
new file mode 100644
index 00000000000..e84d2da7ef3
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/IntegrationsCollectorTest.groovy
@@ -0,0 +1,29 @@
+package datadog.trace.api.telemetry
+
+import datadog.trace.test.util.DDSpecification
+
+class IntegrationsCollectorTest extends DDSpecification {
+
+  def "update-drain integrations"() {
+    setup:
+    IntegrationsCollector.get().integrations.offer(
+      new IntegrationsCollector.Integration(
+      names: ['spring'],
+      enabled: true
+      )
+      )
+    IntegrationsCollector.get().integrations.offer(
+      new IntegrationsCollector.Integration(
+      names: ['netty', 'jdbc'],
+      enabled: false
+      )
+      )
+
+    when:
+    IntegrationsCollector.get().update(['netty', 'jetty'], true)
+
+    then:
+    IntegrationsCollector.get().drain() == ['spring': true, 'netty': true, 'jdbc': false, 'jetty': true]
+    IntegrationsCollector.get().drain() == [:]
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/LogCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/LogCollectorTest.groovy
new file mode 100644
index 00000000000..1393ad89505
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/LogCollectorTest.groovy
@@ -0,0 +1,50 @@
+package datadog.trace.api.telemetry
+
+import datadog.trace.test.util.DDSpecification
+
+class LogCollectorTest extends DDSpecification {
+
+  void "limit log messages in LogCollector"() {
+    setup:
+    def logCollector = new LogCollector(3)
+    when:
+    logCollector.addLogMessage("ERROR", "Message 1", null)
+    logCollector.addLogMessage("ERROR", "Message 2", null)
+    logCollector.addLogMessage("ERROR", "Message 3", null)
+    logCollector.addLogMessage("ERROR", "Message 4", null)
+
+    then:
+    logCollector.rawLogMessages.size() == 3
+  }
+
+  void "grouping messages in LogCollector"() {
+    when:
+    LogCollector.get().addLogMessage("ERROR", "First Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Second Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Third Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Forth Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Second Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Third Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Forth Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Third Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Forth Message", null)
+    LogCollector.get().addLogMessage("ERROR", "Forth Message", null)
+
+    then:
+    def list = LogCollector.get().drain()
+    list.size() == 4
+    listContains(list, 'ERROR', "First Message", null)
+    listContains(list, 'ERROR', "Second Message, {2} additional messages skipped", null)
+    listContains(list, 'ERROR', "Third Message, {3} additional messages skipped", null)
+    listContains(list, 'ERROR', "Forth Message, {4} additional messages skipped", null)
+  }
+
+  boolean listContains(Collection<LogCollector.RawLogMessage> list, String logLevel, String message, Throwable t) {
+    for (final def logMsg in list) {
+      if (logMsg.logLevel == logLevel && logMsg.message() == message && logMsg.throwable == t) {
+        return true
+      }
+    }
+    return false
+  }
+}
diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/TelemetryCollectorsTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy
similarity index 58%
rename from internal-api/src/test/groovy/datadog/trace/api/telemetry/TelemetryCollectorsTest.groovy
rename to internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy
index bebe8fe1ecd..6e4f91ae8a0 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/TelemetryCollectorsTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy
@@ -1,47 +1,8 @@
 package datadog.trace.api.telemetry
 
-import datadog.trace.api.ConfigCollector
-import datadog.trace.api.IntegrationsCollector
-import datadog.trace.api.metrics.SpanMetricRegistryImpl
 import datadog.trace.test.util.DDSpecification
 
-class TelemetryCollectorsTest extends DDSpecification {
-
-  def "update-drain integrations"() {
-    setup:
-    IntegrationsCollector.integrations.offer(
-      new IntegrationsCollector.Integration(
-      names: ['spring'],
-      enabled: true
-      )
-      )
-    IntegrationsCollector.integrations.offer(
-      new IntegrationsCollector.Integration(
-      names: ['netty', 'jdbc'],
-      enabled: false
-      )
-      )
-
-    when:
-    IntegrationsCollector.get().update(['netty', 'jetty'], true)
-
-    then:
-    IntegrationsCollector.get().drain() == ['spring': true, 'netty': true, 'jdbc': false, 'jetty': true]
-    IntegrationsCollector.get().drain() == [:]
-  }
-
-  def "put-get configurations"() {
-    setup:
-    ConfigCollector.get().collect()
-
-    when:
-    ConfigCollector.get().put('key1', 'value1')
-    ConfigCollector.get().put('key2', 'value2')
-    ConfigCollector.get().put('key1', 'replaced')
-
-    then:
-    ConfigCollector.get().collect() == [key1: 'replaced', key2: 'value2']
-  }
+class WafMetricCollectorTest extends DDSpecification {
 
   def "no metrics - drain empty list"() {
     when:
@@ -177,65 +138,4 @@ class TelemetryCollectorsTest extends DDSpecification {
     noExceptionThrown()
     collector.drain().size() == limit
   }
-
-  def "hide pii configuration data"() {
-    setup:
-    ConfigCollector.get().collect()
-
-    when:
-    ConfigCollector.get().put('DD_API_KEY', 'sensitive data')
-
-    then:
-    ConfigCollector.get().collect().get('DD_API_KEY') == '<hidden>'
-  }
-
-  def "update-drain span core metrics"() {
-    setup:
-    def spanMetrics = SpanMetricRegistryImpl.getInstance().get('datadog')
-    spanMetrics.onSpanCreated()
-    spanMetrics.onSpanCreated()
-    spanMetrics.onSpanFinished()
-    def collector = CoreMetricCollector.getInstance()
-
-    when:
-    collector.prepareMetrics()
-    def metrics = collector.drain()
-
-    then:
-    metrics.size() == 2
-
-    def spanCreatedMetric = metrics[0]
-    spanCreatedMetric.type == 'count'
-    spanCreatedMetric.value == 2
-    spanCreatedMetric.namespace == 'tracers'
-    spanCreatedMetric.metricName == 'spans_created'
-    spanCreatedMetric.tags == ['integration_name:datadog']
-
-    def spanFinishedMetric = metrics[1]
-    spanFinishedMetric.type == 'count'
-    spanFinishedMetric.value == 1
-    spanFinishedMetric.namespace == 'tracers'
-    spanFinishedMetric.metricName == 'spans_finished'
-    spanFinishedMetric.tags == ['integration_name:datadog']
-  }
-
-  def "overflowing core metrics"() {
-    setup:
-    def registry = SpanMetricRegistryImpl.getInstance()
-    def collector = CoreMetricCollector.getInstance()
-    final limit = 1024
-
-    when:
-    (0..limit*2).each {
-      def spanMetrics = registry.get('instr-' + it)
-      spanMetrics.onSpanCreated()
-      spanMetrics.onSpanCreated()
-      spanMetrics.onSpanFinished()
-    }
-
-    then:
-    noExceptionThrown()
-    collector.prepareMetrics()
-    collector.drain().size() == limit
-  }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigConverterTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigConverterTest.groovy
index e5406ac0f55..6ef1172f385 100644
--- a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigConverterTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigConverterTest.groovy
@@ -98,4 +98,31 @@ class ConfigConverterTest extends DDSpecification {
     "===="                                          | '='       | [:]
     // spotless:on
   }
+
+  def "render a single interval bitset"() {
+    def set = new BitSet()
+    set.set(200, 299)
+
+    expect:
+    ConfigConverter.renderIntegerRange(set) == "200-299"
+  }
+
+  def "render a single value bitset"() {
+    def set = new BitSet()
+    set.set(33)
+
+    expect:
+    ConfigConverter.renderIntegerRange(set) == "33"
+  }
+
+  def "render bitset intervals"() {
+    def set = new BitSet()
+    set.set(33)
+    set.set(200, 300)
+    set.set(303)
+    set.set(400, 500)
+
+    expect:
+    ConfigConverter.renderIntegerRange(set) == "33,200-300,303,400-500"
+  }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/SpanLinkTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/SpanLinkTest.groovy
new file mode 100644
index 00000000000..b4626179ce4
--- /dev/null
+++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/SpanLinkTest.groovy
@@ -0,0 +1,133 @@
+package datadog.trace.bootstrap.instrumentation.api
+
+
+import datadog.trace.api.DDSpanId
+import datadog.trace.api.DDTraceId
+import datadog.trace.test.util.DDSpecification
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentSpanLink.DEFAULT_FLAGS
+import static datadog.trace.bootstrap.instrumentation.api.AgentSpanLink.SAMPLED_FLAG
+
+class SpanLinkTest extends DDSpecification {
+  def "test span link from context"() {
+    setup:
+    def traceId = DDTraceId.fromHex("11223344556677889900aabbccddeeff")
+    def spanId = DDSpanId.fromHex("123456789abcdef0")
+    AgentSpan.Context context = Stub {
+      getTraceId() >> traceId
+      getSpanId() >> spanId
+      getSamplingPriority() >> (sampled ? 1 : 0)
+    }
+
+    when:
+    def link = SpanLink.from(context)
+
+    then:
+    link.traceId() == traceId
+    link.spanId() == spanId
+    link.traceFlags() == (sampled ? SAMPLED_FLAG : DEFAULT_FLAGS)
+    link.traceState() == ""
+    link.attributes() == SpanLinkAttributes.EMPTY
+
+    when:
+    link.toString()
+
+    then:
+    notThrown(Exception)
+
+    where:
+    sampled << [true, false]
+  }
+
+  def "test span link attributes api"() {
+    when:
+    def attributes = SpanLinkAttributes.builder().build()
+
+    then:
+    attributes.isEmpty()
+
+    when:
+    attributes = SpanLinkAttributes.builder().put('key', 'value').build()
+
+    then:
+    !attributes.isEmpty()
+  }
+
+  def "test span link attributes encoding"() {
+    setup:
+    def builder = SpanLinkAttributes.builder()
+
+    when:
+    builder.put('string', 'value')
+    builder.put('string-empty', '')
+    builder.put('string-null', null)
+    builder.put('bool', true)
+    builder.put('bool-false', false)
+    builder.put('long', 12345L)
+    builder.put('long-negative', -12345L)
+    builder.put('double', 67.89)
+    builder.put('double-negative', -67.89)
+    builder.putStringArray('string-array', ['abc', '', null, 'def'])
+    builder.putStringArray('string-array-null', null)
+    builder.putBooleanArray('bool-array', [true, false, null, Boolean.TRUE, Boolean.FALSE])
+    builder.putStringArray('bool-array-null', null)
+    builder.putLongArray('long-array', [123L, 456L, null, Long.MIN_VALUE, Long.MAX_VALUE])
+    builder.putStringArray('long-array-null', null)
+    builder.putDoubleArray('double-array', [12.3D, 45.6D, null, Double.MIN_VALUE, Double.MAX_VALUE])
+    builder.putStringArray('double-array-null', null)
+    def map = builder.build().asMap()
+
+    then:
+    map['string'] == 'value'
+    map['string-empty'] == ''
+    !map.containsKey('string-null')
+    map['bool'] == 'true'
+    map['bool-false'] == 'false'
+    map['long'] == '12345'
+    map['long-negative'] == '-12345'
+    map['double'] == '67.89'
+    map['double-negative'] == '-67.89'
+
+    map['string-array.0'] == 'abc'
+    map['string-array.1'] == ''
+    !map.containsKey('string-array.2')
+    map['string-array.3'] == 'def'
+    !map.containsKey('string-array-null')
+
+    map['bool-array.0'] == 'true'
+    map['bool-array.1'] == 'false'
+    !map.containsKey('bool-array.2')
+    map['bool-array.3'] == 'true'
+    map['bool-array.4'] == 'false'
+    !map.containsKey('bool-array-null')
+
+    map['long-array.0'] == '123'
+    map['long-array.1'] == '456'
+    !map.containsKey('long-array.2')
+    map['long-array.3'] == '-9223372036854775808'
+    map['long-array.4'] == '9223372036854775807'
+    !map.containsKey('long-array-null')
+
+    map['double-array.0'] == '12.3'
+    map['double-array.1'] == '45.6'
+    !map.containsKey('double-array.2')
+    // Field should be encoded as String using JSON representation so the scientific notation is valid
+    map['double-array.3'] == '4.9E-324'
+    map['double-array.4'] == '1.7976931348623157E308'
+    !map.containsKey('double-array-null')
+
+    when:
+    def attributes = SpanLinkAttributes.fromMap(map)
+
+    then:
+    attributes.asMap() == map
+  }
+
+  def "test span link attributes toString"() {
+    when:
+    SpanLinkAttributes.builder().build().toString()
+
+    then:
+    notThrown(NullPointerException)
+  }
+}
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
similarity index 94%
rename from dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java
rename to internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
index 68570177211..9521e5ecb8a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
@@ -1,4 +1,4 @@
-package com.datadog.profiling.controller;
+package datadog.trace.api.profiling;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java b/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
index fe1ca1cbf46..4f09a332fe2 100644
--- a/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
@@ -261,7 +261,7 @@ public void testRepeatingRegularStartWithLow() throws Exception {
   @Test
   public void testKeep() {
     final AdaptiveSampler sampler =
-        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler);
+        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
     long tests = sampler.testCount();
     long samples = sampler.sampleCount();
     assertTrue(sampler.keep());
@@ -272,7 +272,7 @@ public void testKeep() {
   @Test
   public void testDrop() {
     final AdaptiveSampler sampler =
-        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler);
+        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
     long tests = sampler.testCount();
     long samples = sampler.sampleCount();
     assertFalse(sampler.drop());
@@ -344,7 +344,8 @@ void testConfigListener() throws Exception {
                   }
               }
             },
-            taskScheduler);
+            taskScheduler,
+            true);
     sampler.keep();
     sampler.drop();
     rollWindow();
@@ -383,7 +384,8 @@ private void testSamplerInline(
             AVERAGE_LOOKBACK,
             BUDGET_LOOKBACK,
             null,
-            taskScheduler);
+            taskScheduler,
+            true);
 
     // simulate event generation and sampling for the given number of sampling windows
     final long expectedSamples = WINDOWS * SAMPLES_PER_WINDOW;
@@ -544,7 +546,8 @@ private void testSamplerConcurrently(
             AVERAGE_LOOKBACK,
             BUDGET_LOOKBACK,
             null,
-            taskScheduler);
+            taskScheduler,
+            true);
     final CyclicBarrier startBarrier = new CyclicBarrier(threadCount);
     final CyclicBarrier endBarrier = new CyclicBarrier(threadCount, this::rollWindow);
     final Mean[] means = new Mean[threadCount];
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
index 47ffbc99aee..4d1ad86235f 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
@@ -38,7 +38,7 @@ public void test_filter_all_datadog() {
   }
 
   @Test
-  public void test_filter_first_datadog() {
+  public void test_stack_filters() {
     final StackTraceElement[] stack =
         new StackTraceElement[] {
           stack().className("org.junit.jupiter.api.Test").build(),
@@ -57,6 +57,11 @@ public void test_filter_first_datadog() {
 
     final Throwable filtered2 = StackUtils.filterFirstDatadog(withStack(stack));
     assertThat(filtered2.getStackTrace()).isEqualTo(expected);
+
+    final String[] packages = {"datadog.trace.util.stacktrace"};
+    final StackTraceElement[] expected2 = new StackTraceElement[] {stack[1], stack[3]};
+    final Throwable filtered3 = StackUtils.filterPackagesIn(withStack(stack), packages);
+    assertThat(filtered3.getStackTrace()).isEqualTo(expected2);
   }
 
   @Test
diff --git a/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java b/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
index 41da79f1b51..73e39a2fa65 100644
--- a/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
+++ b/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
@@ -5,6 +5,9 @@
 import datadog.remoteconfig.tuf.RemoteConfigRequest.CachedTargetFile;
 import datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.ClientState;
 import datadog.trace.api.Config;
+import datadog.trace.api.git.GitInfo;
+import datadog.trace.api.git.GitInfoProvider;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.util.TagsHelper;
 import java.util.Arrays;
 import java.util.Collection;
@@ -126,6 +129,15 @@ private List<String> buildRequestTags() {
         Config.get().getGlobalTags().entrySet().stream()
             .map(entry -> entry.getKey() + ":" + entry.getValue())
             .collect(Collectors.toList());
+    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+    String repositoryURL = gitInfo.getRepositoryURL();
+    if (repositoryURL != null) {
+      tags.add(Tags.GIT_REPOSITORY_URL + ":" + repositoryURL);
+    }
+    String sha = gitInfo.getCommit().getSha();
+    if (sha != null) {
+      tags.add(Tags.GIT_COMMIT_SHA + ":" + sha);
+    }
     tags.addAll(
         Arrays.asList(
             "env:" + this.env,
diff --git a/remote-config/src/main/java/datadog/remoteconfig/Product.java b/remote-config/src/main/java/datadog/remoteconfig/Product.java
index cc5d95be9ed..7b079cf56d0 100644
--- a/remote-config/src/main/java/datadog/remoteconfig/Product.java
+++ b/remote-config/src/main/java/datadog/remoteconfig/Product.java
@@ -2,8 +2,11 @@
 
 /* The order of these products is the same as the order in which they're processed */
 public enum Product {
+  AGENT_CONFIG,
+  AGENT_TASK,
   APM_TRACING,
   LIVE_DEBUGGING,
+  LIVE_DEBUGGING_SYMBOL_DB,
   ASM_DD,
   ASM,
   ASM_DATA,
diff --git a/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java b/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
index c5e350c5d36..fe5f84f7d6b 100644
--- a/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
+++ b/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
@@ -207,6 +207,10 @@ public String getServiceEnv() {
       public String getServiceVersion() {
         return this.serviceVersion;
       }
+
+      public List<String> getTags() {
+        return tags;
+      }
     }
 
     private static class AgentInfo {
diff --git a/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy b/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy
index 911ffb805bf..28bfb47ee5c 100644
--- a/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy
+++ b/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy
@@ -1,6 +1,7 @@
 package datadog.remoteconfig
 
 import datadog.remoteconfig.tuf.RemoteConfigRequest
+import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.test.util.DDSpecification
 import datadog.trace.api.Config
 
@@ -15,6 +16,7 @@ class PollerRequestFactoryTest extends DDSpecification {
     System.setProperty("dd.service", "Service Name")
     System.setProperty("dd.env", "PROD")
     System.setProperty("dd.tags", "version:1.0.0-SNAPSHOT")
+    System.setProperty("dd.trace.global.tags", Tags.GIT_REPOSITORY_URL+":https://github.com/DataDog/dd-trace-java,"+Tags.GIT_COMMIT_SHA + ":1234")
     rebuildConfig()
     PollerRequestFactory factory = new PollerRequestFactory(Config.get(), TRACER_VERSION, CONTAINER_ID, INVALID_REMOTE_CONFIG_URL, null)
 
@@ -25,5 +27,8 @@ class PollerRequestFactoryTest extends DDSpecification {
     request.client.tracerInfo.serviceName == "service_name"
     request.client.tracerInfo.serviceEnv == "prod"
     request.client.tracerInfo.serviceVersion == "1.0.0-snapshot"
+    request.client.tracerInfo.tags.contains("env:PROD")
+    request.client.tracerInfo.tags.contains(Tags.GIT_REPOSITORY_URL + ":https://github.com/DataDog/dd-trace-java")
+    request.client.tracerInfo.tags.contains(Tags.GIT_COMMIT_SHA + ":1234")
   }
 }
diff --git a/settings.gradle b/settings.gradle
index 74e2b9e5c94..d89431c025d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -89,6 +89,7 @@ include ':utils:time-utils'
 include ':utils:version-utils'
 
 // smoke tests
+include ':dd-smoke-tests:agent-bootstrap'
 include ':dd-smoke-tests:armeria-grpc'
 include ':dd-smoke-tests:cli'
 include ':dd-smoke-tests:custom-systemloader'
@@ -141,6 +142,7 @@ include ':dd-smoke-tests:vertx-3.9-resteasy'
 include ':dd-smoke-tests:vertx-4.2'
 include ':dd-smoke-tests:wildfly'
 include ':dd-smoke-tests:appsec'
+include ':dd-smoke-tests:appsec:spring-tomcat7'
 include ':dd-smoke-tests:appsec:springboot'
 include ':dd-smoke-tests:appsec:springboot-grpc'
 include ':dd-smoke-tests:appsec:springboot-security'
@@ -174,6 +176,7 @@ include ':dd-java-agent:instrumentation:classloading:jsr14-testing'
 include ':dd-java-agent:instrumentation:classloading:osgi-testing'
 include ':dd-java-agent:instrumentation:classloading:tomcat-testing'
 include ':dd-java-agent:instrumentation:commons-codec-1'
+include ':dd-java-agent:instrumentation:commons-fileupload'
 include ':dd-java-agent:instrumentation:commons-httpclient-2'
 include ':dd-java-agent:instrumentation:commons-lang-2'
 include ':dd-java-agent:instrumentation:commons-lang-3'
@@ -205,6 +208,7 @@ include ':dd-java-agent:instrumentation:finatra-2.9'
 include ':dd-java-agent:instrumentation:freemarker'
 include ':dd-java-agent:instrumentation:glassfish'
 include ':dd-java-agent:instrumentation:google-http-client'
+include ':dd-java-agent:instrumentation:google-pubsub'
 include ':dd-java-agent:instrumentation:graal:native-image'
 include ':dd-java-agent:instrumentation:gradle'
 include ':dd-java-agent:instrumentation:graphql-java-14.0'
@@ -212,6 +216,7 @@ include ':dd-java-agent:instrumentation:grizzly-2'
 include ':dd-java-agent:instrumentation:grizzly-client-1.9'
 include ':dd-java-agent:instrumentation:grizzly-http-2.3.20'
 include ':dd-java-agent:instrumentation:grpc-1.5'
+include ':dd-java-agent:instrumentation:gson-1.6'
 include ':dd-java-agent:instrumentation:guava-10'
 include ':dd-java-agent:instrumentation:hazelcast-3.6'
 include ':dd-java-agent:instrumentation:hazelcast-3.9'
@@ -278,15 +283,18 @@ include ':dd-java-agent:instrumentation:jetty-common'
 include ':dd-java-agent:instrumentation:jetty-util'
 include ':dd-java-agent:instrumentation:jms'
 include ':dd-java-agent:instrumentation:jose-jwt'
+include ':dd-java-agent:instrumentation:org-json'
 include ':dd-java-agent:instrumentation:jsp-2.3'
 include ':dd-java-agent:instrumentation:junit-4.10'
-include ':dd-java-agent:instrumentation:junit-4.10:cucumber'
-include ':dd-java-agent:instrumentation:junit-4.10:munit'
+include ':dd-java-agent:instrumentation:junit-4.10:cucumber-junit-4'
+include ':dd-java-agent:instrumentation:junit-4.10:munit-junit-4'
 include ':dd-java-agent:instrumentation:junit-5.3'
-include ':dd-java-agent:instrumentation:junit-5.3:cucumber'
-include ':dd-java-agent:instrumentation:junit-5.3:spock'
+include ':dd-java-agent:instrumentation:junit-5.3:cucumber-junit-5'
+include ':dd-java-agent:instrumentation:junit-5.3:spock-junit-5'
+include ':dd-java-agent:instrumentation:kafka-common'
 include ':dd-java-agent:instrumentation:kafka-clients-0.11'
 include ':dd-java-agent:instrumentation:kafka-streams-0.11'
+include ':dd-java-agent:instrumentation:kafka-streams-1.0'
 include ':dd-java-agent:instrumentation:karate'
 include ':dd-java-agent:instrumentation:kotlin-coroutines'
 include ':dd-java-agent:instrumentation:kotlin-coroutines:coroutines-1.3'
@@ -378,6 +386,7 @@ include ':dd-java-agent:instrumentation:sparkjava-2.3'
 include ':dd-java-agent:instrumentation:spray-1.3'
 include ':dd-java-agent:instrumentation:spring-beans'
 include ':dd-java-agent:instrumentation:spring-cloud-zuul-2'
+include ':dd-java-agent:instrumentation:spring-core'
 include ':dd-java-agent:instrumentation:spring-data-1.8'
 include ':dd-java-agent:instrumentation:spring-jms-3.1'
 include ':dd-java-agent:instrumentation:spring-messaging-4'
@@ -397,6 +406,7 @@ include ':dd-java-agent:instrumentation:testng'
 include ':dd-java-agent:instrumentation:testng:testng-6'
 include ':dd-java-agent:instrumentation:testng:testng-7'
 include ':dd-java-agent:instrumentation:thymeleaf'
+include 'dd-java-agent:instrumentation:tinylog-2'
 include ':dd-java-agent:instrumentation:tomcat-5.5'
 include ':dd-java-agent:instrumentation:tomcat-5.5-common'
 include ':dd-java-agent:instrumentation:tomcat-appsec-5.5'
diff --git a/telemetry/build.gradle b/telemetry/build.gradle
index 022babe8d0e..23098ec1968 100644
--- a/telemetry/build.gradle
+++ b/telemetry/build.gradle
@@ -29,6 +29,7 @@ dependencies {
 
   compileOnly project(':dd-java-agent:agent-tooling')
   testImplementation project(':dd-java-agent:agent-tooling')
+  testImplementation project(':dd-java-agent:agent-logging')
 
   compileOnly project(':communication')
   testImplementation project(':communication')
diff --git a/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java b/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java
new file mode 100644
index 00000000000..3fc437b4de0
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java
@@ -0,0 +1,137 @@
+package datadog.telemetry;
+
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigSetting;
+import java.util.ArrayList;
+
+/**
+ * Keeps track of attempted to send telemetry events that can be used as a source for the next
+ * telemetry request attempt or telemetry metric calculation.
+ */
+public final class BufferedEvents implements EventSource, EventSink {
+  private static final int INITIAL_CAPACITY = 32;
+  private ArrayList<ConfigSetting> configChangeEvents;
+  private int configChangeIndex;
+  private ArrayList<Integration> integrationEvents;
+  private int integrationIndex;
+  private ArrayList<Dependency> dependencyEvents;
+  private int dependencyIndex;
+  private ArrayList<Metric> metricEvents;
+  private int metricIndex;
+  private ArrayList<DistributionSeries> distributionSeriesEvents;
+  private int distributionSeriesIndex;
+  private ArrayList<LogMessage> logMessageEvents;
+  private int logMessageIndex;
+
+  public void addConfigChangeEvent(ConfigSetting event) {
+    if (configChangeEvents == null) {
+      configChangeEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    configChangeEvents.add(event);
+  }
+
+  @Override
+  public void addIntegrationEvent(Integration event) {
+    if (integrationEvents == null) {
+      integrationEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    integrationEvents.add(event);
+  }
+
+  @Override
+  public void addDependencyEvent(Dependency event) {
+    if (dependencyEvents == null) {
+      dependencyEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    dependencyEvents.add(event);
+  }
+
+  @Override
+  public void addMetricEvent(Metric event) {
+    if (metricEvents == null) {
+      metricEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    metricEvents.add(event);
+  }
+
+  @Override
+  public void addDistributionSeriesEvent(DistributionSeries event) {
+    if (distributionSeriesEvents == null) {
+      distributionSeriesEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    distributionSeriesEvents.add(event);
+  }
+
+  @Override
+  public void addLogMessageEvent(LogMessage event) {
+    if (logMessageEvents == null) {
+      logMessageEvents = new ArrayList<>(INITIAL_CAPACITY);
+    }
+    logMessageEvents.add(event);
+  }
+
+  @Override
+  public boolean hasConfigChangeEvent() {
+    return configChangeEvents != null && configChangeIndex < configChangeEvents.size();
+  }
+
+  @Override
+  public ConfigSetting nextConfigChangeEvent() {
+    return configChangeEvents.get(configChangeIndex++);
+  }
+
+  @Override
+  public boolean hasIntegrationEvent() {
+    return integrationEvents != null && integrationIndex < integrationEvents.size();
+  }
+
+  @Override
+  public Integration nextIntegrationEvent() {
+    return integrationEvents.get(integrationIndex++);
+  }
+
+  @Override
+  public boolean hasDependencyEvent() {
+    return dependencyEvents != null && dependencyIndex < dependencyEvents.size();
+  }
+
+  @Override
+  public Dependency nextDependencyEvent() {
+    return dependencyEvents.get(dependencyIndex++);
+  }
+
+  @Override
+  public boolean hasMetricEvent() {
+    return metricEvents != null && metricIndex < metricEvents.size();
+  }
+
+  @Override
+  public Metric nextMetricEvent() {
+    return metricEvents.get(metricIndex++);
+  }
+
+  @Override
+  public boolean hasDistributionSeriesEvent() {
+    return distributionSeriesEvents != null
+        && distributionSeriesIndex < distributionSeriesEvents.size();
+  }
+
+  @Override
+  public DistributionSeries nextDistributionSeriesEvent() {
+    return distributionSeriesEvents.get(distributionSeriesIndex++);
+  }
+
+  @Override
+  public boolean hasLogMessageEvent() {
+    return logMessageEvents != null && logMessageIndex < logMessageEvents.size();
+  }
+
+  @Override
+  public LogMessage nextLogMessageEvent() {
+    return logMessageEvents.get(logMessageIndex++);
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/EventSink.java b/telemetry/src/main/java/datadog/telemetry/EventSink.java
new file mode 100644
index 00000000000..767845d9f04
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/EventSink.java
@@ -0,0 +1,51 @@
+package datadog.telemetry;
+
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigSetting;
+
+/**
+ * A unified interface for telemetry event sink. It is used to buffer events polled from the queues
+ * to reattempt next sending attempt. A NOOP implementation is used to discard event on the next
+ * failing attempt.
+ */
+interface EventSink {
+  void addConfigChangeEvent(ConfigSetting event);
+
+  void addIntegrationEvent(Integration event);
+
+  void addDependencyEvent(Dependency event);
+
+  void addMetricEvent(Metric event);
+
+  void addDistributionSeriesEvent(DistributionSeries event);
+
+  void addLogMessageEvent(LogMessage event);
+
+  EventSink NOOP = new Noop();
+
+  class Noop implements EventSink {
+    private Noop() {}
+
+    @Override
+    public void addConfigChangeEvent(ConfigSetting event) {}
+
+    @Override
+    public void addIntegrationEvent(Integration event) {}
+
+    @Override
+    public void addDependencyEvent(Dependency event) {}
+
+    @Override
+    public void addMetricEvent(Metric event) {}
+
+    @Override
+    public void addDistributionSeriesEvent(DistributionSeries event) {}
+
+    @Override
+    public void addLogMessageEvent(LogMessage event) {}
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/EventSource.java b/telemetry/src/main/java/datadog/telemetry/EventSource.java
new file mode 100644
index 00000000000..3234edb391f
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/EventSource.java
@@ -0,0 +1,133 @@
+package datadog.telemetry;
+
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigSetting;
+import java.util.Queue;
+
+/**
+ * A unified interface for telemetry event source. There are two types of event sources: - Queued -
+ * a primary telemetry event source - BufferedEvents - events taken from the primary source and
+ * buffered for a retry
+ */
+interface EventSource {
+  boolean hasConfigChangeEvent();
+
+  ConfigSetting nextConfigChangeEvent();
+
+  boolean hasIntegrationEvent();
+
+  Integration nextIntegrationEvent();
+
+  boolean hasDependencyEvent();
+
+  Dependency nextDependencyEvent();
+
+  boolean hasMetricEvent();
+
+  Metric nextMetricEvent();
+
+  boolean hasDistributionSeriesEvent();
+
+  DistributionSeries nextDistributionSeriesEvent();
+
+  boolean hasLogMessageEvent();
+
+  LogMessage nextLogMessageEvent();
+
+  default boolean isEmpty() {
+    return !hasConfigChangeEvent()
+        && !hasIntegrationEvent()
+        && !hasDependencyEvent()
+        && !hasMetricEvent()
+        && !hasDistributionSeriesEvent()
+        && !hasLogMessageEvent();
+  }
+
+  final class Queued implements EventSource {
+    private final Queue<ConfigSetting> configChangeQueue;
+    private final Queue<Integration> integrationQueue;
+    private final Queue<Dependency> dependencyQueue;
+    private final Queue<Metric> metricQueue;
+    private final Queue<DistributionSeries> distributionSeriesQueue;
+    private final Queue<LogMessage> logMessageQueue;
+
+    Queued(
+        Queue<ConfigSetting> configChangeQueue,
+        Queue<Integration> integrationQueue,
+        Queue<Dependency> dependencyQueue,
+        Queue<Metric> metricQueue,
+        Queue<DistributionSeries> distributionSeriesQueue,
+        Queue<LogMessage> logMessageQueue) {
+      this.configChangeQueue = configChangeQueue;
+      this.integrationQueue = integrationQueue;
+      this.dependencyQueue = dependencyQueue;
+      this.metricQueue = metricQueue;
+      this.distributionSeriesQueue = distributionSeriesQueue;
+      this.logMessageQueue = logMessageQueue;
+    }
+
+    @Override
+    public boolean hasConfigChangeEvent() {
+      return !configChangeQueue.isEmpty();
+    }
+
+    @Override
+    public ConfigSetting nextConfigChangeEvent() {
+      return configChangeQueue.poll();
+    }
+
+    @Override
+    public boolean hasIntegrationEvent() {
+      return !integrationQueue.isEmpty();
+    }
+
+    @Override
+    public Integration nextIntegrationEvent() {
+      return integrationQueue.poll();
+    }
+
+    @Override
+    public boolean hasDependencyEvent() {
+      return !dependencyQueue.isEmpty();
+    }
+
+    @Override
+    public Dependency nextDependencyEvent() {
+      return dependencyQueue.poll();
+    }
+
+    @Override
+    public boolean hasMetricEvent() {
+      return !metricQueue.isEmpty();
+    }
+
+    @Override
+    public Metric nextMetricEvent() {
+      return metricQueue.poll();
+    }
+
+    @Override
+    public boolean hasDistributionSeriesEvent() {
+      return !distributionSeriesQueue.isEmpty();
+    }
+
+    @Override
+    public DistributionSeries nextDistributionSeriesEvent() {
+      return distributionSeriesQueue.poll();
+    }
+
+    @Override
+    public boolean hasLogMessageEvent() {
+      return !logMessageQueue.isEmpty();
+    }
+
+    @Override
+    public LogMessage nextLogMessageEvent() {
+      return logMessageQueue.poll();
+    }
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java b/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java
new file mode 100644
index 00000000000..6d559019cc0
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java
@@ -0,0 +1,114 @@
+package datadog.telemetry;
+
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigSetting;
+import java.util.ArrayList;
+
+public class ExtendedHeartbeatData {
+  private static final int DEFAULT_DEPENDENCIES_LIMIT = 2000;
+  private static final int INITIAL_CAPACITY = 32;
+
+  private final int dependenciesLimit;
+  private final ArrayList<ConfigSetting> configuration;
+  private final ArrayList<Dependency> dependencies;
+  private final ArrayList<Integration> integrations;
+
+  public ExtendedHeartbeatData() {
+    this(DEFAULT_DEPENDENCIES_LIMIT);
+  }
+
+  ExtendedHeartbeatData(int dependenciesLimit) {
+    this.dependenciesLimit = dependenciesLimit;
+    configuration = new ArrayList<>(INITIAL_CAPACITY);
+    dependencies = new ArrayList<>(INITIAL_CAPACITY);
+    integrations = new ArrayList<>(INITIAL_CAPACITY);
+  }
+
+  public void pushConfigSetting(ConfigSetting cs) {
+    configuration.add(cs);
+  }
+
+  public void pushDependency(Dependency d) {
+    if (dependencies.size() < dependenciesLimit) {
+      dependencies.add(d);
+    }
+  }
+
+  public void pushIntegration(Integration i) {
+    integrations.add(i);
+  }
+
+  public EventSource snapshot() {
+    return new Snapshot();
+  }
+
+  private final class Snapshot implements EventSource {
+    private int configIndex;
+    private int dependencyIndex;
+    private int integrationIndex;
+
+    @Override
+    public boolean hasConfigChangeEvent() {
+      return configIndex < configuration.size();
+    }
+
+    @Override
+    public ConfigSetting nextConfigChangeEvent() {
+      return configuration.get(configIndex++);
+    }
+
+    @Override
+    public boolean hasIntegrationEvent() {
+      return integrationIndex < integrations.size();
+    }
+
+    @Override
+    public Integration nextIntegrationEvent() {
+      return integrations.get(integrationIndex++);
+    }
+
+    @Override
+    public boolean hasDependencyEvent() {
+      return dependencyIndex < dependencies.size();
+    }
+
+    @Override
+    public Dependency nextDependencyEvent() {
+      return dependencies.get(dependencyIndex++);
+    }
+
+    @Override
+    public boolean hasMetricEvent() {
+      return false;
+    }
+
+    @Override
+    public Metric nextMetricEvent() {
+      return null;
+    }
+
+    @Override
+    public boolean hasDistributionSeriesEvent() {
+      return false;
+    }
+
+    @Override
+    public DistributionSeries nextDistributionSeriesEvent() {
+      return null;
+    }
+
+    @Override
+    public boolean hasLogMessageEvent() {
+      return false;
+    }
+
+    @Override
+    public LogMessage nextLogMessageEvent() {
+      return null;
+    }
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/HostInfo.java b/telemetry/src/main/java/datadog/telemetry/HostInfo.java
index 9cab25f5da0..5f4986d6e18 100644
--- a/telemetry/src/main/java/datadog/telemetry/HostInfo.java
+++ b/telemetry/src/main/java/datadog/telemetry/HostInfo.java
@@ -17,7 +17,7 @@
 
 public class HostInfo {
   private static final Path PROC_VERSION = FileSystems.getDefault().getPath("/proc/version");
-  private static final Logger log = LoggerFactory.getLogger(RequestBuilder.class);
+  private static final Logger log = LoggerFactory.getLogger(TelemetryRequestBody.class);
 
   private static String hostname;
   private static String osName;
diff --git a/telemetry/src/main/java/datadog/telemetry/HttpClient.java b/telemetry/src/main/java/datadog/telemetry/HttpClient.java
deleted file mode 100644
index 367936d7c26..00000000000
--- a/telemetry/src/main/java/datadog/telemetry/HttpClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package datadog.telemetry;
-
-import java.io.IOException;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HttpClient {
-  public static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
-
-  public enum Result {
-    SUCCESS,
-    FAILURE,
-    NOT_FOUND
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(HttpClient.class);
-
-  private final OkHttpClient httpClient;
-
-  public HttpClient(OkHttpClient httpClient) {
-    this.httpClient = httpClient;
-  }
-
-  public Result sendRequest(Request request) {
-    String requestType = request.header(DD_TELEMETRY_REQUEST_TYPE);
-    try (Response response = httpClient.newCall(request).execute()) {
-      if (response.code() == 404) {
-        log.debug("Telemetry endpoint is disabled, dropping {} message", requestType);
-        return Result.NOT_FOUND;
-      }
-      if (!response.isSuccessful()) {
-        log.debug(
-            "Telemetry message {} failed with: {} {} ",
-            requestType,
-            response.code(),
-            response.message());
-        return Result.FAILURE;
-      }
-    } catch (IOException e) {
-      log.debug("Telemetry message {} failed with exception: {}", requestType, e.toString());
-      return Result.FAILURE;
-    }
-
-    log.debug("Telemetry message {} sent successfully", requestType);
-    return Result.SUCCESS;
-  }
-}
diff --git a/telemetry/src/main/java/datadog/telemetry/RequestBuilder.java b/telemetry/src/main/java/datadog/telemetry/RequestBuilder.java
deleted file mode 100644
index 494353c07a7..00000000000
--- a/telemetry/src/main/java/datadog/telemetry/RequestBuilder.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package datadog.telemetry;
-
-import com.squareup.moshi.JsonWriter;
-import datadog.communication.ddagent.TracerVersion;
-import datadog.telemetry.api.ConfigChange;
-import datadog.telemetry.api.DistributionSeries;
-import datadog.telemetry.api.Integration;
-import datadog.telemetry.api.LogMessage;
-import datadog.telemetry.api.Metric;
-import datadog.telemetry.api.RequestType;
-import datadog.telemetry.dependency.Dependency;
-import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
-import datadog.trace.api.Platform;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nullable;
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okio.Buffer;
-import okio.BufferedSink;
-
-public class RequestBuilder extends RequestBody {
-
-  public static class SerializationException extends RuntimeException {
-    public SerializationException(String requestPartName, Throwable cause) {
-      super("Failed serializing Telemetry request " + requestPartName + " part!", cause);
-    }
-  }
-
-  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  private static final String API_VERSION = "v1";
-  private static final AtomicLong SEQ_ID = new AtomicLong();
-  private static final String TELEMETRY_NAMESPACE_TAG_TRACER = "tracers";
-
-  private final Buffer body = new Buffer();
-  private final JsonWriter bodyWriter = JsonWriter.of(body);
-  private final RequestType requestType;
-  private final Request request;
-  private final boolean debug;
-
-  private enum CommonData {
-    INSTANCE;
-
-    Config config = Config.get();
-    String env = config.getEnv();
-    String langVersion = Platform.getLangVersion();
-    String runtimeName = Platform.getRuntimeVendor();
-    String runtimePatches = Platform.getRuntimePatches();
-    String runtimeVersion = Platform.getRuntimeVersion();
-    String serviceName = config.getServiceName();
-    String serviceVersion = config.getVersion();
-    String runtimeId = config.getRuntimeId();
-    String architecture = HostInfo.getArchitecture();
-    String hostname = HostInfo.getHostname();
-    String kernelName = HostInfo.getKernelName();
-    String kernelRelease = HostInfo.getKernelRelease();
-    String kernelVersion = HostInfo.getKernelVersion();
-    String osName = HostInfo.getOsName();
-    String osVersion = HostInfo.getOsVersion();
-  }
-
-  RequestBuilder(RequestType requestType, HttpUrl httpUrl) {
-    this(requestType, httpUrl, false);
-  }
-
-  RequestBuilder(RequestType requestType, HttpUrl httpUrl, boolean debug) {
-    this.requestType = requestType;
-    this.request =
-        new Request.Builder()
-            .url(httpUrl)
-            .addHeader("Content-Type", String.valueOf(JSON))
-            .addHeader("DD-Telemetry-API-Version", API_VERSION)
-            .addHeader("DD-Telemetry-Request-Type", String.valueOf(requestType))
-            .addHeader("DD-Client-Library-Language", "jvm")
-            .addHeader("DD-Client-Library-Version", TracerVersion.TRACER_VERSION)
-            .post(this)
-            .build();
-    this.debug = debug;
-  }
-
-  public void writeHeader() {
-    try {
-      CommonData commonData = CommonData.INSTANCE;
-      bodyWriter.beginObject();
-      bodyWriter.name("api_version").value(API_VERSION);
-
-      bodyWriter.name("application");
-      bodyWriter.beginObject();
-      bodyWriter.name("env").value(commonData.env);
-      bodyWriter.name("language_name").value(DDTags.LANGUAGE_TAG_VALUE);
-      bodyWriter.name("language_version").value(commonData.langVersion);
-      bodyWriter.name("runtime_name").value(commonData.runtimeName);
-      bodyWriter.name("runtime_patches").value(commonData.runtimePatches); // optional
-      bodyWriter.name("runtime_version").value(commonData.runtimeVersion);
-      bodyWriter.name("service_name").value(commonData.serviceName);
-      bodyWriter.name("service_version").value(commonData.serviceVersion);
-      bodyWriter.name("tracer_version").value(TracerVersion.TRACER_VERSION);
-      bodyWriter.endObject();
-
-      if (debug) {
-        bodyWriter.name("debug").value(true);
-      }
-      bodyWriter.name("host");
-      bodyWriter.beginObject();
-      bodyWriter.name("architecture").value(commonData.architecture);
-      bodyWriter.name("hostname").value(commonData.hostname);
-      // only applicable to UNIX based OS
-      bodyWriter.name("kernel_name").value(commonData.kernelName);
-      bodyWriter.name("kernel_release").value(commonData.kernelRelease);
-      bodyWriter.name("kernel_version").value(commonData.kernelVersion);
-      bodyWriter.name("os").value(commonData.osName);
-      bodyWriter.name("os_version").value(commonData.osVersion); // optional
-      bodyWriter.endObject();
-
-      bodyWriter.name("request_type").value(requestType.toString());
-      bodyWriter.name("runtime_id").value(commonData.runtimeId);
-      bodyWriter.name("seq_id").value(SEQ_ID.incrementAndGet());
-      bodyWriter.name("tracer_time").value(System.currentTimeMillis() / 1000L);
-
-      bodyWriter.name("payload");
-      bodyWriter.beginObject();
-    } catch (Exception ex) {
-      throw new SerializationException("header", ex);
-    }
-  }
-
-  public void writeMetrics(List<Metric> series) {
-    try {
-      bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
-      bodyWriter.name("series");
-      bodyWriter.beginArray();
-      for (Metric m : series) {
-        bodyWriter.beginObject();
-        bodyWriter.name("namespace").value(m.getNamespace());
-        bodyWriter.name("common").value(m.getCommon());
-        bodyWriter.name("metric").value(m.getMetric());
-        bodyWriter.name("points").jsonValue(m.getPoints());
-        bodyWriter.name("tags").jsonValue(m.getTags());
-        if (m.getType() != null) bodyWriter.name("type").value(m.getType().toString());
-        bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
-    } catch (Exception ex) {
-      throw new SerializationException("metrics payload", ex);
-    }
-  }
-
-  public void writeDistributionsEvent(List<DistributionSeries> series) {
-    try {
-      bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
-      bodyWriter.name("series");
-      bodyWriter.beginArray();
-      for (DistributionSeries ds : series) {
-        bodyWriter.beginObject();
-        bodyWriter.name("metric").value(ds.getMetric());
-        bodyWriter.name("points").jsonValue(ds.getPoints());
-        bodyWriter.name("tags").jsonValue(ds.getTags());
-        bodyWriter.name("common").value(ds.getCommon());
-        bodyWriter.name("namespace").value(ds.getNamespace());
-        bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
-    } catch (Exception ex) {
-      throw new SerializationException("distribution series payload", ex);
-    }
-  }
-
-  public void writeLogsEvent(List<LogMessage> messages) {
-    try {
-      bodyWriter.name("logs").beginArray();
-      for (LogMessage m : messages) {
-        bodyWriter.beginObject();
-        bodyWriter.name("message").value(m.getMessage());
-        bodyWriter.name("level").value(String.valueOf(m.getLevel()));
-        bodyWriter.name("tags").value(m.getTags());
-        bodyWriter.name("stack_trace").value(m.getStackTrace());
-        bodyWriter.name("tracer_time").value(m.getTracerTime());
-        bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
-    } catch (Exception ex) {
-      throw new SerializationException("logs payload", ex);
-    }
-  }
-
-  public void writeConfigChangeEvent(List<ConfigChange> configChanges) {
-    if (configChanges != null) {
-      try {
-        bodyWriter.name("configuration").beginArray();
-        for (ConfigChange cc : configChanges) {
-          bodyWriter.beginObject();
-          bodyWriter.name("name").value(cc.name);
-          bodyWriter.name("value").jsonValue(cc.value);
-          bodyWriter.endObject();
-        }
-        bodyWriter.endArray();
-      } catch (Exception ex) {
-        throw new SerializationException("config changes payload", ex);
-      }
-    }
-  }
-
-  public void writeDependenciesLoadedEvent(List<Dependency> dependencies) {
-    try {
-      bodyWriter.name("dependencies");
-      bodyWriter.beginArray();
-      for (Dependency d : dependencies) {
-        bodyWriter.beginObject();
-        bodyWriter.name("hash").value(d.hash);
-        bodyWriter.name("name").value(d.name);
-        bodyWriter.name("type").value("PlatformStandard");
-        bodyWriter.name("version").value(d.version);
-        bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
-    } catch (Exception ex) {
-      throw new SerializationException("dependencies payload", ex);
-    }
-  }
-
-  public void writeIntegrationsEvent(List<Integration> integrations) {
-    try {
-      bodyWriter.name("integrations");
-      bodyWriter.beginArray();
-      for (Integration i : integrations) {
-        bodyWriter.beginObject();
-        bodyWriter.name("enabled").value(i.enabled);
-        bodyWriter.name("name").value(i.name);
-        bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
-    } catch (Exception ex) {
-      throw new SerializationException("integrations payload", ex);
-    }
-  }
-
-  public void writeFooter() {
-    try {
-      bodyWriter.endObject(); // payload
-      bodyWriter.endObject(); // request
-    } catch (Exception ex) {
-      throw new SerializationException("footer", ex);
-    }
-  }
-
-  /**
-   * @return associated request. <br>
-   *     NOTE: Its body can still be extended with write methods until it's been sent. That's
-   *     because the request body is lazily evaluated and backed with a buffer that can still be
-   *     extended until the request is sent. <br>
-   *     TODO: see if there is a better way to express this peculiarity in the code.
-   */
-  public Request request() {
-    return request;
-  }
-
-  @Nullable
-  @Override
-  public MediaType contentType() {
-    return JSON;
-  }
-
-  @Override
-  public void writeTo(BufferedSink sink) throws IOException {
-    sink.write(body, body.size());
-  }
-}
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java b/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
new file mode 100644
index 00000000000..be0321fdd9b
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
@@ -0,0 +1,100 @@
+package datadog.telemetry;
+
+import datadog.communication.http.OkHttpUtils;
+import java.io.IOException;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TelemetryClient {
+
+  public enum Result {
+    SUCCESS,
+    FAILURE,
+    NOT_FOUND;
+  }
+
+  public static TelemetryClient buildAgentClient(OkHttpClient okHttpClient, HttpUrl agentUrl) {
+    HttpUrl agentTelemetryUrl =
+        agentUrl.newBuilder().addPathSegments(AGENT_TELEMETRY_API_ENDPOINT).build();
+    return new TelemetryClient(okHttpClient, agentTelemetryUrl, null);
+  }
+
+  public static TelemetryClient buildIntakeClient(String site, long timeoutMillis, String apiKey) {
+    if (apiKey == null) {
+      log.debug("Cannot create Telemetry Intake because DD_API_KEY unspecified.");
+      return null;
+    }
+
+    String prefix = "";
+    if (site.endsWith("datad0g.com")) {
+      prefix = "all-http-intake.logs.";
+    } else if (site.endsWith("datadoghq.com")) {
+      prefix = "instrumentation-telemetry-intake.";
+    }
+
+    String telemetryUrl = "https://" + prefix + site + "/api/v2/apmtelemetry";
+    HttpUrl url;
+    try {
+      url = HttpUrl.get(telemetryUrl);
+    } catch (IllegalArgumentException e) {
+      log.error("Can't create Telemetry URL for {}", telemetryUrl);
+      return null;
+    }
+
+    OkHttpClient httpClient = OkHttpUtils.buildHttpClient(url, timeoutMillis);
+    return new TelemetryClient(httpClient, url, apiKey);
+  }
+
+  private static final Logger log = LoggerFactory.getLogger(TelemetryClient.class);
+
+  private static final String AGENT_TELEMETRY_API_ENDPOINT = "telemetry/proxy/api/v2/apmtelemetry";
+  private static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
+
+  private final OkHttpClient okHttpClient;
+  private final HttpUrl url;
+  private final String apiKey;
+
+  public TelemetryClient(OkHttpClient okHttpClient, HttpUrl url, String apiKey) {
+    this.okHttpClient = okHttpClient;
+    this.url = url;
+    this.apiKey = apiKey;
+  }
+
+  public HttpUrl getUrl() {
+    return url;
+  }
+
+  public Result sendHttpRequest(Request.Builder httpRequestBuilder) {
+    httpRequestBuilder.url(url);
+    if (apiKey != null) {
+      httpRequestBuilder.addHeader("DD-API-KEY", apiKey);
+    }
+
+    Request httpRequest = httpRequestBuilder.build();
+    String requestType = httpRequest.header(DD_TELEMETRY_REQUEST_TYPE);
+    try (Response response = okHttpClient.newCall(httpRequest).execute()) {
+      if (response.code() == 404) {
+        log.debug("Telemetry endpoint is disabled, dropping {} message.", requestType);
+        return Result.NOT_FOUND;
+      }
+      if (!response.isSuccessful()) {
+        log.debug(
+            "Telemetry message {} failed with: {} {}.",
+            requestType,
+            response.code(),
+            response.message());
+        return Result.FAILURE;
+      }
+    } catch (IOException e) {
+      log.debug("Telemetry message {} failed with exception: {}.", requestType, e.toString());
+      return Result.FAILURE;
+    }
+
+    log.debug("Telemetry message {} sent successfully to {}.", requestType, url);
+    return Result.SUCCESS;
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
new file mode 100644
index 00000000000..19f456a6fbd
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
@@ -0,0 +1,191 @@
+package datadog.telemetry;
+
+import datadog.common.container.ContainerInfo;
+import datadog.communication.ddagent.TracerVersion;
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.api.RequestType;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigSetting;
+import datadog.trace.api.DDTags;
+import datadog.trace.api.InstrumenterConfig;
+import datadog.trace.api.ProductActivation;
+import java.io.IOException;
+import okhttp3.MediaType;
+import okhttp3.Request;
+
+public class TelemetryRequest {
+  static final String API_VERSION = "v2";
+  static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+  private final EventSource eventSource;
+  private final EventSink eventSink;
+  private final long messageBytesSoftLimit;
+  private final RequestType requestType;
+  private final boolean debug;
+  private final TelemetryRequestBody requestBody;
+
+  public TelemetryRequest(
+      EventSource eventSource,
+      EventSink eventSink,
+      long messageBytesSoftLimit,
+      RequestType requestType,
+      boolean debug) {
+    this.eventSource = eventSource;
+    this.eventSink = eventSink;
+    this.messageBytesSoftLimit = messageBytesSoftLimit;
+    this.requestType = requestType;
+    this.debug = debug;
+    this.requestBody = new TelemetryRequestBody(requestType);
+    this.requestBody.beginRequest(debug);
+  }
+
+  public Request.Builder httpRequest() {
+    long bodySize = requestBody.endRequest();
+
+    Request.Builder builder =
+        new Request.Builder()
+            .addHeader("Content-Type", String.valueOf(JSON))
+            .addHeader("Content-Length", String.valueOf(bodySize))
+            .addHeader("DD-Telemetry-API-Version", API_VERSION)
+            .addHeader("DD-Telemetry-Request-Type", String.valueOf(this.requestType))
+            .addHeader("DD-Client-Library-Language", DDTags.LANGUAGE_TAG_VALUE)
+            .addHeader("DD-Client-Library-Version", TracerVersion.TRACER_VERSION)
+            .post(requestBody);
+
+    final String containerId = ContainerInfo.get().getContainerId();
+    if (containerId != null) {
+      builder.addHeader("Datadog-Container-ID", containerId);
+    }
+
+    if (debug) {
+      builder.addHeader("DD-Telemetry-Debug-Enabled", "true");
+    }
+
+    return builder;
+  }
+
+  public void writeConfigurations() {
+    if (!isWithinSizeLimits() || !eventSource.hasConfigChangeEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginConfiguration();
+      while (eventSource.hasConfigChangeEvent() && isWithinSizeLimits()) {
+        ConfigSetting event = eventSource.nextConfigChangeEvent();
+        requestBody.writeConfiguration(event);
+        eventSink.addConfigChangeEvent(event);
+      }
+      requestBody.endConfiguration();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("configuration-object", e);
+    }
+  }
+
+  public void writeProducts() {
+    InstrumenterConfig instrumenterConfig = InstrumenterConfig.get();
+    try {
+      boolean appsecEnabled =
+          instrumenterConfig.getAppSecActivation() != ProductActivation.FULLY_DISABLED;
+      boolean profilerEnabled = instrumenterConfig.isProfilingEnabled();
+      requestBody.writeProducts(appsecEnabled, profilerEnabled);
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("products", e);
+    }
+  }
+
+  public void writeIntegrations() {
+    if (!isWithinSizeLimits() || !eventSource.hasIntegrationEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginIntegrations();
+      while (eventSource.hasIntegrationEvent() && isWithinSizeLimits()) {
+        Integration event = eventSource.nextIntegrationEvent();
+        requestBody.writeIntegration(event);
+        eventSink.addIntegrationEvent(event);
+      }
+      requestBody.endIntegrations();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("integrations-message", e);
+    }
+  }
+
+  public void writeDependencies() {
+    if (!isWithinSizeLimits() || !eventSource.hasDependencyEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginDependencies();
+      while (eventSource.hasDependencyEvent() && isWithinSizeLimits()) {
+        Dependency event = eventSource.nextDependencyEvent();
+        requestBody.writeDependency(event);
+        eventSink.addDependencyEvent(event);
+      }
+      requestBody.endDependencies();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("dependencies-message", e);
+    }
+  }
+
+  public void writeMetrics() {
+    if (!isWithinSizeLimits() || !eventSource.hasMetricEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginMetrics();
+      while (eventSource.hasMetricEvent() && isWithinSizeLimits()) {
+        Metric event = eventSource.nextMetricEvent();
+        requestBody.writeMetric(event);
+        eventSink.addMetricEvent(event);
+      }
+      requestBody.endMetrics();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("metrics-message", e);
+    }
+  }
+
+  public void writeDistributions() {
+    if (!isWithinSizeLimits() || !eventSource.hasDistributionSeriesEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginDistributions();
+      while (eventSource.hasDistributionSeriesEvent() && isWithinSizeLimits()) {
+        DistributionSeries event = eventSource.nextDistributionSeriesEvent();
+        requestBody.writeDistribution(event);
+        eventSink.addDistributionSeriesEvent(event);
+      }
+      requestBody.endDistributions();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("distributions-message", e);
+    }
+  }
+
+  public void writeLogs() {
+    if (!isWithinSizeLimits() || !eventSource.hasLogMessageEvent()) {
+      return;
+    }
+    try {
+      requestBody.beginLogs();
+      while (eventSource.hasLogMessageEvent() && isWithinSizeLimits()) {
+        LogMessage event = eventSource.nextLogMessageEvent();
+        requestBody.writeLog(event);
+        eventSink.addLogMessageEvent(event);
+      }
+      requestBody.endLogs();
+    } catch (IOException e) {
+      throw new TelemetryRequestBody.SerializationException("logs-message", e);
+    }
+  }
+
+  public void writeHeartbeat() {
+    requestBody.writeHeartbeatEvent();
+  }
+
+  private boolean isWithinSizeLimits() {
+    return requestBody.size() < messageBytesSoftLimit;
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java
new file mode 100644
index 00000000000..074e4386783
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java
@@ -0,0 +1,327 @@
+package datadog.telemetry;
+
+import com.squareup.moshi.JsonWriter;
+import datadog.communication.ddagent.TracerVersion;
+import datadog.telemetry.api.DistributionSeries;
+import datadog.telemetry.api.Integration;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.Metric;
+import datadog.telemetry.api.RequestType;
+import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.Config;
+import datadog.trace.api.ConfigSetting;
+import datadog.trace.api.DDTags;
+import datadog.trace.api.Platform;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.Buffer;
+import okio.BufferedSink;
+
+public class TelemetryRequestBody extends RequestBody {
+
+  public static class SerializationException extends RuntimeException {
+    public SerializationException(String requestPartName, Throwable cause) {
+      super("Failed serializing Telemetry " + requestPartName + " part!", cause);
+    }
+  }
+
+  private static final AtomicLong SEQ_ID = new AtomicLong();
+  private static final String TELEMETRY_NAMESPACE_TAG_TRACER = "tracers";
+
+  private final RequestType requestType;
+  private final Buffer body;
+  private final JsonWriter bodyWriter;
+
+  /** Exists in a separate class to avoid startup toll */
+  private static class CommonData {
+    final Config config = Config.get();
+    final String env = config.getEnv();
+    final String langVersion = Platform.getLangVersion();
+    final String runtimeName = Platform.getRuntimeVendor();
+    final String runtimePatches = Platform.getRuntimePatches();
+    final String runtimeVersion = Platform.getRuntimeVersion();
+    final String serviceName = config.getServiceName();
+    final String serviceVersion = config.getVersion();
+    final String runtimeId = config.getRuntimeId();
+    final String architecture = HostInfo.getArchitecture();
+    final String hostname = HostInfo.getHostname();
+    final String kernelName = HostInfo.getKernelName();
+    final String kernelRelease = HostInfo.getKernelRelease();
+    final String kernelVersion = HostInfo.getKernelVersion();
+    final String osName = HostInfo.getOsName();
+    final String osVersion = HostInfo.getOsVersion();
+  }
+
+  private static final CommonData commonData = new CommonData();
+
+  TelemetryRequestBody(RequestType requestType) {
+    this.requestType = requestType;
+    this.body = new Buffer();
+    this.bodyWriter = JsonWriter.of(body);
+  }
+
+  public void beginRequest(boolean debug) {
+    try {
+      bodyWriter.beginObject();
+      bodyWriter.name("api_version").value(TelemetryRequest.API_VERSION);
+      // naming_schema_version - optional
+      bodyWriter.name("runtime_id").value(commonData.runtimeId);
+      bodyWriter.name("seq_id").value(SEQ_ID.incrementAndGet());
+      bodyWriter.name("tracer_time").value(System.currentTimeMillis() / 1000L);
+
+      bodyWriter.name("application");
+      bodyWriter.beginObject();
+      bodyWriter.name("service_name").value(commonData.serviceName);
+      bodyWriter.name("env").value(commonData.env);
+      bodyWriter.name("service_version").value(commonData.serviceVersion);
+      bodyWriter.name("tracer_version").value(TracerVersion.TRACER_VERSION);
+      bodyWriter.name("language_name").value(DDTags.LANGUAGE_TAG_VALUE);
+      bodyWriter.name("language_version").value(commonData.langVersion);
+      bodyWriter.name("runtime_name").value(commonData.runtimeName);
+      bodyWriter.name("runtime_version").value(commonData.runtimeVersion);
+      bodyWriter.name("runtime_patches").value(commonData.runtimePatches); // optional
+      bodyWriter.endObject();
+
+      if (debug) {
+        bodyWriter.name("debug").value(true);
+      }
+      bodyWriter.name("host");
+      bodyWriter.beginObject();
+      bodyWriter.name("hostname").value(commonData.hostname);
+      bodyWriter.name("os").value(commonData.osName);
+      bodyWriter.name("os_version").value(commonData.osVersion); // optional
+      bodyWriter.name("architecture").value(commonData.architecture);
+      // only applicable to UNIX based OS
+      bodyWriter.name("kernel_name").value(commonData.kernelName);
+      bodyWriter.name("kernel_release").value(commonData.kernelRelease);
+      bodyWriter.name("kernel_version").value(commonData.kernelVersion);
+      bodyWriter.endObject();
+
+      bodyWriter.name("request_type").value(this.requestType.toString());
+
+      switch (this.requestType) {
+        case APP_STARTED:
+        case APP_EXTENDED_HEARTBEAT:
+          bodyWriter.name("payload");
+          bodyWriter.beginObject();
+          break;
+        case MESSAGE_BATCH:
+          bodyWriter.name("payload");
+          bodyWriter.beginArray();
+          break;
+        default:
+      }
+    } catch (Exception ex) {
+      throw new SerializationException("begin-request", ex);
+    }
+  }
+
+  /** @return body size in bytes */
+  public long endRequest() {
+    try {
+      switch (this.requestType) {
+        case APP_STARTED:
+        case APP_EXTENDED_HEARTBEAT:
+          bodyWriter.endObject(); // payload
+          break;
+        case MESSAGE_BATCH:
+          bodyWriter.endArray(); // payloads
+          break;
+        default:
+      }
+      bodyWriter.endObject(); // request
+      return body.size();
+    } catch (Exception ex) {
+      throw new SerializationException("end-request", ex);
+    }
+  }
+
+  public void writeHeartbeatEvent() {
+    beginMessageIfBatch(RequestType.APP_HEARTBEAT);
+    endMessageIfBatch(RequestType.APP_HEARTBEAT);
+  }
+
+  public void beginMetrics() throws IOException {
+    beginMessageIfBatch(RequestType.GENERATE_METRICS);
+    bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
+    bodyWriter.name("series").beginArray();
+  }
+
+  public void writeMetric(Metric m) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("metric").value(m.getMetric());
+    bodyWriter.name("points").jsonValue(m.getPoints());
+    // interval - optional
+    if (m.getType() != null) bodyWriter.name("type").value(m.getType().toString());
+    bodyWriter.name("tags").jsonValue(m.getTags()); // optional
+    bodyWriter.name("common").value(m.getCommon()); // optional
+    bodyWriter.name("namespace").value(m.getNamespace()); // optional
+    bodyWriter.endObject();
+  }
+
+  public void endMetrics() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.GENERATE_METRICS);
+  }
+
+  public void beginDistributions() throws IOException {
+    beginMessageIfBatch(RequestType.DISTRIBUTIONS);
+    bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
+    bodyWriter.name("series").beginArray();
+  }
+
+  public void writeDistribution(DistributionSeries ds) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("metric").value(ds.getMetric());
+    bodyWriter.name("points").jsonValue(ds.getPoints());
+    bodyWriter.name("tags").jsonValue(ds.getTags());
+    bodyWriter.name("common").value(ds.getCommon());
+    bodyWriter.name("namespace").value(ds.getNamespace());
+    bodyWriter.endObject();
+  }
+
+  public void endDistributions() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.DISTRIBUTIONS);
+  }
+
+  public void beginLogs() throws IOException {
+    beginMessageIfBatch(RequestType.LOGS);
+    bodyWriter.name("logs").beginArray();
+  }
+
+  public void writeLog(LogMessage m) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("message").value(m.getMessage());
+    bodyWriter.name("level").value(String.valueOf(m.getLevel()));
+    bodyWriter.name("tags").value(m.getTags()); // optional
+    bodyWriter.name("stack_trace").value(m.getStackTrace()); // optional
+    bodyWriter.name("tracer_time").value(m.getTracerTime()); // optional
+    bodyWriter.endObject();
+  }
+
+  public void endLogs() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.LOGS);
+  }
+
+  public void beginConfiguration() throws IOException {
+    beginMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
+    bodyWriter.name("configuration").beginArray();
+  }
+
+  public void writeConfiguration(ConfigSetting configSetting) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("name").value(configSetting.key);
+    bodyWriter.setSerializeNulls(true);
+    bodyWriter.name("value").jsonValue(configSetting.value);
+    bodyWriter.setSerializeNulls(false);
+    bodyWriter.name("origin").jsonValue(configSetting.origin.value);
+    bodyWriter.endObject();
+  }
+
+  public void endConfiguration() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
+  }
+
+  public void beginIntegrations() throws IOException {
+    beginMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
+    bodyWriter.name("integrations").beginArray();
+  }
+
+  public void writeIntegration(Integration i) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("enabled").value(i.enabled);
+    bodyWriter.name("name").value(i.name);
+    bodyWriter.endObject();
+  }
+
+  public void endIntegrations() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
+  }
+
+  public void beginDependencies() throws IOException {
+    beginMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
+    bodyWriter.name("dependencies").beginArray();
+  }
+
+  public void writeDependency(Dependency d) throws IOException {
+    bodyWriter.beginObject();
+    bodyWriter.name("hash").value(d.hash); // optional
+    bodyWriter.name("name").value(d.name);
+    bodyWriter.name("version").value(d.version); // optional
+    bodyWriter.endObject();
+  }
+
+  public void endDependencies() throws IOException {
+    bodyWriter.endArray();
+    endMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
+  }
+
+  public void writeProducts(boolean appsecEnabled, boolean profilerEnabled) throws IOException {
+    bodyWriter.name("products");
+    bodyWriter.beginObject();
+
+    bodyWriter.name("appsec");
+    bodyWriter.beginObject();
+    bodyWriter.name("enabled").value(appsecEnabled);
+    bodyWriter.endObject();
+
+    bodyWriter.name("profiler");
+    bodyWriter.beginObject();
+    bodyWriter.name("enabled").value(profilerEnabled);
+    bodyWriter.endObject();
+
+    bodyWriter.endObject();
+  }
+
+  @Nullable
+  @Override
+  public MediaType contentType() {
+    return TelemetryRequest.JSON;
+  }
+
+  @Override
+  public void writeTo(BufferedSink sink) throws IOException {
+    sink.write(body, body.size());
+  }
+
+  public long size() {
+    return body.size();
+  }
+
+  private void beginMessageIfBatch(RequestType messageType) {
+    if (requestType != RequestType.MESSAGE_BATCH) {
+      return;
+    }
+    try {
+      bodyWriter.beginObject();
+      bodyWriter.name("request_type").value(String.valueOf(messageType));
+      if (messageType != RequestType.APP_HEARTBEAT) {
+        bodyWriter.name("payload");
+        bodyWriter.beginObject();
+      }
+    } catch (Exception ex) {
+      throw new SerializationException("begin-message", ex);
+    }
+  }
+
+  private void endMessageIfBatch(RequestType messageType) {
+    if (requestType != RequestType.MESSAGE_BATCH) {
+      return;
+    }
+    try {
+      if (messageType != RequestType.APP_HEARTBEAT) {
+        bodyWriter.endObject(); // payload
+      }
+      bodyWriter.endObject(); // message
+    } catch (Exception ex) {
+      throw new SerializationException("end-message", ex);
+    }
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java
new file mode 100644
index 00000000000..076137c5852
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java
@@ -0,0 +1,72 @@
+package datadog.telemetry;
+
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
+import javax.annotation.Nullable;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TelemetryRouter {
+  private static final Logger log = LoggerFactory.getLogger(TelemetryRouter.class);
+
+  private final DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery;
+  private final TelemetryClient agentClient;
+
+  private final TelemetryClient intakeClient;
+
+  private TelemetryClient currentClient;
+  private boolean errorReported;
+
+  public TelemetryRouter(
+      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
+      TelemetryClient agentClient,
+      @Nullable TelemetryClient intakeClient) {
+    this.ddAgentFeaturesDiscovery = ddAgentFeaturesDiscovery;
+    this.agentClient = agentClient;
+    this.intakeClient = intakeClient;
+    this.currentClient = agentClient;
+  }
+
+  public TelemetryClient.Result sendRequest(TelemetryRequest request) {
+    ddAgentFeaturesDiscovery.discoverIfOutdated();
+    boolean agentSupportsTelemetryProxy = ddAgentFeaturesDiscovery.supportsTelemetryProxy();
+
+    Request.Builder httpRequestBuilder = request.httpRequest();
+    TelemetryClient.Result result = currentClient.sendHttpRequest(httpRequestBuilder);
+
+    boolean requestFailed = result != TelemetryClient.Result.SUCCESS;
+    if (currentClient == agentClient) {
+      if (requestFailed) {
+        reportErrorOnce(currentClient.getUrl(), result);
+        if (intakeClient != null) {
+          log.info("Agent Telemetry endpoint failed. Telemetry will be sent to Intake.");
+          errorReported = false;
+          currentClient = intakeClient;
+        }
+      }
+    } else {
+      if (requestFailed) {
+        reportErrorOnce(currentClient.getUrl(), result);
+      }
+      if (agentSupportsTelemetryProxy || requestFailed) {
+        errorReported = false;
+        if (agentSupportsTelemetryProxy) {
+          log.info("Agent Telemetry endpoint is now available. Telemetry will be sent to Agent.");
+        } else {
+          log.info("Intake Telemetry endpoint failed. Telemetry will be sent to Agent.");
+        }
+        currentClient = agentClient;
+      }
+    }
+
+    return result;
+  }
+
+  private void reportErrorOnce(HttpUrl requestUrl, TelemetryClient.Result result) {
+    if (!errorReported) {
+      log.warn("Got {} sending telemetry request to {}.", result, requestUrl);
+      errorReported = true;
+    }
+  }
+}
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
index 0b8c6466169..14fa7df1aac 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
@@ -3,6 +3,7 @@
 import datadog.telemetry.metric.MetricPeriodicAction;
 import datadog.trace.api.Config;
 import datadog.trace.api.ConfigCollector;
+import datadog.trace.api.ConfigSetting;
 import datadog.trace.api.time.SystemTimeSource;
 import datadog.trace.api.time.TimeSource;
 import java.util.List;
@@ -14,11 +15,14 @@
 public class TelemetryRunnable implements Runnable {
 
   private static final Logger log = LoggerFactory.getLogger(TelemetryRunnable.class);
+  private static final int MAX_APP_STARTED_RETRIES = 3;
+  private static final int MAX_CONSECUTIVE_REQUESTS = 3;
 
   private final TelemetryService telemetryService;
   private final List<TelemetryPeriodicAction> actions;
   private final List<MetricPeriodicAction> actionsAtMetricsInterval;
   private final Scheduler scheduler;
+  private boolean startupEventSent;
 
   public TelemetryRunnable(
       final TelemetryService telemetryService, final List<TelemetryPeriodicAction> actions) {
@@ -38,7 +42,8 @@ public TelemetryRunnable(
             timeSource,
             sleeper,
             (long) (Config.get().getTelemetryHeartbeatInterval() * 1000),
-            (long) (Config.get().getTelemetryMetricsInterval() * 1000));
+            (long) (Config.get().getTelemetryMetricsInterval() * 1000),
+            Config.get().getTelemetryExtendedHeartbeatInterval() * 1000);
   }
 
   private List<MetricPeriodicAction> findMetricPeriodicActions(
@@ -54,11 +59,21 @@ public void run() {
     // Ensure that Config has been initialized, so ConfigCollector can collect all settings first.
     Config.get();
 
+    collectConfigChanges();
+
     scheduler.init();
 
     while (!Thread.interrupted()) {
       try {
-        mainLoopIteration();
+        if (!startupEventSent) {
+          startupEventSent = sendAppStartedEvent();
+        }
+        if (startupEventSent) {
+          mainLoopIteration();
+        } else {
+          // wait until next heartbeat interval before reattempting startup event
+          scheduler.shouldRunHeartbeat();
+        }
         scheduler.sleepUntilNextIteration();
       } catch (InterruptedException e) {
         log.debug("Interrupted; finishing telemetry thread");
@@ -67,15 +82,31 @@ public void run() {
     }
 
     flushPendingTelemetryData();
-    telemetryService.sendAppClosingRequest();
+    telemetryService.sendAppClosingEvent();
     log.debug("Telemetry thread finished");
   }
 
-  private void mainLoopIteration() throws InterruptedException {
-    Map<String, Object> collectedConfig = ConfigCollector.get().collect();
-    if (!collectedConfig.isEmpty()) {
-      telemetryService.addConfiguration(collectedConfig);
+  /**
+   * Attempts to send an app-started event.
+   *
+   * @return `true` - if attempt was successful and `false` otherwise
+   */
+  private boolean sendAppStartedEvent() {
+    int attempt = 0;
+    while (!Thread.interrupted()
+        && attempt < MAX_APP_STARTED_RETRIES
+        && !telemetryService.sendAppStartedEvent()) {
+      attempt += 1;
+      log.debug(
+          "Couldn't send an app-started event on {} attempt out of {}.",
+          attempt,
+          MAX_APP_STARTED_RETRIES);
     }
+    return Thread.interrupted() || attempt < MAX_APP_STARTED_RETRIES;
+  }
+
+  private void mainLoopIteration() throws InterruptedException {
+    collectConfigChanges();
 
     // Collect request metrics every N seconds (default 10s)
     if (scheduler.shouldRunMetrics()) {
@@ -88,15 +119,32 @@ private void mainLoopIteration() throws InterruptedException {
       for (final TelemetryPeriodicAction action : this.actions) {
         action.doIteration(this.telemetryService);
       }
-      telemetryService.sendIntervalRequests();
+      for (int i = 0; i < MAX_CONSECUTIVE_REQUESTS; i++) {
+        if (!telemetryService.sendTelemetryEvents()) {
+          // stop if there is no more data to be sent, or it failed to send a request
+          break;
+        }
+      }
+    }
+
+    if (scheduler.shouldRunExtendedHeartbeat()) {
+      if (telemetryService.sendExtendedHeartbeat()) {
+        // advance next extended-heartbeat only if request was successful, otherwise reattempt it
+        // next heartbeat interval
+        scheduler.scheduleNextExtendedHeartbeat();
+      }
     }
   }
 
-  private void flushPendingTelemetryData() {
-    Map<String, Object> collectedConfig = ConfigCollector.get().collect();
+  private void collectConfigChanges() {
+    Map<String, ConfigSetting> collectedConfig = ConfigCollector.get().collect();
     if (!collectedConfig.isEmpty()) {
       telemetryService.addConfiguration(collectedConfig);
     }
+  }
+
+  private void flushPendingTelemetryData() {
+    collectConfigChanges();
 
     for (MetricPeriodicAction action : actionsAtMetricsInterval) {
       action.collector().prepareMetrics();
@@ -105,7 +153,7 @@ private void flushPendingTelemetryData() {
     for (final TelemetryPeriodicAction action : actions) {
       action.doIteration(telemetryService);
     }
-    telemetryService.sendIntervalRequests();
+    telemetryService.sendTelemetryEvents();
   }
 
   interface ThreadSleeper {
@@ -131,8 +179,10 @@ static class Scheduler {
     private final TimeSource timeSource;
     private final ThreadSleeper sleeper;
     private final long heartbeatIntervalMs;
+    private final long extendedHeartbeatIntervalMs;
     private final long metricsIntervalMs;
     private long nextHeartbeatIntervalMs;
+    private long nextExtendedHeartbeatIntervalMs;
     private long nextMetricsIntervalMs;
     private long currentTime;
 
@@ -140,13 +190,16 @@ public Scheduler(
         final TimeSource timeSource,
         final ThreadSleeper sleeper,
         final long heartbeatIntervalMs,
-        final long metricsIntervalMs) {
+        final long metricsIntervalMs,
+        final long extendedHeartbeatIntervalMs) {
       this.timeSource = timeSource;
       this.sleeper = sleeper;
       this.heartbeatIntervalMs = heartbeatIntervalMs;
       this.metricsIntervalMs = metricsIntervalMs;
+      this.extendedHeartbeatIntervalMs = extendedHeartbeatIntervalMs;
       nextHeartbeatIntervalMs = 0;
       nextMetricsIntervalMs = 0;
+      nextExtendedHeartbeatIntervalMs = 0;
       currentTime = 0;
     }
 
@@ -155,6 +208,7 @@ public void init() {
       this.currentTime = currentTime;
       nextMetricsIntervalMs = currentTime;
       nextHeartbeatIntervalMs = currentTime;
+      scheduleNextExtendedHeartbeat();
     }
 
     public boolean shouldRunMetrics() {
@@ -173,6 +227,15 @@ public boolean shouldRunHeartbeat() {
       return false;
     }
 
+    public boolean shouldRunExtendedHeartbeat() {
+      return currentTime >= nextExtendedHeartbeatIntervalMs;
+    }
+
+    public void scheduleNextExtendedHeartbeat() {
+      // schedule very first extended-heartbeat only after interval elapses
+      nextExtendedHeartbeatIntervalMs = currentTime + extendedHeartbeatIntervalMs;
+    }
+
     public void sleepUntilNextIteration() {
       currentTime = timeSource.getCurrentTimeMillis();
 
@@ -190,8 +253,7 @@ public void sleepUntilNextIteration() {
       while (currentTime >= nextMetricsIntervalMs) {
         // If metric collection exceeded the interval, something went really wrong. Either there's a
         // very short interval (not default), or metric collection is taking abnormally long. We
-        // skip
-        // intervals in this case.
+        // skip intervals in this case.
         nextMetricsIntervalMs += metricsIntervalMs;
       }
 
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryService.java b/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
index 3565847a52f..eea53e7b7c2 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
@@ -1,38 +1,27 @@
 package datadog.telemetry;
 
-import datadog.telemetry.api.ConfigChange;
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.telemetry.api.DistributionSeries;
 import datadog.telemetry.api.Integration;
 import datadog.telemetry.api.LogMessage;
 import datadog.telemetry.api.Metric;
 import datadog.telemetry.api.RequestType;
 import datadog.telemetry.dependency.Dependency;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import datadog.trace.api.ConfigSetting;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import javax.annotation.Nullable;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TelemetryService {
-  private static final Logger log = LoggerFactory.getLogger(TelemetryService.class);
-  private static final String API_ENDPOINT = "telemetry/proxy/api/v2/apmtelemetry";
 
-  private static final int MAX_ELEMENTS_PER_REQUEST = 100;
+  private static final Logger log = LoggerFactory.getLogger(TelemetryService.class);
 
-  // https://github.com/DataDog/instrumentation-telemetry-api-docs/blob/main/GeneratedDocumentation/ApiDocs/v2/producing-telemetry.md#when-to-use-it-1
-  private static final int MAX_DEPENDENCIES_PER_REQUEST = 2000;
+  private static final long DEFAULT_MESSAGE_BYTES_SOFT_LIMIT = Math.round(5 * 1024 * 1024 * 0.75);
 
-  private final HttpClient httpClient;
-  private final int maxElementsPerReq;
-  private final int maxDepsPerReq;
-  private final BlockingQueue<ConfigChange> configurations = new LinkedBlockingQueue<>();
+  private final TelemetryRouter telemetryRouter;
+  private final BlockingQueue<ConfigSetting> configurations = new LinkedBlockingQueue<>();
   private final BlockingQueue<Integration> integrations = new LinkedBlockingQueue<>();
   private final BlockingQueue<Dependency> dependencies = new LinkedBlockingQueue<>();
   private final BlockingQueue<Metric> metrics =
@@ -43,9 +32,13 @@ public class TelemetryService {
   private final BlockingQueue<DistributionSeries> distributionSeries =
       new LinkedBlockingQueue<>(1024);
 
-  private final HttpUrl httpUrl;
+  private final ExtendedHeartbeatData extendedHeartbeatData = new ExtendedHeartbeatData();
+  private final EventSource.Queued eventSource =
+      new EventSource.Queued(
+          configurations, integrations, dependencies, metrics, distributionSeries, logMessages);
 
-  private boolean sentAppStarted;
+  private final long messageBytesSoftLimit;
+  private final boolean debug;
 
   /*
    * Keep track of Open Tracing and Open Telemetry integrations activation as they are mutually exclusive.
@@ -53,32 +46,32 @@ public class TelemetryService {
   private boolean openTracingIntegrationEnabled;
   private boolean openTelemetryIntegrationEnabled;
 
-  public TelemetryService(final OkHttpClient okHttpClient, final HttpUrl httpUrl) {
-    this(new HttpClient(okHttpClient), httpUrl);
-  }
-
-  public TelemetryService(final HttpClient httpClient, final HttpUrl httpUrl) {
-    this(httpClient, MAX_ELEMENTS_PER_REQUEST, MAX_DEPENDENCIES_PER_REQUEST, httpUrl);
+  public static TelemetryService build(
+      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
+      TelemetryClient agentClient,
+      TelemetryClient intakeClient,
+      boolean debug) {
+    TelemetryRouter telemetryRouter =
+        new TelemetryRouter(ddAgentFeaturesDiscovery, agentClient, intakeClient);
+    return new TelemetryService(telemetryRouter, DEFAULT_MESSAGE_BYTES_SOFT_LIMIT, debug);
   }
 
   // For testing purposes
   TelemetryService(
-      final HttpClient httpClient,
-      final int maxElementsPerReq,
-      final int maxDepsPerReq,
-      final HttpUrl agentUrl) {
-    this.httpClient = httpClient;
-    this.sentAppStarted = false;
+      final TelemetryRouter telemetryRouter,
+      final long messageBytesSoftLimit,
+      final boolean debug) {
+    this.telemetryRouter = telemetryRouter;
     this.openTracingIntegrationEnabled = false;
     this.openTelemetryIntegrationEnabled = false;
-    this.maxElementsPerReq = maxElementsPerReq;
-    this.maxDepsPerReq = maxDepsPerReq;
-    this.httpUrl = agentUrl.newBuilder().addPathSegments(API_ENDPOINT).build();
+    this.messageBytesSoftLimit = messageBytesSoftLimit;
+    this.debug = debug;
   }
 
-  public boolean addConfiguration(Map<String, Object> configuration) {
-    for (Map.Entry<String, Object> entry : configuration.entrySet()) {
-      if (!this.configurations.offer(new ConfigChange(entry.getKey(), entry.getValue()))) {
+  public boolean addConfiguration(Map<String, ConfigSetting> configuration) {
+    for (ConfigSetting cs : configuration.values()) {
+      extendedHeartbeatData.pushConfigSetting(cs);
+      if (!this.configurations.offer(cs)) {
         return false;
       }
     }
@@ -86,17 +79,21 @@ public boolean addConfiguration(Map<String, Object> configuration) {
   }
 
   public boolean addDependency(Dependency dependency) {
+    extendedHeartbeatData.pushDependency(dependency);
     return this.dependencies.offer(dependency);
   }
 
   public boolean addIntegration(Integration integration) {
-    if ("opentelemetry-1".equals(integration.name) && integration.enabled) {
-      this.openTelemetryIntegrationEnabled = true;
-      warnAboutExclusiveIntegrations();
-    } else if ("opentracing".equals(integration.name) && integration.enabled) {
-      this.openTracingIntegrationEnabled = true;
+    if ("opentelemetry-1".equals(integration.name)) {
+      openTelemetryIntegrationEnabled = integration.enabled;
+    }
+    if ("opentracing".equals(integration.name)) {
+      openTracingIntegrationEnabled = integration.enabled;
+    }
+    if (openTelemetryIntegrationEnabled && openTracingIntegrationEnabled) {
       warnAboutExclusiveIntegrations();
     }
+    extendedHeartbeatData.pushIntegration(integration);
     return this.integrations.offer(integration);
   }
 
@@ -105,7 +102,6 @@ public boolean addMetric(Metric metric) {
   }
 
   public boolean addLogMessage(LogMessage message) {
-    // TODO doesn't seem to be used
     return this.logMessages.offer(message);
   }
 
@@ -114,260 +110,131 @@ public boolean addDistributionSeries(DistributionSeries series) {
     return this.distributionSeries.offer(series);
   }
 
-  public void sendAppClosingRequest() {
-    RequestBuilder rb = new RequestBuilder(RequestType.APP_CLOSING, httpUrl);
-    rb.writeHeader();
-    rb.writeFooter();
-    Request request = rb.request();
-    httpClient.sendRequest(request);
-  }
-
-  public void sendIntervalRequests() {
-    final State state =
-        new State(
-            configurations, integrations, dependencies, metrics, distributionSeries, logMessages);
-    if (!sentAppStarted) {
-      RequestBuilder rb = new RequestBuilder(RequestType.APP_STARTED, httpUrl);
-      rb.writeHeader();
-      rb.writeConfigChangeEvent(state.configurations.getOrNull());
-      rb.writeIntegrationsEvent(state.integrations.get(maxElementsPerReq));
-      rb.writeDependenciesLoadedEvent(state.dependencies.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-
-      if (result != HttpClient.Result.SUCCESS) {
-        // Do not send other telemetry messages unless app-started has been sent successfully.
-        state.rollback();
-        return;
-      }
-      sentAppStarted = true;
-      state.commit();
-      state.rollback();
-      // When app-started is sent, we do not send more messages until the next interval.
-      return;
-    }
-
-    {
-      RequestBuilder rb = new RequestBuilder(RequestType.APP_HEARTBEAT, httpUrl);
-      rb.writeHeader();
-      rb.writeFooter();
-      if (httpClient.sendRequest(rb.request()) == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      }
-    }
-
-    while (!state.configurations.isEmpty()) {
-      RequestBuilder rb = new RequestBuilder(RequestType.APP_CLIENT_CONFIGURATION_CHANGE, httpUrl);
-      rb.writeHeader();
-      rb.writeConfigChangeEvent(state.configurations.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.configurations.rollback();
-        break;
-      }
-    }
-
-    while (!state.integrations.isEmpty()) {
-      RequestBuilder rb = new RequestBuilder(RequestType.APP_INTEGRATIONS_CHANGE, httpUrl);
-      rb.writeHeader();
-      rb.writeIntegrationsEvent(state.integrations.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.integrations.rollback();
-        break;
-      }
-    }
-
-    while (!state.dependencies.isEmpty()) {
-      RequestBuilder rb = new RequestBuilder(RequestType.APP_DEPENDENCIES_LOADED, httpUrl);
-      rb.writeHeader();
-      rb.writeDependenciesLoadedEvent(state.dependencies.get(maxDepsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.dependencies.rollback();
-        break;
-      }
-    }
-
-    while (!state.metrics.isEmpty()) {
-      RequestBuilder rb = new RequestBuilder(RequestType.GENERATE_METRICS, httpUrl);
-      rb.writeHeader();
-      rb.writeMetrics(state.metrics.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.metrics.rollback();
-        break;
-      }
-    }
-
-    while (!state.distributionSeries.isEmpty()) {
-      RequestBuilder rb = new RequestBuilder(RequestType.DISTRIBUTIONS, httpUrl);
-      rb.writeHeader();
-      rb.writeDistributionsEvent(state.distributionSeries.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.distributionSeries.rollback();
-        break;
-      }
-    }
-
-    while (!state.logMessages.isEmpty()) {
-
-      RequestBuilder rb = new RequestBuilder(RequestType.LOGS, httpUrl);
-      rb.writeHeader();
-      rb.writeLogsEvent(state.logMessages.get(maxElementsPerReq));
-      rb.writeFooter();
-      HttpClient.Result result = httpClient.sendRequest(rb.request());
-
-      if (result == HttpClient.Result.SUCCESS) {
-        state.commit();
-      } else if (result == HttpClient.Result.NOT_FOUND) {
-        state.rollback();
-        return;
-      } else {
-        state.logMessages.rollback();
-        break;
-      }
+  public void sendAppClosingEvent() {
+    TelemetryRequest telemetryRequest =
+        new TelemetryRequest(
+            this.eventSource,
+            EventSink.NOOP,
+            messageBytesSoftLimit,
+            RequestType.APP_CLOSING,
+            debug);
+    if (telemetryRouter.sendRequest(telemetryRequest) != TelemetryClient.Result.SUCCESS) {
+      log.warn("Couldn't send app-closing event!");
     }
   }
 
-  private void warnAboutExclusiveIntegrations() {
-    if (this.openTelemetryIntegrationEnabled && this.openTracingIntegrationEnabled) {
-      log.warn(
-          "Both Open Tracing and Open Telemetry integrations are enabled but mutually exclusive. Tracing performance can be degraded.");
-    }
+  // keeps track of unsent events from the previous attempt
+  private BufferedEvents bufferedEvents;
+
+  /** @return true - if an app-started event has been successfully sent, false - otherwise */
+  public boolean sendAppStartedEvent() {
+    EventSource eventSource;
+    EventSink eventSink;
+    if (bufferedEvents == null) {
+      eventSource = this.eventSource;
+    } else {
+      log.debug(
+          "Sending buffered telemetry events that couldn't have been sent on previous attempt");
+      eventSource = bufferedEvents;
+    }
+    // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
+    bufferedEvents = new BufferedEvents();
+    eventSink = bufferedEvents;
+
+    log.debug("Preparing app-started request");
+    TelemetryRequest request =
+        new TelemetryRequest(
+            eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_STARTED, debug);
+    request.writeProducts();
+    request.writeConfigurations();
+    if (telemetryRouter.sendRequest(request) == TelemetryClient.Result.SUCCESS) {
+      // discard already sent buffered event on the successful attempt
+      bufferedEvents = null;
+      return true;
+    }
+    return false;
   }
 
-  private static class StateList<T> {
-    private final BlockingQueue<T> queue;
-    private List<T> batch;
-    private int consumed;
-
-    public StateList(final BlockingQueue<T> queue) {
-      this.queue = queue;
-      final int size = queue.size();
-      this.batch = new ArrayList<>(size);
-      queue.drainTo(this.batch);
-      this.consumed = 0;
-    }
-
-    public boolean isEmpty() {
-      return consumed >= batch.size();
-    }
-
-    @Nullable
-    public List<T> getOrNull() {
-      final List<T> result = get();
-      if (result.isEmpty()) {
-        return null;
-      }
-      return result;
-    }
-
-    public List<T> get() {
-      return get(batch.size());
-    }
-
-    public List<T> get(final int maxSize) {
-      if (consumed >= batch.size()) {
-        return Collections.emptyList();
-      }
-      final int toIndex = Math.min(batch.size(), consumed + maxSize);
-      final List<T> result = batch.subList(consumed, toIndex);
-      consumed += result.size();
-      return result;
-    }
-
-    public void commit() {
-      if (consumed >= batch.size()) {
-        batch = Collections.emptyList();
-      } else {
-        batch = batch.subList(consumed, batch.size());
-      }
-      consumed = 0;
-    }
-
-    public void rollback() {
-      for (final T element : batch) {
-        // Ignore result, if the queue is full, we'll just lose data.
-        // TODO: Emit a metric when data is lost.
-        queue.offer(element);
+  /**
+   * @return true - only part of data has been sent because of the request size limit false - all
+   *     data has been sent, or it has failed sending a request
+   */
+  public boolean sendTelemetryEvents() {
+    EventSource eventSource;
+    EventSink eventSink;
+    if (bufferedEvents == null) {
+      log.debug("Sending telemetry events");
+      eventSource = this.eventSource;
+      // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
+      bufferedEvents = new BufferedEvents();
+      eventSink = bufferedEvents;
+    } else {
+      log.debug(
+          "Sending buffered telemetry events that couldn't have been sent on previous attempt");
+      eventSource = bufferedEvents;
+      eventSink = EventSink.NOOP; // TODO collect metrics for unsent events
+    }
+    TelemetryRequest request;
+    boolean isMoreDataAvailable = false;
+    if (eventSource.isEmpty()) {
+      log.debug("Preparing app-heartbeat request");
+      request =
+          new TelemetryRequest(
+              eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_HEARTBEAT, debug);
+    } else {
+      log.debug("Preparing message-batch request");
+      request =
+          new TelemetryRequest(
+              eventSource, eventSink, messageBytesSoftLimit, RequestType.MESSAGE_BATCH, debug);
+      request.writeHeartbeat();
+      request.writeConfigurations();
+      request.writeIntegrations();
+      request.writeDependencies();
+      request.writeMetrics();
+      request.writeDistributions();
+      request.writeLogs();
+      isMoreDataAvailable = !this.eventSource.isEmpty();
+    }
+
+    TelemetryClient.Result result = telemetryRouter.sendRequest(request);
+    if (result == TelemetryClient.Result.SUCCESS) {
+      log.debug("Telemetry request has been sent successfully.");
+      bufferedEvents = null;
+      return isMoreDataAvailable;
+    } else {
+      log.debug("Telemetry request has failed: {}", result);
+      if (eventSource == bufferedEvents) {
+        // TODO report metrics for discarded events
+        bufferedEvents = null;
       }
-      batch = Collections.emptyList();
-      consumed = 0;
     }
+    return false;
   }
 
-  private static class State {
-    private final StateList<ConfigChange> configurations;
-    private final StateList<Integration> integrations;
-    private final StateList<Dependency> dependencies;
-    private final StateList<Metric> metrics;
-    private final StateList<DistributionSeries> distributionSeries;
-    private final StateList<LogMessage> logMessages;
-
-    public State(
-        BlockingQueue<ConfigChange> configurations,
-        BlockingQueue<Integration> integrations,
-        BlockingQueue<Dependency> dependencies,
-        BlockingQueue<Metric> metrics,
-        BlockingQueue<DistributionSeries> distributionSeries,
-        BlockingQueue<LogMessage> logMessages) {
-      this.configurations = new StateList<>(configurations);
-      this.integrations = new StateList<>(integrations);
-      this.dependencies = new StateList<>(dependencies);
-      this.metrics = new StateList<>(metrics);
-      this.distributionSeries = new StateList<>(distributionSeries);
-      this.logMessages = new StateList<>(logMessages);
-    }
-
-    public void rollback() {
-      this.configurations.rollback();
-      this.integrations.rollback();
-      this.dependencies.rollback();
-      this.metrics.rollback();
-      this.distributionSeries.rollback();
-      this.logMessages.rollback();
-    }
+  /** @return true - if extended heartbeat request sent successfully, otherwise false */
+  public boolean sendExtendedHeartbeat() {
+    log.debug("Preparing message-batch request");
+    EventSource extendedHeartbeatDataSnapshot = extendedHeartbeatData.snapshot();
+    TelemetryRequest request =
+        new TelemetryRequest(
+            extendedHeartbeatDataSnapshot,
+            EventSink.NOOP,
+            messageBytesSoftLimit,
+            RequestType.APP_EXTENDED_HEARTBEAT,
+            debug);
+    request.writeConfigurations();
+    request.writeDependencies();
+    request.writeIntegrations();
+
+    TelemetryClient.Result result = telemetryRouter.sendRequest(request);
+    if (!extendedHeartbeatDataSnapshot.isEmpty()) {
+      log.warn("Telemetry Extended Heartbeat data does NOT fit in one request.");
+    }
+    return result == TelemetryClient.Result.SUCCESS;
+  }
 
-    public void commit() {
-      this.configurations.commit();
-      this.integrations.commit();
-      this.dependencies.commit();
-      this.metrics.commit();
-      this.distributionSeries.commit();
-      this.logMessages.commit();
-    }
+  void warnAboutExclusiveIntegrations() {
+    log.warn(
+        "Both OpenTracing and OpenTelemetry integrations are enabled but mutually exclusive. Tracing performance can be degraded.");
   }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java b/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
index ce089e51e75..5f4b8282768 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
@@ -1,10 +1,12 @@
 package datadog.telemetry;
 
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.telemetry.TelemetryRunnable.TelemetryPeriodicAction;
 import datadog.telemetry.dependency.DependencyPeriodicAction;
 import datadog.telemetry.dependency.DependencyService;
 import datadog.telemetry.integration.IntegrationPeriodicAction;
+import datadog.telemetry.log.LogPeriodicAction;
 import datadog.telemetry.metric.CoreMetricsPeriodicAction;
 import datadog.telemetry.metric.IastMetricPeriodicAction;
 import datadog.telemetry.metric.WafMetricPeriodicAction;
@@ -14,6 +16,7 @@
 import java.lang.instrument.Instrumentation;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,19 +39,27 @@ static DependencyService createDependencyService(Instrumentation instrumentation
   }
 
   static Thread createTelemetryRunnable(
-      TelemetryService telemetryService, DependencyService dependencyService) {
+      TelemetryService telemetryService,
+      DependencyService dependencyService,
+      boolean telemetryMetricsEnabled) {
     DEPENDENCY_SERVICE = dependencyService;
 
     List<TelemetryPeriodicAction> actions = new ArrayList<>();
-    actions.add(new CoreMetricsPeriodicAction());
-    actions.add(new IntegrationPeriodicAction());
-    actions.add(new WafMetricPeriodicAction());
-    if (Verbosity.OFF != Config.get().getIastTelemetryVerbosity()) {
-      actions.add(new IastMetricPeriodicAction());
+    if (telemetryMetricsEnabled) {
+      actions.add(new CoreMetricsPeriodicAction());
+      actions.add(new IntegrationPeriodicAction());
+      actions.add(new WafMetricPeriodicAction());
+      if (Verbosity.OFF != Config.get().getIastTelemetryVerbosity()) {
+        actions.add(new IastMetricPeriodicAction());
+      }
     }
     if (null != dependencyService) {
       actions.add(new DependencyPeriodicAction(dependencyService));
     }
+    if (Config.get().isTelemetryLogCollectionEnabled()) {
+      actions.add(new LogPeriodicAction());
+      log.debug("Telemetry log collection enabled");
+    }
 
     TelemetryRunnable telemetryRunnable = new TelemetryRunnable(telemetryService, actions);
     return AgentThreadFactory.newAgentThread(
@@ -58,10 +69,24 @@ static Thread createTelemetryRunnable(
   /** Called by reflection (see Agent.startTelemetry) */
   public static void startTelemetry(
       Instrumentation instrumentation, SharedCommunicationObjects sco) {
-    sco.createRemaining(Config.get());
+    Config config = Config.get();
+    sco.createRemaining(config);
     DependencyService dependencyService = createDependencyService(instrumentation);
-    TelemetryService telemetryService = new TelemetryService(sco.okHttpClient, sco.agentUrl);
-    TELEMETRY_THREAD = createTelemetryRunnable(telemetryService, dependencyService);
+    boolean debug = config.isTelemetryDebugRequestsEnabled();
+    DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = sco.featuresDiscovery(config);
+
+    TelemetryClient agentClient = TelemetryClient.buildAgentClient(sco.okHttpClient, sco.agentUrl);
+    TelemetryClient intakeClient =
+        TelemetryClient.buildIntakeClient(
+            config.getSite(),
+            TimeUnit.SECONDS.toMillis(config.getAgentTimeout()),
+            config.getApiKey());
+    TelemetryService telemetryService =
+        TelemetryService.build(ddAgentFeaturesDiscovery, agentClient, intakeClient, debug);
+
+    boolean telemetryMetricsEnabled = config.isTelemetryMetricsEnabled();
+    TELEMETRY_THREAD =
+        createTelemetryRunnable(telemetryService, dependencyService, telemetryMetricsEnabled);
     TELEMETRY_THREAD.start();
   }
 
diff --git a/telemetry/src/main/java/datadog/telemetry/api/ConfigChange.java b/telemetry/src/main/java/datadog/telemetry/api/ConfigChange.java
deleted file mode 100644
index 542ee0496bf..00000000000
--- a/telemetry/src/main/java/datadog/telemetry/api/ConfigChange.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package datadog.telemetry.api;
-
-public final class ConfigChange {
-  public final String name;
-  public final Object value;
-
-  public ConfigChange(String name, Object value) {
-    this.name = name;
-    this.value = value;
-  }
-}
diff --git a/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java b/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
index 7a4b91a213d..a2d717e8b87 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
@@ -5,7 +5,7 @@ public class LogMessage {
   private LogMessageLevel level;
   private String tags;
   private String stackTrace;
-  private Integer tracerTime;
+  private Long tracerTime;
 
   public String getMessage() {
     return message;
@@ -43,11 +43,11 @@ public LogMessage stackTrace(String stackTrace) {
     return this;
   }
 
-  public Integer getTracerTime() {
+  public Long getTracerTime() {
     return tracerTime;
   }
 
-  public LogMessage tracerTime(Integer tracerTime) {
+  public LogMessage tracerTime(Long tracerTime) {
     this.tracerTime = tracerTime;
     return this;
   }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java b/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
index 2d75928faa5..5cb9ae30c27 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
@@ -1,18 +1,23 @@
 package datadog.telemetry.api;
 
-public enum LogMessageLevel {
-  ERROR("ERROR"),
-  WARN("WARN"),
-  DEBUG("DEBUG");
-
-  private final String value;
+import javax.annotation.Nullable;
 
-  LogMessageLevel(String value) {
-    this.value = value;
-  }
+public enum LogMessageLevel {
+  ERROR,
+  WARN,
+  DEBUG;
 
-  @Override
-  public String toString() {
-    return value;
+  @Nullable
+  public static LogMessageLevel fromString(String value) {
+    switch (value) {
+      case "ERROR":
+        return ERROR;
+      case "WARN":
+        return WARN;
+      case "DEBUG":
+        return DEBUG;
+      default:
+        return null;
+    }
   }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/RequestType.java b/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
index e30ee0f9ee3..43d7018849a 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
@@ -2,14 +2,16 @@
 
 public enum RequestType {
   APP_STARTED("app-started"),
-  APP_CLIENT_CONFIGURATION_CHANGE("app-client-configuration-change"),
   APP_DEPENDENCIES_LOADED("app-dependencies-loaded"),
   APP_INTEGRATIONS_CHANGE("app-integrations-change"),
+  APP_CLIENT_CONFIGURATION_CHANGE("app-client-configuration-change"),
   APP_HEARTBEAT("app-heartbeat"),
+  APP_EXTENDED_HEARTBEAT("app-extended-heartbeat"),
   APP_CLOSING("app-closing"),
   GENERATE_METRICS("generate-metrics"),
   LOGS("logs"),
-  DISTRIBUTIONS("distributions");
+  DISTRIBUTIONS("distributions"),
+  MESSAGE_BATCH("message-batch");
 
   private final String value;
 
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
index abac935e796..9f9cedf55e7 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
@@ -57,6 +57,24 @@ public Dependency(String name, String version, String source, @Nullable String h
     this.hash = hash;
   }
 
+  @Override
+  public String toString() {
+    return "Dependency{"
+        + "name='"
+        + name
+        + '\''
+        + ", version='"
+        + version
+        + '\''
+        + ", source='"
+        + source
+        + '\''
+        + ", hash='"
+        + hash
+        + '\''
+        + '}';
+  }
+
   public static List<Dependency> fromMavenPom(JarFile jar) {
     if (jar == null) {
       return Collections.emptyList();
diff --git a/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
index e435ed79ea3..2e5b8b2b25f 100644
--- a/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
@@ -3,7 +3,7 @@
 import datadog.telemetry.TelemetryRunnable;
 import datadog.telemetry.TelemetryService;
 import datadog.telemetry.api.Integration;
-import datadog.trace.api.IntegrationsCollector;
+import datadog.trace.api.telemetry.IntegrationsCollector;
 import java.util.Map;
 
 public class IntegrationPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
diff --git a/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
new file mode 100644
index 00000000000..84034c18f8b
--- /dev/null
+++ b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
@@ -0,0 +1,81 @@
+package datadog.telemetry.log;
+
+import datadog.telemetry.TelemetryRunnable;
+import datadog.telemetry.TelemetryService;
+import datadog.telemetry.api.LogMessage;
+import datadog.telemetry.api.LogMessageLevel;
+import datadog.trace.api.telemetry.LogCollector;
+import datadog.trace.util.stacktrace.StackUtils;
+
+public class LogPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
+
+  /**
+   * The current list of packages passed in is small, but if it kept growing and this did become a
+   * performance issue then we could consider using ClassNameTrie instead (ie. use the builder to
+   * create the trie and store it as a constant in LogPeriodicAction to be passed in here and used
+   * as a filter)
+   */
+  static final String[] PACKAGE_LIST = {"datadog.", "com.datadog.", "java.", "javax.", "jakarta."};
+
+  private static final String RET = "\r\n";
+  private static final String UNKNOWN = "<unknown>";
+
+  @Override
+  public void doIteration(TelemetryService service) {
+    for (LogCollector.RawLogMessage rawLogMsg : LogCollector.get().drain()) {
+
+      LogMessage logMessage =
+          new LogMessage().message(rawLogMsg.message()).tracerTime(rawLogMsg.timestamp);
+
+      if (rawLogMsg.logLevel != null) {
+        logMessage.level(LogMessageLevel.fromString(rawLogMsg.logLevel));
+      }
+
+      if (rawLogMsg.throwable != null) {
+        logMessage.stackTrace(renderStackTrace(rawLogMsg.throwable));
+      }
+
+      service.addLogMessage(logMessage);
+    }
+  }
+
+  private static String renderStackTrace(Throwable t) {
+    StringBuilder stackTrace = new StringBuilder();
+
+    String name = t.getClass().getCanonicalName();
+    if (name == null || name.isEmpty()) {
+      stackTrace.append(UNKNOWN);
+    } else {
+      stackTrace.append(name);
+    }
+
+    if (isDataDogCode(t)) {
+      String msg = t.getMessage();
+      stackTrace.append(": ");
+      if (msg == null || msg.isEmpty()) {
+        stackTrace.append(UNKNOWN);
+      } else {
+        stackTrace.append(msg);
+      }
+    }
+    stackTrace.append(RET);
+
+    Throwable filtered = StackUtils.filterPackagesIn(t, PACKAGE_LIST);
+    for (StackTraceElement stackTraceElement : filtered.getStackTrace()) {
+      stackTrace.append("  at ").append(stackTraceElement).append(RET);
+    }
+    return stackTrace.toString();
+  }
+
+  private static boolean isDataDogCode(Throwable t) {
+    StackTraceElement[] stackTrace = t.getStackTrace();
+    if (stackTrace == null || stackTrace.length == 0) {
+      return false;
+    }
+    String cn = stackTrace[0].getClassName();
+    if (cn.isEmpty()) {
+      return false;
+    }
+    return cn.startsWith("datadog.") || cn.startsWith("com.datadog.");
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/BufferedEventsSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/BufferedEventsSpecification.groovy
new file mode 100644
index 00000000000..1984d680635
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/BufferedEventsSpecification.groovy
@@ -0,0 +1,108 @@
+package datadog.telemetry
+
+import datadog.telemetry.api.DistributionSeries
+import datadog.telemetry.api.Integration
+import datadog.telemetry.api.LogMessage
+import datadog.telemetry.api.Metric
+import datadog.telemetry.dependency.Dependency
+import datadog.trace.api.ConfigOrigin
+import datadog.trace.api.ConfigSetting
+import datadog.trace.test.util.DDSpecification
+
+class BufferedEventsSpecification extends DDSpecification {
+
+  def 'empty events'() {
+    def events = new BufferedEvents()
+
+    expect:
+    events.isEmpty()
+    !events.hasConfigChangeEvent()
+    !events.hasDependencyEvent()
+    !events.hasDistributionSeriesEvent()
+    !events.hasIntegrationEvent()
+    !events.hasLogMessageEvent()
+    !events.hasMetricEvent()
+  }
+
+  def 'return added events'() {
+    def events = new BufferedEvents()
+    def configSetting = new ConfigSetting("key", "value", ConfigOrigin.DEFAULT)
+    def dependency = new Dependency("name", "version", "source", "hash")
+    def series = new DistributionSeries()
+    def integration = new Integration("integration-name", true)
+    def logMessage = new LogMessage()
+    def metric = new Metric()
+
+    when:
+    events.addConfigChangeEvent(configSetting)
+
+    then:
+    !events.isEmpty()
+    events.hasConfigChangeEvent()
+    events.nextConfigChangeEvent() == configSetting
+    !events.hasConfigChangeEvent()
+    events.isEmpty()
+
+    when:
+    events.addDependencyEvent(dependency)
+
+    then:
+    !events.isEmpty()
+    events.hasDependencyEvent()
+    events.nextDependencyEvent() == dependency
+    !events.hasDependencyEvent()
+    events.isEmpty()
+
+    when:
+    events.addDistributionSeriesEvent(series)
+
+    then:
+    !events.isEmpty()
+    events.hasDistributionSeriesEvent()
+    events.nextDistributionSeriesEvent() == series
+    !events.hasDistributionSeriesEvent()
+    events.isEmpty()
+
+    when:
+    events.addIntegrationEvent(integration)
+
+    then:
+    !events.isEmpty()
+    events.hasIntegrationEvent()
+    events.nextIntegrationEvent() == integration
+    !events.hasIntegrationEvent()
+    events.isEmpty()
+
+    when:
+    events.addLogMessageEvent(logMessage)
+
+    then:
+    !events.isEmpty()
+    events.hasLogMessageEvent()
+    events.nextLogMessageEvent() == logMessage
+    !events.hasLogMessageEvent()
+    events.isEmpty()
+
+    when:
+    events.addMetricEvent(metric)
+
+    then:
+    !events.isEmpty()
+    events.hasMetricEvent()
+    events.nextMetricEvent() == metric
+    !events.hasMetricEvent()
+    events.isEmpty()
+  }
+
+  def 'noop sink'() {
+    def sink = EventSink.NOOP
+
+    expect:
+    sink.addMetricEvent(null)
+    sink.addLogMessageEvent(null)
+    sink.addIntegrationEvent(null)
+    sink.addDistributionSeriesEvent(null)
+    sink.addDependencyEvent(null)
+    sink.addConfigChangeEvent(null)
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/ExtendedHeartbeatDataSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/ExtendedHeartbeatDataSpecification.groovy
new file mode 100644
index 00000000000..682df37c2e9
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/ExtendedHeartbeatDataSpecification.groovy
@@ -0,0 +1,84 @@
+package datadog.telemetry
+
+import datadog.telemetry.api.Integration
+import datadog.telemetry.dependency.Dependency
+import datadog.trace.api.ConfigOrigin
+import datadog.trace.api.ConfigSetting
+import spock.lang.Specification
+
+class ExtendedHeartbeatDataSpecification extends Specification {
+
+  def dependency = new Dependency("name", "version", "source", "hash")
+  def configSetting = new ConfigSetting("key", "value", ConfigOrigin.DEFAULT)
+  def integration = new Integration("integration", true)
+
+  def 'discard dependencies after exceeding limit'() {
+    setup:
+    def extHeartbeatData = new ExtendedHeartbeatData(limit)
+
+    when:
+    (limit + 1).times {
+      extHeartbeatData.pushDependency(dependency)
+    }
+
+    then:
+    def snapshot = extHeartbeatData.snapshot()
+    int i = 0
+    while (snapshot.hasDependencyEvent()) {
+      snapshot.nextDependencyEvent()
+      i++
+    }
+    i == limit
+
+    where:
+    limit << [0, 2, 10]
+  }
+
+  def 'return all collected data'() {
+    setup:
+    def extHeartbeatData = new ExtendedHeartbeatData()
+
+    when:
+    def s0 = extHeartbeatData.snapshot()
+
+    then:
+    s0.isEmpty()
+
+    when:
+    extHeartbeatData.pushDependency(dependency)
+    extHeartbeatData.pushConfigSetting(configSetting)
+    extHeartbeatData.pushIntegration(integration)
+
+    then:
+    def s1 = extHeartbeatData.snapshot()
+
+    !s1.isEmpty()
+
+    s1.hasDependencyEvent()
+    s1.nextDependencyEvent() == dependency
+    !s1.hasDependencyEvent()
+
+    !s1.isEmpty()
+
+    s1.hasConfigChangeEvent()
+    s1.nextConfigChangeEvent() == configSetting
+    !s1.hasConfigChangeEvent()
+
+    !s1.isEmpty()
+
+    s1.hasIntegrationEvent()
+    s1.nextIntegrationEvent() == integration
+    !s1.hasIntegrationEvent()
+
+    s1.isEmpty()
+
+    when: 'another snapshot includes all data'
+    def s2 = extHeartbeatData.snapshot()
+
+    then:
+    !s2.isEmpty()
+    s2.hasDependencyEvent()
+    s2.hasConfigChangeEvent()
+    s2.hasIntegrationEvent()
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/HttpClientSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/HttpClientSpecification.groovy
deleted file mode 100644
index 58b6d6a8fb7..00000000000
--- a/telemetry/src/test/groovy/datadog/telemetry/HttpClientSpecification.groovy
+++ /dev/null
@@ -1,59 +0,0 @@
-package datadog.telemetry
-
-import okhttp3.Call
-import okhttp3.HttpUrl
-import okhttp3.MediaType
-import okhttp3.OkHttpClient
-import okhttp3.Protocol
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.ResponseBody
-import spock.lang.Specification
-
-class HttpClientSpecification extends Specification {
-
-  def dummyRequest = new Request.Builder().url(HttpUrl.get("https://example.com")).build()
-
-  Call mockResponse(int code) {
-    Stub(Call) {
-      execute() >> {
-        new Response.Builder()
-          .request(dummyRequest)
-          .protocol(Protocol.HTTP_1_1)
-          .message("OK")
-          .body(ResponseBody.create(MediaType.get("text/plain"), "OK"))
-          .code(code)
-          .build()
-      }
-    }
-  }
-
-  OkHttpClient okHttpClient = Mock()
-
-  def httpClient = new HttpClient(okHttpClient)
-
-  def 'map an http status code to the correct send result'() {
-    when:
-    def result = httpClient.sendRequest(dummyRequest)
-
-    then:
-    result == sendResult
-    1 * okHttpClient.newCall(_) >> mockResponse(httpCode)
-
-    where:
-    httpCode | sendResult
-    100      | HttpClient.Result.FAILURE
-    202      | HttpClient.Result.SUCCESS
-    404      | HttpClient.Result.NOT_FOUND
-    500      | HttpClient.Result.FAILURE
-  }
-
-  def 'catch IOException from OkHttpClient and return FAILURE'() {
-    when:
-    def result = httpClient.sendRequest(dummyRequest)
-
-    then:
-    result == HttpClient.Result.FAILURE
-    1 * okHttpClient.newCall(_) >> { throw new IOException("exception") }
-  }
-}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/RequestBuilderSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/RequestBuilderSpecification.groovy
deleted file mode 100644
index 9ddb9c35f21..00000000000
--- a/telemetry/src/test/groovy/datadog/telemetry/RequestBuilderSpecification.groovy
+++ /dev/null
@@ -1,78 +0,0 @@
-package datadog.telemetry
-
-import datadog.telemetry.api.ConfigChange
-import datadog.telemetry.api.RequestType
-import okhttp3.HttpUrl
-import okhttp3.Request
-import okio.Buffer
-import spock.lang.Specification
-
-/**
- * This test only verifies non-functional specifics that are not covered in TelemetryServiceSpecification
- */
-class RequestBuilderSpecification extends Specification {
-  final HttpUrl httpUrl = HttpUrl.get("https://example.com")
-
-  def 'throw SerializationException in case of JSON nesting problem'() {
-    setup:
-    def b = new RequestBuilder(RequestType.APP_STARTED, httpUrl)
-
-    when:
-    b.writeHeader()
-    b.writeHeader()
-
-    then:
-    RequestBuilder.SerializationException ex = thrown()
-    ex.message == "Failed serializing Telemetry request header part!"
-    ex.cause != null
-  }
-
-  def 'throw SerializationException in case of more than one top-level JSON value'() {
-    setup:
-    def b = new RequestBuilder(RequestType.APP_STARTED, httpUrl)
-
-    when:
-    b.writeHeader()
-    b.writeFooter()
-    b.writeHeader()
-
-    then:
-    RequestBuilder.SerializationException ex = thrown()
-    ex.message == "Failed serializing Telemetry request header part!"
-    ex.cause != null
-  }
-
-  def 'writeConfig must support values of Boolean, String, Integer, Double, Map<String, Object>'() {
-    setup:
-    RequestBuilder rb = new RequestBuilder(RequestType.APP_CLIENT_CONFIGURATION_CHANGE, httpUrl)
-    Map<String, Object> map = new HashMap<>()
-    map.put("key1", "value1")
-    map.put("key2", Double.parseDouble("432.32"))
-    map.put("key3", 324)
-
-    when:
-    // header needed for a proper JSON
-    rb.writeHeader()
-    // but not needed for verification
-    drainToString(rb.request())
-
-    then:
-    rb.writeConfigChangeEvent([
-      new ConfigChange("string", "bar"),
-      new ConfigChange("int", 2342),
-      new ConfigChange("double", Double.valueOf("123.456")),
-      new ConfigChange("map", map)
-    ])
-
-    then:
-    drainToString(rb.request()) == '"configuration":[{"name":"string","value":"bar"},{"name":"int","value":2342},{"name":"double","value":123.456},{"name":"map","value":{"key1":"value1","key2":432.32,"key3":324}}]'
-  }
-
-  String drainToString(Request req) {
-    Buffer buf = new Buffer()
-    req.body().writeTo(buf)
-    byte[] bytes = new byte[buf.size()]
-    buf.read(bytes)
-    return new String(bytes)
-  }
-}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRequestBodySpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRequestBodySpecification.groovy
new file mode 100644
index 00000000000..18cc79c0e66
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRequestBodySpecification.groovy
@@ -0,0 +1,97 @@
+package datadog.telemetry
+
+import datadog.telemetry.api.RequestType
+import datadog.trace.api.ConfigOrigin
+import datadog.trace.api.ConfigSetting
+import okio.Buffer
+import okhttp3.RequestBody
+import spock.lang.Specification
+
+/**
+ * This test only verifies non-functional specifics that are not covered in TelemetryServiceSpecification
+ */
+class TelemetryRequestBodySpecification extends Specification {
+
+  def 'throw SerializationException in case of JSON nesting problem'() {
+    setup:
+    def req = new TelemetryRequestBody(RequestType.APP_STARTED)
+
+    when:
+    req.beginRequest(false)
+    req.beginRequest(false)
+
+    then:
+    TelemetryRequestBody.SerializationException ex = thrown()
+    ex.message == "Failed serializing Telemetry begin-request part!"
+    ex.cause != null
+  }
+
+  def 'throw SerializationException in case of more than one top-level JSON value'() {
+    setup:
+    def req = new TelemetryRequestBody(RequestType.APP_STARTED)
+
+    when:
+    req.beginRequest(false)
+    req.endRequest()
+    req.beginRequest(false)
+
+    then:
+    TelemetryRequestBody.SerializationException ex = thrown()
+    ex.message == "Failed serializing Telemetry begin-request part!"
+    ex.cause != null
+  }
+
+  def 'writeConfig must support values of Boolean, String, Integer, Double, Map<String, Object>'() {
+    setup:
+    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
+    Map<String, Object> map = new HashMap<>()
+    map.put("key1", "value1")
+    map.put("key2", Double.parseDouble("432.32"))
+    map.put("key3", 324)
+
+    when:
+    req.beginRequest(false)
+    // exclude request header to simplify assertion
+    drainToString(req)
+
+    then:
+    req.beginConfiguration()
+    [
+      new ConfigSetting("string", "bar", ConfigOrigin.REMOTE),
+      new ConfigSetting("int", 2342, ConfigOrigin.DEFAULT),
+      new ConfigSetting("double", Double.valueOf("123.456"), ConfigOrigin.ENV),
+      new ConfigSetting("map", map, ConfigOrigin.JVM_PROP),
+      // make sure null values are serialized
+      new ConfigSetting("null", null, ConfigOrigin.DEFAULT)
+    ].forEach { cc -> req.writeConfiguration(cc) }
+    req.endConfiguration()
+
+    then:
+    drainToString(req) == ',"configuration":[' +
+      '{"name":"string","value":"bar","origin":"remote_config"},' +
+      '{"name":"int","value":2342,"origin":"default"},' +
+      '{"name":"double","value":123.456,"origin":"env_var"},' +
+      '{"name":"map","value":{"key1":"value1","key2":432.32,"key3":324},"origin":"jvm_prop"},' +
+      '{"name":"null","value":null,"origin":"default"}]'
+  }
+
+  def 'add debug flag'() {
+    setup:
+    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED)
+
+    when:
+    req.beginRequest(true)
+    req.endRequest()
+
+    then:
+    drainToString(req).contains("\"debug\":true")
+  }
+
+  String drainToString(RequestBody body) {
+    Buffer buf = new Buffer()
+    body.writeTo(buf)
+    byte[] bytes = new byte[buf.size()]
+    buf.read(bytes)
+    return new String(bytes)
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy
new file mode 100644
index 00000000000..b8cdc2a7c4c
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy
@@ -0,0 +1,311 @@
+package datadog.telemetry
+
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery
+import datadog.telemetry.api.RequestType
+import okhttp3.Call
+import okhttp3.HttpUrl
+import okhttp3.MediaType
+import okhttp3.OkHttpClient
+import okhttp3.Protocol
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import spock.lang.Specification
+
+class TelemetryRouterSpecification extends Specification {
+
+  def dummyRequest() {
+    return new TelemetryRequest(Mock(EventSource), Mock(EventSink), 1000, RequestType.APP_STARTED, false)
+  }
+
+  Call mockResponse(int code) {
+    Stub(Call) {
+      execute() >> {
+        new Response.Builder()
+          .request(new Request.Builder().url(HttpUrl.get("https://example.com")).build())
+          .protocol(Protocol.HTTP_1_1)
+          .message("OK")
+          .body(ResponseBody.create(MediaType.get("text/plain"), "OK"))
+          .code(code)
+          .build()
+      }
+    }
+  }
+
+  static HttpUrl agentUrl = HttpUrl.get("https://agent.example.com")
+  static HttpUrl agentTelemetryUrl = agentUrl.resolve("telemetry/proxy/api/v2/apmtelemetry")
+  static HttpUrl intakeUrl = HttpUrl.get("https://intake.example.com")
+  static String apiKey = "api-key"
+  static String apiKeyHeader = "DD-API-KEY"
+
+  OkHttpClient okHttpClient = Mock()
+  DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = Mock()
+
+  def agentTelemetryClient = TelemetryClient.buildAgentClient(okHttpClient, agentUrl)
+  def intakeTelemetryClient = new TelemetryClient(okHttpClient, intakeUrl, apiKey)
+  def httpClient = new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient)
+
+  def 'map an http status code to the correct send result'() {
+    when:
+    def result = httpClient.sendRequest(dummyRequest())
+
+    then:
+    result == sendResult
+    1 * okHttpClient.newCall(_) >> mockResponse(httpCode)
+
+    where:
+    httpCode | sendResult
+    100      | TelemetryClient.Result.FAILURE
+    202      | TelemetryClient.Result.SUCCESS
+    404      | TelemetryClient.Result.NOT_FOUND
+    500      | TelemetryClient.Result.FAILURE
+  }
+
+  def 'catch IOException from OkHttpClient and return FAILURE'() {
+    when:
+    def result = httpClient.sendRequest(dummyRequest())
+
+    then:
+    result == TelemetryClient.Result.FAILURE
+    1 * okHttpClient.newCall(_) >> { throw new IOException("exception") }
+  }
+
+  def 'keep trying to send telemetry to Agent despite of return code when Intake client is null'() {
+    setup:
+    def httpClient = new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null)
+
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >>> [true, false]
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> [false, true]
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    where:
+    returnCode | _
+    200        | _
+    404        | _
+    500        | _
+  }
+
+  def 'switch to Intake when Agent stops supporting telemetry proxy and telemetry requests start failing'() {
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> true
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == intakeUrl
+    request.header(apiKeyHeader) == apiKey
+
+    where:
+    returnCode | _
+    404        | _
+    500        | _
+  }
+
+  def 'do not switch to Intake when Agent stops supporting telemetry proxy but accepts telemetry requests'() {
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> true
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(200) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(201) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+  }
+
+  def 'switch to Intake when Agent fails to receive telemetry requests'() {
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >>> [true, false]
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >>> [false, true]
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == intakeUrl
+    request.header(apiKeyHeader) == apiKey
+
+    where:
+    returnCode | _
+    404        | _
+    500        | _
+  }
+
+  def 'use Agent when Intake is not available'() {
+    setup:
+    def httpClient = new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null)
+
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args ->
+      request = args[0]; mockResponse(returnCode)
+    }
+    request.url() == expectedUrl
+    request.header(apiKeyHeader) == expectedApiKey
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then:
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == expectedUrl
+    request.header(apiKeyHeader) == expectedApiKey
+
+    where:
+    returnCode | expectedApiKey | expectedUrl
+    404        | null           | agentTelemetryUrl
+    500        | null           | agentTelemetryUrl
+  }
+
+  def 'switch to Intake when Agent fails to receive telemetry requests'() {
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'always send first telemetry request to Agent'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args ->
+      request = args[0]; mockResponse(returnCode)
+    }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'switch to Intake if sending a telemetry request to Agent failed or Agent supports telemetry proxy'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == intakeUrl
+    request.header(apiKeyHeader) == apiKey
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'switch back to Agent if Intake request fails'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    where:
+    returnCode | _
+    404        | _
+    500        | _
+  }
+
+  def 'switch back to Agent if it starts supporting telemetry'() {
+    Request request
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'always send first telemetry request to Agent'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args ->
+      request = args[0]; mockResponse(returnCode)
+    }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'switch to Intake if sending a telemetry request to Agent failed or Agent supports telemetry proxy'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> true
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(201) }
+    request.url() == intakeUrl
+    request.header(apiKeyHeader) == apiKey
+
+    when:
+    httpClient.sendRequest(dummyRequest())
+
+    then: 'switch back to Agent if it starts supporting telemetry proxy'
+    1 * ddAgentFeaturesDiscovery.discoverIfOutdated()
+    1 * ddAgentFeaturesDiscovery.supportsTelemetryProxy() >> false
+    1 * okHttpClient.newCall(_) >> { args -> request = args[0]; mockResponse(returnCode) }
+    request.url() == agentTelemetryUrl
+    request.header(apiKeyHeader) == null
+
+    where:
+    returnCode | _
+    404        | _
+    500        | _
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRunnableSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRunnableSpecification.groovy
index 777dd290449..4ba1e110e76 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRunnableSpecification.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRunnableSpecification.groovy
@@ -1,14 +1,15 @@
 package datadog.telemetry
 
 import datadog.telemetry.metric.MetricPeriodicAction
+import datadog.trace.api.config.GeneralConfig
 import datadog.trace.api.telemetry.MetricCollector
 import datadog.trace.api.time.TimeSource
-import spock.lang.Specification
-
+import datadog.trace.test.util.DDSpecification
+import datadog.trace.util.Strings
 import java.util.concurrent.CyclicBarrier
 import java.util.concurrent.TimeUnit
 
-class TelemetryRunnableSpecification extends Specification {
+class TelemetryRunnableSpecification extends DDSpecification {
 
   static class TickSleeper implements TelemetryRunnable.ThreadSleeper {
     CyclicBarrier sleeped = new CyclicBarrier(2)
@@ -34,6 +35,7 @@ class TelemetryRunnableSpecification extends Specification {
 
   void 'happy path'() {
     setup:
+    injectEnvConfig(Strings.toEnvVar(GeneralConfig.TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL), "65")
     TelemetryRunnable.ThreadSleeper sleeperMock = Mock()
     TickSleeper sleeper = new TickSleeper(delegate: sleeperMock)
     TimeSource timeSource = Mock()
@@ -50,7 +52,8 @@ class TelemetryRunnableSpecification extends Specification {
     t.start()
     sleeper.sleeped.await(10, TimeUnit.SECONDS)
 
-    then:
+    then: 'two unsuccessful attempts to send app-started with the following successful attempt'
+    3 * telemetryService.sendAppStartedEvent() >>> [false, false, true]
     1 * timeSource.getCurrentTimeMillis() >> 60 * 1000
     _ * telemetryService.addConfiguration(_)
 
@@ -61,8 +64,8 @@ class TelemetryRunnableSpecification extends Specification {
     1 * metricCollector.drain() >> []
     1 * periodicAction.doIteration(telemetryService)
 
-    then:
-    1 * telemetryService.sendIntervalRequests()
+    then: 'two partial and one final telemetry data requests'
+    3 * telemetryService.sendTelemetryEvents() >>> [true, true, false]
     1 * timeSource.getCurrentTimeMillis() >> 60 * 1000 + 1
     1 * sleeperMock.sleep(9999)
     0 * _
@@ -157,10 +160,25 @@ class TelemetryRunnableSpecification extends Specification {
     1 * periodicAction.doIteration(telemetryService)
 
     then:
-    1 * telemetryService.sendIntervalRequests()
+    1 * telemetryService.sendTelemetryEvents()
     1 * timeSource.getCurrentTimeMillis() >> 120 * 1000 + 7
     1 * sleeperMock.sleep(9993)
 
+    when: 'eights iteration (65 seconds, extended-heartbeat)'
+    sleeper.go.await(5, TimeUnit.SECONDS)
+    sleeper.sleeped.await(5, TimeUnit.SECONDS)
+
+    then:
+    1 * timeSource.getCurrentTimeMillis() >> 125 * 1000
+
+    then:
+    1 * telemetryService.sendExtendedHeartbeat()
+
+    then:
+    1 * timeSource.getCurrentTimeMillis() >> 125 * 1000 + 8
+    1 * sleeperMock.sleep(4992)
+    0 * _
+
     when:
     t.interrupt()
     t.join()
@@ -170,18 +188,42 @@ class TelemetryRunnableSpecification extends Specification {
     1 * metricCollector.prepareMetrics()
     1 * metricCollector.drain() >> []
     1 * periodicAction.doIteration(telemetryService)
-    1 * telemetryService.sendIntervalRequests()
+    1 * telemetryService.sendTelemetryEvents()
 
     then:
-    1 * telemetryService.sendAppClosingRequest()
+    1 * telemetryService.sendAppClosingEvent()
     0 * _
   }
 
+  void 'do not reattempt app-started event until next cycle'() {
+    setup:
+    TelemetryRunnable.ThreadSleeper sleeperMock = Mock()
+    TickSleeper sleeper = new TickSleeper(delegate: sleeperMock)
+    TimeSource timeSource = Mock()
+    TelemetryService telemetryService = Mock(TelemetryService)
+    MetricCollector<MetricCollector.Metric> metricCollector = Mock(MetricCollector)
+    MetricPeriodicAction metricAction = Stub(MetricPeriodicAction) {
+      collector() >> metricCollector
+    }
+    TelemetryRunnable.TelemetryPeriodicAction periodicAction = Mock(TelemetryRunnable.TelemetryPeriodicAction)
+    TelemetryRunnable runnable = new TelemetryRunnable(telemetryService, [metricAction, periodicAction], sleeper, timeSource)
+    t = new Thread(runnable)
+
+    when: 'initial iteration before the first sleep (metrics and heartbeat)'
+    t.start()
+    sleeper.sleeped.await(10, TimeUnit.SECONDS)
+
+    then: 'three unsuccessful attempts to send app-started (TelemetryRunnable.MAX_APP_STARTED_RETRIES) with following successful attempt'
+    3 * telemetryService.sendAppStartedEvent() >>> [false, false, false]
+    2 * timeSource.getCurrentTimeMillis() >> 60 * 1000
+    1 * sleeperMock.sleep(10000)
+  }
+
   void 'scheduler skips metrics intervals'() {
     setup:
     TimeSource timeSource = Mock()
     TickSleeper sleeper = Mock()
-    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000)
+    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0)
 
     when: 'first iteration'
     scheduler.init()
@@ -230,7 +272,7 @@ class TelemetryRunnableSpecification extends Specification {
     setup:
     TimeSource timeSource = Mock()
     TickSleeper sleeper = Mock()
-    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000)
+    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0)
 
     when: 'first iteration'
     scheduler.init()
@@ -273,12 +315,13 @@ class TelemetryRunnableSpecification extends Specification {
     !scheduler.shouldRunHeartbeat()
   }
 
-  void 'scheduler with heartbeat #heartbeatSecs and metrics #metricsSecs'() {
+  void 'scheduler with heartbeat #heartbeatSecs and metrics #metricsSecs and extended-heartbeat #extHeartbeatSecs'() {
     setup:
     TimeSourceAndSleeper timing = new TimeSourceAndSleeper()
-    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timing, timing, heartbeatSecs * 1000, metricsSecs * 1000)
+    TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(timing, timing, heartbeatSecs * 1000, metricsSecs * 1000, extHeartbeatSecs * 1000)
     def metricsRun = []
     def heartbeatsRun = []
+    def extHeartbeatsRun = []
 
     when:
     scheduler.init()
@@ -287,6 +330,12 @@ class TelemetryRunnableSpecification extends Specification {
     iters.times {
       metricsRun.add(scheduler.shouldRunMetrics())
       heartbeatsRun.add(scheduler.shouldRunHeartbeat())
+      def runExtHeartbeat = scheduler.shouldRunExtendedHeartbeat()
+      extHeartbeatsRun.add(runExtHeartbeat)
+      if (runExtHeartbeat) {
+        // need to manually advance to retry next iteration if extended-heartbeat request failed
+        scheduler.scheduleNextExtendedHeartbeat()
+      }
       scheduler.sleepUntilNextIteration()
     }
 
@@ -295,14 +344,16 @@ class TelemetryRunnableSpecification extends Specification {
     heartbeatsRun.size() == iters
     metricsRun.count { it } == expectedMetrics
     heartbeatsRun.count { it } == expectedHeartbeats
+    extHeartbeatsRun.count { it } == expectedExtHeartbeats
 
     where:
-    heartbeatSecs | metricsSecs | expectedHeartbeats | expectedMetrics | iters
-    1             | 1           | 10                 | 10              | 10
-    60            | 10          | 2                  | 12              | 12
-    10            | 60          | 12                 | 2               | 12
-    5             | 3           | 3                  | 4               | 6
-    3             | 5           | 4                  | 3               | 6
+    iters | metricsSecs | heartbeatSecs | extHeartbeatSecs | expectedMetrics | expectedHeartbeats | expectedExtHeartbeats
+    10    | 0           | 0             | 0                | 10              | 10                 | 10
+    10    | 1           | 1             | 1                | 10              | 10                 | 9
+    12    | 10          | 60            | 60               | 12              | 2                  | 1
+    12    | 60          | 10            | 10               | 2               | 12                 | 11
+    6     | 3           | 5             | 5                | 4               | 3                  | 2
+    6     | 5           | 3             | 3                | 3               | 4                  | 3
   }
 
   class TimeSourceAndSleeper implements TimeSource, TelemetryRunnable.ThreadSleeper {
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryServiceSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryServiceSpecification.groovy
index 5177aeae063..4c0d35c4e79 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/TelemetryServiceSpecification.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetryServiceSpecification.groovy
@@ -3,51 +3,58 @@ package datadog.telemetry
 import datadog.telemetry.dependency.Dependency
 import datadog.telemetry.api.Integration
 import datadog.telemetry.api.DistributionSeries
-
-import datadog.telemetry.api.ConfigChange
 import datadog.telemetry.api.LogMessage
 import datadog.telemetry.api.LogMessageLevel
 import datadog.telemetry.api.Metric
 import datadog.telemetry.api.RequestType
-import okhttp3.HttpUrl
+import datadog.trace.api.ConfigOrigin
+import datadog.trace.api.ConfigSetting
 import spock.lang.Specification
 
 class TelemetryServiceSpecification extends Specification {
-
-  TestHttpClient testHttpClient = new TestHttpClient()
-
-  def configuration = ["confkey": "confvalue"]
-  def confKeyValue = new ConfigChange("confkey", "confvalue")
+  def confKeyValue = new ConfigSetting("confkey", "confvalue", ConfigOrigin.DEFAULT)
+  def configuration = [confkey: confKeyValue]
   def integration = new Integration("integration", true)
   def dependency = new Dependency("dependency", "1.0.0", "src", "hash")
   def metric = new Metric().namespace("tracers").metric("metric").points([[1, 2]]).tags(["tag1", "tag2"])
   def distribution = new DistributionSeries().namespace("tracers").metric("distro").points([1, 2, 3]).tags(["tag1", "tag2"]).common(false)
   def logMessage = new LogMessage().message("log-message").tags("tag1:tag2").level(LogMessageLevel.DEBUG).stackTrace("stack-trace").tracerTime(32423)
-  TelemetryService telemetryService = new TelemetryService(testHttpClient, HttpUrl.get("https://example.com"))
 
-  void 'happy path without data'() {
+  def 'happy path without data'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
     when: 'first iteration'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppStartedEvent()
 
     then: 'app-started'
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products()
     testHttpClient.assertNoMoreRequests()
 
     when: 'second iteration'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then: 'app-heartbeat only'
+    testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT)
+    testHttpClient.assertNoMoreRequests()
+
+    when: 'third iteration'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
 
     then: 'app-heartbeat only'
     testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT)
     testHttpClient.assertNoMoreRequests()
   }
 
-  void 'happy path with data before app-started'() {
+  def 'happy path with data'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
     when: 'add data before first iteration'
     telemetryService.addConfiguration(configuration)
     telemetryService.addIntegration(integration)
@@ -57,48 +64,64 @@ class TelemetryServiceSpecification extends Specification {
     telemetryService.addLogMessage(logMessage)
 
     and: 'send messages'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppStartedEvent()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload()
+      .products()
       .configuration([confKeyValue])
-      .dependencies([dependency])
-      .integrations([integration])
+
+    when:
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then:
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(6)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      // no configuration here as it has already been sent with the app-started event
+      .assertNextMessage(RequestType.APP_INTEGRATIONS_CHANGE).hasPayload().integrations([integration])
+      .assertNextMessage(RequestType.APP_DEPENDENCIES_LOADED).hasPayload().dependencies([dependency])
+      .assertNextMessage(RequestType.GENERATE_METRICS).hasPayload().namespace("tracers").metrics([metric])
+      .assertNextMessage(RequestType.DISTRIBUTIONS).hasPayload().namespace("tracers").distributionSeries([distribution])
+      .assertNextMessage(RequestType.LOGS).hasPayload().logs([logMessage])
+      .assertNoMoreMessages()
     testHttpClient.assertNoMoreRequests()
 
-    when: 'second iteration'
-    testHttpClient.expectRequests(4, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    when: 'second iteration heartbeat only'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT)
-    testHttpClient.assertRequestBody(RequestType.GENERATE_METRICS)
-      .assertPayload()
-      .namespace("tracers")
-      .metrics([metric])
-    testHttpClient.assertRequestBody(RequestType.DISTRIBUTIONS)
-      .assertPayload()
-      .namespace("tracers")
-      .distributionSeries([distribution])
-    testHttpClient.assertRequestBody(RequestType.LOGS)
-      .assertPayload()
-      .logs([logMessage])
+    testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT).assertNoPayload()
+    testHttpClient.assertNoMoreRequests()
+
+    when: 'third iteration metrics data'
+    telemetryService.addMetric(metric)
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then:
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(2)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      .assertNextMessage(RequestType.GENERATE_METRICS).hasPayload().namespace("tracers").metrics([metric])
+      .assertNoMoreMessages()
     testHttpClient.assertNoMoreRequests()
   }
 
-  void 'happy path with data after app-started'() {
+  def 'happy path with data after app-started'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
     when: 'send messages'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppStartedEvent()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products()
     testHttpClient.assertNoMoreRequests()
 
     when: 'add data after first iteration'
@@ -110,92 +133,67 @@ class TelemetryServiceSpecification extends Specification {
     telemetryService.addLogMessage(logMessage)
 
     and: 'send messages'
-    testHttpClient.expectRequests(7, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT)
-    testHttpClient.assertRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
-      .assertPayload()
-      .configuration([confKeyValue])
-    testHttpClient.assertRequestBody(RequestType.APP_INTEGRATIONS_CHANGE)
-      .assertPayload()
-      .integrations([integration])
-    testHttpClient.assertRequestBody(RequestType.APP_DEPENDENCIES_LOADED)
-      .assertPayload()
-      .dependencies([dependency])
-    testHttpClient.assertRequestBody(RequestType.GENERATE_METRICS)
-      .assertPayload()
-      .metrics([metric])
-    testHttpClient.assertRequestBody(RequestType.DISTRIBUTIONS)
-      .assertPayload()
-      .distributionSeries([distribution])
-    testHttpClient.assertRequestBody(RequestType.LOGS)
-      .assertPayload()
-      .logs([logMessage])
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(7)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE).hasPayload().configuration([confKeyValue])
+      .assertNextMessage(RequestType.APP_INTEGRATIONS_CHANGE).hasPayload().integrations([integration])
+      .assertNextMessage(RequestType.APP_DEPENDENCIES_LOADED).hasPayload().dependencies([dependency])
+      .assertNextMessage(RequestType.GENERATE_METRICS).hasPayload().namespace("tracers").metrics([metric])
+      .assertNextMessage(RequestType.DISTRIBUTIONS).hasPayload().namespace("tracers").distributionSeries([distribution])
+      .assertNextMessage(RequestType.LOGS).hasPayload().logs([logMessage])
+      .assertNoMoreMessages()
     testHttpClient.assertNoMoreRequests()
   }
 
-  void 'no message before app-started'() {
+  def 'do not discard data for app-started event until it has been successfully sent'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+    telemetryService.addConfiguration(configuration)
+
     when: 'attempt with 404 error'
-    testHttpClient.expectRequests(1, HttpClient.Result.NOT_FOUND)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.NOT_FOUND)
+    !telemetryService.sendAppStartedEvent()
 
     then: 'app-started is attempted'
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
     testHttpClient.assertNoMoreRequests()
 
     when: 'attempt with 500 error'
-    testHttpClient.expectRequests(1, HttpClient.Result.FAILURE)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.FAILURE)
+    !telemetryService.sendAppStartedEvent()
 
     then: 'app-started is attempted'
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
     testHttpClient.assertNoMoreRequests()
 
-    when: 'attempt with unexpected FAILURE (e.g. 100 http status code) (not valid)'
-    testHttpClient.expectRequests(1, HttpClient.Result.FAILURE)
-    telemetryService.sendIntervalRequests()
+    when: 'attempt with unexpected FAILURE (not valid)'
+    testHttpClient.expectRequest(TelemetryClient.Result.FAILURE)
+    !telemetryService.sendAppStartedEvent()
 
     then: 'app-started is attempted'
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
     testHttpClient.assertNoMoreRequests()
 
     when: 'attempt with success'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppStartedEvent()
 
-    then:
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-      .assertPayload()
-      .configuration(null)
-      .dependencies([])
-      .integrations([])
+    then: 'app-started is attempted'
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
     testHttpClient.assertNoMoreRequests()
   }
 
-  void 'NOT_FOUND (e.g. 404 http status code) at #requestType prevents further messages'() {
-    when: 'initial iteration'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
-
-    then:
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
-    testHttpClient.assertNoMoreRequests()
+  def 'resend data on successful attempt after a failure'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
 
-    when: 'add data'
     telemetryService.addConfiguration(configuration)
     telemetryService.addIntegration(integration)
     telemetryService.addDependency(dependency)
@@ -203,39 +201,104 @@ class TelemetryServiceSpecification extends Specification {
     telemetryService.addDistributionSeries(distribution)
     telemetryService.addLogMessage(logMessage)
 
-    and: 'send messages'
-    testHttpClient.expectRequests(prevCalls, HttpClient.Result.SUCCESS)
-    testHttpClient.expectRequests(1, HttpClient.Result.NOT_FOUND)
-    telemetryService.sendIntervalRequests()
+    when: 'attempt with NOT_FOUND error'
+    testHttpClient.expectRequest(TelemetryClient.Result.NOT_FOUND)
+    !telemetryService.sendAppStartedEvent()
 
-    then:
-    testHttpClient.assertRequests(prevCalls)
-    testHttpClient.assertRequestBody(requestType)
+    then: 'app-started attempted with config'
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
+    testHttpClient.assertNoMoreRequests()
 
-    and: 'no further requests after the first 404'
+    when: 'successful app-started attempt'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppStartedEvent()
+
+    then: 'attempt app-started  with SUCCESS'
+    testHttpClient.assertRequestBody(RequestType.APP_STARTED).assertPayload().products().configuration([confKeyValue])
+
+    when: 'successful batch attempt'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then: 'attempt batch with SUCCESS'
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(6)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      // no configuration here as it has already been sent with the app-started event
+      .assertNextMessage(RequestType.APP_INTEGRATIONS_CHANGE).hasPayload().integrations([integration])
+      .assertNextMessage(RequestType.APP_DEPENDENCIES_LOADED).hasPayload().dependencies([dependency])
+      .assertNextMessage(RequestType.GENERATE_METRICS).hasPayload().namespace("tracers").metrics([metric])
+      .assertNextMessage(RequestType.DISTRIBUTIONS).hasPayload().namespace("tracers").distributionSeries([distribution])
+      .assertNextMessage(RequestType.LOGS).hasPayload().logs([logMessage])
+      .assertNoMoreMessages()
     testHttpClient.assertNoMoreRequests()
 
-    where:
-    requestType                                 | prevCalls
-    RequestType.APP_HEARTBEAT                   | 0
-    RequestType.APP_CLIENT_CONFIGURATION_CHANGE | 1
-    RequestType.APP_INTEGRATIONS_CHANGE         | 2
-    RequestType.APP_DEPENDENCIES_LOADED         | 3
-    RequestType.GENERATE_METRICS                | 4
-    RequestType.DISTRIBUTIONS                   | 5
-    RequestType.LOGS                            | 6
+    when: 'attempt with NOT_FOUND error'
+    testHttpClient.expectRequest(TelemetryClient.Result.NOT_FOUND)
+    telemetryService.sendTelemetryEvents()
+
+    then: 'message-batch attempted with heartbeat'
+    testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT).assertNoPayload()
+    testHttpClient.assertNoMoreRequests()
   }
 
-  void 'FAILURE (e.g. 500 http status code) at #requestType does not prevents further messages'() {
-    when: 'initial iteration'
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+  def 'send closing event request'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
+    when:
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendAppClosingEvent()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_STARTED)
+    testHttpClient.assertRequestBody(RequestType.APP_CLOSING)
     testHttpClient.assertNoMoreRequests()
+  }
+
+  def 'report when both OTel and OT are enabled'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = Spy(new TelemetryService(testHttpClient, 1000, false))
+    def otel = new Integration("opentelemetry-1", otelEnabled)
+    def ot = new Integration("opentracing", otEnabled)
+
+    when:
+    telemetryService.addIntegration(otel)
+
+    then:
+    0 * telemetryService.warnAboutExclusiveIntegrations()
+
+    when:
+    telemetryService.addIntegration(ot)
+
+    then:
+    warnining * telemetryService.warnAboutExclusiveIntegrations()
+
+    where:
+    otelEnabled | otEnabled | warnining
+    true        | true      | 1
+    true        | false     | 0
+    false       | true      | 0
+    false       | false     | 0
+  }
+
+  def 'split telemetry requests if the size above the limit'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 5000, false)
+
+    when: 'send a heartbeat request without telemetry data to measure body size to set stable request size limit'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then: 'get body size'
+    def bodySize = testHttpClient.assertRequestBody(RequestType.APP_HEARTBEAT).bodySize()
+    bodySize > 0
+
+    when: 'sending first part of data'
+    telemetryService = new TelemetryService(testHttpClient, bodySize + 500, false)
 
-    when: 'add data'
     telemetryService.addConfiguration(configuration)
     telemetryService.addIntegration(integration)
     telemetryService.addDependency(dependency)
@@ -243,37 +306,104 @@ class TelemetryServiceSpecification extends Specification {
     telemetryService.addDistributionSeries(distribution)
     telemetryService.addLogMessage(logMessage)
 
-    and: 'send messages'
-    testHttpClient.expectRequests(prevCalls, HttpClient.Result.SUCCESS)
-    testHttpClient.expectRequests(1, HttpClient.Result.FAILURE)
-    testHttpClient.expectRequests(afterCalls, HttpClient.Result.SUCCESS)
-    telemetryService.sendIntervalRequests()
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendTelemetryEvents()
+
+    then: 'attempt with SUCCESS'
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(5)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE).hasPayload().configuration([confKeyValue])
+      .assertNextMessage(RequestType.APP_INTEGRATIONS_CHANGE).hasPayload().integrations([integration])
+      .assertNextMessage(RequestType.APP_DEPENDENCIES_LOADED).hasPayload().dependencies([dependency])
+      .assertNextMessage(RequestType.GENERATE_METRICS).hasPayload().namespace("tracers").metrics([metric])
+      // no more data fit this message is sent in the next message
+      .assertNoMoreMessages()
+
+    when: 'sending second part of data'
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    !telemetryService.sendTelemetryEvents()
 
     then:
-    testHttpClient.assertRequests(prevCalls)
-    testHttpClient.assertRequestBody(requestType)
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+      .assertBatch(3)
+      .assertFirstMessage(RequestType.APP_HEARTBEAT).hasNoPayload()
+      .assertNextMessage(RequestType.DISTRIBUTIONS).hasPayload().namespace("tracers").distributionSeries([distribution])
+      .assertNextMessage(RequestType.LOGS).hasPayload().logs([logMessage])
+      .assertNoMoreMessages()
+    testHttpClient.assertNoMoreRequests()
+  }
 
-    then: 'requests continue after first 500'
-    testHttpClient.assertRequests(afterCalls)
+  def 'send all collected data with extended-heartbeat request every time'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
+    telemetryService.addConfiguration(configuration)
+    telemetryService.addIntegration(integration)
+    telemetryService.addDependency(dependency)
+
+    when:
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendExtendedHeartbeat()
+
+    then:
+    testHttpClient.assertRequestBody(RequestType.APP_EXTENDED_HEARTBEAT)
+      .assertPayload()
+      .configuration([confKeyValue])
+      .integrations([integration])
+      .dependencies([dependency])
     testHttpClient.assertNoMoreRequests()
 
-    where:
-    requestType                                 | prevCalls | afterCalls
-    RequestType.APP_HEARTBEAT                   | 0         | 6
-    RequestType.APP_CLIENT_CONFIGURATION_CHANGE | 1         | 5
-    RequestType.APP_INTEGRATIONS_CHANGE         | 2         | 4
-    RequestType.APP_DEPENDENCIES_LOADED         | 3         | 3
-    RequestType.GENERATE_METRICS                | 4         | 2
-    RequestType.DISTRIBUTIONS                   | 5         | 1
-    RequestType.LOGS                            | 6         | 0
+    when:
+    telemetryService.addConfiguration(configuration)
+    telemetryService.addIntegration(integration)
+    telemetryService.addDependency(dependency)
+
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendExtendedHeartbeat()
+
+    then:
+    testHttpClient.assertRequestBody(RequestType.APP_EXTENDED_HEARTBEAT)
+      .assertPayload()
+      .configuration([confKeyValue, confKeyValue])
+      .integrations([integration, integration])
+      .dependencies([dependency, dependency])
+    testHttpClient.assertNoMoreRequests()
   }
 
-  void 'Send closing event request'() {
+  def 'send extended-heartbeat request, even if data already has been sent or attempted as part of another telemetry events'() {
+    setup:
+    TestTelemetryRouter testHttpClient = new TestTelemetryRouter()
+    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false)
+
+    telemetryService.addConfiguration(configuration)
+    telemetryService.addIntegration(integration)
+    telemetryService.addDependency(dependency)
+
     when:
-    testHttpClient.expectRequests(1, HttpClient.Result.SUCCESS)
-    telemetryService.sendAppClosingRequest()
+    testHttpClient.expectRequest(resultCode)
+    telemetryService.sendTelemetryEvents()
 
     then:
-    testHttpClient.assertRequestBody(RequestType.APP_CLOSING)
+    testHttpClient.assertRequestBody(RequestType.MESSAGE_BATCH)
+
+    when:
+    testHttpClient.expectRequest(TelemetryClient.Result.SUCCESS)
+    telemetryService.sendExtendedHeartbeat()
+
+    then:
+    testHttpClient.assertRequestBody(RequestType.APP_EXTENDED_HEARTBEAT)
+      .assertPayload()
+      .configuration([confKeyValue])
+      .integrations([integration])
+      .dependencies([dependency])
+    testHttpClient.assertNoMoreRequests()
+
+    where:
+    resultCode                           | _
+    TelemetryClient.Result.SUCCESS   | _
+    TelemetryClient.Result.FAILURE   | _
+    TelemetryClient.Result.NOT_FOUND | _
   }
 }
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetrySystemSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetrySystemSpecification.groovy
index 7eeb4608887..f92b4e836a3 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/TelemetrySystemSpecification.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetrySystemSpecification.groovy
@@ -5,13 +5,14 @@ import datadog.communication.ddagent.SharedCommunicationObjects
 import datadog.communication.monitor.Monitoring
 import datadog.telemetry.dependency.DependencyService
 import datadog.telemetry.dependency.LocationsCollectingTransformer
+import datadog.trace.api.config.GeneralConfig
+import datadog.trace.test.util.DDSpecification
+import datadog.trace.util.Strings
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
-import spock.lang.Specification
-
 import java.lang.instrument.Instrumentation
 
-class TelemetrySystemSpecification extends Specification {
+class TelemetrySystemSpecification extends DDSpecification {
   Instrumentation inst = Mock()
 
   void 'installs dependencies transformer'() {
@@ -31,7 +32,7 @@ class TelemetrySystemSpecification extends Specification {
     def depService = Mock(DependencyService)
 
     when:
-    def thread = TelemetrySystem.createTelemetryRunnable(telemetryService, depService)
+    def thread = TelemetrySystem.createTelemetryRunnable(telemetryService, depService, true)
 
     then:
     thread != null
@@ -42,6 +43,8 @@ class TelemetrySystemSpecification extends Specification {
 
   void 'start-stop telemetry system'() {
     setup:
+    injectEnvConfig(Strings.toEnvVar(GeneralConfig.SITE), "datad0g.com")
+    injectEnvConfig(Strings.toEnvVar(GeneralConfig.API_KEY), "api-key")
     def instrumentation = Mock(Instrumentation)
 
     when:
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TestHttpClient.groovy b/telemetry/src/test/groovy/datadog/telemetry/TestTelemetryRouter.groovy
similarity index 51%
rename from telemetry/src/test/groovy/datadog/telemetry/TestHttpClient.groovy
rename to telemetry/src/test/groovy/datadog/telemetry/TestTelemetryRouter.groovy
index 8f0f2cad678..77151821515 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/TestHttpClient.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/TestTelemetryRouter.groovy
@@ -4,33 +4,39 @@ import datadog.communication.ddagent.TracerVersion
 import datadog.telemetry.dependency.Dependency
 import datadog.telemetry.api.Integration
 import datadog.telemetry.api.DistributionSeries
-
-import datadog.telemetry.api.ConfigChange
 import datadog.telemetry.api.LogMessage
 import datadog.telemetry.api.Metric
 import datadog.telemetry.api.RequestType
+import datadog.trace.api.ConfigSetting
 import groovy.json.JsonSlurper
 import okhttp3.Request
 import okio.Buffer
 
-class TestHttpClient extends HttpClient {
-  private Queue<Result> mockResults = new LinkedList<>()
+class TestTelemetryRouter extends TelemetryRouter {
+  private Queue<TelemetryClient.Result> mockResults = new LinkedList<>()
   private Queue<RequestAssertions> requests = new LinkedList<>()
 
-  TestHttpClient() {
-    super(null)
+  TestTelemetryRouter() {
+    super(null, null, null)
   }
 
   @Override
-  Result sendRequest(Request request) {
+  TelemetryClient.Result sendRequest(TelemetryRequest request) {
     if (mockResults.isEmpty()) {
       throw new IllegalStateException("Unexpected request has been sent. State expectations with `expectRequests` prior sending requests.")
     }
-    requests.add(new RequestAssertions(request))
+
+    def requestBuilder = request.httpRequest()
+    requestBuilder.url("https://example.com")
+    requests.add(new RequestAssertions(requestBuilder.build()))
     return mockResults.poll()
   }
 
-  void expectRequests(int requestNumber, Result mockResult) {
+  void expectRequest(TelemetryClient.Result mockResult) {
+    expectRequests(1, mockResult)
+  }
+
+  void expectRequests(int requestNumber, TelemetryClient.Result mockResult) {
     for (int i=0; i < requestNumber; i++) {
       mockResults.add(mockResult)
     }
@@ -46,15 +52,8 @@ class TestHttpClient extends HttpClient {
     return this.requests.poll()
   }
 
-  void assertRequests(int numberOfRequests) {
-    for (int i=0; i < numberOfRequests; i++) {
-      assertRequest()
-    }
-  }
-
   BodyAssertions assertRequestBody(RequestType rt) {
-    return assertRequest().headers(rt)
-      .assertBody().commonParts(rt)
+    return assertRequest().headers(rt).assertBody().commonParts(rt)
   }
 
   void assertNoMoreRequests() {
@@ -76,40 +75,49 @@ class TestHttpClient extends HttpClient {
     }
 
     RequestAssertions headers(RequestType requestType) {
-      assert request.method() == 'POST'
-      assert request.headers().names() == [
+      assert this.request.method() == 'POST'
+      assert this.request.headers().names() == [
         'Content-Type',
+        'Content-Length',
         'DD-Client-Library-Language',
         'DD-Client-Library-Version',
         'DD-Telemetry-API-Version',
         'DD-Telemetry-Request-Type'
       ] as Set
-      assert request.header('Content-Type') == 'application/json; charset=utf-8'
-      assert request.header('DD-Client-Library-Language') == 'jvm'
-      assert request.header('DD-Client-Library-Version') == TracerVersion.TRACER_VERSION
-      assert request.header('DD-Telemetry-API-Version') == 'v1'
-      assert request.header('DD-Telemetry-Request-Type') == requestType.toString()
+      assert this.request.header('Content-Type') == 'application/json; charset=utf-8'
+      assert this.request.header('Content-Length').toInteger() > 0
+      assert this.request.header('DD-Client-Library-Language') == 'jvm'
+      assert this.request.header('DD-Client-Library-Version') == TracerVersion.TRACER_VERSION
+      assert this.request.header('DD-Telemetry-API-Version') == 'v2'
+      assert this.request.header('DD-Telemetry-Request-Type') == requestType.toString()
       return this
     }
 
     BodyAssertions assertBody() {
       Buffer buf = new Buffer()
-      request.body().writeTo(buf)
+      this.request.body().writeTo(buf)
       byte[] bytes = new byte[buf.size()]
       buf.read(bytes)
-      return new BodyAssertions(SLURPER.parse(bytes) as Map<String, Object>)
+      def parsed = SLURPER.parse(bytes) as Map<String, Object>
+      return new BodyAssertions(parsed, bytes)
     }
   }
 
   static class BodyAssertions {
-    private Map<String, Object> body
+    private final Map<String, Object> body
+    private final byte[] bodyBytes
 
-    BodyAssertions(Map<String, Object> body) {
+    BodyAssertions(Map<String, Object> body, byte[] bodyBytes) {
       this.body = body
+      this.bodyBytes = bodyBytes
+    }
+
+    int bodySize() {
+      return this.bodyBytes.length
     }
 
     BodyAssertions commonParts(RequestType requestType) {
-      assert body['api_version'] == 'v1'
+      assert body['api_version'] == 'v2'
 
       def app = body['application']
       assert app['env'] != null
@@ -136,34 +144,114 @@ class TestHttpClient extends HttpClient {
     }
 
     PayloadAssertions assertPayload() {
-      return new PayloadAssertions(body['payload'] as Map<String, Object>)
+      def payload = body['payload'] as Map<String, Object>
+      assert payload != null
+      return new PayloadAssertions(payload)
+    }
+
+    BatchAssertions assertBatch(int expectedNumberOfPayloads) {
+      List<Map<String, Object>> payloads = body['payload']
+      assert payloads != null && payloads.size() == expectedNumberOfPayloads
+      return new BatchAssertions(payloads)
+    }
+
+    void assertNoPayload() {
+      assert body['payload'] == null
+    }
+  }
+
+  static class BatchAssertions {
+    private List<Map<String, Object>> messages
+
+    BatchAssertions(List<Map<String, Object>> messages) {
+      this.messages = messages
+    }
+
+    BatchMessageAssertions assertFirstMessage(RequestType expected) {
+      return assertMessage(0, expected)
+    }
+
+    private BatchMessageAssertions assertMessage(int index, RequestType expected) {
+      if (index > messages.size()) {
+        throw new IllegalStateException("Asserted more messages than available (${messages.size()}) in the batch")
+      }
+      def message = messages[index]
+      assert message['request_type'] == String.valueOf(expected)
+      return new BatchMessageAssertions(this, index, message)
+    }
+  }
+
+  static class BatchMessageAssertions {
+    private BatchAssertions batchAssertions
+    private int messageIndex
+    private Map<String, Object> message
+
+    BatchMessageAssertions(BatchAssertions batchAssertions, int messageIndex, Map<String, Object> message) {
+      this.batchAssertions = batchAssertions
+      this.messageIndex = messageIndex
+      this.message = message
+    }
+
+    BatchMessageAssertions hasNoPayload() {
+      assert message['payload'] == null
+      return this
+    }
+
+    BatchMessageAssertions assertNextMessage(RequestType expected) {
+      messageIndex += 1
+      if (messageIndex >= batchAssertions.messages.size()) {
+        throw new IllegalStateException("No more messages available")
+      }
+      return batchAssertions.assertMessage(messageIndex, expected)
+    }
+
+    PayloadAssertions hasPayload() {
+      def payload = message['payload'] as Map<String, Object>
+      assert payload != null
+      return new PayloadAssertions(payload, this)
+    }
+
+    void assertNoMoreMessages() {
+      assert messageIndex == batchAssertions.messages.size() - 1
     }
   }
 
   static class PayloadAssertions {
     private Map<String, Object> payload
+    private BatchMessageAssertions batch
 
     PayloadAssertions(Map<String, Object> payload) {
+      this(payload, null)
+    }
+
+    PayloadAssertions(Map<String, Object> payload, BatchMessageAssertions batch) {
       this.payload = payload
+      this.batch = batch
     }
 
-    PayloadAssertions configuration(List<ConfigChange> configuration) {
+    PayloadAssertions configuration(List<ConfigSetting> configuration) {
       def expected = configuration == null ? null : []
       if (configuration != null) {
-        for (ConfigChange kv : configuration) {
-          expected.add([name: kv.name, value: kv.value])
+        for (ConfigSetting cs : configuration) {
+          expected.add([name: cs.key, value: cs.value, origin: cs.origin.value])
         }
       }
-      assert payload['configuration'] == expected
+      assert this.payload['configuration'] == expected
+      return this
+    }
+
+    PayloadAssertions products(boolean appsecEnabled = true, boolean profilerEnabled = false) {
+      def expected = [appsec: [enabled: appsecEnabled], profiler: [enabled: profilerEnabled]]
+      assert this.payload['products'] == expected
       return this
     }
 
     PayloadAssertions dependencies(List<Dependency> dependencies) {
       def expected = []
       for (Dependency d : dependencies) {
-        expected.add([hash: d.hash, name: d.name, type: "PlatformStandard", version: d.version])
+        expected.add([hash: d.hash, name: d.name, version: d.version])
       }
-      assert payload['dependencies'] == expected
+      assert this.payload['dependencies'] == expected
       return this
     }
 
@@ -175,12 +263,12 @@ class TestHttpClient extends HttpClient {
         map.put("name", i.name)
         expected.add(map)
       }
-      assert payload['integrations'] == expected
+      assert this.payload['integrations'] == expected
       return this
     }
 
     PayloadAssertions namespace(String namespace) {
-      assert payload['namespace'] == namespace
+      assert this.payload['namespace'] == namespace
       return this
     }
 
@@ -204,7 +292,7 @@ class TestHttpClient extends HttpClient {
         obj.put("tags", m.getTags())
         expected.add(obj)
       }
-      assert payload['series'] == expected
+      assert this.payload['series'] == expected
       return this
     }
 
@@ -221,7 +309,7 @@ class TestHttpClient extends HttpClient {
         obj.put("tags", d.getTags())
         expected.add(obj)
       }
-      assert payload['series'] == expected
+      assert this.payload['series'] == expected
       return this
     }
 
@@ -240,8 +328,16 @@ class TestHttpClient extends HttpClient {
         }
         expected.add(map)
       }
-      assert payload['logs'] == expected
+      assert this.payload['logs'] == expected
       return this
     }
+
+    BatchMessageAssertions assertNextMessage(RequestType requestType) {
+      return batch.assertNextMessage(requestType)
+    }
+
+    void assertNoMoreMessages() {
+      batch.assertNoMoreMessages()
+    }
   }
 }
diff --git a/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy
index 046150894c9..bbe25f09425 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy
@@ -2,7 +2,7 @@ package datadog.telemetry.integration
 
 import datadog.telemetry.TelemetryService
 import datadog.telemetry.api.Integration
-import datadog.trace.api.IntegrationsCollector
+import datadog.trace.api.telemetry.IntegrationsCollector
 import spock.lang.Specification
 
 class IntegrationPeriodicActionTest extends Specification {
diff --git a/telemetry/src/test/groovy/datadog/telemetry/log/LogFilteringTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/log/LogFilteringTest.groovy
new file mode 100644
index 00000000000..25c8e4dac34
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/log/LogFilteringTest.groovy
@@ -0,0 +1,69 @@
+package datadog.telemetry.log
+
+import datadog.telemetry.TelemetryService
+import datadog.telemetry.api.LogMessage
+import datadog.trace.api.telemetry.LogCollector
+import datadog.trace.test.util.DDSpecification
+import org.slf4j.Logger
+import datadog.slf4j.impl.StaticLoggerBinder
+
+class LogFilteringTest extends DDSpecification {
+  Logger logger
+  TelemetryService telemetryService = Mock()
+  LogPeriodicAction periodicAction = new LogPeriodicAction()
+
+  @Override
+  void setup(){
+    injectSysConfig("dd.instrumentation.telemetry.debug", "true")
+    injectSysConfig("dd.telemetry.log-collection.enabled", "true")
+    logger = StaticLoggerBinder.getSingleton().getLoggerFactory().getLogger("pepe")
+    LogCollector.get().drain()
+  }
+
+  void 'stack trace filtering for non datadog exceptions'(){
+    setup:
+    logger.error("Debug message", new Exception("Exception message"))
+
+    when:
+    periodicAction.doIteration(telemetryService)
+
+    then:
+    1 * telemetryService.addLogMessage( { LogMessage logMessage ->
+      logMessage.getMessage() == 'Debug message'
+      String[] stackTraceLines = logMessage.stackTrace.split("\r\n")
+
+      stackTraceLines[0] == "java.lang.Exception"
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[1])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[2])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[3])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[4])
+    } )
+    0 * _._
+  }
+
+  void 'stack trace filtering for datadog exceptions'(){
+    setup:
+    try {
+      ExceptionHelper.throwExceptionFromDatadogCode("Exception Message")
+    }
+    catch (Exception e){
+      logger.error("Debug message", e)
+    }
+
+    when:
+    periodicAction.doIteration(telemetryService)
+
+    then:
+    1 * telemetryService.addLogMessage( { LogMessage logMessage ->
+      logMessage.getMessage() == 'Debug message'
+      String[] stackTraceLines = logMessage.stackTrace.split("\r\n")
+
+      stackTraceLines[0] == "java.lang.Exception: Exception Message"
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[1])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[2])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[3])
+      ExceptionHelper.isDataDogOrJava(stackTraceLines[4])
+    } )
+    0 * _._
+  }
+}
diff --git a/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy
new file mode 100644
index 00000000000..7eca5f0c378
--- /dev/null
+++ b/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy
@@ -0,0 +1,59 @@
+package datadog.telemetry.log
+
+import datadog.telemetry.TelemetryService
+import datadog.telemetry.api.LogMessage
+import datadog.telemetry.api.LogMessageLevel
+import datadog.trace.api.telemetry.LogCollector
+import datadog.trace.test.util.DDSpecification
+
+class LogPeriodicActionTest extends DDSpecification {
+  LogPeriodicAction periodicAction = new LogPeriodicAction()
+  TelemetryService telemetryService = Mock()
+
+  @Override
+  void setup(){
+    injectSysConfig("dd.instrumentation.telemetry.debug", "true")
+    LogCollector.get().drain()
+  }
+
+  @Override
+  void cleanup(){
+    LogCollector.get().drain()
+  }
+
+  void 'push exception into the telemetry service'() {
+    setup:
+    try {
+      ExceptionHelper.throwExceptionFromDatadogCode(null)
+    } catch (Exception e) {
+      LogCollector.get().addLogMessage(LogMessageLevel.ERROR.toString(), "test", e)
+    }
+
+    when:
+    periodicAction.doIteration(telemetryService)
+
+    then:
+    1 * telemetryService.addLogMessage( { LogMessage logMessage ->
+      logMessage.getMessage() == 'test'
+    } )
+    0 * _._
+  }
+
+  void 'push exception (without stacktrace) into the telemetry service'() {
+    setup:
+    try {
+      ExceptionHelper.throwExceptionFromDatadogCodeWithoutStacktrace(null)
+    } catch (Exception e) {
+      LogCollector.get().addLogMessage(LogMessageLevel.ERROR.toString(), "test", e)
+    }
+
+    when:
+    periodicAction.doIteration(telemetryService)
+
+    then:
+    1 * telemetryService.addLogMessage( { LogMessage logMessage ->
+      logMessage.getMessage() == 'test'
+    } )
+    0 * _._
+  }
+}
diff --git a/telemetry/src/test/java/datadog/telemetry/log/ExceptionHelper.java b/telemetry/src/test/java/datadog/telemetry/log/ExceptionHelper.java
new file mode 100644
index 00000000000..75a213a5792
--- /dev/null
+++ b/telemetry/src/test/java/datadog/telemetry/log/ExceptionHelper.java
@@ -0,0 +1,32 @@
+package datadog.telemetry.log;
+
+class ExceptionHelper {
+
+  static class MutableException extends Exception {
+    public MutableException(String message) {
+      super(message, null, true, true);
+    }
+  }
+
+  static void throwExceptionFromDatadogCode(String message) throws Exception {
+    throw new Exception(message);
+  }
+
+  static void throwExceptionFromDatadogCodeWithoutStacktrace(String message) throws Exception {
+    Exception ex = new MutableException(message);
+    ex.setStackTrace(new StackTraceElement[0]);
+    throw ex;
+  }
+
+  static boolean isDataDogOrJava(String stackLine) {
+    int slashPosition = stackLine.indexOf('/');
+    int startOfLine = (-1 != slashPosition ? slashPosition : stackLine.indexOf(" at ") + 3);
+    String callSpec = stackLine.substring(startOfLine + 1, stackLine.length());
+    for (String prefix : LogPeriodicAction.PACKAGE_LIST) {
+      if (callSpec.startsWith(prefix)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/telemetry/src/test/resources/telemetry_intake_emu.py b/telemetry/src/test/resources/telemetry_intake_emu.py
index 0769a108ddd..eb33f9ba1f0 100644
--- a/telemetry/src/test/resources/telemetry_intake_emu.py
+++ b/telemetry/src/test/resources/telemetry_intake_emu.py
@@ -12,7 +12,8 @@
   'app-integrations-change',
   'app-closing',
   'app-heartbeat',
-  'generate-metrics'
+  'generate-metrics',
+  'logs'
 ]
 
 def print_line():
@@ -34,13 +35,25 @@ def do_POST(self):
 
         self.send_response(HTTPStatus.ACCEPTED)
         self.end_headers()
-        hdr = self.headers.get('Content-Length')
-        if hdr is not None:
-            content_len = int(hdr)
-            body = str(self.rfile.read(content_len), 'utf-8')
-            print(body)
-            #print(f'\033[0;33m{body}\033[0m')
-            #self.wfile.write(b'Hello world')
+
+        if 'Content-Length' in self.headers:
+          content_len = int(self.headers.get('Content-Length'))
+          body = str(self.rfile.read(content_len), 'utf-8')
+          print(body)
+        elif 'chunked' in self.headers.get("Transfer-Encoding", ""):
+          while True:
+            line = self.rfile.readline().strip()
+            chunk_length = int(line, 16)
+            if chunk_length != 0:
+              chunk = str(self.rfile.read(chunk_length), 'utf-8')
+              print(chunk)
+
+            self.rfile.readline()
+
+            if chunk_length == 0:
+              break
+
+
     def log_message(self, format, *args):
         return