#774 - remove MetaObject api of ArcusInterceptor

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/AbstractFutureModifier.java

@@ -23,6 +23,7 @@
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass;
 import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
 import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue1;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.ArcusScope;
 
@@ -48,7 +49,8 @@ public byte[] modify(ClassLoader classLoader, String javassistClassName, Protect
         try {
             InstrumentClass aClass = byteCodeInstrumentor.getClass(classLoader, javassistClassName, classFileBuffer);
 
-            aClass.addTraceVariable("__operation", "__setOperation", "__getOperation", "net.spy.memcached.ops.Operation");
+//            operation -> ObjectTraceValue1.class
+            aClass.addTraceValue(ObjectTraceValue1.class);
 
             Interceptor futureSetOperationInterceptor = byteCodeInstrumentor.newInterceptor(classLoader, protectedDomain, "com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.FutureSetOperationInterceptor");
             aClass.addInterceptor("setOperation", new String[]{"net.spy.memcached.ops.Operation"}, futureSetOperationInterceptor);

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/BaseOperationModifier.java

@@ -21,6 +21,7 @@
 import com.navercorp.pinpoint.bootstrap.Agent;
 import com.navercorp.pinpoint.bootstrap.instrument.ByteCodeInstrumentor;
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue2;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 
 import org.slf4j.Logger;
@@ -50,7 +51,8 @@ public byte[] modify(ClassLoader classLoader, String javassistClassName, Protect
         try {
             InstrumentClass aClass = byteCodeInstrumentor.getClass(classLoader, javassistClassName, classFileBuffer);
 
-            aClass.addTraceVariable("__serviceCode", "__setServiceCode", "__getServiceCode", "java.lang.String");
+//            serviceCode->ObjectTraceValue2
+            aClass.addTraceValue(ObjectTraceValue2.class);
 
             /* Do not intercept
             aClass.addTraceVariable("__asyncTrace", "__setAsyncTrace", "__getAsyncTrace", "java.lang.Object");

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/CacheManagerModifier.java

@@ -21,6 +21,7 @@
 import com.navercorp.pinpoint.bootstrap.Agent;
 import com.navercorp.pinpoint.bootstrap.instrument.ByteCodeInstrumentor;
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue2;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.CacheManagerConstructInterceptor;
 
@@ -50,13 +51,15 @@ public byte[] modify(ClassLoader classLoader, String javassistClassName, Protect
         try {
             InstrumentClass aClass = byteCodeInstrumentor.getClass(classLoader, javassistClassName, classFileBuffer);
 
-            aClass.addTraceVariable("__serviceCode", "__setServiceCode", "__getServiceCode", "java.lang.String");
+//            serviceCode->ObjectTraceValue2
+            aClass.addTraceValue(ObjectTraceValue2.class);
+
             aClass.addConstructorInterceptor(new String[]{"java.lang.String", "java.lang.String", "net.spy.memcached.ConnectionFactoryBuilder", "java.util.concurrent.CountDownLatch", "int", "int"}, new CacheManagerConstructInterceptor());
 
             return aClass.toBytecode();
         } catch (Exception e) {
             if (logger.isWarnEnabled()) {
-                logger.warn( e.getMessage(), e);
+                logger.warn(e.getMessage(), e);
             }
             return null;
         }

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/FrontCacheGetFutureModifier.java

@@ -21,6 +21,8 @@
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass;
 import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
 import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue3;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue4;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.ArcusScope;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.FrontCacheGetFutureConstructInterceptor;
@@ -50,8 +52,11 @@ public byte[] modify(ClassLoader classLoader, String javassistClassName, Protect
         try {
             InstrumentClass aClass = byteCodeInstrumentor.getClass(classLoader, javassistClassName, classFileBuffer);
 
-            aClass.addTraceVariable("__cacheName", "__setCacheName", "__getCacheName", "java.lang.String");
-            aClass.addTraceVariable("__cacheKey", "__setCacheKey", "__getCacheKey", "java.lang.String");
+//            cacheName->ObjectTraceValue3
+            aClass.addTraceValue(ObjectTraceValue3.class);
+
+//            cacheKey->ObjectTraceValue4
+            aClass.addTraceValue(ObjectTraceValue4.class);
 
             Interceptor frontCacheGetFutureConstructInterceptor = new FrontCacheGetFutureConstructInterceptor();
             aClass.addConstructorInterceptor(new String[]{"net.sf.ehcache.Element"}, frontCacheGetFutureConstructInterceptor);

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/MemcachedClientModifier.java

@@ -27,6 +27,7 @@
 import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
 import com.navercorp.pinpoint.bootstrap.interceptor.ParameterExtractorSupport;
 import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue2;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.ArcusScope;
 import com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.IndexParameterExtractor;
@@ -63,7 +64,8 @@ public byte[] modify(ClassLoader classLoader, String javassistClassName,
             if (!checkCompatibility(aClass, args)) {
                 return null;
             }
-            aClass.addTraceVariable("__serviceCode", "__setServiceCode", "__getServiceCode", "java.lang.String");
+//            serviceCode->ObjectTraceValue2
+            aClass.addTraceValue(ObjectTraceValue2.class);
 
             Interceptor addOpInterceptor = byteCodeInstrumentor.newInterceptor(classLoader, protectedDomain,
                     "com.navercorp.pinpoint.profiler.modifier.arcus.interceptor.AddOpInterceptor");

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/AddOpInterceptor.java

@@ -18,9 +18,9 @@
 
 import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.interceptor.TargetClassLoader;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue2Utils;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
-import com.navercorp.pinpoint.bootstrap.util.MetaObject;
 
 import net.spy.memcached.ops.Operation;
 
@@ -34,19 +34,32 @@ public class AddOpInterceptor implements SimpleAroundInterceptor, TargetClassLoa
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
     private final boolean isDebug = logger.isDebugEnabled();
 
-    private MetaObject<String> getServiceCode = new MetaObject<String>("__getServiceCode");
-    private MetaObject<String> setServiceCode = new MetaObject<String>("__setServiceCode", String.class);
 
     @Override
     public void before(Object target, Object[] args) {
         if (isDebug) {
             logger.beforeInterceptor(target, args);
         }
 
-        String serviceCode = getServiceCode.invoke(target);
-        Operation op = (Operation) args[1];
+        final String serviceCode = getServiceCode(target);
+        setServiceCode(args[1], serviceCode);
+    }
 
-        setServiceCode.invoke(op, serviceCode);
+    //    __serviceCode -> ObjectTraceValue2
+    private String getServiceCode(Object target) {
+        final Object serviceCodeObject = ObjectTraceValue2Utils.__getTraceObject2(target, null);
+        if (serviceCodeObject instanceof String) {
+            return (String) serviceCodeObject;
+        }
+        return null;
+    }
+
+    private void setServiceCode(Object target, Object value) {
+        if (target instanceof Operation) {
+            ObjectTraceValue2Utils.__setTraceObject2(target, value);
+        } else {
+            logger.info("invalid arg1");
+        }
     }
 
     @Override

profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java

@@ -22,7 +22,8 @@
 
 import com.navercorp.pinpoint.bootstrap.context.RecordableTrace;
 import com.navercorp.pinpoint.bootstrap.interceptor.*;
-import com.navercorp.pinpoint.bootstrap.util.MetaObject;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue1Utils;
+import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.ObjectTraceValue2Utils;
 import com.navercorp.pinpoint.common.ServiceType;
 
 import net.spy.memcached.MemcachedNode;
@@ -34,10 +35,6 @@
  */
 public class ApiInterceptor extends SpanEventSimpleAroundInterceptor implements ParameterExtractorSupport, TargetClassLoader {
 
-
-    private MetaObject<Object> getOperation = new MetaObject<Object>("__getOperation");
-    private MetaObject<Object> getServiceCode = new MetaObject<Object>("__getServiceCode");
-
     private ParameterExtractor parameterExtractor;
 
     public ApiInterceptor() {
@@ -62,7 +59,7 @@ public void doInAfterTrace(RecordableTrace trace, Object target, Object[] args,
 
         // find the target node
         if (result instanceof Future && !(result instanceof FrontCacheGetFuture)) {
-            Operation op = (Operation) getOperation.invoke(((Future<?>)result));
+            final Operation op = getOperation(result);
             if (op != null) {
                 MemcachedNode handlingNode = op.getHandlingNode();
                 SocketAddress socketAddress = handlingNode.getSocketAddress();
@@ -76,7 +73,7 @@ public void doInAfterTrace(RecordableTrace trace, Object target, Object[] args,
         }
 
         // determine the service type
-        String serviceCode = (String) getServiceCode.invoke(target);
+        final String serviceCode = getServiceCode(target);
         if (serviceCode != null) {
             trace.recordDestinationId(serviceCode);
             trace.recordServiceType(ServiceType.ARCUS);
@@ -88,6 +85,23 @@ public void doInAfterTrace(RecordableTrace trace, Object target, Object[] args,
         trace.markAfterTime();
     }
 
+    private Operation getOperation(Object result) {
+//        __operation -> ObjectTraceValue1.class
+        final Object operationObject = ObjectTraceValue1Utils.__getTraceObject1(result, null);
+        if (operationObject instanceof Operation) {
+            return (Operation) operationObject;
+        }
+        return null;
+    }
+
+    private String getServiceCode(Object target) {
+        final Object serviceCodeObject = ObjectTraceValue2Utils.__getTraceObject2(target, null);
+        if (serviceCodeObject instanceof String) {
+            return (String) serviceCodeObject;
+        }
+        return null;
+    }
+
     @Override
     public void setParameterExtractor(ParameterExtractor parameterExtractor) {
         this.parameterExtractor = parameterExtractor;