Skip to content

Commit 63c09f4

Browse files
Update default system tests commit
1 parent 3e0cdbd commit 63c09f4

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.circleci/config.continue.yml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
3636
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"
3737
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
3838

39-
default_system_tests_commit: &default_system_tests_commit 2799fa982318da14c9d3e5f722abdc670d2802c3
39+
default_system_tests_commit: &default_system_tests_commit 761b9e7a82ffb136c4653a4d1623d120d67b005b
4040

4141
parameters:
4242
nightly:
@@ -932,7 +932,7 @@ jobs:
932932
command: |
933933
cd system-tests
934934
DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
935-
935+
936936
- run:
937937
name: Run IDM Crossed Tracing Libraries propagation tests for messaging
938938
environment:
@@ -975,7 +975,7 @@ jobs:
975975
no_output_timeout: 5m
976976
command: |
977977
cd system-tests
978-
export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
978+
export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
979979
./run.sh DEBUGGER_SCENARIOS
980980
981981
- run:

dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ public void methodAdvice(MethodTransformer transformer) {
5555
* the tests) and not the parent one. The way to distinguish between the two is by examining the
5656
* "remoteArgs" passed to the runner method: the args are non-empty in the child process, and
5757
* empty in the parent one.
58+
*
59+
* <p>The instrumentation works by increasing the Reporter.class counter in the call depth thread
60+
* local map. The counter is decreased when the runner method exits.
61+
*
62+
* <p>Since the tracing instrumentation is checking the counter value to avoid nested calls,
63+
* increasing it here results in effectively disabling the tracing.
5864
*/
5965
public static class RunnerAdvice {
6066
@Advice.OnMethodEnter

0 commit comments

Comments
 (0)