Commit 5a85e01
committed
Fix CI failures and reduce agent JAR size for Jetty filenames PR
- Add jetty-appsec-9.4 and jetty-appsec-11.0 to armeria-jetty-1.24
testRuntimeOnly classpath; these are required after the muzzle split
that tightened jetty-appsec-9.3 to [9.3, 9.4.10)
- Merge jetty-appsec-10.0 functionality into jetty-appsec-9.4: extend
the muzzle from [9.4.10, 10.0) to also cover [10.0.10, 11.0) using
_multiParts:MultiParts + javax.servlet.http.Part as discriminators;
delete the now-redundant jetty-appsec-10.0 module
- Delete intermediate modules jetty-appsec-10.0.10 and jetty-appsec-11.0.10
that were split-by-point-release and now handled by the two modules above
- Scope server.request.body.filenames to Jetty 9.3+: revert filenames
additions from jetty-appsec-8.1.3 (Jetty 8, EOL 2015) and
jetty-appsec-9.2 (Jetty 9.2, EOL 2019) to stay within the 32 MiB
agent JAR limit; requestBodyProcessed support for those versions is
unchanged
Agent JAR: 33,551,402 bytes (3,030 bytes under the 32 MiB limit)1 parent eb6ca70 commit 5a85e01
File tree
24 files changed
+32
-1189
lines changed- dd-java-agent/instrumentation
- armeria/armeria-jetty-1.24
- jetty
- jetty-appsec
- jetty-appsec-10.0.10
- src/main/java/datadog/trace/instrumentation/jetty1010
- jetty-appsec-10.0
- src/main/java/datadog/trace/instrumentation/jetty10
- jetty-appsec-11.0.10
- src/main/java/datadog/trace/instrumentation/jetty1110
- jetty-appsec-11.0
- src/main/java/datadog/trace/instrumentation/jetty11
- jetty-appsec-8.1.3/src
- main/java/datadog/trace/instrumentation/jetty8
- test/groovy/datadog/trace/instrumentation/jetty8
- jetty-appsec-9.2/src
- main/java/datadog/trace/instrumentation/jetty92
- test/groovy/datadog/trace/instrumentation/jetty92
- jetty-appsec-9.4
- src/main/java/datadog/trace/instrumentation/jetty94
- jetty-server
- jetty-server-10.0
- jetty-server-11.0
- jetty-server-12.0
24 files changed
+32
-1189
lines changedLines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
| 91 | + | |
90 | 92 | | |
91 | 93 | | |
92 | 94 | | |
Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 0 additions & 32 deletions
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 0 additions & 32 deletions
This file was deleted.
0 commit comments