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
Handle comment injection for procedure CALLs #6807
Merged
sethsamuel
merged 7 commits into
master
from
seth.samuel/SDBM-876-PSQLException-when-enabling-dbm-and-apm-correlation
Mar 13, 2024
Merged
Handle comment injection for procedure CALLs #6807
sethsamuel
merged 7 commits into
master
from
seth.samuel/SDBM-876-PSQLException-when-enabling-dbm-and-apm-correlation
Mar 13, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 48 metrics, 15 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.077 s) : 0, 1077242
Total [baseline] (8.557 s) : 0, 8557037
Agent [candidate] (1.088 s) : 0, 1087640
Total [candidate] (8.65 s) : 0, 8649623
section iast
Agent [baseline] (1.202 s) : 0, 1202252
Total [baseline] (9.042 s) : 0, 9041765
Agent [candidate] (1.208 s) : 0, 1208479
Total [candidate] (9.057 s) : 0, 9057032
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.202 s) : 0, 1202221
Total [baseline] (9.008 s) : 0, 9007599
Agent [candidate] (1.21 s) : 0, 1209839
Total [candidate] (9.026 s) : 0, 9025794
section iast_TELEMETRY_OFF
Agent [baseline] (1.196 s) : 0, 1195671
Total [baseline] (9.036 s) : 0, 9035968
Agent [candidate] (1.203 s) : 0, 1202531
Total [candidate] (9.077 s) : 0, 9076783
gantt
title insecure-bank - break down per module: candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (694.704 ms) : 0, 694704
BytebuddyAgent [candidate] (701.2 ms) : 0, 701200
GlobalTracer [baseline] (291.038 ms) : 0, 291038
GlobalTracer [candidate] (294.296 ms) : 0, 294296
AppSec [baseline] (48.781 ms) : 0, 48781
AppSec [candidate] (49.252 ms) : 0, 49252
Remote Config [baseline] (723.18 µs) : 0, 723
Remote Config [candidate] (719.17 µs) : 0, 719
Telemetry [baseline] (7.655 ms) : 0, 7655
Telemetry [candidate] (7.692 ms) : 0, 7692
section iast
BytebuddyAgent [baseline] (799.568 ms) : 0, 799568
BytebuddyAgent [candidate] (802.815 ms) : 0, 802815
GlobalTracer [baseline] (287.936 ms) : 0, 287936
GlobalTracer [candidate] (289.425 ms) : 0, 289425
AppSec [baseline] (48.581 ms) : 0, 48581
AppSec [candidate] (48.952 ms) : 0, 48952
IAST [baseline] (23.78 ms) : 0, 23780
IAST [candidate] (24.766 ms) : 0, 24766
Remote Config [baseline] (612.326 µs) : 0, 612
Remote Config [candidate] (608.646 µs) : 0, 609
Telemetry [baseline] (7.348 ms) : 0, 7348
Telemetry [candidate] (7.401 ms) : 0, 7401
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (799.49 ms) : 0, 799490
BytebuddyAgent [candidate] (803.613 ms) : 0, 803613
GlobalTracer [baseline] (287.597 ms) : 0, 287597
GlobalTracer [candidate] (290.458 ms) : 0, 290458
AppSec [baseline] (48.187 ms) : 0, 48187
AppSec [candidate] (50.201 ms) : 0, 50201
IAST [baseline] (23.057 ms) : 0, 23057
IAST [candidate] (23.015 ms) : 0, 23015
Remote Config [baseline] (626.198 µs) : 0, 626
Remote Config [candidate] (621.693 µs) : 0, 622
Telemetry [baseline] (8.972 ms) : 0, 8972
Telemetry [candidate] (7.357 ms) : 0, 7357
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (791.632 ms) : 0, 791632
BytebuddyAgent [candidate] (795.684 ms) : 0, 795684
GlobalTracer [baseline] (288.456 ms) : 0, 288456
GlobalTracer [candidate] (291.069 ms) : 0, 291069
AppSec [baseline] (49.448 ms) : 0, 49448
AppSec [candidate] (51.632 ms) : 0, 51632
IAST [baseline] (23.315 ms) : 0, 23315
IAST [candidate] (22.514 ms) : 0, 22514
Remote Config [baseline] (573.819 µs) : 0, 574
Remote Config [candidate] (588.983 µs) : 0, 589
Telemetry [baseline] (7.878 ms) : 0, 7878
Telemetry [candidate] (6.564 ms) : 0, 6564
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.087 s) : 0, 1087297
Total [baseline] (9.267 s) : 0, 9266727
Agent [candidate] (1.09 s) : 0, 1089648
Total [candidate] (9.173 s) : 0, 9173280
section appsec
Agent [baseline] (1.224 s) : 0, 1223988
Total [baseline] (9.383 s) : 0, 9383284
Agent [candidate] (1.212 s) : 0, 1212102
Total [candidate] (9.272 s) : 0, 9272401
section iast
Agent [baseline] (1.204 s) : 0, 1203910
Total [baseline] (9.362 s) : 0, 9362023
Agent [candidate] (1.204 s) : 0, 1204414
Total [candidate] (9.334 s) : 0, 9333526
section profiling
Agent [baseline] (1.27 s) : 0, 1269960
Total [baseline] (9.339 s) : 0, 9338558
Agent [candidate] (1.279 s) : 0, 1278684
Total [candidate] (9.472 s) : 0, 9472332
gantt
title petclinic - break down per module: candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (701.206 ms) : 0, 701206
BytebuddyAgent [candidate] (702.053 ms) : 0, 702053
GlobalTracer [baseline] (293.445 ms) : 0, 293445
GlobalTracer [candidate] (294.931 ms) : 0, 294931
AppSec [baseline] (49.619 ms) : 0, 49619
AppSec [candidate] (49.491 ms) : 0, 49491
Remote Config [baseline] (727.486 µs) : 0, 727
Remote Config [candidate] (735.423 µs) : 0, 735
Telemetry [baseline] (7.697 ms) : 0, 7697
Telemetry [candidate] (7.829 ms) : 0, 7829
section appsec
BytebuddyAgent [baseline] (709.743 ms) : 0, 709743
BytebuddyAgent [candidate] (703.038 ms) : 0, 703038
GlobalTracer [baseline] (298.003 ms) : 0, 298003
GlobalTracer [candidate] (294.598 ms) : 0, 294598
AppSec [baseline] (155.18 ms) : 0, 155180
AppSec [candidate] (154.387 ms) : 0, 154387
IAST [baseline] (18.338 ms) : 0, 18338
IAST [candidate] (17.941 ms) : 0, 17941
Remote Config [baseline] (625.125 µs) : 0, 625
Remote Config [candidate] (609.315 µs) : 0, 609
Telemetry [baseline] (7.106 ms) : 0, 7106
Telemetry [candidate] (6.92 ms) : 0, 6920
section iast
BytebuddyAgent [baseline] (800.796 ms) : 0, 800796
BytebuddyAgent [candidate] (800.269 ms) : 0, 800269
GlobalTracer [baseline] (288.059 ms) : 0, 288059
GlobalTracer [candidate] (288.958 ms) : 0, 288958
AppSec [baseline] (50.018 ms) : 0, 50018
AppSec [candidate] (49.167 ms) : 0, 49167
IAST [baseline] (23.522 ms) : 0, 23522
IAST [candidate] (23.68 ms) : 0, 23680
Remote Config [baseline] (600.781 µs) : 0, 601
Remote Config [candidate] (589.388 µs) : 0, 589
Telemetry [baseline] (6.575 ms) : 0, 6575
Telemetry [candidate] (7.426 ms) : 0, 7426
section profiling
BytebuddyAgent [baseline] (687.234 ms) : 0, 687234
BytebuddyAgent [candidate] (690.181 ms) : 0, 690181
GlobalTracer [baseline] (375.088 ms) : 0, 375088
GlobalTracer [candidate] (379.109 ms) : 0, 379109
AppSec [baseline] (49.742 ms) : 0, 49742
AppSec [candidate] (50.03 ms) : 0, 50030
Remote Config [baseline] (745.114 µs) : 0, 745
Remote Config [candidate] (799.681 µs) : 0, 800
Telemetry [baseline] (7.394 ms) : 0, 7394
Telemetry [candidate] (7.378 ms) : 0, 7378
ProfilingAgent [baseline] (93.652 ms) : 0, 93652
ProfilingAgent [candidate] (94.908 ms) : 0, 94908
Profiling [baseline] (93.675 ms) : 0, 93675
Profiling [candidate] (94.932 ms) : 0, 94932
LoadRequest duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section baseline
no_agent (369.121 µs) : 349, 390
. : milestone, 369,
iast (469.005 µs) : 448, 490
. : milestone, 469,
iast_FULL (539.223 µs) : 519, 560
. : milestone, 539,
iast_GLOBAL (490.705 µs) : 469, 512
. : milestone, 491,
iast_HARDCODED_SECRET_DISABLED (466.92 µs) : 447, 487
. : milestone, 467,
iast_INACTIVE (443.798 µs) : 423, 464
. : milestone, 444,
iast_TELEMETRY_OFF (465.709 µs) : 445, 486
. : milestone, 466,
tracing (442.282 µs) : 422, 463
. : milestone, 442,
section candidate
no_agent (368.12 µs) : 348, 388
. : milestone, 368,
iast (468.392 µs) : 448, 489
. : milestone, 468,
iast_FULL (536.819 µs) : 516, 557
. : milestone, 537,
iast_GLOBAL (491.089 µs) : 471, 511
. : milestone, 491,
iast_HARDCODED_SECRET_DISABLED (466.796 µs) : 446, 487
. : milestone, 467,
iast_INACTIVE (443.92 µs) : 423, 465
. : milestone, 444,
iast_TELEMETRY_OFF (465.628 µs) : 445, 486
. : milestone, 466,
tracing (444.069 µs) : 423, 465
. : milestone, 444,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~8a1b83cf2b, baseline=1.32.0-SNAPSHOT~8f6b8c31aa
dateFormat X
axisFormat %s
section baseline
no_agent (1.343 ms) : 1323, 1362
. : milestone, 1343,
appsec (1.778 ms) : 1755, 1801
. : milestone, 1778,
iast (1.503 ms) : 1479, 1526
. : milestone, 1503,
profiling (1.565 ms) : 1540, 1590
. : milestone, 1565,
tracing (1.501 ms) : 1478, 1524
. : milestone, 1501,
section candidate
no_agent (1.347 ms) : 1328, 1366
. : milestone, 1347,
appsec (1.78 ms) : 1757, 1803
. : milestone, 1780,
iast (1.531 ms) : 1508, 1554
. : milestone, 1531,
profiling (1.545 ms) : 1521, 1568
. : milestone, 1545,
tracing (1.501 ms) : 1477, 1526
. : milestone, 1501,
|
jmeunier28
approved these changes
Mar 13, 2024
mcculls
reviewed
Mar 13, 2024
...gent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
Show resolved
Hide resolved
mcculls
approved these changes
Mar 13, 2024
sethsamuel
deleted the
seth.samuel/SDBM-876-PSQLException-when-enabling-dbm-and-apm-correlation
branch
March 13, 2024 15:15
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This Do
This PR changes SQL comment injection to append when using a
CALL
to a procedure.Motivation
Both Postgres and MySQL crash if there is content before
CALL
in a prepared statement but appear to tolerate it at the end of the statement.Additional Notes
Jira ticket: SDBM-876