Another ClassValue optimization (#4013)

* Another ClassValue optimization * Spotless
open-telemetry · Aug 30, 2021 · 436aeaf · 436aeaf
1 parent c91eda5
commit 436aeaf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/...o/opentelemetry/javaagent/instrumentation/springwebmvc/HandlerAdapterInstrumentation.java b/...o/opentelemetry/javaagent/instrumentation/springwebmvc/HandlerAdapterInstrumentation.java
@@ -8,6 +8,7 @@
 import static io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming.Source.CONTROLLER;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.springwebmvc.IsGrailsHandler.isGrailsHandler;
 import static io.opentelemetry.javaagent.instrumentation.springwebmvc.SpringWebMvcSingletons.handlerInstrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -60,7 +61,7 @@ public static void nameResourceAndStartSpan(
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
       // TODO (trask) should there be a way to customize Instrumenter.shouldStart()?
-      if (handler.getClass().getName().startsWith("org.grails.")) {
+      if (isGrailsHandler(handler)) {
         // skip creating handler span for grails, grails instrumentation will take care of it
         return;
       }

diff --git a/...rc/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/IsGrailsHandler.java b/...rc/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/IsGrailsHandler.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+
+public final class IsGrailsHandler {
+
+  private static final ClassValue<Boolean> cache =
+      new ClassValue<Boolean>() {
+        @Override
+        protected Boolean computeValue(Class<?> type) {
+          return type.getName().startsWith("org.grails.");
+        }
+      };
+
+  public static boolean isGrailsHandler(Object handler) {
+    return cache.get(handler.getClass());
+  }
+
+  private IsGrailsHandler() {}
+}