-
Notifications
You must be signed in to change notification settings - Fork 303
fix bug on proto schema extraction #8403
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
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 58 metrics, 5 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.052 s) : 0, 1051926
Total [baseline] (10.43 s) : 0, 10429649
Agent [candidate] (1.049 s) : 0, 1049258
Total [candidate] (10.471 s) : 0, 10471497
section appsec
Agent [baseline] (1.183 s) : 0, 1182912
Total [baseline] (10.761 s) : 0, 10761117
Agent [candidate] (1.181 s) : 0, 1180998
Total [candidate] (10.714 s) : 0, 10714358
section iast
Agent [baseline] (1.177 s) : 0, 1177056
Total [baseline] (10.991 s) : 0, 10990635
Agent [candidate] (1.173 s) : 0, 1173020
Total [candidate] (10.954 s) : 0, 10953884
section profiling
Agent [baseline] (1.261 s) : 0, 1261275
Total [baseline] (10.888 s) : 0, 10887935
Agent [candidate] (1.268 s) : 0, 1267776
Total [candidate] (10.889 s) : 0, 10889163
gantt
title petclinic - break down per module: candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (725.536 ms) : 0, 725536
BytebuddyAgent [candidate] (723.328 ms) : 0, 723328
GlobalTracer [baseline] (241.834 ms) : 0, 241834
GlobalTracer [candidate] (241.236 ms) : 0, 241236
AppSec [baseline] (55.6 ms) : 0, 55600
AppSec [candidate] (55.709 ms) : 0, 55709
Remote Config [baseline] (695.368 µs) : 0, 695
Remote Config [candidate] (702.49 µs) : 0, 702
Telemetry [baseline] (12.927 ms) : 0, 12927
Telemetry [candidate] (12.998 ms) : 0, 12998
section appsec
BytebuddyAgent [baseline] (734.357 ms) : 0, 734357
BytebuddyAgent [candidate] (733.258 ms) : 0, 733258
GlobalTracer [baseline] (236.821 ms) : 0, 236821
GlobalTracer [candidate] (236.249 ms) : 0, 236249
AppSec [baseline] (176.894 ms) : 0, 176894
AppSec [candidate] (176.528 ms) : 0, 176528
Remote Config [baseline] (659.603 µs) : 0, 660
Remote Config [candidate] (670.252 µs) : 0, 670
Telemetry [baseline] (8.232 ms) : 0, 8232
Telemetry [candidate] (8.287 ms) : 0, 8287
IAST [baseline] (21.337 ms) : 0, 21337
IAST [candidate] (21.53 ms) : 0, 21530
section iast
BytebuddyAgent [baseline] (840.93 ms) : 0, 840930
BytebuddyAgent [candidate] (836.965 ms) : 0, 836965
GlobalTracer [baseline] (231.633 ms) : 0, 231633
GlobalTracer [candidate] (230.856 ms) : 0, 230856
AppSec [baseline] (56.999 ms) : 0, 56999
AppSec [candidate] (57.41 ms) : 0, 57410
Remote Config [baseline] (606.254 µs) : 0, 606
Remote Config [candidate] (613.922 µs) : 0, 614
Telemetry [baseline] (8.653 ms) : 0, 8653
Telemetry [candidate] (8.81 ms) : 0, 8810
IAST [baseline] (22.93 ms) : 0, 22930
IAST [candidate] (23.04 ms) : 0, 23040
section profiling
BytebuddyAgent [baseline] (707.765 ms) : 0, 707765
BytebuddyAgent [candidate] (711.892 ms) : 0, 711892
GlobalTracer [baseline] (350.133 ms) : 0, 350133
GlobalTracer [candidate] (352.005 ms) : 0, 352005
AppSec [baseline] (55.412 ms) : 0, 55412
AppSec [candidate] (55.079 ms) : 0, 55079
Remote Config [baseline] (669.797 µs) : 0, 670
Remote Config [candidate] (680.638 µs) : 0, 681
Telemetry [baseline] (8.874 ms) : 0, 8874
Telemetry [candidate] (8.9 ms) : 0, 8900
ProfilingAgent [baseline] (95.983 ms) : 0, 95983
ProfilingAgent [candidate] (96.803 ms) : 0, 96803
Profiling [baseline] (96.007 ms) : 0, 96007
Profiling [candidate] (96.827 ms) : 0, 96827
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.046 s) : 0, 1045723
Total [baseline] (8.649 s) : 0, 8648799
Agent [candidate] (1.041 s) : 0, 1040523
Total [candidate] (8.641 s) : 0, 8640664
section iast
Agent [baseline] (1.168 s) : 0, 1168279
Total [baseline] (9.248 s) : 0, 9247718
Agent [candidate] (1.172 s) : 0, 1172484
Total [candidate] (9.257 s) : 0, 9256830
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.168 s) : 0, 1168176
Total [baseline] (9.193 s) : 0, 9193049
Agent [candidate] (1.174 s) : 0, 1173713
Total [candidate] (9.2 s) : 0, 9200342
section iast_TELEMETRY_OFF
Agent [baseline] (1.163 s) : 0, 1163097
Total [baseline] (9.192 s) : 0, 9191872
Agent [candidate] (1.165 s) : 0, 1165105
Total [candidate] (9.265 s) : 0, 9264926
gantt
title insecure-bank - break down per module: candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (721.071 ms) : 0, 721071
BytebuddyAgent [candidate] (716.6 ms) : 0, 716600
GlobalTracer [baseline] (240.732 ms) : 0, 240732
GlobalTracer [candidate] (239.354 ms) : 0, 239354
AppSec [baseline] (55.714 ms) : 0, 55714
AppSec [candidate] (55.279 ms) : 0, 55279
Remote Config [baseline] (692.901 µs) : 0, 693
Remote Config [candidate] (691.217 µs) : 0, 691
Telemetry [baseline] (12.168 ms) : 0, 12168
Telemetry [candidate] (13.445 ms) : 0, 13445
section iast
BytebuddyAgent [baseline] (834.488 ms) : 0, 834488
BytebuddyAgent [candidate] (836.937 ms) : 0, 836937
GlobalTracer [baseline] (230.143 ms) : 0, 230143
GlobalTracer [candidate] (230.92 ms) : 0, 230920
IAST [baseline] (22.534 ms) : 0, 22534
IAST [candidate] (22.896 ms) : 0, 22896
AppSec [baseline] (56.694 ms) : 0, 56694
AppSec [candidate] (57.099 ms) : 0, 57099
Remote Config [baseline] (594.212 µs) : 0, 594
Remote Config [candidate] (626.994 µs) : 0, 627
Telemetry [baseline] (8.546 ms) : 0, 8546
Telemetry [candidate] (8.716 ms) : 0, 8716
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (833.641 ms) : 0, 833641
BytebuddyAgent [candidate] (837.676 ms) : 0, 837676
GlobalTracer [baseline] (229.974 ms) : 0, 229974
GlobalTracer [candidate] (230.93 ms) : 0, 230930
IAST [baseline] (22.855 ms) : 0, 22855
IAST [candidate] (22.976 ms) : 0, 22976
AppSec [baseline] (57.158 ms) : 0, 57158
AppSec [candidate] (57.575 ms) : 0, 57575
Remote Config [baseline] (607.012 µs) : 0, 607
Remote Config [candidate] (620.36 µs) : 0, 620
Telemetry [baseline] (8.7 ms) : 0, 8700
Telemetry [candidate] (8.586 ms) : 0, 8586
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (830.313 ms) : 0, 830313
BytebuddyAgent [candidate] (831.744 ms) : 0, 831744
GlobalTracer [baseline] (229.481 ms) : 0, 229481
GlobalTracer [candidate] (230.123 ms) : 0, 230123
IAST [baseline] (25.837 ms) : 0, 25837
IAST [candidate] (25.976 ms) : 0, 25976
AppSec [baseline] (53.2 ms) : 0, 53200
AppSec [candidate] (52.799 ms) : 0, 52799
Remote Config [baseline] (617.034 µs) : 0, 617
Remote Config [candidate] (608.035 µs) : 0, 608
Telemetry [baseline] (8.463 ms) : 0, 8463
Telemetry [candidate] (8.602 ms) : 0, 8602
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 13 metrics, 15 unstable metrics. Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section baseline
no_agent (387.675 µs) : 367, 408
. : milestone, 388,
iast (508.358 µs) : 487, 530
. : milestone, 508,
iast_FULL (735.494 µs) : 714, 757
. : milestone, 735,
iast_GLOBAL (552.006 µs) : 529, 575
. : milestone, 552,
iast_HARDCODED_SECRET_DISABLED (514.726 µs) : 492, 538
. : milestone, 515,
iast_INACTIVE (463.21 µs) : 442, 484
. : milestone, 463,
iast_TELEMETRY_OFF (501.427 µs) : 479, 524
. : milestone, 501,
tracing (455.52 µs) : 434, 477
. : milestone, 456,
section candidate
no_agent (383.549 µs) : 363, 404
. : milestone, 384,
iast (515.218 µs) : 493, 537
. : milestone, 515,
iast_FULL (745.16 µs) : 723, 767
. : milestone, 745,
iast_GLOBAL (552.547 µs) : 531, 574
. : milestone, 553,
iast_HARDCODED_SECRET_DISABLED (513.094 µs) : 491, 535
. : milestone, 513,
iast_INACTIVE (470.598 µs) : 449, 492
. : milestone, 471,
iast_TELEMETRY_OFF (500.225 µs) : 478, 522
. : milestone, 500,
tracing (456.455 µs) : 436, 477
. : milestone, 456,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section baseline
no_agent (1.358 ms) : 1338, 1379
. : milestone, 1358,
appsec (1.761 ms) : 1738, 1785
. : milestone, 1761,
appsec_no_iast (1.772 ms) : 1749, 1795
. : milestone, 1772,
iast (1.506 ms) : 1482, 1530
. : milestone, 1506,
profiling (1.494 ms) : 1470, 1518
. : milestone, 1494,
tracing (1.469 ms) : 1444, 1494
. : milestone, 1469,
section candidate
no_agent (1.359 ms) : 1339, 1378
. : milestone, 1359,
appsec (1.758 ms) : 1734, 1781
. : milestone, 1758,
appsec_no_iast (1.748 ms) : 1724, 1773
. : milestone, 1748,
iast (1.517 ms) : 1493, 1542
. : milestone, 1517,
profiling (1.511 ms) : 1487, 1535
. : milestone, 1511,
tracing (1.5 ms) : 1476, 1525
. : milestone, 1500,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics. Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section baseline
no_agent (15.233 s) : 15233000, 15233000
. : milestone, 15233000,
appsec (15.088 s) : 15088000, 15088000
. : milestone, 15088000,
iast (18.448 s) : 18448000, 18448000
. : milestone, 18448000,
iast_GLOBAL (17.76 s) : 17760000, 17760000
. : milestone, 17760000,
profiling (15.075 s) : 15075000, 15075000
. : milestone, 15075000,
tracing (14.836 s) : 14836000, 14836000
. : milestone, 14836000,
section candidate
no_agent (15.532 s) : 15532000, 15532000
. : milestone, 15532000,
appsec (15.145 s) : 15145000, 15145000
. : milestone, 15145000,
iast (18.349 s) : 18349000, 18349000
. : milestone, 18349000,
iast_GLOBAL (17.753 s) : 17753000, 17753000
. : milestone, 17753000,
profiling (15.033 s) : 15033000, 15033000
. : milestone, 15033000,
tracing (15.014 s) : 15014000, 15014000
. : milestone, 15014000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.47.0-SNAPSHOT~0765d26d23, baseline=1.47.0-SNAPSHOT~919d6073eb
dateFormat X
axisFormat %s
section baseline
no_agent (1.471 ms) : 1459, 1482
. : milestone, 1471,
appsec (2.36 ms) : 2316, 2403
. : milestone, 2360,
iast (2.114 ms) : 2059, 2170
. : milestone, 2114,
iast_GLOBAL (2.15 ms) : 2095, 2206
. : milestone, 2150,
profiling (1.968 ms) : 1924, 2012
. : milestone, 1968,
tracing (1.949 ms) : 1906, 1992
. : milestone, 1949,
section candidate
no_agent (1.472 ms) : 1460, 1483
. : milestone, 1472,
appsec (2.357 ms) : 2314, 2400
. : milestone, 2357,
iast (2.104 ms) : 2049, 2159
. : milestone, 2104,
iast_GLOBAL (2.157 ms) : 2101, 2212
. : milestone, 2157,
profiling (1.963 ms) : 1920, 2006
. : milestone, 1963,
tracing (1.945 ms) : 1902, 1987
. : milestone, 1945,
|
descriptor.getFields().stream() | ||
// iterate fields in number order to ensure hash stability | ||
.sorted(Comparator.comparingInt(FieldDescriptor::getNumber)) | ||
.collect(Collectors.toList())) { |
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.
What is the collector for?
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.
Ah it was already there (this part is best viewed with "ignore whitespace changes" turned on because I changed the indentation). But indeed I think it's unnecessary, I can remove it.
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.
well it says Foreach not applicable to type 'java. util. stream. Stream<com. google. protobuf. Descriptors. FieldDescriptor>'
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.
I guess I'd have to use it with .forEach(...)
but I don't know how to break out of that.
We could also say that we don't break, and if we're looking at a descriptor, we iterate over all properties even if the limit has been reached, the gain from breaking early is probably marginal.
...c/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy
Outdated
Show resolved
Hide resolved
...c/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy
Outdated
Show resolved
Hide resolved
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.
Good catch, thanks for fixing it 🙇
| Package | Type | Package file | Manager | Update | Change | |---|---|---|---|---|---| | [com.datadoghq:dd-trace-api](https://github.com/datadog/dd-trace-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.46.1` -> `1.47.0` | | [com.datadoghq:dd-trace-ot](https://github.com/datadog/dd-trace-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.46.1` -> `1.47.0` | | [software.amazon.awssdk:sdk-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:sqs](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:dynamodb-enhanced](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:dynamodb](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:aws-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:bom](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | | [software.amazon.awssdk:auth](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.30.33` -> `2.30.34` | --- ### Release Notes <details> <summary>datadog/dd-trace-java (com.datadoghq:dd-trace-api)</summary> ### [`v1.47.0`](https://github.com/DataDog/dd-trace-java/releases/tag/v1.47.0): 1.47.0 ##### Components ##### Application Security Management (IAST) - 🐛 Exclude com.stripe.net.HttpURLConnectionClient to solve IAST SSRF vulnerability false positives ([#​8483](DataDog/dd-trace-java#8483) - [@​jandro996](https://github.com/jandro996)) - 🐛 Add exclusion to solve IAST weak randomness vulnerability false positives ([#​8462](DataDog/dd-trace-java#8462) - [@​jandro996](https://github.com/jandro996)) - ✨ Fix weak randomness false positive in Kafka client ([#​8408](DataDog/dd-trace-java#8408) - [@​smola](https://github.com/smola)) - ✨ Fix location for SSRF with Kong Unirest ([#​8407](DataDog/dd-trace-java#8407) - [@​smola](https://github.com/smola)) - ✨ Exclude IBM Instana from IAST ([#​8406](DataDog/dd-trace-java#8406) - [@​smola](https://github.com/smola)) - 🐛 Fix org.json iast instrumentation test for latest dependency ([#​8347](DataDog/dd-trace-java#8347) - [@​jandro996](https://github.com/jandro996)) - ✨ Configuration to Disable APM Tracing ([#​8219](DataDog/dd-trace-java#8219) - [@​jandro996](https://github.com/jandro996)) - ✨ Address cookie vulnerability cardinality issues ([#​8210](DataDog/dd-trace-java#8210) - [@​jandro996](https://github.com/jandro996)) - ✨ Email HTML Injection detection in IAST ([#​8205](DataDog/dd-trace-java#8205) - [@​sezen-datadog](https://github.com/sezen-datadog)) ##### Application Security Management (WAF) - 🐛✨ Ensure usr.exists tag is not overridden when UsernameNotFoundException is thrown ([#​8376](DataDog/dd-trace-java#8376) - [@​manuel-alvarez-alvarez](https://github.com/manuel-alvarez-alvarez)) - 🐛✨ Ensure usr.exists tag is not overridden by auto instrumentation ([#​8374](DataDog/dd-trace-java#8374) - [@​manuel-alvarez-alvarez](https://github.com/manuel-alvarez-alvarez)) - ✨ Update appsec metrics with event_rules_version tag ([#​8354](DataDog/dd-trace-java#8354) - [@​sezen-datadog](https://github.com/sezen-datadog)) - ✨ Update metrics: appsec.waf.requests ([#​8353](DataDog/dd-trace-java#8353) - [@​Mariovido](https://github.com/Mariovido)) - ✨ Improve ASM support in vert.x 5.0 ([#​8285](DataDog/dd-trace-java#8285) - [@​manuel-alvarez-alvarez](https://github.com/manuel-alvarez-alvarez)) - ✨ Update metrics: appsec.waf.updates and appsec.waf.init ([#​8280](DataDog/dd-trace-java#8280) - [@​Mariovido](https://github.com/Mariovido)) - ✨ Configuration to Disable APM Tracing ([#​8219](DataDog/dd-trace-java#8219) - [@​jandro996](https://github.com/jandro996)) ##### Build & Tooling - 🐛 Do not generate Muzzle references for primitive arrays in method body ([#​8361](DataDog/dd-trace-java#8361) - [@​amarziali](https://github.com/amarziali)) - 📖 Improve dev env setup documentation for Windows ([#​8180](DataDog/dd-trace-java#8180) - [@​lucaspimentel](https://github.com/lucaspimentel)) ##### Continuous Integration Visibility - ✨ Add support for skip-EFD tagging ([#​8487](DataDog/dd-trace-java#8487) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - 🐛 Fix an NPE in Gradle Android instrumentation ([#​8484](DataDog/dd-trace-java#8484) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Consider modified tests when applying fail-fast tests ordering ([#​8474](DataDog/dd-trace-java#8474) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Implement tests reordering for TestNG ([#​8467](DataDog/dd-trace-java#8467) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - 🐛 Fix Gradle Launcher instrumentation to not interfere with Gradle Test Kit ([#​8465](DataDog/dd-trace-java#8465) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - 🧹 Use separate TestEventHandlers per framework in CI Vis instrumentations ([#​8451](DataDog/dd-trace-java#8451) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) - ✨ Remove warning log when JUnit 4 test method cannot be retrieved ([#​8445](DataDog/dd-trace-java#8445) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - 🐛 Fix Scalatest tracing for tests that are reported asynchronously ([#​8444](DataDog/dd-trace-java#8444) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Implement attempt to fix tests ([#​8393](DataDog/dd-trace-java#8393) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) - ✨ Implement test disabling ([#​8377](DataDog/dd-trace-java#8377) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) - ✨ Update CODEOWNERS parser to not log errors on comments with leading whitespace ([#​8349](DataDog/dd-trace-java#8349) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Request Test Management tests list ([#​8345](DataDog/dd-trace-java#8345) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) - ✨ Receive test management settings from CIVis settings request ([#​8331](DataDog/dd-trace-java#8331) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) - ✨ Implement quarantined tests tagging ([#​8326](DataDog/dd-trace-java#8326) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Implement tests quarantining ([#​8320](DataDog/dd-trace-java#8320) - [@​nikita-tkachenko-datadog](https://github.com/nikita-tkachenko-datadog)) - ✨ Add tag to specify if the user is setting DD_SERVICE ([#​8318](DataDog/dd-trace-java#8318) - [@​daniel-mohedano](https://github.com/daniel-mohedano)) ##### Crash tracking - ✨ Only fork jps when required ([#​8419](DataDog/dd-trace-java#8419) - [@​mcculls](https://github.com/mcculls)) - 🐛 Use Java home of the crashed process to launch crash uploader ([#​8348](DataDog/dd-trace-java#8348) - [@​jbachorik](https://github.com/jbachorik)) ##### Data Streams Monitoring - 🐛 Fix error happening when sqs message attributes are readonly ([#​8473](DataDog/dd-trace-java#8473) - [@​vandonr](https://github.com/vandonr)) - 🐛 Fix bug on proto schema extraction ([#​8403](DataDog/dd-trace-java#8403) - [@​vandonr](https://github.com/vandonr)) - 🐛 Fix service name overrides in consumers ([#​8387](DataDog/dd-trace-java#8387) - [@​piochelepiotr](https://github.com/piochelepiotr)) ##### Database Monitoring - ✨ Add DBMTracePreparedStatements to tracer configuration log ([#​8508](DataDog/dd-trace-java#8508) - [@​cecile75](https://github.com/cecile75)) ##### Dynamic Instrumentation - ✨ Look in another location for grpc service methods ([#​8468](DataDog/dd-trace-java#8468) - [@​evanchooly](https://github.com/evanchooly)) - 🐛 Fix Exception Replay with Lambda proxy classes ([#​8452](DataDog/dd-trace-java#8452) - [@​jpbempel](https://github.com/jpbempel)) - ✨ Add code origin support for spring-webmvc ([#​8416](DataDog/dd-trace-java#8416) - [@​evanchooly](https://github.com/evanchooly)) - ✨ Add support for scanning jar from loaded class ([#​8370](DataDog/dd-trace-java#8370) - [@​jpbempel](https://github.com/jpbempel)) - 🐛 Disable capture of entry values ([#​8369](DataDog/dd-trace-java#8369) - [@​jpbempel](https://github.com/jpbempel)) - 🐛 Fix CodeOrigin for `@Trace` annotation ([#​8344](DataDog/dd-trace-java#8344) - [@​jpbempel](https://github.com/jpbempel)) - 🐛 Fix equals/hashCode for CodeOrigin probe ([#​8319](DataDog/dd-trace-java#8319) - [@​jpbempel](https://github.com/jpbempel)) - ✨ Add code origin support to kafka message listeners ([#​8301](DataDog/dd-trace-java#8301) - [@​evanchooly](https://github.com/evanchooly)) ##### Metrics - ✨ Create metric: appsec.waf.error ([#​8381](DataDog/dd-trace-java#8381) - [@​sezen-datadog](https://github.com/sezen-datadog)) - ✨ Create metric: appsec.rasp.error ([#​8364](DataDog/dd-trace-java#8364) - [@​sezen-datadog](https://github.com/sezen-datadog)) ##### Profiling - ✨ Bump ddprof library to 1.22.0 ([#​8463](DataDog/dd-trace-java#8463) - [@​jbachorik](https://github.com/jbachorik)) - IBM J9 8u361 corresponds to OpenJDK 8u362 by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#187 - Fix compatibility with musl libc 1.2.4 by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#189 - Modify version extraction by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#179 - Do not write null values to jvminfo event by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#184 - Productize VMStructs-based stack walker by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#177 - A few minor downport issues by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#180 - Enable ASGCT by default on fairly safe J9 JDK versions by [@​jbachorik](https://github.com/jbachorik) in DataDog/java-profiler#181 - 🐛 Exclude OrderedThreadPoolExecutor from queue-time measurements ([#​8456](DataDog/dd-trace-java#8456) - [@​jbachorik](https://github.com/jbachorik)) - ✨ Record JVM info on JVMs without JFR ([#​8431](DataDog/dd-trace-java#8431) - [@​jbachorik](https://github.com/jbachorik)) - 🐛 Actually use CleanupTask in TempLocationManager ([#​8420](DataDog/dd-trace-java#8420) - [@​mcculls](https://github.com/mcculls)) - ✨ Only fork jps when required ([#​8419](DataDog/dd-trace-java#8419) - [@​mcculls](https://github.com/mcculls)) - 🐛 Adjust JFR checks for J9 ([#​8405](DataDog/dd-trace-java#8405) - [@​jbachorik](https://github.com/jbachorik)) - 🧹 Disable smap RSS parsing by default ([#​8342](DataDog/dd-trace-java#8342) - [@​MattAlp](https://github.com/MattAlp)) ##### Telemetry - 🐛 Add support for JBoss jar:file format to DependencyResolver ([#​8428](DataDog/dd-trace-java#8428) - [@​jandro996](https://github.com/jandro996)) - ✨ Update metrics: appsec.waf.requests ([#​8353](DataDog/dd-trace-java#8353) - [@​Mariovido](https://github.com/Mariovido)) ##### Trace context propagation - ✨ Introduce tracing propagator ([#​8313](DataDog/dd-trace-java#8313) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) ##### Tracer core - 🐛 Fix Stable Config telemetry source names ([#​8460](DataDog/dd-trace-java#8460) - [@​BaptisteFoy](https://github.com/BaptisteFoy)) - ✨ Probe trace endpoints with a valid payload of empty arrays ([#​8414](DataDog/dd-trace-java#8414) - [@​mcculls](https://github.com/mcculls)) - ✨ Add 1 minute fail-safe to JUL/JMX class-loading callback ([#​8399](DataDog/dd-trace-java#8399) - [@​mcculls](https://github.com/mcculls)) - ✨ Migrate DSM injection calls to context-first APIs ([#​8383](DataDog/dd-trace-java#8383) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) - 🧹 Move continuation capture methods from scope to tracer ([#​8371](DataDog/dd-trace-java#8371) - [@​mcculls](https://github.com/mcculls)) - ✨ Migrate context extraction calls to context-first APIs ([#​8368](DataDog/dd-trace-java#8368) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) - 🧹 Migrate context injection calls to context-first APIs ([#​8358](DataDog/dd-trace-java#8358) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) - 💡 Support reading configurations from files ([#​8338](DataDog/dd-trace-java#8338) - [@​mtoffl01](https://github.com/mtoffl01)) - 💡 Implementation of BaggagePropagator and BaggageContext ([#​8330](DataDog/dd-trace-java#8330) - [@​mhlidd](https://github.com/mhlidd)) - 🧹 Combine continuation implementations into one which supports multiple activations ([#​8324](DataDog/dd-trace-java#8324) - [@​mcculls](https://github.com/mcculls)) - ✨ Introduce tracing propagator ([#​8313](DataDog/dd-trace-java#8313) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) - ✨ Remove old context propagation API ([#​8271](DataDog/dd-trace-java#8271) - [@​PerfectSlayer](https://github.com/PerfectSlayer)) ##### Instrumentations ##### AWS Lambda instrumentation - 🐛 Send error message and stack to Lambda extension ([#​8417](DataDog/dd-trace-java#8417) - [@​nhulston](https://github.com/nhulston)) ##### AWS SDK instrumentation - 🐛 Fix error happening when sqs message attributes are readonly ([#​8473](DataDog/dd-trace-java#8473) - [@​vandonr](https://github.com/vandonr)) - 💡 Inject trace context into AWS Step Functions input ([#​7585](DataDog/dd-trace-java#7585) - [@​DylanLovesCoffee](https://github.com/DylanLovesCoffee)) ##### Core Java language instrumentation - ✨ Look in another location for grpc service methods ([#​8468](DataDog/dd-trace-java#8468) - [@​evanchooly](https://github.com/evanchooly)) - ✨ Add code origin support for spring-webmvc ([#​8416](DataDog/dd-trace-java#8416) - [@​evanchooly](https://github.com/evanchooly)) - 💡 Implementation of BaggagePropagator and BaggageContext ([#​8330](DataDog/dd-trace-java#8330) - [@​mhlidd](https://github.com/mhlidd)) - ✨ Add code origin support to kafka message listeners ([#​8301](DataDog/dd-trace-java#8301) - [@​evanchooly](https://github.com/evanchooly)) ##### gRPC instrumentation - ✨ Look in another location for grpc service methods ([#​8468](DataDog/dd-trace-java#8468) - [@​evanchooly](https://github.com/evanchooly)) ##### Kafka instrumentation - ✨ Add messaging.destination.name tag to kafka integrations ([#​8366](DataDog/dd-trace-java#8366) - [@​rarguelloF](https://github.com/rarguelloF)) ##### Protocol Buffer instrumentation - 🐛 Fix bug on proto schema extraction ([#​8403](DataDog/dd-trace-java#8403) - [@​vandonr](https://github.com/vandonr)) </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**: Never, 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: 108a0f86aa59ab4c938cbac0688dd4c19cb301fa
What Does This Do
Fix a bug in the protobuf instrumentation where schema extraction would stop on the first occurence of an already-extracted message
Motivation
Noticed the bug as I was working on system tests. Basically, we didn't differentiate "stop" from "skip". A message already extracted, or reaching the max depth should be a "skip" event, while reaching max properties is a "stop" event (it's actually the only one I think).
With this fix, it means that we'll not stop extracting at exactly
maxProperties
. Once we reach it, we still "resolve" the properties up the hierarchy, but since that is capped too bymaxDepth
, the real max ismaxProperties + maxDepth
, which is close enough.Additional Notes
This bug was already covered by existing system tests, but the expected value was wrong 🙃
This will have the side effect of changing the schema ID where it applies (i.e. where extraction was stopped too early)
Contributor Checklist
type:
and (comp:
orinst:
) labels in addition to any usefull labelsclose
,fix
or any linking keywords when referencing an issue.Use
solves
instead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]