Optimize advice method loading (#177)

pavolloffay · web-flow · commit bc1f192601b0 · 2020-12-15T09:42:48.000+01:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheClientInstrumentationModule.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheClientInstrumentationModule.java
@@ -90,21 +90,21 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
       // instrument response
       transformers.put(
           isMethod().and(named("execute")).and(not(isAbstract())),
-          HttpClient_ExecuteAdvice_response.class.getName());
+          ApacheClientInstrumentationModule.class.getName() + "$HttpClient_ExecuteAdvice_response");
 
       // instrument request
       transformers.put(
           isMethod()
               .and(named("execute"))
               .and(not(isAbstract()))
               .and(takesArgument(0, hasSuperType(named("org.apache.http.HttpMessage")))),
-          HttpClient_ExecuteAdvice_request0.class.getName());
+          ApacheClientInstrumentationModule.class.getName() + "$HttpClient_ExecuteAdvice_request0");
       transformers.put(
           isMethod()
               .and(named("execute"))
               .and(not(isAbstract()))
               .and(takesArgument(1, hasSuperType(named("org.apache.http.HttpMessage")))),
-          HttpClient_ExecuteAdvice_request1.class.getName());
+          ApacheClientInstrumentationModule.class.getName() + "$HttpClient_ExecuteAdvice_request1");
 
       return transformers;
     }
@@ -197,12 +197,12 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
       // instrumentation for request body along with OutputStream instrumentation
       transformers.put(
           named("writeTo").and(takesArguments(1)).and(takesArgument(0, is(OutputStream.class))),
-          HttpEntity_WriteToAdvice.class.getName());
+          ApacheClientInstrumentationModule.class.getName() + "$HttpEntity_WriteToAdvice");
 
       // instrumentation for response body along with InputStream instrumentation
       transformers.put(
           named("getContent").and(takesArguments(0)).and(returns(InputStream.class)),
-          HttpEntity_GetContentAdvice.class.getName());
+          ApacheClientInstrumentationModule.class.getName() + "$HttpEntity_GetContentAdvice");
       return transformers;
     }
   }
diff --git a/instrumentation/java-streams/src/main/java/io/opentelemetry/instrumentation/hypertrace/java/inputstream/InputStreamInstrumentationModule.java b/instrumentation/java-streams/src/main/java/io/opentelemetry/instrumentation/hypertrace/java/inputstream/InputStreamInstrumentationModule.java
@@ -75,21 +75,22 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
       Map<ElementMatcher<? super MethodDescription>, String> transformers = new HashMap<>();
       transformers.put(
           namedOneOf("read").and(takesArguments(0)).and(isPublic()),
-          InputStream_ReadNoArgsAdvice.class.getName());
+          InputStreamInstrumentationModule.class.getName() + "$InputStream_ReadNoArgsAdvice");
       transformers.put(
           namedOneOf("read")
               .and(takesArguments(1))
               .and(takesArgument(0, is(byte[].class)))
               .and(isPublic()),
-          InputStream_ReadByteArrayAdvice.class.getName());
+          InputStreamInstrumentationModule.class.getName() + "$InputStream_ReadByteArrayAdvice");
       transformers.put(
           namedOneOf("read")
               .and(takesArguments(3))
               .and(takesArgument(0, is(byte[].class)))
               .and(takesArgument(1, is(int.class)))
               .and(takesArgument(2, is(int.class)))
               .and(isPublic()),
-          InputStream_ReadByteArrayOffsetAdvice.class.getName());
+          InputStreamInstrumentationModule.class.getName()
+              + "$InputStream_ReadByteArrayOffsetAdvice");
       transformers.put(
           namedOneOf("readAllBytes").and(takesArguments(0)).and(isPublic()),
           InputStream_ReadAllBytes.class.getName());
@@ -100,7 +101,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
               .and(takesArgument(1, is(int.class)))
               .and(takesArgument(2, is(int.class)))
               .and(isPublic()),
-          InputStream_ReadNBytes.class.getName());
+          InputStreamInstrumentationModule.class.getName() + "$InputStream_ReadNBytes");
       return transformers;
     }
   }
diff --git a/instrumentation/java-streams/src/main/java/io/opentelemetry/instrumentation/hypertrace/java/outputstream/OutputStreamInstrumentationModule.java b/instrumentation/java-streams/src/main/java/io/opentelemetry/instrumentation/hypertrace/java/outputstream/OutputStreamInstrumentationModule.java
@@ -75,21 +75,22 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
               .and(takesArguments(1))
               .and(takesArgument(0, is(int.class)))
               .and(isPublic()),
-          OutputStream_WriteIntAdvice.class.getName());
+          OutputStreamInstrumentationModule.class.getName() + "$OutputStream_WriteIntAdvice");
       transformers.put(
           namedOneOf("write")
               .and(takesArguments(1))
               .and(takesArgument(0, is(byte[].class)))
               .and(isPublic()),
-          OutputStream_WriteByteArrAdvice.class.getName());
+          OutputStreamInstrumentationModule.class.getName() + "$OutputStream_WriteByteArrAdvice");
       transformers.put(
           namedOneOf("write")
               .and(takesArguments(3))
               .and(takesArgument(0, is(byte[].class)))
               .and(takesArgument(1, is(int.class)))
               .and(takesArgument(2, is(int.class)))
               .and(isPublic()),
-          OutputStream_WriteByteArrOffsetAdvice.class.getName());
+          OutputStreamInstrumentationModule.class.getName()
+              + "$OutputStream_WriteByteArrOffsetAdvice");
       return transformers;
     }
   }
diff --git a/instrumentation/jaxrs-client-2.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/jaxrs/v2_0/JaxrsClientBodyInstrumentationModule.java b/instrumentation/jaxrs-client-2.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/jaxrs/v2_0/JaxrsClientBodyInstrumentationModule.java
@@ -64,7 +64,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
     public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
       return singletonMap(
           named("build").and(returns(hasInterface(named("javax.ws.rs.client.Client")))),
-          ClientBuilder_build_Advice.class.getName());
+          JaxrsClientBodyInstrumentationModule.class.getName() + "$ClientBuilder_build_Advice");
     }
   }
 
diff --git a/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentationModule.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentationModule.java
@@ -98,7 +98,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
               .and(takesArgument(0, named("javax.servlet.ServletRequest")))
               .and(takesArgument(1, named("javax.servlet.ServletResponse")))
               .and(isPublic()),
-          Filter2Advice.class.getName());
+          Servlet2BodyInstrumentationModule.class.getName() + "$Filter2Advice");
     }
   }
 
diff --git a/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentationModule.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentationModule.java
@@ -93,14 +93,13 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
               .and(takesArgument(0, named("javax.servlet.ServletRequest")))
               .and(takesArgument(1, named("javax.servlet.ServletResponse")))
               .and(isPublic()),
-          FilterAdvice.class.getName());
+          Servlet30BodyInstrumentationModule.class.getName() + "$FilterAdvice");
     }
   }
 
   public static class FilterAdvice {
     // request attribute key injected at first filerChain.doFilter
     private static final String ALREADY_LOADED = "__org.hypertrace.agent.on_start_executed";
-    private static final String TRACER_NAME = "org.hypertrace.agent.servlet";
 
     @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
     public static boolean start(

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {`
`64`	`64`	`public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {`
`65`	`65`	`return singletonMap(`
`66`	`66`	`named("build").and(returns(hasInterface(named("javax.ws.rs.client.Client")))),`
`67`		`- ClientBuilder_build_Advice.class.getName());`
	`67`	`+ JaxrsClientBodyInstrumentationModule.class.getName() + "$ClientBuilder_build_Advice");`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor`
`98`	`98`	`.and(takesArgument(0, named("javax.servlet.ServletRequest")))`
`99`	`99`	`.and(takesArgument(1, named("javax.servlet.ServletResponse")))`
`100`	`100`	`.and(isPublic()),`
`101`		`- Filter2Advice.class.getName());`
	`101`	`+ Servlet2BodyInstrumentationModule.class.getName() + "$Filter2Advice");`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -93,14 +93,13 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor`
`93`	`93`	`.and(takesArgument(0, named("javax.servlet.ServletRequest")))`
`94`	`94`	`.and(takesArgument(1, named("javax.servlet.ServletResponse")))`
`95`	`95`	`.and(isPublic()),`
`96`		`- FilterAdvice.class.getName());`
	`96`	`+ Servlet30BodyInstrumentationModule.class.getName() + "$FilterAdvice");`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public static class FilterAdvice {`
`101`	`101`	`// request attribute key injected at first filerChain.doFilter`
`102`	`102`	`private static final String ALREADY_LOADED = "__org.hypertrace.agent.on_start_executed";`
`103`		`- private static final String TRACER_NAME = "org.hypertrace.agent.servlet";`
`104`	`103`
`105`	`104`	`@Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)`
`106`	`105`	`public static boolean start(`