-
Notifications
You must be signed in to change notification settings - Fork 317
[🍒 7160] Start Datadog appender when doing agentless log submission for Log4j2 #7180
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
Merged
nikita-tkachenko-datadog
merged 1 commit into
release/v1.35.x
from
nikita-tkachenko/agentlesss-log-intake-fix-1.35.1
Jun 12, 2024
Merged
[🍒 7160] Start Datadog appender when doing agentless log submission for Log4j2 #7180
nikita-tkachenko-datadog
merged 1 commit into
release/v1.35.x
from
nikita-tkachenko/agentlesss-log-intake-fix-1.35.1
Jun 12, 2024
Conversation
This file contains hidden or 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
Contributor
amarziali
approved these changes
Jun 12, 2024
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 54 metrics, 17 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.059 s) : 0, 1059448
Total [baseline] (8.53 s) : 0, 8530243
Agent [candidate] (1.06 s) : 0, 1060205
Total [candidate] (8.521 s) : 0, 8521293
section iast
Agent [baseline] (1.167 s) : 0, 1166515
Total [baseline] (8.999 s) : 0, 8998916
Agent [candidate] (1.171 s) : 0, 1171214
Total [candidate] (8.999 s) : 0, 8999331
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.18 s) : 0, 1180097
Total [baseline] (8.989 s) : 0, 8989301
Agent [candidate] (1.169 s) : 0, 1168886
Total [candidate] (8.98 s) : 0, 8980117
section iast_TELEMETRY_OFF
Agent [baseline] (1.164 s) : 0, 1164003
Total [baseline] (8.987 s) : 0, 8987081
Agent [candidate] (1.163 s) : 0, 1162986
Total [candidate] (8.998 s) : 0, 8998358
gantt
title insecure-bank - break down per module: candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (663.387 ms) : 0, 663387
BytebuddyAgent [candidate] (664.237 ms) : 0, 664237
GlobalTracer [baseline] (303.177 ms) : 0, 303177
GlobalTracer [candidate] (302.938 ms) : 0, 302938
AppSec [baseline] (49.944 ms) : 0, 49944
AppSec [candidate] (50.002 ms) : 0, 50002
Logs Intake [baseline] (395.557 µs) : 0, 396
Logs Intake [candidate] (390.4 µs) : 0, 390
Remote Config [baseline] (690.303 µs) : 0, 690
Remote Config [candidate] (656.255 µs) : 0, 656
Telemetry [baseline] (7.558 ms) : 0, 7558
Telemetry [candidate] (7.491 ms) : 0, 7491
section iast
BytebuddyAgent [baseline] (778.885 ms) : 0, 778885
BytebuddyAgent [candidate] (781.448 ms) : 0, 781448
GlobalTracer [baseline] (292.52 ms) : 0, 292520
GlobalTracer [candidate] (293.966 ms) : 0, 293966
AppSec [baseline] (46.436 ms) : 0, 46436
AppSec [candidate] (47.267 ms) : 0, 47267
Logs Intake [baseline] (301.926 µs) : 0, 302
Logs Intake [candidate] (299.98 µs) : 0, 300
Remote Config [baseline] (572.943 µs) : 0, 573
Remote Config [candidate] (594.581 µs) : 0, 595
Telemetry [baseline] (9.187 ms) : 0, 9187
Telemetry [candidate] (10.131 ms) : 0, 10131
IAST [baseline] (25.331 ms) : 0, 25331
IAST [candidate] (24.131 ms) : 0, 24131
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (789.103 ms) : 0, 789103
BytebuddyAgent [candidate] (779.309 ms) : 0, 779309
GlobalTracer [baseline] (295.448 ms) : 0, 295448
GlobalTracer [candidate] (293.966 ms) : 0, 293966
AppSec [baseline] (46.944 ms) : 0, 46944
AppSec [candidate] (46.627 ms) : 0, 46627
Logs Intake [baseline] (299.055 µs) : 0, 299
Logs Intake [candidate] (304.614 µs) : 0, 305
Remote Config [baseline] (591.76 µs) : 0, 592
Remote Config [candidate] (591.819 µs) : 0, 592
Telemetry [baseline] (9.225 ms) : 0, 9225
Telemetry [candidate] (9.968 ms) : 0, 9968
IAST [baseline] (24.967 ms) : 0, 24967
IAST [candidate] (24.704 ms) : 0, 24704
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (776.468 ms) : 0, 776468
BytebuddyAgent [candidate] (774.802 ms) : 0, 774802
GlobalTracer [baseline] (293.428 ms) : 0, 293428
GlobalTracer [candidate] (292.837 ms) : 0, 292837
AppSec [baseline] (47.146 ms) : 0, 47146
AppSec [candidate] (50.051 ms) : 0, 50051
Logs Intake [baseline] (298.812 µs) : 0, 299
Logs Intake [candidate] (297.416 µs) : 0, 297
Remote Config [baseline] (565.241 µs) : 0, 565
Remote Config [candidate] (583.203 µs) : 0, 583
Telemetry [baseline] (8.294 ms) : 0, 8294
Telemetry [candidate] (7.549 ms) : 0, 7549
IAST [baseline] (24.474 ms) : 0, 24474
IAST [candidate] (23.49 ms) : 0, 23490
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.063 s) : 0, 1062735
Total [baseline] (10.461 s) : 0, 10461087
Agent [candidate] (1.07 s) : 0, 1069595
Total [candidate] (10.387 s) : 0, 10386818
section appsec
Agent [baseline] (1.179 s) : 0, 1179177
Total [baseline] (10.442 s) : 0, 10441579
Agent [candidate] (1.183 s) : 0, 1182576
Total [candidate] (10.488 s) : 0, 10488156
section iast
Agent [baseline] (1.173 s) : 0, 1172520
Total [baseline] (10.782 s) : 0, 10782221
Agent [candidate] (1.168 s) : 0, 1168459
Total [candidate] (10.724 s) : 0, 10724494
section profiling
Agent [baseline] (1.266 s) : 0, 1266312
Total [baseline] (10.634 s) : 0, 10633781
Agent [candidate] (1.259 s) : 0, 1258684
Total [candidate] (10.652 s) : 0, 10652495
gantt
title petclinic - break down per module: candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (664.277 ms) : 0, 664277
BytebuddyAgent [candidate] (669.432 ms) : 0, 669432
GlobalTracer [baseline] (305.212 ms) : 0, 305212
GlobalTracer [candidate] (306.138 ms) : 0, 306138
AppSec [baseline] (50.313 ms) : 0, 50313
AppSec [candidate] (50.7 ms) : 0, 50700
Logs Intake [baseline] (408.543 µs) : 0, 409
Logs Intake [candidate] (392.422 µs) : 0, 392
Remote Config [baseline] (666.592 µs) : 0, 667
Remote Config [candidate] (671.569 µs) : 0, 672
Telemetry [baseline] (7.544 ms) : 0, 7544
Telemetry [candidate] (7.547 ms) : 0, 7547
section appsec
BytebuddyAgent [baseline] (675.001 ms) : 0, 675001
BytebuddyAgent [candidate] (676.609 ms) : 0, 676609
GlobalTracer [baseline] (297.536 ms) : 0, 297536
GlobalTracer [candidate] (298.074 ms) : 0, 298074
AppSec [baseline] (152.667 ms) : 0, 152667
AppSec [candidate] (153.069 ms) : 0, 153069
Logs Intake [baseline] (318.429 µs) : 0, 318
Logs Intake [candidate] (334.244 µs) : 0, 334
Remote Config [baseline] (636.911 µs) : 0, 637
Remote Config [candidate] (654.169 µs) : 0, 654
Telemetry [baseline] (8.431 ms) : 0, 8431
Telemetry [candidate] (7.86 ms) : 0, 7860
IAST [baseline] (20.466 ms) : 0, 20466
IAST [candidate] (23.005 ms) : 0, 23005
section iast
BytebuddyAgent [baseline] (780.809 ms) : 0, 780809
BytebuddyAgent [candidate] (779.204 ms) : 0, 779204
GlobalTracer [baseline] (295.419 ms) : 0, 295419
GlobalTracer [candidate] (293.307 ms) : 0, 293307
AppSec [baseline] (47.252 ms) : 0, 47252
AppSec [candidate] (47.112 ms) : 0, 47112
Logs Intake [baseline] (305.484 µs) : 0, 305
Logs Intake [candidate] (301.666 µs) : 0, 302
Remote Config [baseline] (577.215 µs) : 0, 577
Remote Config [candidate] (567.875 µs) : 0, 568
Telemetry [baseline] (9.251 ms) : 0, 9251
Telemetry [candidate] (6.867 ms) : 0, 6867
IAST [baseline] (25.624 ms) : 0, 25624
IAST [candidate] (27.828 ms) : 0, 27828
section profiling
BytebuddyAgent [baseline] (666.422 ms) : 0, 666422
BytebuddyAgent [candidate] (661.67 ms) : 0, 661670
GlobalTracer [baseline] (388.024 ms) : 0, 388024
GlobalTracer [candidate] (385.334 ms) : 0, 385334
AppSec [baseline] (51.051 ms) : 0, 51051
AppSec [candidate] (50.72 ms) : 0, 50720
Logs Intake [baseline] (336.83 µs) : 0, 337
Logs Intake [candidate] (328.534 µs) : 0, 329
Remote Config [baseline] (757.881 µs) : 0, 758
Remote Config [candidate] (737.56 µs) : 0, 738
Telemetry [baseline] (7.394 ms) : 0, 7394
Telemetry [candidate] (7.359 ms) : 0, 7359
ProfilingAgent [baseline] (95.359 ms) : 0, 95359
ProfilingAgent [candidate] (95.917 ms) : 0, 95917
Profiling [baseline] (95.383 ms) : 0, 95383
Profiling [candidate] (95.942 ms) : 0, 95942
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 17 unstable metrics. Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section baseline
no_agent (366.36 µs) : 347, 386
. : milestone, 366,
iast (480.33 µs) : 459, 501
. : milestone, 480,
iast_FULL (553.107 µs) : 532, 574
. : milestone, 553,
iast_GLOBAL (504.201 µs) : 483, 525
. : milestone, 504,
iast_HARDCODED_SECRET_DISABLED (477.389 µs) : 456, 498
. : milestone, 477,
iast_INACTIVE (455.307 µs) : 434, 477
. : milestone, 455,
iast_TELEMETRY_OFF (472.678 µs) : 451, 495
. : milestone, 473,
tracing (435.633 µs) : 415, 456
. : milestone, 436,
section candidate
no_agent (368.352 µs) : 348, 388
. : milestone, 368,
iast (484.137 µs) : 463, 505
. : milestone, 484,
iast_FULL (545.182 µs) : 524, 567
. : milestone, 545,
iast_GLOBAL (506.91 µs) : 486, 528
. : milestone, 507,
iast_HARDCODED_SECRET_DISABLED (480.244 µs) : 459, 501
. : milestone, 480,
iast_INACTIVE (449.842 µs) : 428, 471
. : milestone, 450,
iast_TELEMETRY_OFF (468.976 µs) : 448, 490
. : milestone, 469,
tracing (440.045 µs) : 420, 461
. : milestone, 440,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section baseline
no_agent (1.353 ms) : 1333, 1372
. : milestone, 1353,
appsec (1.717 ms) : 1694, 1740
. : milestone, 1717,
appsec_no_iast (1.721 ms) : 1697, 1745
. : milestone, 1721,
iast (1.496 ms) : 1471, 1520
. : milestone, 1496,
profiling (1.517 ms) : 1492, 1543
. : milestone, 1517,
tracing (1.459 ms) : 1435, 1483
. : milestone, 1459,
section candidate
no_agent (1.34 ms) : 1321, 1359
. : milestone, 1340,
appsec (1.703 ms) : 1678, 1728
. : milestone, 1703,
appsec_no_iast (1.728 ms) : 1703, 1752
. : milestone, 1728,
iast (1.503 ms) : 1481, 1525
. : milestone, 1503,
profiling (1.517 ms) : 1491, 1543
. : milestone, 1517,
tracing (1.474 ms) : 1449, 1498
. : milestone, 1474,
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 biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section baseline
no_agent (15.035 s) : 15035000, 15035000
. : milestone, 15035000,
appsec (15.039 s) : 15039000, 15039000
. : milestone, 15039000,
iast (18.729 s) : 18729000, 18729000
. : milestone, 18729000,
iast_GLOBAL (17.948 s) : 17948000, 17948000
. : milestone, 17948000,
profiling (15.294 s) : 15294000, 15294000
. : milestone, 15294000,
tracing (15.204 s) : 15204000, 15204000
. : milestone, 15204000,
section candidate
no_agent (15.66 s) : 15660000, 15660000
. : milestone, 15660000,
appsec (14.983 s) : 14983000, 14983000
. : milestone, 14983000,
iast (18.971 s) : 18971000, 18971000
. : milestone, 18971000,
iast_GLOBAL (17.742 s) : 17742000, 17742000
. : milestone, 17742000,
profiling (15.7 s) : 15700000, 15700000
. : milestone, 15700000,
tracing (15.076 s) : 15076000, 15076000
. : milestone, 15076000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.36.0-SNAPSHOT~d1c7a3e1ec, baseline=1.36.0-SNAPSHOT~222ce2c65e
dateFormat X
axisFormat %s
section baseline
no_agent (1.469 ms) : 1458, 1481
. : milestone, 1469,
appsec (2.215 ms) : 2181, 2249
. : milestone, 2215,
iast (1.983 ms) : 1942, 2025
. : milestone, 1983,
iast_GLOBAL (2.015 ms) : 1974, 2056
. : milestone, 2015,
profiling (1.852 ms) : 1819, 1885
. : milestone, 1852,
tracing (1.834 ms) : 1802, 1866
. : milestone, 1834,
section candidate
no_agent (1.465 ms) : 1453, 1476
. : milestone, 1465,
appsec (2.215 ms) : 2181, 2249
. : milestone, 2215,
iast (1.974 ms) : 1933, 2015
. : milestone, 1974,
iast_GLOBAL (2.01 ms) : 1970, 2051
. : milestone, 2010,
profiling (2.342 ms) : 2165, 2519
. : milestone, 2342,
tracing (1.834 ms) : 1802, 1867
. : milestone, 1834,
|
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
Fixes agentless log submission for Log4j2: some Log4j versions require appenders to be started explicitly before they can be used. Otherwise log messages forwarded to an appender that is not started are ignored.
Also adds a check that prevents multiple Datadog appenders from being added to the same logging config.
Jira ticket: CIVIS-10104