Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove custom scope manager support #8164

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Conversation

PerfectSlayer
Copy link
Contributor

@PerfectSlayer PerfectSlayer commented Jan 8, 2025

What Does This Do

Following the deprecation for removal #8058, this PR removes the support for custom scope manager from OpenTracing artifact (dd-trace-ot).

Motivation

This change is part of the refactoring to improve support for generic Contexts across the dd-trace-java codebase

Additional Notes

Breaking change warning:

Warning

Support for custom scope manager using OpenTelemetry tracer artifact (dd-trace-ot) is dropped.
Tracing with OpenTracing API and custom scope manager will continue to work on 1.44.x releases.

Contributor Checklist

Jira ticket: LANGPLAT-39

@pr-commenter
Copy link

pr-commenter bot commented Jan 8, 2025

Benchmarks

Startup

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
git_branch master bbujon/dd-trace-ot-cleanup
git_commit_date 1736277396 1736328693
git_commit_sha 54d4a6f a2125e2
release_version 1.45.0-SNAPSHOT~54d4a6f433 1.45.0-SNAPSHOT~a2125e2fba
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1736331006 1736331006
ci_job_id 758073824 758073824
ci_pipeline_id 52414889 52414889
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 60 metrics, 3 unstable metrics.

Startup time reports for petclinic
gantt
    title petclinic - global startup overhead: candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.058 s) : 0, 1058022
Total [baseline] (10.564 s) : 0, 10564158
Agent [candidate] (1.054 s) : 0, 1054159
Total [candidate] (10.427 s) : 0, 10426871
section appsec
Agent [baseline] (1.186 s) : 0, 1185694
Total [baseline] (10.728 s) : 0, 10728073
Agent [candidate] (1.187 s) : 0, 1186774
Total [candidate] (10.694 s) : 0, 10693986
section iast
Agent [baseline] (1.179 s) : 0, 1179147
Total [baseline] (10.976 s) : 0, 10975768
Agent [candidate] (1.18 s) : 0, 1180479
Total [candidate] (10.951 s) : 0, 10950622
section profiling
Agent [baseline] (1.281 s) : 0, 1280648
Total [baseline] (10.934 s) : 0, 10933617
Agent [candidate] (1.279 s) : 0, 1278717
Total [candidate] (10.906 s) : 0, 10905719
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.058 s -
Agent appsec 1.186 s 127.673 ms (12.1%)
Agent iast 1.179 s 121.125 ms (11.4%)
Agent profiling 1.281 s 222.627 ms (21.0%)
Total tracing 10.564 s -
Total appsec 10.728 s 163.915 ms (1.6%)
Total iast 10.976 s 411.611 ms (3.9%)
Total profiling 10.934 s 369.459 ms (3.5%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.054 s -
Agent appsec 1.187 s 132.615 ms (12.6%)
Agent iast 1.18 s 126.321 ms (12.0%)
Agent profiling 1.279 s 224.558 ms (21.3%)
Total tracing 10.427 s -
Total appsec 10.694 s 267.115 ms (2.6%)
Total iast 10.951 s 523.751 ms (5.0%)
Total profiling 10.906 s 478.848 ms (4.6%)
gantt
    title petclinic - break down per module: candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (713.646 ms) : 0, 713646
BytebuddyAgent [candidate] (712.461 ms) : 0, 712461
GlobalTracer [baseline] (257.046 ms) : 0, 257046
GlobalTracer [candidate] (255.781 ms) : 0, 255781
AppSec [baseline] (56.408 ms) : 0, 56408
AppSec [candidate] (55.982 ms) : 0, 55982
Remote Config [baseline] (731.841 µs) : 0, 732
Remote Config [candidate] (713.685 µs) : 0, 714
Telemetry [baseline] (15.246 ms) : 0, 15246
Telemetry [candidate] (14.262 ms) : 0, 14262
section appsec
BytebuddyAgent [baseline] (729.553 ms) : 0, 729553
BytebuddyAgent [candidate] (729.669 ms) : 0, 729669
GlobalTracer [baseline] (252.431 ms) : 0, 252431
GlobalTracer [candidate] (252.923 ms) : 0, 252923
AppSec [baseline] (170.225 ms) : 0, 170225
AppSec [candidate] (170.732 ms) : 0, 170732
Remote Config [baseline] (666.45 µs) : 0, 666
Remote Config [candidate] (657.096 µs) : 0, 657
Telemetry [baseline] (8.22 ms) : 0, 8220
Telemetry [candidate] (8.16 ms) : 0, 8160
IAST [baseline] (19.373 ms) : 0, 19373
IAST [candidate] (19.271 ms) : 0, 19271
section iast
BytebuddyAgent [baseline] (829.449 ms) : 0, 829449
BytebuddyAgent [candidate] (830.534 ms) : 0, 830534
GlobalTracer [baseline] (246.441 ms) : 0, 246441
GlobalTracer [candidate] (246.791 ms) : 0, 246791
AppSec [baseline] (58.142 ms) : 0, 58142
AppSec [candidate] (57.919 ms) : 0, 57919
Remote Config [baseline] (648.822 µs) : 0, 649
Remote Config [candidate] (635.496 µs) : 0, 635
Telemetry [baseline] (8.635 ms) : 0, 8635
Telemetry [candidate] (8.599 ms) : 0, 8599
IAST [baseline] (20.911 ms) : 0, 20911
IAST [candidate] (20.975 ms) : 0, 20975
section profiling
BytebuddyAgent [baseline] (706.114 ms) : 0, 706114
BytebuddyAgent [candidate] (702.36 ms) : 0, 702360
GlobalTracer [baseline] (372.729 ms) : 0, 372729
GlobalTracer [candidate] (374.17 ms) : 0, 374170
AppSec [baseline] (54.696 ms) : 0, 54696
AppSec [candidate] (54.956 ms) : 0, 54956
Remote Config [baseline] (665.008 µs) : 0, 665
Remote Config [candidate] (672.203 µs) : 0, 672
Telemetry [baseline] (8.142 ms) : 0, 8142
Telemetry [candidate] (8.147 ms) : 0, 8147
ProfilingAgent [baseline] (96.269 ms) : 0, 96269
ProfilingAgent [candidate] (96.554 ms) : 0, 96554
Profiling [baseline] (96.292 ms) : 0, 96292
Profiling [candidate] (96.577 ms) : 0, 96577
Loading
Startup time reports for insecure-bank
gantt
    title insecure-bank - global startup overhead: candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.062 s) : 0, 1062052
Total [baseline] (8.608 s) : 0, 8607779
Agent [candidate] (1.054 s) : 0, 1054106
Total [candidate] (8.614 s) : 0, 8613564
section iast
Agent [baseline] (1.179 s) : 0, 1178851
Total [baseline] (9.217 s) : 0, 9216698
Agent [candidate] (1.187 s) : 0, 1187189
Total [candidate] (9.207 s) : 0, 9206813
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.181 s) : 0, 1181005
Total [baseline] (9.178 s) : 0, 9178030
Agent [candidate] (1.181 s) : 0, 1180866
Total [candidate] (9.195 s) : 0, 9194915
section iast_TELEMETRY_OFF
Agent [baseline] (1.174 s) : 0, 1173936
Total [baseline] (9.228 s) : 0, 9227510
Agent [candidate] (1.173 s) : 0, 1172798
Total [candidate] (9.227 s) : 0, 9226504
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.062 s -
Agent iast 1.179 s 116.799 ms (11.0%)
Agent iast_HARDCODED_SECRET_DISABLED 1.181 s 118.953 ms (11.2%)
Agent iast_TELEMETRY_OFF 1.174 s 111.884 ms (10.5%)
Total tracing 8.608 s -
Total iast 9.217 s 608.919 ms (7.1%)
Total iast_HARDCODED_SECRET_DISABLED 9.178 s 570.251 ms (6.6%)
Total iast_TELEMETRY_OFF 9.228 s 619.731 ms (7.2%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.054 s -
Agent iast 1.187 s 133.082 ms (12.6%)
Agent iast_HARDCODED_SECRET_DISABLED 1.181 s 126.759 ms (12.0%)
Agent iast_TELEMETRY_OFF 1.173 s 118.692 ms (11.3%)
Total tracing 8.614 s -
Total iast 9.207 s 593.248 ms (6.9%)
Total iast_HARDCODED_SECRET_DISABLED 9.195 s 581.351 ms (6.7%)
Total iast_TELEMETRY_OFF 9.227 s 612.94 ms (7.1%)
gantt
    title insecure-bank - break down per module: candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (717.179 ms) : 0, 717179
BytebuddyAgent [candidate] (711.994 ms) : 0, 711994
GlobalTracer [baseline] (257.024 ms) : 0, 257024
GlobalTracer [candidate] (255.658 ms) : 0, 255658
AppSec [baseline] (56.146 ms) : 0, 56146
AppSec [candidate] (55.417 ms) : 0, 55417
Remote Config [baseline] (721.473 µs) : 0, 721
Remote Config [candidate] (709.827 µs) : 0, 710
Telemetry [baseline] (15.921 ms) : 0, 15921
Telemetry [candidate] (15.365 ms) : 0, 15365
section iast
BytebuddyAgent [baseline] (828.863 ms) : 0, 828863
BytebuddyAgent [candidate] (835.304 ms) : 0, 835304
GlobalTracer [baseline] (246.134 ms) : 0, 246134
GlobalTracer [candidate] (247.737 ms) : 0, 247737
AppSec [baseline] (58.159 ms) : 0, 58159
AppSec [candidate] (58.363 ms) : 0, 58363
Remote Config [baseline] (664.21 µs) : 0, 664
Remote Config [candidate] (659.471 µs) : 0, 659
Telemetry [baseline] (8.662 ms) : 0, 8662
Telemetry [candidate] (8.801 ms) : 0, 8801
IAST [baseline] (21.403 ms) : 0, 21403
IAST [candidate] (21.246 ms) : 0, 21246
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (830.841 ms) : 0, 830841
BytebuddyAgent [candidate] (830.575 ms) : 0, 830575
GlobalTracer [baseline] (246.724 ms) : 0, 246724
GlobalTracer [candidate] (246.649 ms) : 0, 246649
AppSec [baseline] (58.037 ms) : 0, 58037
AppSec [candidate] (58.238 ms) : 0, 58238
Remote Config [baseline] (647.269 µs) : 0, 647
Remote Config [candidate] (651.321 µs) : 0, 651
Telemetry [baseline] (8.66 ms) : 0, 8660
Telemetry [candidate] (8.706 ms) : 0, 8706
IAST [baseline] (21.045 ms) : 0, 21045
IAST [candidate] (21.093 ms) : 0, 21093
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (825.066 ms) : 0, 825066
BytebuddyAgent [candidate] (824.183 ms) : 0, 824183
GlobalTracer [baseline] (246.181 ms) : 0, 246181
GlobalTracer [candidate] (245.868 ms) : 0, 245868
AppSec [baseline] (57.807 ms) : 0, 57807
AppSec [candidate] (57.872 ms) : 0, 57872
Remote Config [baseline] (643.876 µs) : 0, 644
Remote Config [candidate] (648.505 µs) : 0, 649
Telemetry [baseline] (8.57 ms) : 0, 8570
Telemetry [candidate] (8.546 ms) : 0, 8546
IAST [baseline] (20.788 ms) : 0, 20788
IAST [candidate] (20.714 ms) : 0, 20714
Loading

Load

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
end_time 2025-01-08T09:42:41 2025-01-08T09:49:39
git_branch master bbujon/dd-trace-ot-cleanup
git_commit_date 1736277396 1736328693
git_commit_sha 54d4a6f a2125e2
release_version 1.45.0-SNAPSHOT~54d4a6f433 1.45.0-SNAPSHOT~a2125e2fba
start_time 2025-01-08T09:42:28 2025-01-08T09:49:26
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1736330132 1736330132
ci_job_id 758073825 758073825
ci_pipeline_id 52414889 52414889
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.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433
    dateFormat X
    axisFormat %s
section baseline
no_agent (379.867 µs) : 360, 399
.   : milestone, 380,
iast (496.216 µs) : 474, 518
.   : milestone, 496,
iast_FULL (652.431 µs) : 631, 674
.   : milestone, 652,
iast_GLOBAL (524.938 µs) : 503, 547
.   : milestone, 525,
iast_HARDCODED_SECRET_DISABLED (494.875 µs) : 473, 517
.   : milestone, 495,
iast_INACTIVE (454.238 µs) : 433, 475
.   : milestone, 454,
iast_TELEMETRY_OFF (482.114 µs) : 461, 504
.   : milestone, 482,
tracing (449.416 µs) : 428, 471
.   : milestone, 449,
section candidate
no_agent (376.68 µs) : 356, 397
.   : milestone, 377,
iast (493.003 µs) : 471, 515
.   : milestone, 493,
iast_FULL (651.299 µs) : 630, 673
.   : milestone, 651,
iast_GLOBAL (522.733 µs) : 501, 544
.   : milestone, 523,
iast_HARDCODED_SECRET_DISABLED (495.334 µs) : 474, 517
.   : milestone, 495,
iast_INACTIVE (453.842 µs) : 433, 475
.   : milestone, 454,
iast_TELEMETRY_OFF (488.006 µs) : 466, 510
.   : milestone, 488,
tracing (450.288 µs) : 430, 471
.   : milestone, 450,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 379.867 µs [360.324 µs, 399.409 µs] -
iast 496.216 µs [474.43 µs, 518.001 µs] 116.349 µs (30.6%)
iast_FULL 652.431 µs [630.644 µs, 674.218 µs] 272.564 µs (71.8%)
iast_GLOBAL 524.938 µs [502.767 µs, 547.109 µs] 145.071 µs (38.2%)
iast_HARDCODED_SECRET_DISABLED 494.875 µs [472.895 µs, 516.856 µs] 115.008 µs (30.3%)
iast_INACTIVE 454.238 µs [433.212 µs, 475.263 µs] 74.371 µs (19.6%)
iast_TELEMETRY_OFF 482.114 µs [460.702 µs, 503.527 µs] 102.247 µs (26.9%)
tracing 449.416 µs [428.181 µs, 470.65 µs] 69.549 µs (18.3%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 376.68 µs [356.266 µs, 397.093 µs] -
iast 493.003 µs [471.384 µs, 514.621 µs] 116.323 µs (30.9%)
iast_FULL 651.299 µs [629.665 µs, 672.933 µs] 274.619 µs (72.9%)
iast_GLOBAL 522.733 µs [501.298 µs, 544.168 µs] 146.053 µs (38.8%)
iast_HARDCODED_SECRET_DISABLED 495.334 µs [473.527 µs, 517.14 µs] 118.654 µs (31.5%)
iast_INACTIVE 453.842 µs [432.605 µs, 475.079 µs] 77.162 µs (20.5%)
iast_TELEMETRY_OFF 488.006 µs [465.616 µs, 510.397 µs] 111.327 µs (29.6%)
tracing 450.288 µs [429.697 µs, 470.88 µs] 73.609 µs (19.5%)
Request duration reports for petclinic
gantt
    title petclinic - request duration [CI 0.99] : candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.346 ms) : 1327, 1365
.   : milestone, 1346,
appsec (1.757 ms) : 1733, 1781
.   : milestone, 1757,
appsec_no_iast (1.736 ms) : 1711, 1760
.   : milestone, 1736,
iast (1.519 ms) : 1495, 1543
.   : milestone, 1519,
profiling (1.517 ms) : 1492, 1541
.   : milestone, 1517,
tracing (1.489 ms) : 1464, 1514
.   : milestone, 1489,
section candidate
no_agent (1.358 ms) : 1338, 1378
.   : milestone, 1358,
appsec (1.748 ms) : 1724, 1771
.   : milestone, 1748,
appsec_no_iast (1.756 ms) : 1732, 1781
.   : milestone, 1756,
iast (1.487 ms) : 1464, 1510
.   : milestone, 1487,
profiling (1.503 ms) : 1479, 1527
.   : milestone, 1503,
tracing (1.496 ms) : 1472, 1520
.   : milestone, 1496,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.346 ms [1.327 ms, 1.365 ms] -
appsec 1.757 ms [1.733 ms, 1.781 ms] 410.995 µs (30.5%)
appsec_no_iast 1.736 ms [1.711 ms, 1.76 ms] 389.785 µs (29.0%)
iast 1.519 ms [1.495 ms, 1.543 ms] 172.935 µs (12.8%)
profiling 1.517 ms [1.492 ms, 1.541 ms] 170.86 µs (12.7%)
tracing 1.489 ms [1.464 ms, 1.514 ms] 143.244 µs (10.6%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.358 ms [1.338 ms, 1.378 ms] -
appsec 1.748 ms [1.724 ms, 1.771 ms] 389.541 µs (28.7%)
appsec_no_iast 1.756 ms [1.732 ms, 1.781 ms] 398.119 µs (29.3%)
iast 1.487 ms [1.464 ms, 1.51 ms] 129.004 µs (9.5%)
profiling 1.503 ms [1.479 ms, 1.527 ms] 144.996 µs (10.7%)
tracing 1.496 ms [1.472 ms, 1.52 ms] 137.482 µs (10.1%)

Dacapo

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
git_branch master bbujon/dd-trace-ot-cleanup
git_commit_date 1736277396 1736328693
git_commit_sha 54d4a6f a2125e2
release_version 1.45.0-SNAPSHOT~54d4a6f433 1.45.0-SNAPSHOT~a2125e2fba
See matching parameters
Baseline Candidate
application biojava biojava
ci_job_date 1736330589 1736330589
ci_job_id 758073826 758073826
ci_pipeline_id 52414889 52414889
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.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.469 ms) : 1457, 1480
.   : milestone, 1469,
appsec (2.36 ms) : 2317, 2403
.   : milestone, 2360,
iast (2.107 ms) : 2053, 2161
.   : milestone, 2107,
iast_GLOBAL (2.142 ms) : 2088, 2196
.   : milestone, 2142,
profiling (1.979 ms) : 1934, 2023
.   : milestone, 1979,
tracing (1.941 ms) : 1899, 1982
.   : milestone, 1941,
section candidate
no_agent (1.469 ms) : 1457, 1480
.   : milestone, 1469,
appsec (2.352 ms) : 2309, 2394
.   : milestone, 2352,
iast (2.092 ms) : 2038, 2146
.   : milestone, 2092,
iast_GLOBAL (2.155 ms) : 2100, 2210
.   : milestone, 2155,
profiling (1.954 ms) : 1911, 1997
.   : milestone, 1954,
tracing (1.936 ms) : 1894, 1977
.   : milestone, 1936,
Loading
  • baseline results
Variant Execution Time [CI 0.99] Δ no_agent
no_agent 1.469 ms [1.457 ms, 1.48 ms] -
appsec 2.36 ms [2.317 ms, 2.403 ms] 891.056 µs (60.7%)
iast 2.107 ms [2.053 ms, 2.161 ms] 638.584 µs (43.5%)
iast_GLOBAL 2.142 ms [2.088 ms, 2.196 ms] 673.199 µs (45.8%)
profiling 1.979 ms [1.934 ms, 2.023 ms] 509.778 µs (34.7%)
tracing 1.941 ms [1.899 ms, 1.982 ms] 472.045 µs (32.1%)
  • candidate results
Variant Execution Time [CI 0.99] Δ no_agent
no_agent 1.469 ms [1.457 ms, 1.48 ms] -
appsec 2.352 ms [2.309 ms, 2.394 ms] 883.034 µs (60.1%)
iast 2.092 ms [2.038 ms, 2.146 ms] 623.604 µs (42.5%)
iast_GLOBAL 2.155 ms [2.1 ms, 2.21 ms] 686.324 µs (46.7%)
profiling 1.954 ms [1.911 ms, 1.997 ms] 485.548 µs (33.1%)
tracing 1.936 ms [1.894 ms, 1.977 ms] 467.142 µs (31.8%)
Execution time for biojava
gantt
    title biojava - execution time [CI 0.99] : candidate=1.45.0-SNAPSHOT~a2125e2fba, baseline=1.45.0-SNAPSHOT~54d4a6f433
    dateFormat X
    axisFormat %s
section baseline
no_agent (14.962 s) : 14962000, 14962000
.   : milestone, 14962000,
appsec (15.107 s) : 15107000, 15107000
.   : milestone, 15107000,
iast (18.63 s) : 18630000, 18630000
.   : milestone, 18630000,
iast_GLOBAL (17.592 s) : 17592000, 17592000
.   : milestone, 17592000,
profiling (15.168 s) : 15168000, 15168000
.   : milestone, 15168000,
tracing (15.188 s) : 15188000, 15188000
.   : milestone, 15188000,
section candidate
no_agent (15.164 s) : 15164000, 15164000
.   : milestone, 15164000,
appsec (14.834 s) : 14834000, 14834000
.   : milestone, 14834000,
iast (18.097 s) : 18097000, 18097000
.   : milestone, 18097000,
iast_GLOBAL (18.0 s) : 18000000, 18000000
.   : milestone, 18000000,
profiling (15.029 s) : 15029000, 15029000
.   : milestone, 15029000,
tracing (14.841 s) : 14841000, 14841000
.   : milestone, 14841000,
Loading
  • baseline results
Variant Execution Time [CI 0.99] Δ no_agent
no_agent 14.962 s [14.962 s, 14.962 s] -
appsec 15.107 s [15.107 s, 15.107 s] 145.0 ms (1.0%)
iast 18.63 s [18.63 s, 18.63 s] 3.668 s (24.5%)
iast_GLOBAL 17.592 s [17.592 s, 17.592 s] 2.63 s (17.6%)
profiling 15.168 s [15.168 s, 15.168 s] 206.0 ms (1.4%)
tracing 15.188 s [15.188 s, 15.188 s] 226.0 ms (1.5%)
  • candidate results
Variant Execution Time [CI 0.99] Δ no_agent
no_agent 15.164 s [15.164 s, 15.164 s] -
appsec 14.834 s [14.834 s, 14.834 s] -330.0 ms (-2.2%)
iast 18.097 s [18.097 s, 18.097 s] 2.933 s (19.3%)
iast_GLOBAL 18.0 s [18.0 s, 18.0 s] 2.836 s (18.7%)
profiling 15.029 s [15.029 s, 15.029 s] -135.0 ms (-0.9%)
tracing 14.841 s [14.841 s, 14.841 s] -323.0 ms (-2.1%)

!spanFinished(span3)

when:
// 'next3' should time out & finish after 1s
conditions.eventually { assert spanFinished(span3) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason for removing this test assertion?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the OT CustomScopeManager wrapper does not exactly have the same clean up mechanism than the DD ContinuableScopeManager. The OT one does not check current depth so it schedules the clean up for every span, including the nested ones (here span3), while the DD one only enables it for the local root span.

Removing this assertion allows to fall through the scope0.close() / span0.finish() and trigger the clean of span3.

@PerfectSlayer PerfectSlayer force-pushed the bbujon/dd-trace-ot-cleanup branch from c123841 to ef36dc7 Compare January 8, 2025 08:53
@PerfectSlayer PerfectSlayer force-pushed the bbujon/dd-trace-ot-cleanup branch from ef36dc7 to d6d6049 Compare January 8, 2025 08:56
@DataDog DataDog deleted a comment from github-actions bot Jan 8, 2025
@PerfectSlayer PerfectSlayer merged commit 4905729 into master Jan 8, 2025
147 of 149 checks passed
@PerfectSlayer PerfectSlayer deleted the bbujon/dd-trace-ot-cleanup branch January 8, 2025 10:12
@github-actions github-actions bot added this to the 1.45.0 milestone Jan 8, 2025
@PerfectSlayer PerfectSlayer added the tag: breaking change Breaking changes label Jan 8, 2025
svc-squareup-copybara pushed a commit to cashapp/misk that referenced this pull request Jan 9, 2025
| Package | Type | Package file | Manager | Update | Change |
|---|---|---|---|---|---|
|
[com.google.api.grpc:proto-google-common-protos](https://github.com/googleapis/sdk-platform-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.50.0` -> `2.50.1` |
|
[com.google.cloud:google-cloud-core-http](https://github.com/googleapis/sdk-platform-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.49.0` -> `2.49.1` |
|
[com.google.cloud:google-cloud-core](https://github.com/googleapis/sdk-platform-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.49.0` -> `2.49.1` |
| [com.google.api:gax](https://github.com/googleapis/sdk-platform-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.59.0` -> `2.59.1` |
| [com.datadoghq:dd-trace-api](https://github.com/datadog/dd-trace-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | minor |
`1.44.1` -> `1.45.0` |
| [com.datadoghq:dd-trace-ot](https://github.com/datadog/dd-trace-java)
| dependencies | misk/gradle/libs.versions.toml | gradle | minor |
`1.44.1` -> `1.45.0` |
| [software.amazon.awssdk:sdk-core](https://aws.amazon.com/sdkforjava) |
dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |
|
[software.amazon.awssdk:dynamodb-enhanced](https://aws.amazon.com/sdkforjava)
| dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |
| [software.amazon.awssdk:dynamodb](https://aws.amazon.com/sdkforjava) |
dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |
| [software.amazon.awssdk:aws-core](https://aws.amazon.com/sdkforjava) |
dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |
| [software.amazon.awssdk:bom](https://aws.amazon.com/sdkforjava) |
dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |
| [software.amazon.awssdk:auth](https://aws.amazon.com/sdkforjava) |
dependencies | misk/gradle/libs.versions.toml | gradle | patch |
`2.29.47` -> `2.29.48` |

---

### Release Notes

<details>
<summary>datadog/dd-trace-java (com.datadoghq:dd-trace-api)</summary>

###
[`v1.45.0`](https://github.com/DataDog/dd-trace-java/releases/tag/v1.45.0):
1.45.0

##### Breaking changes

> \[!WARNING]\
> Support for custom scope manager using OpenTelemetry tracer artifact
(`dd-trace-ot`) is dropped.
> Tracing with OpenTracing API and custom scope manager will continue to
work on 1.44.x releases.

##### Components

##### Application Security Management (IAST)

- ✨ Add propagation to URI#toURL method
([#&#8203;8146](DataDog/dd-trace-java#8146) -
[@&#8203;manuel-alvarez-alvarez](https://github.com/manuel-alvarez-alvarez))
- ✨ Increase IAST propagation to StringBuilder setLength
([#&#8203;8119](DataDog/dd-trace-java#8119) -
[@&#8203;Mariovido](https://github.com/Mariovido))
- ✨ Increase IAST propagation to StringBuffer append
([#&#8203;8082](DataDog/dd-trace-java#8082) -
[@&#8203;Mariovido](https://github.com/Mariovido))
- ✨ Handle IAST security controls custom validation and
sanitization methods
([#&#8203;7997](DataDog/dd-trace-java#7997) -
[@&#8203;jandro996](https://github.com/jandro996))

##### Application Security Management (WAF)

- ✨ Update user lifecycle tracking to V3
([#&#8203;8108](DataDog/dd-trace-java#8108) -
[@&#8203;manuel-alvarez-alvarez](https://github.com/manuel-alvarez-alvarez))
- ✨ Exploit prevention for Shell Injection / Command Injection
([#&#8203;7615](DataDog/dd-trace-java#7615) -
[@&#8203;jandro996](https://github.com/jandro996))

##### Build & Tooling

- 💡 Support instrumentation of repackaged libraries
([#&#8203;8153](DataDog/dd-trace-java#8153) -
[@&#8203;mcculls](https://github.com/mcculls))
- ✨ Configure native image build setting for JDK-22 based
GraalVM
([#&#8203;8092](DataDog/dd-trace-java#8092) -
[@&#8203;MattAlp](https://github.com/MattAlp))

##### Database Monitoring

- ✨ Add full APM/DBM mode for Oracle
([#&#8203;8090](DataDog/dd-trace-java#8090) -
[@&#8203;nenadnoveljic](https://github.com/nenadnoveljic))

##### Dynamic Instrumentation

- 🐛 make local var hoisting disabled by default
([#&#8203;8158](DataDog/dd-trace-java#8158) -
[@&#8203;jpbempel](https://github.com/jpbempel))
- 🐛 Fix var hoisting issue when no previous store
([#&#8203;8122](DataDog/dd-trace-java#8122) -
[@&#8203;jpbempel](https://github.com/jpbempel))
- ✨ Only decorate spans without code origin information
([#&#8203;8105](DataDog/dd-trace-java#8105) -
[@&#8203;evanchooly](https://github.com/evanchooly))
- 🐛 Fix suspend Kotlin methods instrumentation
([#&#8203;8080](DataDog/dd-trace-java#8080) -
[@&#8203;jpbempel](https://github.com/jpbempel))
- 🐛 Fix class file version detection
([#&#8203;8057](DataDog/dd-trace-java#8057) -
[@&#8203;jpbempel](https://github.com/jpbempel))

##### GraalVM native-image

- ✨ Configure native image build setting for JDK-22 based
GraalVM
([#&#8203;8092](DataDog/dd-trace-java#8092) -
[@&#8203;MattAlp](https://github.com/MattAlp))

##### ML Observability (LLMObs)

- ✨🧪 Add LLMObs configuration
([#&#8203;8076](DataDog/dd-trace-java#8076) -
[@&#8203;gary-huang](https://github.com/gary-huang))

##### Metrics

- Bump integrations-core submodule to 7.60.0
([#&#8203;8098](DataDog/dd-trace-java#8098) -
[@&#8203;mcculls](https://github.com/mcculls))
- Upgrade to java-dogstatsd-client v4.4.3
([#&#8203;8096](DataDog/dd-trace-java#8096) -
[@&#8203;mcculls](https://github.com/mcculls))

##### OpenTracing

- ⚠️🧹 Remove custom scope manager support
([#&#8203;8164](DataDog/dd-trace-java#8164) -
[@&#8203;PerfectSlayer](https://github.com/PerfectSlayer))

##### Telemetry

- ✨ Retry telemetry requests if CI Visibility is enabled
([#&#8203;8147](DataDog/dd-trace-java#8147) -
[@&#8203;nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog))
- ✨ Add configurable Dependency service resolution period
([#&#8203;8079](DataDog/dd-trace-java#8079) -
[@&#8203;jandro996](https://github.com/jandro996))

##### Testing

- 🐛 Remove restriction to not run vertx4 latest tests on java 17
([#&#8203;8133](DataDog/dd-trace-java#8133) -
[@&#8203;vandonr](https://github.com/vandonr))

##### Tracer core

- ✨ Defer remote components to avoid OkHttp class-loading
side-effects
([#&#8203;8131](DataDog/dd-trace-java#8131) -
[@&#8203;mcculls](https://github.com/mcculls))
- ✨ Improve Context API null handling and Javadoc
([#&#8203;8129](DataDog/dd-trace-java#8129) -
[@&#8203;PerfectSlayer](https://github.com/PerfectSlayer))
- 🐛⚡ Avoid performing blocking I/O operation on application
thread
([#&#8203;8120](DataDog/dd-trace-java#8120) -
[@&#8203;mcculls](https://github.com/mcculls))
- 💡 Introduce a shared context component, independent of tracing
([#&#8203;8117](DataDog/dd-trace-java#8117) -
[@&#8203;mcculls](https://github.com/mcculls))
- ✨ Improves ServiceNameCollector
([#&#8203;8109](DataDog/dd-trace-java#8109) -
[@&#8203;amarziali](https://github.com/amarziali))
- Upgrade to ASM 9.7.1 (adds new constant for Java 24)
([#&#8203;8097](DataDog/dd-trace-java#8097) -
[@&#8203;mcculls](https://github.com/mcculls))
- 🐛 Dynamically evaluate service name for message consumers
([#&#8203;8088](DataDog/dd-trace-java#8088) -
[@&#8203;amarziali](https://github.com/amarziali))

##### Serverless

- 🐛 Add avoid double instrumenting lambda non-streaming handlers.
([#&#8203;8073](DataDog/dd-trace-java#8073) -
[@&#8203;purple4reina](https://github.com/purple4reina))

##### Instrumentations

##### AWS SDK instrumentation

- 💡 Instrument EMR's relocated AWS SDK
([#&#8203;8157](DataDog/dd-trace-java#8157) -
[@&#8203;mcculls](https://github.com/mcculls))

##### Eclipse Vert.x instrumentation

- 🐛 Remove restriction to not run vertx4 latest tests on java 17
([#&#8203;8133](DataDog/dd-trace-java#8133) -
[@&#8203;vandonr](https://github.com/vandonr))

##### JDBC instrumentation

- ✨ Add full APM/DBM mode for Oracle
([#&#8203;8090](DataDog/dd-trace-java#8090) -
[@&#8203;nenadnoveljic](https://github.com/nenadnoveljic))

##### Jetty instrumentation

- 🐛 Ensure jetty 12 has servlet.path starting with /
([#&#8203;8093](DataDog/dd-trace-java#8093) -
[@&#8203;github-actions](https://github.com/github-actions)\[bot])

##### JMS instrumentation

- 🧹 Re-use `javax` JMS module for `jakarta` namespace
([#&#8203;8155](DataDog/dd-trace-java#8155) -
[@&#8203;mcculls](https://github.com/mcculls))
- 🧹 Group `javax.jms` instrumentations under a single module
([#&#8203;8154](DataDog/dd-trace-java#8154) -
[@&#8203;mcculls](https://github.com/mcculls))

##### Reactor instrumentation

- 🐛 Reactor: early propagate span in context when subscribing
([#&#8203;8166](DataDog/dd-trace-java#8166) -
[@&#8203;amarziali](https://github.com/amarziali))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 6pm every weekday,before 2am
every weekday" in timezone Australia/Melbourne, Automerge - At any time
(no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

GitOrigin-RevId: ba2355aa4e2e39ab1fee27319cc4176238efd90b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants