-
Notifications
You must be signed in to change notification settings - Fork 320
Fix muzzle mismatch causing Spark jobs on Databricks 17.3 to not be instrumented #9872
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
Conversation
|
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
|
🎯 Code Coverage 🔗 Commit SHA: 91f2995 | Docs | Datadog PR Page | Was this helpful? Give us feedback! |
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 53 metrics, 12 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.031 s) : 0, 1031402
Total [baseline] (8.692 s) : 0, 8691501
Agent [candidate] (1.036 s) : 0, 1035552
Total [candidate] (8.665 s) : 0, 8665394
section iast
Agent [baseline] (1.164 s) : 0, 1163820
Total [baseline] (9.38 s) : 0, 9380039
Agent [candidate] (1.163 s) : 0, 1163453
Total [candidate] (9.395 s) : 0, 9394657
gantt
title insecure-bank - break down per module: candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.473 ms) : 0, 1473
crashtracking [candidate] (1.475 ms) : 0, 1475
BytebuddyAgent [baseline] (703.181 ms) : 0, 703181
BytebuddyAgent [candidate] (707.27 ms) : 0, 707270
GlobalTracer [baseline] (245.092 ms) : 0, 245092
GlobalTracer [candidate] (245.656 ms) : 0, 245656
AppSec [baseline] (32.373 ms) : 0, 32373
AppSec [candidate] (32.17 ms) : 0, 32170
Debugger [baseline] (6.399 ms) : 0, 6399
Debugger [candidate] (6.355 ms) : 0, 6355
Remote Config [baseline] (690.109 µs) : 0, 690
Remote Config [candidate] (668.486 µs) : 0, 668
Telemetry [baseline] (15.951 ms) : 0, 15951
Telemetry [candidate] (15.716 ms) : 0, 15716
Flare Poller [baseline] (4.973 ms) : 0, 4973
Flare Poller [candidate] (4.922 ms) : 0, 4922
section iast
crashtracking [baseline] (1.476 ms) : 0, 1476
crashtracking [candidate] (1.469 ms) : 0, 1469
BytebuddyAgent [baseline] (825.325 ms) : 0, 825325
BytebuddyAgent [candidate] (825.794 ms) : 0, 825794
GlobalTracer [baseline] (234.227 ms) : 0, 234227
GlobalTracer [candidate] (234.117 ms) : 0, 234117
AppSec [baseline] (30.002 ms) : 0, 30002
AppSec [candidate] (29.476 ms) : 0, 29476
Debugger [baseline] (6.106 ms) : 0, 6106
Debugger [candidate] (6.102 ms) : 0, 6102
Remote Config [baseline] (622.368 µs) : 0, 622
Remote Config [candidate] (598.172 µs) : 0, 598
Telemetry [baseline] (8.635 ms) : 0, 8635
Telemetry [candidate] (8.487 ms) : 0, 8487
Flare Poller [baseline] (4.182 ms) : 0, 4182
Flare Poller [candidate] (4.18 ms) : 0, 4180
IAST [baseline] (31.94 ms) : 0, 31940
IAST [candidate] (31.913 ms) : 0, 31913
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.031 s) : 0, 1031304
Total [baseline] (10.755 s) : 0, 10755403
Agent [candidate] (1.028 s) : 0, 1028411
Total [candidate] (10.836 s) : 0, 10836022
section appsec
Agent [baseline] (1.206 s) : 0, 1206151
Total [baseline] (10.956 s) : 0, 10955766
Agent [candidate] (1.205 s) : 0, 1205480
Total [candidate] (11.044 s) : 0, 11044143
section iast
Agent [baseline] (1.166 s) : 0, 1166126
Total [baseline] (11.131 s) : 0, 11131137
Agent [candidate] (1.167 s) : 0, 1166539
Total [candidate] (11.225 s) : 0, 11224720
section profiling
Agent [baseline] (1.179 s) : 0, 1178836
Total [baseline] (10.936 s) : 0, 10936413
Agent [candidate] (1.19 s) : 0, 1189993
Total [candidate] (10.935 s) : 0, 10934624
gantt
title petclinic - break down per module: candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.466 ms) : 0, 1466
crashtracking [candidate] (1.461 ms) : 0, 1461
BytebuddyAgent [baseline] (703.411 ms) : 0, 703411
BytebuddyAgent [candidate] (701.903 ms) : 0, 701903
GlobalTracer [baseline] (245.088 ms) : 0, 245088
GlobalTracer [candidate] (244.757 ms) : 0, 244757
AppSec [baseline] (32.28 ms) : 0, 32280
AppSec [candidate] (31.996 ms) : 0, 31996
Debugger [baseline] (6.354 ms) : 0, 6354
Debugger [candidate] (6.316 ms) : 0, 6316
Remote Config [baseline] (683.274 µs) : 0, 683
Remote Config [candidate] (677.693 µs) : 0, 678
Telemetry [baseline] (14.36 ms) : 0, 14360
Telemetry [candidate] (14.408 ms) : 0, 14408
Flare Poller [baseline] (6.395 ms) : 0, 6395
Flare Poller [candidate] (5.623 ms) : 0, 5623
section appsec
crashtracking [baseline] (1.469 ms) : 0, 1469
crashtracking [candidate] (1.465 ms) : 0, 1465
BytebuddyAgent [baseline] (728.602 ms) : 0, 728602
BytebuddyAgent [candidate] (727.909 ms) : 0, 727909
GlobalTracer [baseline] (236.588 ms) : 0, 236588
GlobalTracer [candidate] (236.432 ms) : 0, 236432
IAST [baseline] (24.949 ms) : 0, 24949
IAST [candidate] (25.079 ms) : 0, 25079
AppSec [baseline] (174.494 ms) : 0, 174494
AppSec [candidate] (174.4 ms) : 0, 174400
Debugger [baseline] (5.932 ms) : 0, 5932
Debugger [candidate] (5.922 ms) : 0, 5922
Remote Config [baseline] (628.62 µs) : 0, 629
Remote Config [candidate] (642.327 µs) : 0, 642
Telemetry [baseline] (8.429 ms) : 0, 8429
Telemetry [candidate] (8.449 ms) : 0, 8449
Flare Poller [baseline] (3.887 ms) : 0, 3887
Flare Poller [candidate] (3.915 ms) : 0, 3915
section iast
crashtracking [baseline] (1.472 ms) : 0, 1472
crashtracking [candidate] (1.488 ms) : 0, 1488
BytebuddyAgent [baseline] (827.755 ms) : 0, 827755
BytebuddyAgent [candidate] (827.205 ms) : 0, 827205
GlobalTracer [baseline] (234.683 ms) : 0, 234683
GlobalTracer [candidate] (235.223 ms) : 0, 235223
IAST [baseline] (33.45 ms) : 0, 33450
IAST [candidate] (30.842 ms) : 0, 30842
AppSec [baseline] (28.121 ms) : 0, 28121
AppSec [candidate] (30.823 ms) : 0, 30823
Debugger [baseline] (6.089 ms) : 0, 6089
Debugger [candidate] (6.142 ms) : 0, 6142
Remote Config [baseline] (595.71 µs) : 0, 596
Remote Config [candidate] (602.854 µs) : 0, 603
Telemetry [baseline] (8.406 ms) : 0, 8406
Telemetry [candidate] (8.572 ms) : 0, 8572
Flare Poller [baseline] (4.159 ms) : 0, 4159
Flare Poller [candidate] (4.18 ms) : 0, 4180
section profiling
crashtracking [baseline] (1.478 ms) : 0, 1478
crashtracking [candidate] (1.48 ms) : 0, 1480
BytebuddyAgent [baseline] (731.357 ms) : 0, 731357
BytebuddyAgent [candidate] (737.095 ms) : 0, 737095
GlobalTracer [baseline] (220.732 ms) : 0, 220732
GlobalTracer [candidate] (223.263 ms) : 0, 223263
AppSec [baseline] (32.21 ms) : 0, 32210
AppSec [candidate] (32.991 ms) : 0, 32991
Debugger [baseline] (9.204 ms) : 0, 9204
Debugger [candidate] (10.982 ms) : 0, 10982
Remote Config [baseline] (717.388 µs) : 0, 717
Remote Config [candidate] (2.228 ms) : 0, 2228
Telemetry [baseline] (13.753 ms) : 0, 13753
Telemetry [candidate] (10.651 ms) : 0, 10651
Flare Poller [baseline] (4.177 ms) : 0, 4177
Flare Poller [candidate] (4.196 ms) : 0, 4196
ProfilingAgent [baseline] (109.357 ms) : 0, 109357
ProfilingAgent [candidate] (110.735 ms) : 0, 110735
Profiling [baseline] (110.017 ms) : 0, 110017
Profiling [candidate] (111.381 ms) : 0, 111381
LoadParameters
See matching parameters
SummaryFound 2 performance improvements and 2 performance regressions! Performance is the same for 8 metrics, 12 unstable metrics.
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section baseline
no_agent (1.211 ms) : 1200, 1223
. : milestone, 1211,
iast (3.285 ms) : 3237, 3334
. : milestone, 3285,
iast_FULL (5.748 ms) : 5691, 5805
. : milestone, 5748,
iast_GLOBAL (3.629 ms) : 3565, 3693
. : milestone, 3629,
profiling (2.098 ms) : 2079, 2116
. : milestone, 2098,
tracing (1.766 ms) : 1753, 1780
. : milestone, 1766,
section candidate
no_agent (1.192 ms) : 1181, 1204
. : milestone, 1192,
iast (3.338 ms) : 3297, 3380
. : milestone, 3338,
iast_FULL (5.563 ms) : 5508, 5618
. : milestone, 5563,
iast_GLOBAL (3.629 ms) : 3573, 3684
. : milestone, 3629,
profiling (2.044 ms) : 2026, 2062
. : milestone, 2044,
tracing (1.773 ms) : 1759, 1787
. : milestone, 1773,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section baseline
no_agent (18.017 ms) : 17833, 18200
. : milestone, 18017,
appsec (20.711 ms) : 20498, 20923
. : milestone, 20711,
code_origins (18.661 ms) : 18475, 18847
. : milestone, 18661,
iast (18.548 ms) : 18360, 18736
. : milestone, 18548,
profiling (20.909 ms) : 20698, 21121
. : milestone, 20909,
tracing (17.531 ms) : 17358, 17703
. : milestone, 17531,
section candidate
no_agent (18.257 ms) : 18067, 18447
. : milestone, 18257,
appsec (20.879 ms) : 20670, 21087
. : milestone, 20879,
code_origins (19.508 ms) : 19311, 19705
. : milestone, 19508,
iast (18.458 ms) : 18270, 18645
. : milestone, 18458,
profiling (19.46 ms) : 19261, 19660
. : milestone, 19460,
tracing (18.306 ms) : 18120, 18492
. : milestone, 18306,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 1 unstable metrics. Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section baseline
no_agent (1.489 ms) : 1478, 1501
. : milestone, 1489,
appsec (3.721 ms) : 3503, 3940
. : milestone, 3721,
iast (2.219 ms) : 2155, 2282
. : milestone, 2219,
iast_GLOBAL (2.273 ms) : 2209, 2337
. : milestone, 2273,
profiling (2.066 ms) : 2014, 2117
. : milestone, 2066,
tracing (2.048 ms) : 1999, 2098
. : milestone, 2048,
section candidate
no_agent (1.488 ms) : 1477, 1500
. : milestone, 1488,
appsec (3.665 ms) : 3448, 3882
. : milestone, 3665,
iast (2.226 ms) : 2163, 2290
. : milestone, 2226,
iast_GLOBAL (2.277 ms) : 2212, 2341
. : milestone, 2277,
profiling (2.056 ms) : 2004, 2107
. : milestone, 2056,
tracing (2.046 ms) : 1996, 2096
. : milestone, 2046,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.55.0-SNAPSHOT~91f2995198, baseline=1.55.0-SNAPSHOT~9b91826873
dateFormat X
axisFormat %s
section baseline
no_agent (15.245 s) : 15245000, 15245000
. : milestone, 15245000,
appsec (15.014 s) : 15014000, 15014000
. : milestone, 15014000,
iast (18.782 s) : 18782000, 18782000
. : milestone, 18782000,
iast_GLOBAL (18.22 s) : 18220000, 18220000
. : milestone, 18220000,
profiling (15.28 s) : 15280000, 15280000
. : milestone, 15280000,
tracing (14.915 s) : 14915000, 14915000
. : milestone, 14915000,
section candidate
no_agent (15.403 s) : 15403000, 15403000
. : milestone, 15403000,
appsec (15.008 s) : 15008000, 15008000
. : milestone, 15008000,
iast (18.571 s) : 18571000, 18571000
. : milestone, 18571000,
iast_GLOBAL (18.124 s) : 18124000, 18124000
. : milestone, 18124000,
profiling (15.689 s) : 15689000, 15689000
. : milestone, 15689000,
tracing (15.405 s) : 15405000, 15405000
. : milestone, 15405000,
|
...on/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
Outdated
Show resolved
Hide resolved
0b0a74f to
b3de67a
Compare
b3de67a to
2dbcfec
Compare
...on/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
Outdated
Show resolved
Hide resolved
6ec48b4 to
bcc5bde
Compare
4ee15d0 to
6e95cce
Compare
b57ba96 to
d54d86c
Compare
53e0799 to
74db1a2
Compare
pawel-big-lebowski
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
What Does This Do
Fix muzzle mismatch causing Spark jobs on Databricks 17.3 to not be instrumented
Motivation
Remediation to
instrumentation blockedby Muzzle checks that we found out with the following DEBUG logs:(1) is fixed with directly passing the harcoded property key from MicroBatchExecution BatchID key: https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/runtime/MicroBatchExecution.scala#L1331-L1333
(2) is fixed by looking up the various constructors of SparkPlanInfo and using the one with the expected number of arguments, 5, so that we're not affected by the overloaded Databricks constructors.
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any useful labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]