Skip to content

Commit 7867432

Browse files
committed
wip
1 parent 02cae20 commit 7867432

File tree

50 files changed

+1491
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1491
-195
lines changed
Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
muzzle {
2+
pass {
3+
name = '9_full_series'
4+
group = "org.eclipse.jetty"
5+
module = 'jetty-server'
6+
versions = "[9,10)"
7+
assertInverse = true
8+
}
9+
pass {
10+
name = 'before_904'
11+
group = "org.eclipse.jetty"
12+
module = 'jetty-server'
13+
versions = "[9,9.0.4)"
14+
assertInverse = true
15+
}
16+
pass {
17+
name = 'between_904_and_930'
18+
group = "org.eclipse.jetty"
19+
module = 'jetty-server'
20+
versions = "[9.0.4,9.3.0.M1)"
21+
assertInverse = true
22+
}
23+
pass {
24+
name = 'between_930_and_9421'
25+
group = "org.eclipse.jetty"
26+
module = 'jetty-server'
27+
versions = "[9.3.0.M1,9.4.21)"
28+
assertInverse = true
29+
}
30+
pass {
31+
name = 'between_9421_and_10'
32+
group = "org.eclipse.jetty"
33+
module = 'jetty-server'
34+
versions = "[9.4.21,10)"
35+
assertInverse = true
36+
}
37+
pass {
38+
name = '10_series'
39+
group = "org.eclipse.jetty"
40+
module = 'jetty-server'
41+
versions = "[10,11)"
42+
assertInverse = true
43+
javaVersion = 11
44+
}
45+
pass {
46+
name = 'named_dispatches'
47+
group = 'org.eclipse.jetty'
48+
module = 'jetty-server'
49+
versions = "[10.0.16,11),[11.0.16,12)"
50+
assertInverse = true
51+
javaVersion = 11
52+
}
53+
pass {
54+
name = 'between_10_and_12'
55+
group = "org.eclipse.jetty"
56+
module = 'jetty-server'
57+
versions = "[10,12)"
58+
assertInverse = true
59+
javaVersion = 11
60+
}
61+
}
62+
63+
apply plugin: 'java-test-fixtures'
64+
apply from: "$rootDir/gradle/java.gradle"
65+
66+
sourceSets {
67+
main_jetty904 {
68+
java.srcDirs "${project.projectDir}/src/main/java_jetty904"
69+
}
70+
main_jetty93 {
71+
java.srcDirs "${project.projectDir}/src/main/java_jetty93"
72+
}
73+
main_jetty9421 {
74+
java.srcDirs "${project.projectDir}/src/main/java_jetty9421"
75+
}
76+
main_jetty10 {
77+
java.srcDirs "${project.projectDir}/src/main/java_jetty10"
78+
}
79+
}
80+
81+
jar {
82+
from sourceSets.main_jetty904.output
83+
from sourceSets.main_jetty93.output
84+
from sourceSets.main_jetty9421.output
85+
from sourceSets.main_jetty10.output
86+
}
87+
88+
List<DirectoryProperty> extraInstrumentJavaDirs = []
89+
['main_jetty904', 'main_jetty93', 'main_jetty9421', 'main_jetty10'].each {
90+
JavaCompile compileTask = tasks["compile${it.capitalize()}Java"]
91+
extraInstrumentJavaDirs << compileTask.destinationDirectory
92+
compileTask.dependsOn tasks['compileJava']
93+
project.afterEvaluate { p ->
94+
tasks['instrumentJava'].dependsOn compileTask
95+
tasks["forbiddenApis${it.capitalize()}"].dependsOn("instrument${it.capitalize()}Java")
96+
}
97+
}
98+
99+
instrument {
100+
// the instrumenters are in main, but helpers/advice in possibly other sourceSets
101+
// The muzzle generator of references run as part of InstrumentJava needs access to
102+
// these extra classes. The task dependencies for instrumentJava are added above
103+
additionalClasspath = [
104+
instrumentJava: extraInstrumentJavaDirs
105+
]
106+
}
107+
108+
tasks.named("compileMain_jetty10Java", JavaCompile) {
109+
setJavaVersion(it, 11)
110+
}
111+
112+
addTestSuiteForDir('jetty92ForkedTest', 'test')
113+
addTestSuiteForDir('jetty94ForkedTest', 'test')
114+
addTestSuiteForDir('latestDepJetty9ForkedTest', 'test')
115+
addTestSuiteForDir('latestDepForkedTest', 'test')
116+
117+
tasks.named("latestDepForkedTest") {
118+
javaLauncher = getJavaLauncherFor(11)
119+
}
120+
tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) {
121+
setJavaVersion(it, 11)
122+
}
123+
124+
dependencies {
125+
compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.0.v20130308'
126+
127+
implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
128+
129+
main_jetty904CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.4.v20130625'
130+
main_jetty904CompileOnly project(':internal-api')
131+
main_jetty904CompileOnly project(':dd-java-agent:agent-tooling')
132+
main_jetty904CompileOnly project(':dd-java-agent:agent-bootstrap')
133+
// not pretty, but we can't depend on sourceSets.main.output;
134+
// that would make a dependency on the classes task due to the
135+
// intermediation of the InstrumentPlugin, creating a circular
136+
// dependency (the instrument plugin needs all the sourceSets
137+
// compiled to properly generate References)
138+
main_jetty904CompileOnly files("$project.buildDir/classes/java/raw")
139+
140+
main_jetty93CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.0.v20150612'
141+
main_jetty93CompileOnly project(':internal-api')
142+
main_jetty93CompileOnly project(':dd-java-agent:agent-tooling')
143+
main_jetty93CompileOnly project(':dd-java-agent:agent-bootstrap')
144+
main_jetty93CompileOnly files("$project.buildDir/classes/java/raw") {
145+
builtBy = ['compileJava']
146+
}
147+
148+
main_jetty9421CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.21.v20190926'
149+
main_jetty9421CompileOnly project(':internal-api')
150+
main_jetty9421CompileOnly project(':dd-java-agent:agent-tooling')
151+
main_jetty9421CompileOnly project(':dd-java-agent:agent-bootstrap')
152+
main_jetty9421CompileOnly files("$project.buildDir/classes/java/raw") {
153+
builtBy = ['compileJava']
154+
}
155+
156+
main_jetty10CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'
157+
158+
main_jetty10CompileOnly project(':internal-api')
159+
main_jetty10CompileOnly project(':dd-java-agent:agent-tooling')
160+
main_jetty10CompileOnly project(':dd-java-agent:agent-bootstrap')
161+
main_jetty10Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
162+
main_jetty10CompileOnly files("$project.buildDir/classes/java/raw") {
163+
builtBy = ['compileJava']
164+
}
165+
166+
testFixturesImplementation(project(':dd-java-agent:instrumentation-testing')) {
167+
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
168+
}
169+
// Don't want to conflict with jetty from the test server.
170+
testImplementation(project(':dd-java-agent:instrumentation-testing')) {
171+
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
172+
}
173+
testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
174+
175+
String jetty9Version = '9.0.0.v20130308'
176+
testFixturesCompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: jetty9Version
177+
testFixturesCompileOnly group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jetty9Version
178+
testFixturesImplementation group: 'javax.websocket', name: 'javax.websocket-api', version: '1.0'
179+
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: jetty9Version
180+
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jetty9Version
181+
testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: jetty9Version
182+
testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
183+
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
184+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')
185+
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
186+
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
187+
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10')
188+
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
189+
testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
190+
testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
191+
192+
jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
193+
jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.2.30.v20200428'
194+
jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.2.30.v20200428'
195+
jetty92TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.2.30.v20200428'
196+
jetty92TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2')
197+
jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
198+
199+
jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.15.v20190215'
200+
jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.15.v20190215'
201+
jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.4.15.v20190215'
202+
jetty94TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.4.15.v20190215'
203+
jetty94TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
204+
jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
205+
206+
latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
207+
latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
208+
latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
209+
latestDepJetty9TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.+'
210+
211+
latestDepJetty9TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
212+
latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
213+
214+
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+'
215+
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+'
216+
latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
217+
latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
218+
latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
219+
}
220+
configurations.getByName('latestDepForkedTestRuntimeClasspath').resolutionStrategy {
221+
force libs.slf4j
222+
}

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/ExtractAdapter.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/HandleAdvice.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyDecorator.java

File renamed without changes.

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java

File renamed without changes.

0 commit comments

Comments
 (0)