Support reactor context span propagation #7864

amarziali · 2024-10-31T10:46:09Z

What Does This Do

This PR add the possibility to manually add the current span in the reactor subscriber context using the key dd.span and allows addressing top-down context propagation.

Then, when the publisher has a span in its context will activate this span when it will signal downstream (onNext, onError, onComplete). That will make downstream operators using this span as active as well.

Here above few examples (see also unit tests on this PR for more):

No downstream context propagation

This is the basic example where context propagation happens only bottom up

Span parent = buildSpan("parent").start();
try (Scope parentScope = activateSpan(parent)) {
Mono.just("Hello")
.flatMap(s ->  {
   final Span child = buildSpan("child").start();
   return Mono.just(s + " World).doFinally(ignored -> child.finish());
 }
. map(s -> {
   final Span last = buildSpan("last").start();
  try (Scope ignored = activateSpan(last)) {
     // do something interesting
    return s;
  } finally {
    last.finish();
 }
}).block()
parent.finish();
}

The scope of parent is propagated upstream when block() is called. The scope for child is not propagated upstream .

The produced trace looks like [parent[child][last]

Set active span on the chain

We now change slightly the previous example to let child propagating downstream when the flatmap emits.

Span parent = buildSpan("parent").start();
try (Scope parentScope = activateSpan(parent)) {
Mono.just("Hello")
.flatMap(s ->  {
   final Span child = buildSpan("child").start();
   return Mono.just(s + " World).contextWrite("dd.span", child).doFinally(ignored -> child.finish());
 }
. map(s -> {
   final Span last = buildSpan("last").start();
  try (Scope ignored = activateSpan(last)) {
     // do something interesting
    return s;
  } finally {
    last.finish();
 }
}).block()
parent.finish();
}

When we indicate that we want to emit child as active span, the map operator will see now that span and not the parent span captured when subscribe was called

Hence the trace structure is now [parent[child[last]]]

Restore a span in the chain

Previously, forcing an operator to emit a different active span caused all the downstream chain to see that span as active.
We might want to change the active span on the way down. The example will be now:

Span parent = buildSpan("parent").start();
try (Scope parentScope = activateSpan(parent)) {
Mono.just("Hello")
.flatMap(s ->  {
   final Span child = buildSpan("child").start();
   return Mono.just(s + " World)
   // do something more with child as active span in the flatmap ...
   // ....
   .contextWrite("dd.span", child).doFinally(ignored -> child.finish());
 }
// now change back to parent
.contextWrite("dd.span", parent)
. map(s -> {
   final Span last = buildSpan("last").start();
  try (Scope ignored = activateSpan(last)) {
     // do something interesting
    return s;
  } finally {
    last.finish();
 }
}).block()
parent.finish();
}

Each time we use contextWrite setting dd.span it will propagate upstream that information so we should carefully set and reset that information in the right places

The trace structure should look like [parent[child][last]]

Motivation

Additional Notes

Contributor Checklist

Format the title according the contribution guidelines
Assign the type: and (comp: or inst:) labels in addition to any usefull labels
Squash your commits prior merging or merge using GitHub's Squash and merge
Don't use close, fix or any linking keywords when referencing an issue.
Use solves instead, and assign the PR milestone to the issue
Update the public documentation in case of new configuration flag or behavior

Jira ticket: [PROJ-IDENT]

pr-commenter · 2024-10-31T10:59:25Z

Benchmarks

Startup

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
git_branch	master	andrea.marziali/reactor-v2
git_commit_date	1730375835	1730379126
git_commit_sha	`03ad484`	`a10e1d2`
release_version	1.42.0-SNAPSHOT~03ad4845ab	1.42.0-SNAPSHOT~a10e1d2ca0

See matching parameters

	Baseline	Candidate
application	insecure-bank	insecure-bank
ci_job_date	1730381427	1730381427
ci_job_id	691384298	691384298
ci_pipeline_id	47948190	47948190
cpu_model	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
module	Agent	Agent
parent	None	None
variant	iast	iast

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 54 metrics, 9 unstable metrics.

Startup time reports for insecure-bank

gantt
    title insecure-bank - global startup overhead: candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.086 s) : 0, 1085558
Total [baseline] (8.547 s) : 0, 8547223
Agent [candidate] (1.088 s) : 0, 1087673
Total [candidate] (8.587 s) : 0, 8587012
section iast
Agent [baseline] (1.203 s) : 0, 1203037
Total [baseline] (9.096 s) : 0, 9096258
Agent [candidate] (1.204 s) : 0, 1203899
Total [candidate] (9.149 s) : 0, 9148769
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.202 s) : 0, 1202494
Total [baseline] (9.088 s) : 0, 9087742
Agent [candidate] (1.204 s) : 0, 1204493
Total [candidate] (9.083 s) : 0, 9083069
section iast_TELEMETRY_OFF
Agent [baseline] (1.199 s) : 0, 1199422
Total [baseline] (9.113 s) : 0, 9113331
Agent [candidate] (1.201 s) : 0, 1200734
Total [candidate] (9.101 s) : 0, 9100886

baseline results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.086 s	-
Agent	iast	1.203 s	117.48 ms (10.8%)
Agent	iast_HARDCODED_SECRET_DISABLED	1.202 s	116.937 ms (10.8%)
Agent	iast_TELEMETRY_OFF	1.199 s	113.864 ms (10.5%)
Total	tracing	8.547 s	-
Total	iast	9.096 s	549.035 ms (6.4%)
Total	iast_HARDCODED_SECRET_DISABLED	9.088 s	540.519 ms (6.3%)
Total	iast_TELEMETRY_OFF	9.113 s	566.108 ms (6.6%)

candidate results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.088 s	-
Agent	iast	1.204 s	116.226 ms (10.7%)
Agent	iast_HARDCODED_SECRET_DISABLED	1.204 s	116.821 ms (10.7%)
Agent	iast_TELEMETRY_OFF	1.201 s	113.061 ms (10.4%)
Total	tracing	8.587 s	-
Total	iast	9.149 s	561.757 ms (6.5%)
Total	iast_HARDCODED_SECRET_DISABLED	9.083 s	496.057 ms (5.8%)
Total	iast_TELEMETRY_OFF	9.101 s	513.874 ms (6.0%)

gantt
    title insecure-bank - break down per module: candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (691.028 ms) : 0, 691028
BytebuddyAgent [candidate] (692.405 ms) : 0, 692405
GlobalTracer [baseline] (316.182 ms) : 0, 316182
GlobalTracer [candidate] (314.928 ms) : 0, 314928
AppSec [baseline] (54.119 ms) : 0, 54119
AppSec [candidate] (54.139 ms) : 0, 54139
Remote Config [baseline] (666.793 µs) : 0, 667
Remote Config [candidate] (659.822 µs) : 0, 660
Telemetry [baseline] (9.8 ms) : 0, 9800
Telemetry [candidate] (11.786 ms) : 0, 11786
section iast
BytebuddyAgent [baseline] (801.397 ms) : 0, 801397
BytebuddyAgent [candidate] (802.605 ms) : 0, 802605
GlobalTracer [baseline] (303.035 ms) : 0, 303035
GlobalTracer [candidate] (303.144 ms) : 0, 303144
AppSec [baseline] (55.681 ms) : 0, 55681
AppSec [candidate] (56.04 ms) : 0, 56040
Remote Config [baseline] (591.017 µs) : 0, 591
Remote Config [candidate] (593.365 µs) : 0, 593
Telemetry [baseline] (8.121 ms) : 0, 8121
Telemetry [candidate] (8.123 ms) : 0, 8123
IAST [baseline] (20.562 ms) : 0, 20562
IAST [candidate] (19.697 ms) : 0, 19697
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (800.597 ms) : 0, 800597
BytebuddyAgent [candidate] (802.247 ms) : 0, 802247
GlobalTracer [baseline] (303.024 ms) : 0, 303024
GlobalTracer [candidate] (302.98 ms) : 0, 302980
AppSec [baseline] (55.913 ms) : 0, 55913
AppSec [candidate] (56.568 ms) : 0, 56568
Remote Config [baseline] (594.666 µs) : 0, 595
Remote Config [candidate] (605.58 µs) : 0, 606
Telemetry [baseline] (7.338 ms) : 0, 7338
Telemetry [candidate] (7.422 ms) : 0, 7422
IAST [baseline] (21.365 ms) : 0, 21365
IAST [candidate] (21.008 ms) : 0, 21008
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (797.449 ms) : 0, 797449
BytebuddyAgent [candidate] (798.746 ms) : 0, 798746
GlobalTracer [baseline] (303.029 ms) : 0, 303029
GlobalTracer [candidate] (302.732 ms) : 0, 302732
AppSec [baseline] (56.715 ms) : 0, 56715
AppSec [candidate] (57.751 ms) : 0, 57751
Remote Config [baseline] (601.042 µs) : 0, 601
Remote Config [candidate] (607.375 µs) : 0, 607
Telemetry [baseline] (7.376 ms) : 0, 7376
Telemetry [candidate] (7.407 ms) : 0, 7407
IAST [baseline] (20.557 ms) : 0, 20557
IAST [candidate] (19.894 ms) : 0, 19894

Startup time reports for petclinic

gantt
    title petclinic - global startup overhead: candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.074 s) : 0, 1074151
Total [baseline] (10.419 s) : 0, 10418623
Agent [candidate] (1.081 s) : 0, 1080824
Total [candidate] (10.41 s) : 0, 10409737
section appsec
Agent [baseline] (1.222 s) : 0, 1222226
Total [baseline] (10.689 s) : 0, 10688556
Agent [candidate] (1.211 s) : 0, 1210525
Total [candidate] (10.654 s) : 0, 10654023
section iast
Agent [baseline] (1.205 s) : 0, 1205414
Total [baseline] (10.85 s) : 0, 10849787
Agent [candidate] (1.214 s) : 0, 1213749
Total [candidate] (10.859 s) : 0, 10859269
section profiling
Agent [baseline] (1.288 s) : 0, 1287937
Total [baseline] (10.748 s) : 0, 10747557
Agent [candidate] (1.29 s) : 0, 1289946
Total [candidate] (10.778 s) : 0, 10777515

baseline results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.074 s	-
Agent	appsec	1.222 s	148.075 ms (13.8%)
Agent	iast	1.205 s	131.263 ms (12.2%)
Agent	profiling	1.288 s	213.786 ms (19.9%)
Total	tracing	10.419 s	-
Total	appsec	10.689 s	269.933 ms (2.6%)
Total	iast	10.85 s	431.164 ms (4.1%)
Total	profiling	10.748 s	328.934 ms (3.2%)

candidate results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.081 s	-
Agent	appsec	1.211 s	129.7 ms (12.0%)
Agent	iast	1.214 s	132.925 ms (12.3%)
Agent	profiling	1.29 s	209.122 ms (19.3%)
Total	tracing	10.41 s	-
Total	appsec	10.654 s	244.286 ms (2.3%)
Total	iast	10.859 s	449.532 ms (4.3%)
Total	profiling	10.778 s	367.778 ms (3.5%)

gantt
    title petclinic - break down per module: candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (684.732 ms) : 0, 684732
BytebuddyAgent [candidate] (687.412 ms) : 0, 687412
GlobalTracer [baseline] (313.582 ms) : 0, 313582
GlobalTracer [candidate] (314.965 ms) : 0, 314965
AppSec [baseline] (53.894 ms) : 0, 53894
AppSec [candidate] (54.232 ms) : 0, 54232
Remote Config [baseline] (659.297 µs) : 0, 659
Remote Config [candidate] (666.278 µs) : 0, 666
Telemetry [baseline] (7.661 ms) : 0, 7661
Telemetry [candidate] (9.895 ms) : 0, 9895
section appsec
BytebuddyAgent [baseline] (709.657 ms) : 0, 709657
BytebuddyAgent [candidate] (702.58 ms) : 0, 702580
GlobalTracer [baseline] (314.42 ms) : 0, 314420
GlobalTracer [candidate] (311.397 ms) : 0, 311397
AppSec [baseline] (166.185 ms) : 0, 166185
AppSec [candidate] (163.205 ms) : 0, 163205
Remote Config [baseline] (648.534 µs) : 0, 649
Remote Config [candidate] (628.931 µs) : 0, 629
Telemetry [baseline] (7.433 ms) : 0, 7433
Telemetry [candidate] (8.448 ms) : 0, 8448
IAST [baseline] (20.208 ms) : 0, 20208
IAST [candidate] (21.302 ms) : 0, 21302
section iast
BytebuddyAgent [baseline] (803.087 ms) : 0, 803087
BytebuddyAgent [candidate] (807.718 ms) : 0, 807718
GlobalTracer [baseline] (303.178 ms) : 0, 303178
GlobalTracer [candidate] (305.864 ms) : 0, 305864
AppSec [baseline] (57.343 ms) : 0, 57343
AppSec [candidate] (58.341 ms) : 0, 58341
Remote Config [baseline] (596.19 µs) : 0, 596
Remote Config [candidate] (608.077 µs) : 0, 608
Telemetry [baseline] (7.487 ms) : 0, 7487
Telemetry [candidate] (7.477 ms) : 0, 7477
IAST [baseline] (20.035 ms) : 0, 20035
IAST [candidate] (20.021 ms) : 0, 20021
section profiling
BytebuddyAgent [baseline] (686.536 ms) : 0, 686536
BytebuddyAgent [candidate] (689.197 ms) : 0, 689197
GlobalTracer [baseline] (401.701 ms) : 0, 401701
GlobalTracer [candidate] (401.672 ms) : 0, 401672
AppSec [baseline] (54.782 ms) : 0, 54782
AppSec [candidate] (55.0 ms) : 0, 55000
Remote Config [baseline] (679.986 µs) : 0, 680
Remote Config [candidate] (680.721 µs) : 0, 681
Telemetry [baseline] (12.072 ms) : 0, 12072
Telemetry [candidate] (12.059 ms) : 0, 12059
ProfilingAgent [baseline] (93.029 ms) : 0, 93029
ProfilingAgent [candidate] (92.184 ms) : 0, 92184
Profiling [baseline] (93.052 ms) : 0, 93052
Profiling [candidate] (92.207 ms) : 0, 92207

Load

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
end_time	2024-10-31T13:02:54	2024-10-31T13:09:47
git_branch	master	andrea.marziali/reactor-v2
git_commit_date	1730375835	1730379126
git_commit_sha	`03ad484`	`a10e1d2`
release_version	1.42.0-SNAPSHOT~03ad4845ab	1.42.0-SNAPSHOT~a10e1d2ca0
start_time	2024-10-31T13:02:40	2024-10-31T13:09:34

See matching parameters

	Baseline	Candidate
application	insecure-bank	insecure-bank
ci_job_date	1730380538	1730380538
ci_job_id	691384299	691384299
ci_pipeline_id	47948190	47948190
cpu_model	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
variant	iast	iast

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 17 unstable metrics.

Request duration reports for insecure-bank

gantt
    title insecure-bank - request duration [CI 0.99] : candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab
    dateFormat X
    axisFormat %s
section baseline
no_agent (366.492 µs) : 347, 386
.   : milestone, 366,
iast (487.43 µs) : 466, 509
.   : milestone, 487,
iast_FULL (638.184 µs) : 617, 659
.   : milestone, 638,
iast_GLOBAL (510.634 µs) : 489, 532
.   : milestone, 511,
iast_HARDCODED_SECRET_DISABLED (490.938 µs) : 470, 512
.   : milestone, 491,
iast_INACTIVE (451.402 µs) : 430, 473
.   : milestone, 451,
iast_TELEMETRY_OFF (475.489 µs) : 454, 497
.   : milestone, 475,
tracing (440.278 µs) : 420, 461
.   : milestone, 440,
section candidate
no_agent (364.651 µs) : 344, 385
.   : milestone, 365,
iast (487.806 µs) : 466, 509
.   : milestone, 488,
iast_FULL (646.734 µs) : 625, 668
.   : milestone, 647,
iast_GLOBAL (524.066 µs) : 501, 547
.   : milestone, 524,
iast_HARDCODED_SECRET_DISABLED (486.679 µs) : 465, 508
.   : milestone, 487,
iast_INACTIVE (443.776 µs) : 423, 464
.   : milestone, 444,
iast_TELEMETRY_OFF (479.089 µs) : 458, 500
.   : milestone, 479,
tracing (442.873 µs) : 422, 464
.   : milestone, 443,

baseline results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	366.492 µs [346.693 µs, 386.292 µs]	-
iast	487.43 µs [465.948 µs, 508.912 µs]	120.937 µs (33.0%)
iast_FULL	638.184 µs [617.058 µs, 659.309 µs]	271.691 µs (74.1%)
iast_GLOBAL	510.634 µs [489.306 µs, 531.962 µs]	144.142 µs (39.3%)
iast_HARDCODED_SECRET_DISABLED	490.938 µs [469.576 µs, 512.3 µs]	124.446 µs (34.0%)
iast_INACTIVE	451.402 µs [429.735 µs, 473.068 µs]	84.909 µs (23.2%)
iast_TELEMETRY_OFF	475.489 µs [453.704 µs, 497.273 µs]	108.996 µs (29.7%)
tracing	440.278 µs [419.732 µs, 460.825 µs]	73.786 µs (20.1%)

candidate results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	364.651 µs [344.452 µs, 384.851 µs]	-
iast	487.806 µs [466.316 µs, 509.296 µs]	123.154 µs (33.8%)
iast_FULL	646.734 µs [625.474 µs, 667.993 µs]	282.082 µs (77.4%)
iast_GLOBAL	524.066 µs [501.247 µs, 546.885 µs]	159.415 µs (43.7%)
iast_HARDCODED_SECRET_DISABLED	486.679 µs [464.971 µs, 508.386 µs]	122.027 µs (33.5%)
iast_INACTIVE	443.776 µs [423.15 µs, 464.401 µs]	79.124 µs (21.7%)
iast_TELEMETRY_OFF	479.089 µs [457.797 µs, 500.381 µs]	114.437 µs (31.4%)
tracing	442.873 µs [421.943 µs, 463.802 µs]	78.221 µs (21.5%)

Request duration reports for petclinic

gantt
    title petclinic - request duration [CI 0.99] : candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.328 ms) : 1309, 1347
.   : milestone, 1328,
appsec (1.724 ms) : 1701, 1747
.   : milestone, 1724,
appsec_no_iast (1.742 ms) : 1719, 1766
.   : milestone, 1742,
iast (1.483 ms) : 1460, 1505
.   : milestone, 1483,
profiling (1.494 ms) : 1472, 1516
.   : milestone, 1494,
tracing (1.483 ms) : 1458, 1507
.   : milestone, 1483,
section candidate
no_agent (1.339 ms) : 1320, 1358
.   : milestone, 1339,
appsec (1.74 ms) : 1717, 1763
.   : milestone, 1740,
appsec_no_iast (1.735 ms) : 1711, 1759
.   : milestone, 1735,
iast (1.466 ms) : 1443, 1488
.   : milestone, 1466,
profiling (1.549 ms) : 1514, 1584
.   : milestone, 1549,
tracing (1.463 ms) : 1438, 1488
.   : milestone, 1463,

baseline results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	1.328 ms [1.309 ms, 1.347 ms]	-
appsec	1.724 ms [1.701 ms, 1.747 ms]	396.648 µs (29.9%)
appsec_no_iast	1.742 ms [1.719 ms, 1.766 ms]	414.591 µs (31.2%)
iast	1.483 ms [1.46 ms, 1.505 ms]	154.804 µs (11.7%)
profiling	1.494 ms [1.472 ms, 1.516 ms]	166.336 µs (12.5%)
tracing	1.483 ms [1.458 ms, 1.507 ms]	154.822 µs (11.7%)

candidate results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	1.339 ms [1.32 ms, 1.358 ms]	-
appsec	1.74 ms [1.717 ms, 1.763 ms]	400.63 µs (29.9%)
appsec_no_iast	1.735 ms [1.711 ms, 1.759 ms]	395.437 µs (29.5%)
iast	1.466 ms [1.443 ms, 1.488 ms]	126.37 µs (9.4%)
profiling	1.549 ms [1.514 ms, 1.584 ms]	209.603 µs (15.7%)
tracing	1.463 ms [1.438 ms, 1.488 ms]	123.906 µs (9.3%)

Dacapo

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
git_branch	master	andrea.marziali/reactor-v2
git_commit_date	1730375835	1730379126
git_commit_sha	`03ad484`	`a10e1d2`
release_version	1.42.0-SNAPSHOT~03ad4845ab	1.42.0-SNAPSHOT~a10e1d2ca0

See matching parameters

	Baseline	Candidate
application	biojava	biojava
ci_job_date	1730380935	1730380935
ci_job_id	691384300	691384300
ci_pipeline_id	47948190	47948190
cpu_model	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
variant	appsec	appsec

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics.

Execution time for tomcat

gantt
    title tomcat - execution time [CI 0.99] : candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.477 ms) : 1466, 1489
.   : milestone, 1477,
appsec (2.341 ms) : 2300, 2382
.   : milestone, 2341,
iast (2.08 ms) : 2028, 2131
.   : milestone, 2080,
iast_GLOBAL (2.13 ms) : 2077, 2182
.   : milestone, 2130,
profiling (1.939 ms) : 1897, 1980
.   : milestone, 1939,
tracing (1.917 ms) : 1878, 1957
.   : milestone, 1917,
section candidate
no_agent (1.482 ms) : 1470, 1494
.   : milestone, 1482,
appsec (2.359 ms) : 2318, 2401
.   : milestone, 2359,
iast (2.088 ms) : 2036, 2140
.   : milestone, 2088,
iast_GLOBAL (2.137 ms) : 2085, 2189
.   : milestone, 2137,
profiling (1.958 ms) : 1916, 2000
.   : milestone, 1958,
tracing (1.932 ms) : 1892, 1972
.   : milestone, 1932,

baseline results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	1.477 ms [1.466 ms, 1.489 ms]	-
appsec	2.341 ms [2.3 ms, 2.382 ms]	863.254 µs (58.4%)
iast	2.08 ms [2.028 ms, 2.131 ms]	602.292 µs (40.8%)
iast_GLOBAL	2.13 ms [2.077 ms, 2.182 ms]	652.368 µs (44.2%)
profiling	1.939 ms [1.897 ms, 1.98 ms]	461.257 µs (31.2%)
tracing	1.917 ms [1.878 ms, 1.957 ms]	439.71 µs (29.8%)

candidate results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	1.482 ms [1.47 ms, 1.494 ms]	-
appsec	2.359 ms [2.318 ms, 2.401 ms]	877.21 µs (59.2%)
iast	2.088 ms [2.036 ms, 2.14 ms]	605.964 µs (40.9%)
iast_GLOBAL	2.137 ms [2.085 ms, 2.189 ms]	654.828 µs (44.2%)
profiling	1.958 ms [1.916 ms, 2.0 ms]	475.719 µs (32.1%)
tracing	1.932 ms [1.892 ms, 1.972 ms]	450.136 µs (30.4%)

Execution time for biojava

gantt
    title biojava - execution time [CI 0.99] : candidate=1.42.0-SNAPSHOT~a10e1d2ca0, baseline=1.42.0-SNAPSHOT~03ad4845ab
    dateFormat X
    axisFormat %s
section baseline
no_agent (15.515 s) : 15515000, 15515000
.   : milestone, 15515000,
appsec (15.239 s) : 15239000, 15239000
.   : milestone, 15239000,
iast (18.981 s) : 18981000, 18981000
.   : milestone, 18981000,
iast_GLOBAL (17.815 s) : 17815000, 17815000
.   : milestone, 17815000,
profiling (15.785 s) : 15785000, 15785000
.   : milestone, 15785000,
tracing (15.514 s) : 15514000, 15514000
.   : milestone, 15514000,
section candidate
no_agent (15.063 s) : 15063000, 15063000
.   : milestone, 15063000,
appsec (15.135 s) : 15135000, 15135000
.   : milestone, 15135000,
iast (18.703 s) : 18703000, 18703000
.   : milestone, 18703000,
iast_GLOBAL (18.035 s) : 18035000, 18035000
.   : milestone, 18035000,
profiling (15.719 s) : 15719000, 15719000
.   : milestone, 15719000,
tracing (15.081 s) : 15081000, 15081000
.   : milestone, 15081000,

baseline results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	15.515 s [15.515 s, 15.515 s]	-
appsec	15.239 s [15.239 s, 15.239 s]	-276.0 ms (-1.8%)
iast	18.981 s [18.981 s, 18.981 s]	3.466 s (22.3%)
iast_GLOBAL	17.815 s [17.815 s, 17.815 s]	2.3 s (14.8%)
profiling	15.785 s [15.785 s, 15.785 s]	270.0 ms (1.7%)
tracing	15.514 s [15.514 s, 15.514 s]	-1.0 ms (-0.0%)

candidate results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	15.063 s [15.063 s, 15.063 s]	-
appsec	15.135 s [15.135 s, 15.135 s]	72.0 ms (0.5%)
iast	18.703 s [18.703 s, 18.703 s]	3.64 s (24.2%)
iast_GLOBAL	18.035 s [18.035 s, 18.035 s]	2.972 s (19.7%)
profiling	15.719 s [15.719 s, 15.719 s]	656.0 ms (4.4%)
tracing	15.081 s [15.081 s, 15.081 s]	18.0 ms (0.1%)

...r-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/SpanExtractorHelper.java

.../src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java

mcculls

Nice refactoring, just a minor comment about re-using the value of self.currentContext()

amarziali · 2024-10-31T14:44:04Z

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WithAgentSpan.java

@@ -0,0 +1,5 @@
+package datadog.trace.bootstrap.instrumentation.api;
+
+public interface WithAgentSpan {


Note for future improvements: we might expose the behaviour (i.e. activate()) instead the internal AgentSpan object

PerfectSlayer

As future design idea, I would like to have the OT/OTel span capabilities exposed rather than their internals (delegate span).

For example, having an ActivableSpan interface that exposes the activate() method rather than WithAgentSpan that exposes the delegate internal.

      if (context.hasKey("dd.span")) {
        Object maybeSpan = context.get("dd.span");
        if (maybeSpan instanceof WithAgentSpan) {
          AgentSpan span = ((WithAgentSpan) maybeSpan).asAgentSpan();
          if (span != null) {
            return activateSpan(span);
          }
        }
      }

will become:

      if (context.hasKey("dd.span")) {
        Object maybeSpan = context.get("dd.span");
        if (maybeSpan instanceof ActivableSpan) {
          return ((ActivableSpan) maybeSpan).activate();
        }
      }

Even though OT/OTel spans should rely on AgentSpan for a long time, it feels safer to expose capability rather than internal. That's not blocking though :)

Support reactor context span propagation

181d2be

amarziali added type: enhancement inst: reactor Reactor instrumentation labels Oct 31, 2024

amarziali requested a review from a team as a code owner October 31, 2024 10:46

Merge branch 'master' into andrea.marziali/reactor-v2

e609d9f

mcculls reviewed Oct 31, 2024

View reviewed changes

...r-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/SpanExtractorHelper.java Outdated Show resolved Hide resolved

Add interface for agent span wrappers and simplify logic

30418fe

amarziali requested a review from a team as a code owner October 31, 2024 11:42

amarziali requested a review from mcculls October 31, 2024 11:42

mcculls reviewed Oct 31, 2024

View reviewed changes

.../src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java Outdated Show resolved Hide resolved

mcculls approved these changes Oct 31, 2024

View reviewed changes

Avoid using twice currentContext

a10e1d2

amarziali enabled auto-merge (squash) October 31, 2024 13:02

amarziali disabled auto-merge October 31, 2024 13:20

amarziali commented Oct 31, 2024

View reviewed changes

amarziali merged commit 497e7c8 into master Oct 31, 2024
99 of 100 checks passed

amarziali deleted the andrea.marziali/reactor-v2 branch October 31, 2024 14:44

github-actions bot added this to the 1.42.0 milestone Oct 31, 2024

PerfectSlayer reviewed Oct 31, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support reactor context span propagation #7864

Support reactor context span propagation #7864

amarziali commented Oct 31, 2024 •

edited by PerfectSlayer

Loading

pr-commenter bot commented Oct 31, 2024 •

edited

Loading

mcculls left a comment

amarziali Oct 31, 2024

PerfectSlayer left a comment •

edited

Loading

		@@ -0,0 +1,5 @@
		package datadog.trace.bootstrap.instrumentation.api;

		public interface WithAgentSpan {

Support reactor context span propagation #7864

Support reactor context span propagation #7864

Conversation

amarziali commented Oct 31, 2024 • edited by PerfectSlayer Loading

What Does This Do

Motivation

Additional Notes

Contributor Checklist

pr-commenter bot commented Oct 31, 2024 • edited Loading

Benchmarks

Startup

Parameters

Summary

Load

Parameters

Summary

Dacapo

Parameters

Summary

mcculls left a comment

Choose a reason for hiding this comment

amarziali Oct 31, 2024

Choose a reason for hiding this comment

PerfectSlayer left a comment • edited Loading

Choose a reason for hiding this comment

amarziali commented Oct 31, 2024 •

edited by PerfectSlayer

Loading

pr-commenter bot commented Oct 31, 2024 •

edited

Loading

PerfectSlayer left a comment •

edited

Loading