now we have spring 6, uncomment fixme on smoke tests

DataDog · Jan 27, 2023 · 2929f81 · 2929f81
1 parent f32c4e1
commit 2929f81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle
@@ -2,15 +2,6 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_17
 }
 
-muzzle {
-  pass {
-    group = 'org.springframework'
-    module = 'spring-webmvc'
-    versions = "[6,]"
-    extraDependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
-  }
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 
 [compileMain_java17Java, compileTestJava].each {

diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy b/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy
@@ -31,12 +31,8 @@ class SpringBootWebmvcIntegrationTest extends AbstractServerSmokeTest {
   @Override
   protected Set<String> expectedTraces() {
     return [
-      "\\[servlet\\.request:GET /fruits\\[repository\\.operation:FruitRepository\\.findAll\\[h2\\.query:.*",
-      //FIXME: it should rather be
-      //"\\[servlet\\.request:GET /fruits\\[spring\\.handler:FruitController\\.listFruits\\[repository\\.operation:FruitRepository\\.findAll\\[h2\\.query:.*",
-      "\\[servlet\\.request:GET /fruits/banana\\[repository\\.operation:FruitRepository\\.findByName\\[h2\\.query:.*"
-      //FIXME: it should rather be:
-      //            "\\[servlet\\.request:GET /fruits/\\{name}\\[spring\\.handler:FruitController\\.findOneFruit\\[repository\\.operation:FruitRepository\\.findByName\\[h2\\.query:.*"
+      "\\[servlet\\.request:GET /fruits\\[spring\\.handler:FruitController\\.listFruits\\[repository\\.operation:FruitRepository\\.findAll\\[h2\\.query:.*",
+      "\\[servlet\\.request:GET /fruits/\\{name}\\[spring\\.handler:FruitController\\.findOneFruit\\[repository\\.operation:FruitRepository\\.findByName\\[h2\\.query:.*"
     ]
   }