Use W3C Trace Context trace ID as parent ID regardless of propagation style order #7355

mtoffl01 · 2024-07-23T21:08:52Z

What Does This Do

If multiple trace contexts are extracted from trace headers, and they share the same trace ID but different span IDs, then we use the span ID found in the traceparent header to overwrite the span ID found in the other context. Also, set _dd.parent_id metadata on the span context using the p key in tracestate. If not present, set _dd.parent_id metadata using the x-datadog-parent-id header.

Also removes checks and references to p=0000000000000000 in tracestate header, as we do not need to explicitly handle this case.

Motivation

Improves support for w3c propagation.

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]

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java

pr-commenter · 2024-07-23T21:50:34Z

Benchmarks

Startup

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
git_branch	master	mtoff/w3c-phase-3
git_commit_date	1724404909	1724405035
git_commit_sha	`1efda00`	`1d63cae`
release_version	1.39.0-SNAPSHOT~1efda00b65	1.39.0-SNAPSHOT~1d63caec9c

See matching parameters

	Baseline	Candidate
application	insecure-bank	insecure-bank
ci_job_date	1724408235	1724408235
ci_job_id	614990709	614990709
ci_pipeline_id	42664186	42664186
cpu_model	Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8175M 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 45 metrics, 18 unstable metrics.

Startup time reports for petclinic

gantt
    title petclinic - global startup overhead: candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.549 s) : 0, 1548882
Total [baseline] (14.186 s) : 0, 14186202
Agent [candidate] (1.548 s) : 0, 1548436
Total [candidate] (14.304 s) : 0, 14303926
section appsec
Agent [baseline] (1.732 s) : 0, 1731839
Total [baseline] (14.411 s) : 0, 14410863
Agent [candidate] (1.738 s) : 0, 1737788
Total [candidate] (14.537 s) : 0, 14536991
section iast
Agent [baseline] (1.725 s) : 0, 1725128
Total [baseline] (14.992 s) : 0, 14992473
Agent [candidate] (1.74 s) : 0, 1739808
Total [candidate] (14.856 s) : 0, 14856022
section profiling
Agent [baseline] (1.855 s) : 0, 1855055
Total [baseline] (14.634 s) : 0, 14633777
Agent [candidate] (1.868 s) : 0, 1868449
Total [candidate] (14.578 s) : 0, 14577749

baseline results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.549 s	-
Agent	appsec	1.732 s	182.957 ms (11.8%)
Agent	iast	1.725 s	176.246 ms (11.4%)
Agent	profiling	1.855 s	306.173 ms (19.8%)
Total	tracing	14.186 s	-
Total	appsec	14.411 s	224.661 ms (1.6%)
Total	iast	14.992 s	806.271 ms (5.7%)
Total	profiling	14.634 s	447.575 ms (3.2%)

candidate results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.548 s	-
Agent	appsec	1.738 s	189.352 ms (12.2%)
Agent	iast	1.74 s	191.372 ms (12.4%)
Agent	profiling	1.868 s	320.013 ms (20.7%)
Total	tracing	14.304 s	-
Total	appsec	14.537 s	233.065 ms (1.6%)
Total	iast	14.856 s	552.096 ms (3.9%)
Total	profiling	14.578 s	273.823 ms (1.9%)

gantt
    title petclinic - break down per module: candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (992.184 ms) : 0, 992184
BytebuddyAgent [candidate] (991.741 ms) : 0, 991741
GlobalTracer [baseline] (453.579 ms) : 0, 453579
GlobalTracer [candidate] (453.569 ms) : 0, 453569
AppSec [baseline] (72.46 ms) : 0, 72460
AppSec [candidate] (72.405 ms) : 0, 72405
Remote Config [baseline] (823.14 µs) : 0, 823
Remote Config [candidate] (828.92 µs) : 0, 829
Telemetry [baseline] (9.826 ms) : 0, 9826
Telemetry [candidate] (9.841 ms) : 0, 9841
section appsec
BytebuddyAgent [baseline] (1.008 s) : 0, 1007566
BytebuddyAgent [candidate] (1.011 s) : 0, 1010547
GlobalTracer [baseline] (446.308 ms) : 0, 446308
GlobalTracer [candidate] (447.294 ms) : 0, 447294
AppSec [baseline] (235.109 ms) : 0, 235109
AppSec [candidate] (235.477 ms) : 0, 235477
IAST [baseline] (25.289 ms) : 0, 25289
IAST [candidate] (26.777 ms) : 0, 26777
Remote Config [baseline] (749.68 µs) : 0, 750
Remote Config [candidate] (756.304 µs) : 0, 756
Telemetry [baseline] (9.5 ms) : 0, 9500
Telemetry [candidate] (10.234 ms) : 0, 10234
section iast
BytebuddyAgent [baseline] (1.154 s) : 0, 1153732
BytebuddyAgent [candidate] (1.163 s) : 0, 1163275
GlobalTracer [baseline] (437.137 ms) : 0, 437137
GlobalTracer [candidate] (440.356 ms) : 0, 440356
AppSec [baseline] (73.984 ms) : 0, 73984
AppSec [candidate] (73.919 ms) : 0, 73919
IAST [baseline] (29.327 ms) : 0, 29327
IAST [candidate] (30.034 ms) : 0, 30034
Remote Config [baseline] (751.896 µs) : 0, 752
Remote Config [candidate] (777.97 µs) : 0, 778
Telemetry [baseline] (10.095 ms) : 0, 10095
Telemetry [candidate] (11.144 ms) : 0, 11144
section profiling
BytebuddyAgent [baseline] (984.764 ms) : 0, 984764
BytebuddyAgent [candidate] (990.021 ms) : 0, 990021
GlobalTracer [baseline] (583.574 ms) : 0, 583574
GlobalTracer [candidate] (585.769 ms) : 0, 585769
AppSec [baseline] (73.344 ms) : 0, 73344
AppSec [candidate] (73.859 ms) : 0, 73859
Remote Config [baseline] (882.074 µs) : 0, 882
Remote Config [candidate] (898.922 µs) : 0, 899
Telemetry [baseline] (9.368 ms) : 0, 9368
Telemetry [candidate] (9.472 ms) : 0, 9472
ProfilingAgent [baseline] (147.431 ms) : 0, 147431
ProfilingAgent [candidate] (152.38 ms) : 0, 152380
Profiling [baseline] (147.504 ms) : 0, 147504
Profiling [candidate] (152.454 ms) : 0, 152454

Startup time reports for insecure-bank

gantt
    title insecure-bank - global startup overhead: candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.55 s) : 0, 1550095
Total [baseline] (11.821 s) : 0, 11820981
Agent [candidate] (1.549 s) : 0, 1549297
Total [candidate] (11.845 s) : 0, 11845226
section iast
Agent [baseline] (1.719 s) : 0, 1718506
Total [baseline] (12.487 s) : 0, 12486755
Agent [candidate] (1.724 s) : 0, 1724183
Total [candidate] (12.532 s) : 0, 12532041
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.722 s) : 0, 1722481
Total [baseline] (12.462 s) : 0, 12462423
Agent [candidate] (1.719 s) : 0, 1718952
Total [candidate] (12.525 s) : 0, 12524854
section iast_TELEMETRY_OFF
Agent [baseline] (1.712 s) : 0, 1711803
Total [baseline] (12.502 s) : 0, 12501507
Agent [candidate] (1.711 s) : 0, 1711012
Total [candidate] (12.508 s) : 0, 12507578

baseline results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.55 s	-
Agent	iast	1.719 s	168.411 ms (10.9%)
Agent	iast_HARDCODED_SECRET_DISABLED	1.722 s	172.386 ms (11.1%)
Agent	iast_TELEMETRY_OFF	1.712 s	161.708 ms (10.4%)
Total	tracing	11.821 s	-
Total	iast	12.487 s	665.774 ms (5.6%)
Total	iast_HARDCODED_SECRET_DISABLED	12.462 s	641.443 ms (5.4%)
Total	iast_TELEMETRY_OFF	12.502 s	680.526 ms (5.8%)

candidate results

Module	Variant	Duration	Δ tracing
Agent	tracing	1.549 s	-
Agent	iast	1.724 s	174.886 ms (11.3%)
Agent	iast_HARDCODED_SECRET_DISABLED	1.719 s	169.655 ms (11.0%)
Agent	iast_TELEMETRY_OFF	1.711 s	161.715 ms (10.4%)
Total	tracing	11.845 s	-
Total	iast	12.532 s	686.815 ms (5.8%)
Total	iast_HARDCODED_SECRET_DISABLED	12.525 s	679.629 ms (5.7%)
Total	iast_TELEMETRY_OFF	12.508 s	662.352 ms (5.6%)

gantt
    title insecure-bank - break down per module: candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (992.868 ms) : 0, 992868
BytebuddyAgent [candidate] (992.496 ms) : 0, 992496
GlobalTracer [baseline] (454.089 ms) : 0, 454089
GlobalTracer [candidate] (453.398 ms) : 0, 453398
AppSec [baseline] (72.416 ms) : 0, 72416
AppSec [candidate] (72.578 ms) : 0, 72578
Remote Config [baseline] (828.879 µs) : 0, 829
Remote Config [candidate] (833.184 µs) : 0, 833
Telemetry [baseline] (9.841 ms) : 0, 9841
Telemetry [candidate] (9.898 ms) : 0, 9898
section iast
BytebuddyAgent [baseline] (1.15 s) : 0, 1150247
BytebuddyAgent [candidate] (1.153 s) : 0, 1153169
GlobalTracer [baseline] (435.104 ms) : 0, 435104
GlobalTracer [candidate] (437.291 ms) : 0, 437291
AppSec [baseline] (72.582 ms) : 0, 72582
AppSec [candidate] (71.496 ms) : 0, 71496
IAST [baseline] (29.901 ms) : 0, 29901
IAST [candidate] (29.488 ms) : 0, 29488
Remote Config [baseline] (726.711 µs) : 0, 727
Remote Config [candidate] (768.742 µs) : 0, 769
Telemetry [baseline] (9.879 ms) : 0, 9879
Telemetry [candidate] (11.828 ms) : 0, 11828
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (1.151 s) : 0, 1151175
BytebuddyAgent [candidate] (1.149 s) : 0, 1148624
GlobalTracer [baseline] (437.094 ms) : 0, 437094
GlobalTracer [candidate] (436.095 ms) : 0, 436095
AppSec [baseline] (75.948 ms) : 0, 75948
AppSec [candidate] (73.16 ms) : 0, 73160
IAST [baseline] (28.239 ms) : 0, 28239
IAST [candidate] (30.114 ms) : 0, 30114
Remote Config [baseline] (732.619 µs) : 0, 733
Remote Config [candidate] (749.868 µs) : 0, 750
Telemetry [baseline] (9.195 ms) : 0, 9195
Telemetry [candidate] (10.042 ms) : 0, 10042
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (1.144 s) : 0, 1143788
BytebuddyAgent [candidate] (1.143 s) : 0, 1143477
GlobalTracer [baseline] (435.12 ms) : 0, 435120
GlobalTracer [candidate] (434.671 ms) : 0, 434671
AppSec [baseline] (70.861 ms) : 0, 70861
AppSec [candidate] (70.924 ms) : 0, 70924
IAST [baseline] (29.527 ms) : 0, 29527
IAST [candidate] (30.334 ms) : 0, 30334
Remote Config [baseline] (728.411 µs) : 0, 728
Remote Config [candidate] (762.194 µs) : 0, 762
Telemetry [baseline] (11.729 ms) : 0, 11729
Telemetry [candidate] (10.747 ms) : 0, 10747

Load

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
end_time	2024-08-23T09:36:44	2024-08-23T09:45:42
git_branch	master	mtoff/w3c-phase-3
git_commit_date	1724404909	1724405035
git_commit_sha	`1efda00`	`1d63cae`
release_version	1.39.0-SNAPSHOT~1efda00b65	1.39.0-SNAPSHOT~1d63caec9c
start_time	2024-08-23T09:36:28	2024-08-23T09:45:26

See matching parameters

	Baseline	Candidate
application	insecure-bank	insecure-bank
ci_job_date	1724406798	1724406798
ci_job_id	614990712	614990712
ci_pipeline_id	42664186	42664186
cpu_model	Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz
variant	iast	iast

Summary

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

Request duration reports for petclinic

gantt
    title petclinic - request duration [CI 0.99] : candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.721 ms) : 1696, 1746
.   : milestone, 1721,
appsec (2.189 ms) : 2158, 2220
.   : milestone, 2189,
appsec_no_iast (2.164 ms) : 2132, 2196
.   : milestone, 2164,
iast (1.865 ms) : 1836, 1894
.   : milestone, 1865,
profiling (1.922 ms) : 1887, 1958
.   : milestone, 1922,
tracing (1.866 ms) : 1834, 1898
.   : milestone, 1866,
section candidate
no_agent (1.705 ms) : 1679, 1731
.   : milestone, 1705,
appsec (2.17 ms) : 2137, 2202
.   : milestone, 2170,
appsec_no_iast (2.174 ms) : 2140, 2208
.   : milestone, 2174,
iast (1.827 ms) : 1797, 1856
.   : milestone, 1827,
profiling (1.978 ms) : 1941, 2015
.   : milestone, 1978,
tracing (1.896 ms) : 1864, 1927
.   : milestone, 1896,

baseline results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	1.721 ms [1.696 ms, 1.746 ms]	-
appsec	2.189 ms [2.158 ms, 2.22 ms]	468.037 µs (27.2%)
appsec_no_iast	2.164 ms [2.132 ms, 2.196 ms]	443.337 µs (25.8%)
iast	1.865 ms [1.836 ms, 1.894 ms]	144.114 µs (8.4%)
profiling	1.922 ms [1.887 ms, 1.958 ms]	201.538 µs (11.7%)
tracing	1.866 ms [1.834 ms, 1.898 ms]	144.723 µs (8.4%)

candidate results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	1.705 ms [1.679 ms, 1.731 ms]	-
appsec	2.17 ms [2.137 ms, 2.202 ms]	464.565 µs (27.2%)
appsec_no_iast	2.174 ms [2.14 ms, 2.208 ms]	468.658 µs (27.5%)
iast	1.827 ms [1.797 ms, 1.856 ms]	121.685 µs (7.1%)
profiling	1.978 ms [1.941 ms, 2.015 ms]	272.926 µs (16.0%)
tracing	1.896 ms [1.864 ms, 1.927 ms]	190.518 µs (11.2%)

Request duration reports for insecure-bank

gantt
    title insecure-bank - request duration [CI 0.99] : candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65
    dateFormat X
    axisFormat %s
section baseline
no_agent (450.886 µs) : 422, 480
.   : milestone, 451,
iast (583.108 µs) : 550, 616
.   : milestone, 583,
iast_FULL (683.876 µs) : 651, 717
.   : milestone, 684,
iast_GLOBAL (605.442 µs) : 572, 639
.   : milestone, 605,
iast_HARDCODED_SECRET_DISABLED (581.596 µs) : 549, 614
.   : milestone, 582,
iast_INACTIVE (541.206 µs) : 510, 572
.   : milestone, 541,
iast_TELEMETRY_OFF (567.591 µs) : 535, 600
.   : milestone, 568,
tracing (531.462 µs) : 502, 561
.   : milestone, 531,
section candidate
no_agent (447.055 µs) : 419, 476
.   : milestone, 447,
iast (582.481 µs) : 550, 615
.   : milestone, 582,
iast_FULL (676.751 µs) : 644, 710
.   : milestone, 677,
iast_GLOBAL (606.888 µs) : 574, 640
.   : milestone, 607,
iast_HARDCODED_SECRET_DISABLED (581.8 µs) : 549, 614
.   : milestone, 582,
iast_INACTIVE (536.851 µs) : 507, 567
.   : milestone, 537,
iast_TELEMETRY_OFF (571.747 µs) : 541, 603
.   : milestone, 572,
tracing (531.206 µs) : 501, 561
.   : milestone, 531,

baseline results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	450.886 µs [421.969 µs, 479.803 µs]	-
iast	583.108 µs [549.917 µs, 616.3 µs]	132.223 µs (29.3%)
iast_FULL	683.876 µs [650.757 µs, 716.996 µs]	232.99 µs (51.7%)
iast_GLOBAL	605.442 µs [572.223 µs, 638.66 µs]	154.556 µs (34.3%)
iast_HARDCODED_SECRET_DISABLED	581.596 µs [548.814 µs, 614.378 µs]	130.71 µs (29.0%)
iast_INACTIVE	541.206 µs [510.445 µs, 571.967 µs]	90.32 µs (20.0%)
iast_TELEMETRY_OFF	567.591 µs [534.824 µs, 600.359 µs]	116.705 µs (25.9%)
tracing	531.462 µs [501.542 µs, 561.382 µs]	80.576 µs (17.9%)

candidate results

Variant	Request duration [CI 0.99]	Δ no_agent
no_agent	447.055 µs [418.584 µs, 475.526 µs]	-
iast	582.481 µs [549.999 µs, 614.963 µs]	135.425 µs (30.3%)
iast_FULL	676.751 µs [643.771 µs, 709.732 µs]	229.696 µs (51.4%)
iast_GLOBAL	606.888 µs [573.802 µs, 639.974 µs]	159.833 µs (35.8%)
iast_HARDCODED_SECRET_DISABLED	581.8 µs [549.144 µs, 614.456 µs]	134.744 µs (30.1%)
iast_INACTIVE	536.851 µs [506.718 µs, 566.984 µs]	89.796 µs (20.1%)
iast_TELEMETRY_OFF	571.747 µs [540.616 µs, 602.877 µs]	124.691 µs (27.9%)
tracing	531.206 µs [501.37 µs, 561.042 µs]	84.15 µs (18.8%)

Dacapo

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
git_branch	master	mtoff/w3c-phase-3
git_commit_date	1724404909	1724405035
git_commit_sha	`1efda00`	`1d63cae`
release_version	1.39.0-SNAPSHOT~1efda00b65	1.39.0-SNAPSHOT~1d63caec9c

See matching parameters

	Baseline	Candidate
application	biojava	biojava
ci_job_date	1724407611	1724407611
ci_job_id	614990715	614990715
ci_pipeline_id	42664186	42664186
cpu_model	Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8175M 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.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.537 ms) : 1524, 1549
.   : milestone, 1537,
appsec (2.698 ms) : 2637, 2759
.   : milestone, 2698,
iast (2.363 ms) : 2290, 2436
.   : milestone, 2363,
iast_GLOBAL (2.448 ms) : 2372, 2524
.   : milestone, 2448,
profiling (2.221 ms) : 2159, 2282
.   : milestone, 2221,
tracing (2.194 ms) : 2135, 2254
.   : milestone, 2194,
section candidate
no_agent (1.54 ms) : 1527, 1553
.   : milestone, 1540,
appsec (2.707 ms) : 2645, 2769
.   : milestone, 2707,
iast (2.383 ms) : 2309, 2458
.   : milestone, 2383,
iast_GLOBAL (2.433 ms) : 2358, 2508
.   : milestone, 2433,
profiling (2.232 ms) : 2170, 2295
.   : milestone, 2232,
tracing (2.196 ms) : 2136, 2256
.   : milestone, 2196,

baseline results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	1.537 ms [1.524 ms, 1.549 ms]	-
appsec	2.698 ms [2.637 ms, 2.759 ms]	1.161 ms (75.6%)
iast	2.363 ms [2.29 ms, 2.436 ms]	826.27 µs (53.8%)
iast_GLOBAL	2.448 ms [2.372 ms, 2.524 ms]	911.323 µs (59.3%)
profiling	2.221 ms [2.159 ms, 2.282 ms]	684.13 µs (44.5%)
tracing	2.194 ms [2.135 ms, 2.254 ms]	657.788 µs (42.8%)

candidate results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	1.54 ms [1.527 ms, 1.553 ms]	-
appsec	2.707 ms [2.645 ms, 2.769 ms]	1.167 ms (75.8%)
iast	2.383 ms [2.309 ms, 2.458 ms]	843.173 µs (54.7%)
iast_GLOBAL	2.433 ms [2.358 ms, 2.508 ms]	893.201 µs (58.0%)
profiling	2.232 ms [2.17 ms, 2.295 ms]	692.297 µs (45.0%)
tracing	2.196 ms [2.136 ms, 2.256 ms]	655.739 µs (42.6%)

Execution time for biojava

gantt
    title biojava - execution time [CI 0.99] : candidate=1.39.0-SNAPSHOT~1d63caec9c, baseline=1.39.0-SNAPSHOT~1efda00b65
    dateFormat X
    axisFormat %s
section baseline
no_agent (20.698 s) : 20698000, 20698000
.   : milestone, 20698000,
appsec (21.178 s) : 21178000, 21178000
.   : milestone, 21178000,
iast (24.761 s) : 24761000, 24761000
.   : milestone, 24761000,
iast_GLOBAL (24.502 s) : 24502000, 24502000
.   : milestone, 24502000,
profiling (20.924 s) : 20924000, 20924000
.   : milestone, 20924000,
tracing (21.06 s) : 21060000, 21060000
.   : milestone, 21060000,
section candidate
no_agent (21.175 s) : 21175000, 21175000
.   : milestone, 21175000,
appsec (21.489 s) : 21489000, 21489000
.   : milestone, 21489000,
iast (25.507 s) : 25507000, 25507000
.   : milestone, 25507000,
iast_GLOBAL (24.954 s) : 24954000, 24954000
.   : milestone, 24954000,
profiling (20.937 s) : 20937000, 20937000
.   : milestone, 20937000,
tracing (21.656 s) : 21656000, 21656000
.   : milestone, 21656000,

baseline results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	20.698 s [20.698 s, 20.698 s]	-
appsec	21.178 s [21.178 s, 21.178 s]	480.0 ms (2.3%)
iast	24.761 s [24.761 s, 24.761 s]	4.063 s (19.6%)
iast_GLOBAL	24.502 s [24.502 s, 24.502 s]	3.804 s (18.4%)
profiling	20.924 s [20.924 s, 20.924 s]	226.0 ms (1.1%)
tracing	21.06 s [21.06 s, 21.06 s]	362.0 ms (1.7%)

candidate results

Variant	Execution Time [CI 0.99]	Δ no_agent
no_agent	21.175 s [21.175 s, 21.175 s]	-
appsec	21.489 s [21.489 s, 21.489 s]	314.0 ms (1.5%)
iast	25.507 s [25.507 s, 25.507 s]	4.332 s (20.5%)
iast_GLOBAL	24.954 s [24.954 s, 24.954 s]	3.779 s (17.8%)
profiling	20.937 s [20.937 s, 20.937 s]	-238.0 ms (-1.1%)
tracing	21.656 s [21.656 s, 21.656 s]	481.0 ms (2.3%)

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java

Store Datadog last parent ID Allow tags update from TagContext Add Datadog parent header validation

mtoffl01 · 2024-08-06T18:19:19Z

dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HttpExtractorTest.groovy

+    // assert context.propagationTags.traceIdHighOrderBits ==
+
+
+    // TODO Add more cases to cover every behavior


@PerfectSlayer , not sure if 151-155 is still relevant.

You can replace them by:
// TODO Add some more W3C override checks and I will get back at it later.
It should not block your PR 😉

PerfectSlayer

The changes look great! Glad to see you successfully went to the bottom of it 😅

Can you add a little comment in the PR too due to the behavior change of last parent ID? (from 0000...00 default to null and what it means).

I won't approved right now due to the OTel event test file but it's good to me if you remove it 👍

PerfectSlayer · 2024-08-14T06:46:58Z

dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HttpExtractorTest.groovy

+    assert context.traceId.toLong() == DDTraceId.from(expectedTraceId).toLong()
+    assert context.spanId == DDSpanId.from(expectedSpanId)
+    assert context.tags[PARENT_ID] == expectedParentId
+    // TODO Add some more W3C override checks


That is fine. It's out of the scope for this PR

...t/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy

PerfectSlayer

🙌

…der to consume updated W3C parametric tests

zacharycmontoya · 2024-08-19T18:45:30Z

In the last commit, I updated the system-test to the current commit for master, but the parametric tests are failing for unrelated failures in test_span_sampling.py and test_telemetry.py. Can we still merge the PR?

PerfectSlayer · 2024-08-20T05:55:36Z

@zacharycmontoya System tests are supposed to pass.
I would recommend to update system tests in a dedicated PR, then rebase this one on top of the new master (I can do the rebase)
We do have a shell script that does the system test update: update_pinned_system_tests.sh

…b6 in order to consume updated W3C parametric tests" This reverts commit f25f61b.

zacharycmontoya · 2024-08-20T21:24:10Z

@zacharycmontoya System tests are supposed to pass. I would recommend to update system tests in a dedicated PR, then rebase this one on top of the new master (I can do the rebase) We do have a shell script that does the system test update: update_pinned_system_tests.sh

Understood, I've added a new PR here: #7481

Note: I'll be on PTO the rest of the week so I won't check back in on this until next week.

PerfectSlayer · 2024-08-23T09:24:21Z

Just merged system tests PR. Updating branch and start CI again

mtoffl01 and others added 5 commits July 23, 2024 17:06

re-committing after formatting ran from git hooks

6865282

Revert temp changes to ExtractedContext.java

526e582

Update HttpCodec.java

d17b895

Update HttpCodec.java

9d8fa79

Update HttpCodec.java

d2db6e4

mtoffl01 commented Jul 23, 2024

View reviewed changes

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java Outdated Show resolved Hide resolved

mtoffl01 commented Jul 23, 2024

View reviewed changes

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java Outdated Show resolved Hide resolved

mtoffl01 and others added 3 commits July 24, 2024 10:02

Reformatted

b7aae73

Update HttpCodec.java

2c44b58

feat(core): Simplify W3C phase 3 implementation

9401fc2

PerfectSlayer added type: enhancement comp: context propagation Trace context propagation labels Jul 26, 2024

mcculls reviewed Jul 30, 2024

View reviewed changes

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java Show resolved Hide resolved

mtoffl01 added 6 commits July 30, 2024 16:21

ran formatter

57185ef

ran formatter

ae3f5bb

Ran formatter

6f9d628

Added unit tests

62c8c6a

removed file

0f343ea

formatter

72aaba4

mtoffl01 commented Aug 1, 2024

View reviewed changes

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java Outdated Show resolved Hide resolved

mtoffl01 and others added 6 commits August 1, 2024 12:49

removed superfluous comment and variable

d98e799

feat(context): Improve W3C support

29d67d7

Store Datadog last parent ID Allow tags update from TagContext Add Datadog parent header validation

feat(context): Add W3C header override test

45ce050

fix lastParentId assignment for case when no p tag available

3bd6bcf

remove superfluous comment

d93bb1a

feat(context): Make sure last parent id can't be invalid

810158c

mtoffl01 mentioned this pull request Aug 5, 2024

[java] Enable test_tracestate_w3c_p_extract_datadog_w3c for Java DataDog/system-tests#2849

Merged

7 tasks

PerfectSlayer added 2 commits August 5, 2024 17:10

feat(context): Make sure last parent id can't be invalid

5703c94

feat(context): Make sure last parent id can't be invalid

4d447c6

mtoffl01 added 2 commits August 6, 2024 10:48

Changed comment to be clearer

60c9dda

added more unit test cases for better codecov

e433adf

mtoffl01 marked this pull request as ready for review August 6, 2024 18:16

mtoffl01 requested a review from a team as a code owner August 6, 2024 18:16

mtoffl01 requested review from dougqh and PerfectSlayer August 6, 2024 18:16

mtoffl01 commented Aug 6, 2024

View reviewed changes

mtoffl01 requested a review from mcculls August 8, 2024 17:55

mtoffl01 added 2 commits August 9, 2024 10:51

Merge branch 'master' into mtoff/w3c-phase-3

a16b342

update TODO comment

3c73b58

mtoffl01 requested a review from a team as a code owner August 9, 2024 15:03

PerfectSlayer reviewed Aug 14, 2024

View reviewed changes

mtoffl01 added 2 commits August 14, 2024 09:22

remove mistake span events changes

9774d3f

Clarified wording on applyTraceContextToFirstContext function

8cb89a5

PerfectSlayer approved these changes Aug 16, 2024

View reviewed changes

mtoffl01 and others added 2 commits August 16, 2024 12:25

Merge branch 'master' into mtoff/w3c-phase-3

b81ef67

Update system-tests to 412461cf49ec3115b291f92ad6c7e5a0758545b6 in or…

f25f61b

…der to consume updated W3C parametric tests

amarziali removed the request for review from a team August 19, 2024 17:05

Revert "Update system-tests to 412461cf49ec3115b291f92ad6c7e5a0758545…

85c9005

…b6 in order to consume updated W3C parametric tests" This reverts commit f25f61b.

zacharycmontoya mentioned this pull request Aug 20, 2024

Update system-tests to 7e14da64c8b78bc26c8037c27cf2f68c5d880e4e #7481

Closed

5 tasks

Merge branch 'master' into mtoff/w3c-phase-3

1d63cae

PerfectSlayer changed the title ~~tracecontext takes precedence for parent IDs, regardless of propagation style order~~ Use W3C Trace Context trace ID as parent ID regardless of propagation style order Aug 26, 2024

PerfectSlayer merged commit ab9943c into master Aug 26, 2024
85 checks passed

PerfectSlayer deleted the mtoff/w3c-phase-3 branch August 26, 2024 06:11

github-actions bot added this to the 1.39.0 milestone Aug 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use W3C Trace Context trace ID as parent ID regardless of propagation style order #7355

Use W3C Trace Context trace ID as parent ID regardless of propagation style order #7355

mtoffl01 commented Jul 23, 2024 •

edited

Loading

pr-commenter bot commented Jul 23, 2024 •

edited

Loading

mtoffl01 Aug 6, 2024

PerfectSlayer Aug 9, 2024

PerfectSlayer left a comment

PerfectSlayer Aug 14, 2024

PerfectSlayer left a comment

zacharycmontoya commented Aug 19, 2024

PerfectSlayer commented Aug 20, 2024

zacharycmontoya commented Aug 20, 2024

PerfectSlayer commented Aug 23, 2024

		// assert context.propagationTags.traceIdHighOrderBits ==


		// TODO Add more cases to cover every behavior

Use W3C Trace Context trace ID as parent ID regardless of propagation style order #7355

Use W3C Trace Context trace ID as parent ID regardless of propagation style order #7355

Conversation

mtoffl01 commented Jul 23, 2024 • edited Loading

What Does This Do

Motivation

Additional Notes

Contributor Checklist

pr-commenter bot commented Jul 23, 2024 • edited Loading

Benchmarks

Startup

Parameters

Summary

Load

Parameters

Summary

Dacapo

Parameters

Summary

mtoffl01 Aug 6, 2024

Choose a reason for hiding this comment

PerfectSlayer Aug 9, 2024

Choose a reason for hiding this comment

PerfectSlayer left a comment

Choose a reason for hiding this comment

PerfectSlayer Aug 14, 2024

Choose a reason for hiding this comment

PerfectSlayer left a comment

Choose a reason for hiding this comment

zacharycmontoya commented Aug 19, 2024

PerfectSlayer commented Aug 20, 2024

zacharycmontoya commented Aug 20, 2024

PerfectSlayer commented Aug 23, 2024

mtoffl01 commented Jul 23, 2024 •

edited

Loading

pr-commenter bot commented Jul 23, 2024 •

edited

Loading