diff --git a/build.gradle b/build.gradle index 5157e96..dcf3db7 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ dependencies { //integrationTestImplementation("org.jboss.slf4j:slf4j-jboss-logmanager") // REST implementation (Jackson serialization) + MicroProfile OpenAPI specification - implementation 'io.quarkus:quarkus-resteasy-reactive-jackson' + implementation 'io.quarkus:quarkus-rest-jackson' implementation 'io.quarkus:quarkus-smallrye-openapi' testImplementation 'io.quarkus:quarkus-junit5' diff --git a/gradle.properties b/gradle.properties index 174722c..11d453b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ #Gradle properties #Thu Apr 20 09:07:19 CEST 2023 #quarkusPluginVersion=3.2.9.Final -quarkusPluginVersion=3.8.3 +quarkusPluginVersion=3.15.1 quarkusPlatformArtifactId=quarkus-bom quarkusPluginId=io.quarkus quarkusPlatformGroupId=io.quarkus.platform #quarkusPlatformVersion=3.2.9.Final -quarkusPlatformVersion=3.8.3 +quarkusPlatformVersion=3.15.1 confluentAvroSerdeVersion=7.3.3 diff --git a/src/integrationTest/java/net/explorviz/span/api/LandscapeResourceIt.java b/src/integrationTest/java/net/explorviz/span/api/LandscapeResourceIt.java index e9d81c5..b076ce8 100644 --- a/src/integrationTest/java/net/explorviz/span/api/LandscapeResourceIt.java +++ b/src/integrationTest/java/net/explorviz/span/api/LandscapeResourceIt.java @@ -164,22 +164,22 @@ void testLoadTracesByTimeRange() { final PersistenceSpan differentTokenSpan = new PersistenceSpan( UUID.randomUUID(), gitCommitChecksum, "123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()", - "847"); + "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final String duplicateMethodName = "myMethodName()"; final String otherMethodName = "myOtherMethodName()"; final PersistenceSpan firstOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan secondOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan otherSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L", "", "2L", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + otherMethodName, "321"); + "net.explorviz.Class." + otherMethodName, "321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); spanProcessor.accept(differentTokenSpan); spanProcessor.accept(firstOccurenceSpan); diff --git a/src/integrationTest/java/net/explorviz/span/api/TimestampResourceIt.java b/src/integrationTest/java/net/explorviz/span/api/TimestampResourceIt.java index 18a7711..3fd841c 100644 --- a/src/integrationTest/java/net/explorviz/span/api/TimestampResourceIt.java +++ b/src/integrationTest/java/net/explorviz/span/api/TimestampResourceIt.java @@ -64,10 +64,10 @@ void testLoadAllTimestampsForToken() { endExpected, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + otherMethodName, "321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); - spanProcessor.accept(firstSpanOfFirstBucket); - spanProcessor.accept(firstSpanOfSecondBuckec); - spanProcessor.accept(firstSpanOfThirdBucket); - spanProcessor.accept(secondSpanOfSecondBucket); + spanProcessor.accept(differentTokenSpan); + spanProcessor.accept(firstOccurenceSpan); + spanProcessor.accept(secondOccurenceSpan); + spanProcessor.accept(otherSpan); final Response response = given().pathParam("token", uuidExpected).when() .get("/v2/landscapes/{token}/timestamps"); @@ -116,7 +116,7 @@ void testLoadNewerTimestampsForToken() { final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "0123L", "", "1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class.myMethod()", "847"); + "net.explorviz.Class.myMethod()", "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final String duplicateMethodName = "myMethodName()"; final String otherMethodName = "myOtherMethodName()"; @@ -125,19 +125,19 @@ void testLoadNewerTimestampsForToken() { "1L", secondBucketStart, secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "789L", "", "3L", thirdBucketStart, thirdBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L", "0L", "", secondBucketStart, secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + otherMethodName, - "321"); + "321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); spanProcessor.accept(firstSpanOfFirstBucket); spanProcessor.accept(firstSpanOfSecondBuckec); @@ -181,7 +181,8 @@ void testLoadAllTimestampsForTokenAndCommit() { final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, "notTestCommit-1", "0123L", "", "1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class.myMethod()", "847"); + "net.explorviz.Class.myMethod()", "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final String duplicateMethodName = "myMethodName()"; final String otherMethodName = "myOtherMethodName()"; @@ -190,19 +191,21 @@ void testLoadAllTimestampsForTokenAndCommit() { secondBucketStart, secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, "notTestCommit-2", "789L", "", "3L", thirdBucketStart, thirdBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, "notTestCommit-2", "456L", "0L", "", secondBucketStart, secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + otherMethodName, - "321"); + "321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); spanProcessor.accept(firstSpanOfFirstBucket); spanProcessor.accept(firstSpanOfSecondBuckec); @@ -242,7 +245,8 @@ void testLoadNewerTimestampsForTokenAndCommit() { final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, expectedCommit, "0123L", "", "1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class.myMethod()", "847"); + "net.explorviz.Class.myMethod()", "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final String duplicateMethodName = "myMethodName()"; final String otherMethodName = "myOtherMethodName()"; @@ -251,19 +255,22 @@ void testLoadNewerTimestampsForTokenAndCommit() { secondBucketStart, secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, expectedCommit, "789L", "", "3L", thirdBucketStart, thirdBucketEnd, "nodeIp", "host-name", "app-name", "java", 0, - "net.explorviz.Class." + duplicateMethodName, "847"); + "net.explorviz.Class." + duplicateMethodName, "847", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, expectedCommit, "456L", "0L", "", secondBucketStart + 1000, secondBucketEnd + 1000, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + otherMethodName, - "321"); + "321", + "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment"); spanProcessor.accept(firstSpanOfFirstBucket); spanProcessor.accept(firstSpanOfSecondBuckec);