Changed metricsinstrumentation to use tracing instrumentation

Author: Bruno Rodrigues

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/MetricsInstrumentation.java

@@ -2,25 +2,25 @@
 
 import graphql.ExecutionResult;
 import graphql.execution.instrumentation.InstrumentationContext;
-import graphql.execution.instrumentation.InstrumentationState;
-import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.instrumentation.SimpleInstrumentationContext;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
-import graphql.servlet.GraphQLContext;
+import graphql.execution.instrumentation.tracing.TracingInstrumentation;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
 
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
  * @author Bruno Rodrigues
  */
-public class MetricsInstrumentation extends SimpleInstrumentation {
+public class MetricsInstrumentation extends TracingInstrumentation {
 
     private MeterRegistry meterRegistry;
 
     private static final String OPERATION_TIME_METRIC_NAME = "graphql.timer.operation";
     private static final String OPERATION_NAME_TAG = "operationName";
+    private static final String OPERATION = "operation";
     private static final String UNKNOWN_OPERATION_NAME = "unknown";
     private static final String EXCEPTION_TAG = "exceptionName";
     private static final String NONE_EXCEPTION = "None";
@@ -30,26 +30,20 @@ public MetricsInstrumentation(MeterRegistry meterRegistry) {
         this.meterRegistry = meterRegistry;
     }
 
-    //This create a custom instrumentation state that stores any needed value.
-    //In this case, it stores the begin time of the query
-    @Override
-    public InstrumentationState createState() {
-        return new MetricsSupport();
-    }
-
     @Override
     public InstrumentationContext<ExecutionResult> beginExecution(InstrumentationExecutionParameters parameters) {
 
         return new SimpleInstrumentationContext<ExecutionResult>() {
             @Override
             public void onCompleted(ExecutionResult result, Throwable t) {
 
-                GraphQLContext graphQLContext = parameters.getContext();
-                MetricsSupport metricsSupport = parameters.getInstrumentationState();
-                if (graphQLContext.getHttpServletRequest().isPresent()) {
+                if (result.getExtensions().containsKey("tracingData")) {
 
-                    Timer timer = buildTimer(parameters.getOperation(), t);
-                    timer.record(metricsSupport.getTotalTime(), TimeUnit.NANOSECONDS);
+                    Map<String, Object> tracingData = (Map<String, Object>) result.getExtensions().get("tracing");
+                    Timer timer = buildTimer(parameters.getOperation(), "execution", t);
+                    timer.record((long) tracingData.get("duration"), TimeUnit.NANOSECONDS);
+                    timer.record((long) ((Map<String, Object>)tracingData.get("validation")).get("duration"), TimeUnit.NANOSECONDS);
+                    timer.record((long) ((Map<String, Object>)tracingData.get("parsing")).get("duration"), TimeUnit.NANOSECONDS);
 
                 }
 
@@ -59,10 +53,11 @@ public void onCompleted(ExecutionResult result, Throwable t) {
 
     }
 
-    private Timer buildTimer(String operationName, Throwable t) {
+    private Timer buildTimer(String operationName, String operation, Throwable t) {
         return Timer.builder(OPERATION_TIME_METRIC_NAME)
                 .description(TIMER_DESCRIPTION)
                 .tag(OPERATION_NAME_TAG, operationName != null ? operationName : UNKNOWN_OPERATION_NAME)
+                .tag(OPERATION, operation)
                 .tag(EXCEPTION_TAG, t == null ? NONE_EXCEPTION : t.getClass().getSimpleName())
                 .register(meterRegistry);
     }