Skip to content

Commit cbd79c3

Browse files
committed
fix mistake on muzzle directive
1 parent 9533232 commit cbd79c3

File tree

5 files changed

+32
-0
lines changed

5 files changed

+32
-0
lines changed

dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ muzzle {
66
group = "org.eclipse.jetty"
77
module = "jetty-client"
88
versions = "[10,12)"
9+
javaVersion = "11"
910
}
1011
fail {
1112
group = "org.eclipse.jetty"

dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,26 @@ muzzle {
44
* is compiled with Java 11, so we can't validate with muzzle which uses Java 8.
55
*/
66
pass {
7+
name = "client"
8+
group = "org.eclipse.jetty"
9+
module = "jetty-client"
10+
versions = "[9.1,10)"
11+
}
12+
pass {
13+
name = "listener"
714
group = "org.eclipse.jetty"
815
module = "jetty-client"
916
versions = "[9.1,10)"
1017
}
1118
fail {
19+
name = "client"
20+
group = "org.eclipse.jetty"
21+
module = "jetty-client"
22+
versions = "[10,12)"
23+
javaVersion = "11"
24+
}
25+
pass {
26+
name = "listener"
1227
group = "org.eclipse.jetty"
1328
module = "jetty-client"
1429
versions = "[10,12)"
@@ -19,6 +34,7 @@ muzzle {
1934
module = "jetty-client"
2035
versions = "[,9.1)"
2136
}
37+
2238
fail {
2339
group = "org.eclipse.jetty"
2440
module = "jetty-client"

dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ public Map<String, String> contextStore() {
3838
return contextStore;
3939
}
4040

41+
@Override
42+
public String muzzleDirective() {
43+
return "listener";
44+
}
45+
4146
@Override
4247
public void methodAdvice(MethodTransformer transformer) {
4348
transformer.applyAdvice(

dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ public String[] helperClassNames() {
3939
return new String[] {"datadog.trace.instrumentation.jetty_client.CallbackWrapper"};
4040
}
4141

42+
@Override
43+
public String muzzleDirective() {
44+
return "listener";
45+
}
46+
4247
@Override
4348
public void methodAdvice(MethodTransformer transformer) {
4449
transformer.applyAdvice(

dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public String[] helperClassNames() {
4949
};
5050
}
5151

52+
@Override
53+
public String muzzleDirective() {
54+
return "client";
55+
}
56+
5257
@Override
5358
public Map<String, String> contextStore() {
5459
return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());

0 commit comments

Comments
 (0)