fixed tests

Author: nayeem-kamal

dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/groovy/GraphQLTest.groovy

@@ -78,7 +78,7 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
       .type(newTypeWiring("Book").dataFetcher("year", new DataFetcher<CompletionStage<Integer>>() {
         @Override
         CompletionStage<Integer> get(DataFetchingEnvironment environment) throws Exception {
-          return CompletableFuture.completedStage(2015)
+          return CompletableFuture.completedFuture(2015)
         }
       }))
       .build()
@@ -359,31 +359,25 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
             "graphql.operation.name" null
             "error.message" { it.contains("Field 'title' in type 'Book' is undefined") }
             "error.message" { it.contains("(and 1 more errors)") }
-            defaultTags()
-            events {
-              event {
-                eventName "error"
-                attributes {
-                  "error.type" "graphql.validation.ValidationError"
-                  "error.message" "Field 'title' in type 'Book' is undefined"
-                  "error.stack" String
-                  "graphql.error.path" null
-                }
-              }
-              event {
-                eventName "error"
-                attributes {
-                  "error.type" "graphql.validation.ValidationError"
-                  "error.message" "Field 'color' in type 'Book' is undefined"
-                  "error.stack" String
-                  "graphql.error.path" null
-                }
-              }
+            "events" {
+              def events = new groovy.json.JsonSlurper().parseText(it) as List
+              events.size() == 2
+              def event1 = events[0]
+              event1.name == "dd.graphql.query.error"
+              event1.time_unix_nano instanceof Long
+              def attrs1 = event1.attributes
+              attrs1.message == "Validation error of type FieldUndefined: Field 'title' in type 'Book' is undefined @ 'bookById/title'"
+              attrs1.locations == ["4:5"]
+
+              def event2 = events[1]
+              event2.name == "dd.graphql.query.error"
+              event2.time_unix_nano instanceof Long
+              def attrs2 = event2.attributes
+              attrs2.message == "Validation error of type FieldUndefined: Field 'color' in type 'Book' is undefined @ 'bookById/color'"
+              attrs2.locations == ["5:5"]
             }
-
-
+            defaultTags()
           }
-
         }
         span {
           operationName "graphql.validation"
@@ -439,19 +433,18 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "graphql-java"
             "graphql.source" query
             "graphql.operation.name" null
-            "error.message" "Invalid Syntax : offending token ')' at line 2 column 30"
-            defaultTags()
-          }
-          events {
-            event {
-              eventName "error"
-              attributes {
-                "error.type" "graphql.parser.InvalidSyntaxException"
-                "error.message" "Invalid Syntax : offending token ')' at line 2 column 30"
-                "error.stack" String
-                "graphql.error.path" null
-              }
+            "error.message" { it.toLowerCase().startsWith("invalid syntax") }
+            "events" {
+              def events = new groovy.json.JsonSlurper().parseText(it) as List
+              events.size() == 1
+              def event = events[0]
+              event.name == "dd.graphql.query.error"
+              event.time_unix_nano instanceof Long
+              def attrs = event.attributes
+              attrs.message == "Invalid Syntax : offending token ')' at line 2 column 25"
+              attrs.locations == ["2:25"]
             }
+            defaultTags()
           }
         }
         span {
@@ -464,7 +457,7 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "graphql-java"
             "error.type" "graphql.parser.InvalidSyntaxException"
-            "error.message" "Invalid Syntax : offending token ')' at line 2 column 30"
+            "error.message" { it.toLowerCase().startsWith("invalid syntax") }
             "error.stack" String
             defaultTags()
           }
@@ -506,6 +499,17 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
             "graphql.source" expectedQuery
             "graphql.operation.name" "findBookById"
             "error.message" "Exception while fetching data (/bookById/cover) : TEST"
+            "events" {
+              def events = new groovy.json.JsonSlurper().parseText(it) as List
+              events.size() == 1
+              def event = events[0]
+              event.name == "dd.graphql.query.error"
+              event.time_unix_nano instanceof Long
+              def attrs = event.attributes
+              attrs.message == "Exception while fetching data (/bookById/cover) : TEST"
+              attrs.locations == ["4:5"]
+              attrs.path == ["bookById", "cover"]
+            }
             defaultTags()
           }
         }
@@ -682,152 +686,6 @@ abstract class GraphQLTest extends VersionedNamingTestBase {
       }
     }
   }
-
-  def "query fetch error with span events"() {
-    setup:
-    def query = 'query findBookById {\n' +
-    '  bookById(id: "book-1") {\n' +
-    '    id #test\n' +
-    '    cover\n' + // throws an exception when fetched
-    '    year\n' + // also throws an exception
-    '  }\n' +
-    '}'
-    def expectedQuery = 'query findBookById {\n' +
-    '  bookById(id: {String}) {\n' +
-    '    id\n' +
-    '    cover\n' +
-    '    year\n' +
-    '  }\n' +
-    '}\n'
-    ExecutionResult result = graphql.execute(query)
-
-    expect:
-    !result.getErrors().isEmpty()
-
-    assertTraces(1) {
-      trace(7) {
-        span {
-          operationName operation()
-          resourceName "findBookById"
-          spanType DDSpanTypes.GRAPHQL
-          errored true
-          measured true
-          parent()
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            "graphql.source" expectedQuery
-            "graphql.operation.name" "findBookById"
-            "error.message" { it.contains("Exception while fetching data (/bookById/cover) : TEST") }
-            defaultTags()
-          }
-          events {
-            event {
-              eventName "error"
-              attributes {
-                "error.type" "java.lang.IllegalStateException"
-                "error.message" "TEST"
-                "error.stack" String
-                "graphql.error.path" "/bookById/cover"
-              }
-            }
-            event {
-              eventName "error"
-              attributes {
-                "error.type" "java.lang.IllegalStateException"
-                "error.message" "TEST"
-                "error.stack" String
-                "graphql.error.path" "/bookById/year"
-              }
-            }
-          }
-        }
-        span {
-          operationName "graphql.field"
-          resourceName "Book.cover"
-          childOf(span(0))
-          spanType DDSpanTypes.GRAPHQL
-          errored true
-          measured true
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            "graphql.type" "String"
-            "graphql.coordinates" "Book.cover"
-            "error.type" "java.lang.IllegalStateException"
-            "error.message" "TEST"
-            "error.stack" String
-            defaultTags()
-          }
-        }
-        span {
-          operationName "Book.year"
-          resourceName "Book.year"
-          childOf(span(0))
-          spanType DDSpanTypes.GRAPHQL
-          errored true
-          measured true
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            "graphql.type" "Int"
-            "graphql.coordinates" "Book.year"
-            "error.type" "java.lang.IllegalStateException"
-            "error.message" "TEST"
-            "error.stack" String
-            defaultTags()
-          }
-        }
-        span {
-          operationName "graphql.field"
-          resourceName "Query.bookById"
-          childOf(span(0))
-          spanType DDSpanTypes.GRAPHQL
-          errored false
-          measured true
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            "graphql.type" "Book"
-            "graphql.coordinates" "Query.bookById"
-            defaultTags()
-          }
-        }
-        span {
-          operationName "getBookById"
-          resourceName "book"
-          childOf(span(3))
-          spanType null
-          errored false
-          measured false
-          tags {
-            "$Tags.COMPONENT" "trace"
-            defaultTags()
-          }
-        }
-        span {
-          operationName "graphql.validation"
-          resourceName "graphql.validation"
-          childOf(span(0))
-          spanType DDSpanTypes.GRAPHQL
-          errored false
-          measured true
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            defaultTags()
-          }
-        }
-        span {
-          operationName "graphql.parsing"
-          resourceName "graphql.parsing"
-          childOf(span(0))
-          spanType DDSpanTypes.GRAPHQL
-          errored false
-          measured true
-          tags {
-            "$Tags.COMPONENT" "graphql-java"
-            defaultTags()
-          }
-        }
-      }
-    }
-  }
 }
 
 @Flaky