Skip to content

Add support for endpoint discovery in spring mvc #8352

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.

Sign up for GitHub

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

Merged
manuel-alvarez-alvarez merged 9 commits into from
Mar 28, 2025
Merged

Add support for endpoint discovery in spring mvc #8352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3b5aa7a
Add endpoint discover for spring mvc
manuel-alvarez-alvarez Feb 26, 2025
cb60df2
Update endpoints payload
manuel-alvarez-alvarez Mar 20, 2025
d6bc2d8
Disable endpoint collection by default
manuel-alvarez-alvarez Mar 25, 2025
0e5386d
Make better use of config options
manuel-alvarez-alvarez Mar 25, 2025
642dd58
Fix failing tests
manuel-alvarez-alvarez Mar 26, 2025
83a89c4
Fix muzzle directive
manuel-alvarez-alvarez Mar 26, 2025
50c8ee3
Fix coverage
manuel-alvarez-alvarez Mar 26, 2025
bd769d9
Remove property
manuel-alvarez-alvarez Mar 28, 2025
5302575
Update system tests commit
manuel-alvarez-alvarez Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix muzzle directive
  • Loading branch information
@manuel-alvarez-alvarez
manuel-alvarez-alvarez committed Mar 28, 2025
commit 83a89c4aba7543cace4580a450125f09bc8a5f41
14 changes: 14 additions & 0 deletions dd-java-agent/instrumentation/spring-webmvc-3.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ muzzle {
extraDependency "javax.servlet:javax.servlet-api:3.0.1"
extraDependency "org.springframework:spring-webmvc:3.1.0.RELEASE"
}

pass {
name = 'spring-mvc-pre-5.3'
group = 'org.springframework'
module = 'spring-webmvc'
versions = "[3.1.0.RELEASE,5.3)"
skipVersions += [
'1.2.1',
'1.2.2',
'1.2.3',
'1.2.4'] // broken releases... missing dependencies
skipVersions += '3.2.1.RELEASE' // missing a required class. (bad release?)
extraDependency "javax.servlet:javax.servlet-api:3.0.1"
}
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
5 changes: 5 additions & 0 deletions .../java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
"org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition"));
}

@Override
public String muzzleDirective() {
return "spring-mvc-pre-5.3";
}

@Override
public String[] helperClassNames() {
return new String[] {packageName + ".RequestMappingInfoIterator"};
Expand Down