Skip to content

Commit 97e910e

Browse files
Fix muzzle directive
1 parent 762ec01 commit 97e910e

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

dd-java-agent/instrumentation/spring-webmvc-3.1/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@ muzzle {
3434
extraDependency "javax.servlet:javax.servlet-api:3.0.1"
3535
extraDependency "org.springframework:spring-webmvc:3.1.0.RELEASE"
3636
}
37+
38+
pass {
39+
name = 'spring-mvc-pre-5.3'
40+
group = 'org.springframework'
41+
module = 'spring-webmvc'
42+
versions = "[3.1.0.RELEASE,5.3)"
43+
skipVersions += [
44+
'1.2.1',
45+
'1.2.2',
46+
'1.2.3',
47+
'1.2.4'] // broken releases... missing dependencies
48+
skipVersions += '3.2.1.RELEASE' // missing a required class. (bad release?)
49+
extraDependency "javax.servlet:javax.servlet-api:3.0.1"
50+
}
3751
}
3852

3953
apply from: "$rootDir/gradle/java.gradle"

dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
4141
"org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition"));
4242
}
4343

44+
@Override
45+
public String muzzleDirective() {
46+
return "spring-mvc-pre-5.3";
47+
}
48+
4449
@Override
4550
public String[] helperClassNames() {
4651
return new String[] {packageName + ".RequestMappingInfoIterator"};

0 commit comments

Comments
 (0)