Pr 1454

instrumentation/graphql-java-21.0/build.gradle

@@ -34,4 +34,10 @@ site {
 
 test {
     useJUnitPlatform()
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
+    onlyIf {
+        !project.hasProperty('test8')
+    }
+
 }
+

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/GraphQLErrorHandler.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/GraphQLObfuscator.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/GraphQLOperationDefinition.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/GraphQLSpanUtil.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/GraphQLTransactionName.java

@@ -1,13 +1,20 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
 
 package com.nr.instrumentation.graphql;
 
-import graphql.language.*;
+import graphql.language.Document;
+import graphql.language.Field;
+import graphql.language.InlineFragment;
+import graphql.language.OperationDefinition;
+import graphql.language.Selection;
+import graphql.language.SelectionSet;
+import graphql.language.SelectionSetContainer;
+import graphql.language.TypeName;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,9 +48,13 @@ public class GraphQLTransactionName {
      * @return a transaction name based on given document
      */
     public static String from(final Document document) {
-        if (document == null) return DEFAULT_TRANSACTION_NAME;
+        if (document == null) {
+            return DEFAULT_TRANSACTION_NAME;
+        }
         List<OperationDefinition> operationDefinitions = document.getDefinitionsOfType(OperationDefinition.class);
-        if (isNullOrEmpty(operationDefinitions)) return DEFAULT_TRANSACTION_NAME;
+        if (isNullOrEmpty(operationDefinitions)) {
+            return DEFAULT_TRANSACTION_NAME;
+        }
         if (operationDefinitions.size() == 1) {
             return getTransactionNameFor(operationDefinitions.get(0));
         }
@@ -53,7 +64,9 @@ public static String from(final Document document) {
     }
 
     private static String getTransactionNameFor(OperationDefinition operationDefinition) {
-        if (operationDefinition == null) return DEFAULT_TRANSACTION_NAME;
+        if (operationDefinition == null) {
+            return DEFAULT_TRANSACTION_NAME;
+        }
         return createBeginningOfTransactionNameFrom(operationDefinition) +
                 createEndOfTransactionNameFrom(operationDefinition.getSelectionSet());
     }
@@ -66,7 +79,9 @@ private static String createBeginningOfTransactionNameFrom(final OperationDefini
 
     private static String createEndOfTransactionNameFrom(final SelectionSet selectionSet) {
         Selection selection = onlyNonFederatedSelectionOrNoneFrom(selectionSet);
-        if (selection == null) return "";
+        if (selection == null) {
+            return "";
+        }
         List<Selection> selections = new ArrayList<>();
         while (selection != null) {
             selections.add(selection);

instrumentation/graphql-java-21.0/src/main/java/com/nr/instrumentation/graphql/Utils.java

@@ -1,3 +1,10 @@
+/*
+ *
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
 package com.nr.instrumentation.graphql;
 
 import java.util.Collection;

instrumentation/graphql-java-21.0/src/main/java/graphql/ExecutionStrategy_Instrumentation.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
@@ -19,8 +19,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import static com.nr.instrumentation.graphql.GraphQLSpanUtil.*;
-import static com.nr.instrumentation.graphql.GraphQLErrorHandler.*;
+import static com.nr.instrumentation.graphql.GraphQLErrorHandler.reportNonNullableExceptionToNR;
+import static com.nr.instrumentation.graphql.GraphQLSpanUtil.setResolverAttributes;
 
 @Weave(originalName = "graphql.execution.ExecutionStrategy", type = MatchType.BaseClass)
 public class ExecutionStrategy_Instrumentation {

instrumentation/graphql-java-21.0/src/main/java/graphql/GraphQL_Instrumentation.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */

instrumentation/graphql-java-21.0/src/main/java/graphql/ParseAndValidate_Instrumentation.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
@@ -17,9 +17,12 @@
 import graphql.validation.ValidationError;
 
 import java.util.List;
+import java.util.Locale;
+import java.util.function.Predicate;
 
-import static com.nr.instrumentation.graphql.GraphQLSpanUtil.*;
-import static com.nr.instrumentation.graphql.GraphQLErrorHandler.*;
+import static com.nr.instrumentation.graphql.GraphQLErrorHandler.reportGraphQLError;
+import static com.nr.instrumentation.graphql.GraphQLErrorHandler.reportGraphQLException;
+import static com.nr.instrumentation.graphql.GraphQLSpanUtil.setOperationAttributes;
 
 @Weave(originalName = "graphql.ParseAndValidate", type = MatchType.ExactClass)
 public class ParseAndValidate_Instrumentation {
@@ -41,7 +44,15 @@ public static ParseAndValidateResult parse(ExecutionInput executionInput) {
         return result;
     }
 
-    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument) {
+    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument, Predicate<Class<?>> rulePredicate, Locale locale) {
+        List<ValidationError> errors = Weaver.callOriginal();
+        if (errors != null && !errors.isEmpty()) {
+            reportGraphQLError(errors.get(0));
+        }
+        return errors;
+    }
+
+    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument, Predicate<Class<?>> rulePredicate) {
         List<ValidationError> errors = Weaver.callOriginal();
         if (errors != null && !errors.isEmpty()) {
             reportGraphQLError(errors.get(0));

instrumentation/graphql-java-21.0/src/test/java/com/nr/instrumentation/graphql/GraphQLObfuscatorTest.java

@@ -1,18 +1,21 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
 
 package com.nr.instrumentation.graphql;
 
+import com.newrelic.test.marker.Java8IncompatibleTest;
+import org.junit.experimental.categories.Category;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
 
 import static com.nr.instrumentation.graphql.helper.GraphQLTestHelper.readText;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Category({ Java8IncompatibleTest.class })
 public class GraphQLObfuscatorTest {
 
     private final static String OBFUSCATE_DATA_DIR = "obfuscateQueryTestData";

instrumentation/graphql-java-21.0/src/test/java/com/nr/instrumentation/graphql/GraphQLSpanUtilTest.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
@@ -9,6 +9,7 @@
 
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.agent.bridge.PrivateApi;
+import com.newrelic.test.marker.Java8IncompatibleTest;
 import com.nr.instrumentation.graphql.helper.GraphQLTestHelper;
 import com.nr.instrumentation.graphql.helper.PrivateApiStub;
 import graphql.execution.ExecutionStepInfo;
@@ -18,6 +19,7 @@
 import graphql.language.Definition;
 import graphql.language.Document;
 import graphql.schema.GraphQLNonNull;
+import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +37,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Category({ Java8IncompatibleTest.class })
 public class GraphQLSpanUtilTest {
 
     private static final List<Definition> NO_DEFINITIONS = Collections.emptyList();
@@ -111,7 +114,8 @@ public void testInvalidClassExceptionFix() {
                 "'graphql.field.parentType' is not required and should be null here");
     }
 
-    private static ExecutionStrategyParameters mockExecutionStrategyParametersForInvalidClassCastExceptionTest(String graphqlFieldPath, String graphqlFieldName) {
+    private static ExecutionStrategyParameters mockExecutionStrategyParametersForInvalidClassCastExceptionTest(String graphqlFieldPath,
+            String graphqlFieldName) {
         ExecutionStrategyParameters parameters = mock(ExecutionStrategyParameters.class);
         ResultPath resultPath = mock(ResultPath.class);
         MergedField mergedField = mock(MergedField.class);

instrumentation/graphql-java-21.0/src/test/java/com/nr/instrumentation/graphql/GraphQLTransactionNameTest.java

@@ -1,19 +1,22 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
 
 package com.nr.instrumentation.graphql;
 
+import com.newrelic.test.marker.Java8IncompatibleTest;
 import graphql.language.Document;
+import org.junit.experimental.categories.Category;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
 
 import static com.nr.instrumentation.graphql.helper.GraphQLTestHelper.parseDocument;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Category({ Java8IncompatibleTest.class })
 public class GraphQLTransactionNameTest {
 
     private final static String TEST_DATA_DIR = "transactionNameTestData";

instrumentation/graphql-java-21.0/src/test/java/com/nr/instrumentation/graphql/helper/GraphQLTestHelper.java

@@ -1,19 +1,22 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
 
 package com.nr.instrumentation.graphql.helper;
 
+import com.newrelic.test.marker.Java8IncompatibleTest;
 import graphql.language.Document;
 import graphql.parser.Parser;
+import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+@Category({ Java8IncompatibleTest.class })
 public class GraphQLTestHelper {
     public static Document parseDocument(String testDir, String filename) {
         return Parser.parse(readText(testDir, filename));

instrumentation/graphql-java-21.0/src/test/java/com/nr/instrumentation/graphql/helper/PrivateApiStub.java

@@ -1,20 +1,23 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
 
 package com.nr.instrumentation.graphql.helper;
 
 import com.newrelic.agent.bridge.PrivateApi;
+import com.newrelic.test.marker.Java8IncompatibleTest;
+import org.junit.experimental.categories.Category;
 
 import javax.management.MBeanServer;
 import java.io.Closeable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+@Category({ Java8IncompatibleTest.class })
 public class PrivateApiStub implements PrivateApi {
     private final Map<String, String> tracerParameters = new HashMap<>();
 

instrumentation/graphql-java-21.0/src/test/java/graphql/GraphQL_InstrumentationTest.java

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * Copyright 2023 New Relic Corporation. All rights reserved.
  *  * SPDX-License-Identifier: Apache-2.0
  *
  */
@@ -12,6 +12,7 @@
 import com.newrelic.agent.introspec.Introspector;
 import com.newrelic.agent.introspec.SpanEvent;
 import com.newrelic.api.agent.Trace;
+import com.newrelic.test.marker.Java8IncompatibleTest;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.StaticDataFetcher;
 import graphql.schema.idl.RuntimeWiring;
@@ -21,6 +22,7 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.runner.RunWith;
 
@@ -34,7 +36,8 @@
 import static org.junit.Assert.assertTrue;
 
 @RunWith(InstrumentationTestRunner.class)
-@InstrumentationTestConfig(includePrefixes = {"graphql", "com.nr.instrumentation"}, configName = "distributed_tracing.yml")
+@InstrumentationTestConfig(includePrefixes = { "graphql", "com.nr.instrumentation" }, configName = "distributed_tracing.yml")
+@Category({ Java8IncompatibleTest.class })
 public class GraphQL_InstrumentationTest {
     private static final long DEFAULT_TIMEOUT_IN_MILLIS = 10_000;
     private static final String TEST_ARG = "testArg";
@@ -103,7 +106,7 @@ public void validationException() {
         //when
         trace(createRunnable(query));
         //then
-        String expectedErrorMessage = "Validation error of type FieldUndefined: Field 'noSuchField' in type 'Query' is undefined @ 'noSuchField'";
+        String expectedErrorMessage = "Validation error (FieldUndefined@[noSuchField]) : Field 'noSuchField' in type 'Query' is undefined";
         assertErrorOperation("QUERY/<anonymous>/noSuchField",
                 "GraphQL/operation/QUERY/<anonymous>/noSuchField", "graphql.GraphqlErrorException", expectedErrorMessage, false);
     }