fix: let nutz-plugins compatible with 3.2.1-2017

change: using ContextCarrier.items() in 3.2.1-2017
remove: useless javadoc in nutz-plugins

apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>nutz-plugins</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.2-2017</version>
+        <version>3.2.1-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java

@@ -6,7 +6,7 @@ import java.net.URI;
 import org.nutz.http.Request;
 import org.nutz.http.Request.METHOD;
 import org.nutz.http.Response;
-import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.CarrierItem;
 import org.skywalking.apm.agent.core.context.ContextCarrier;
 import org.skywalking.apm.agent.core.context.ContextManager;
 import org.skywalking.apm.agent.core.context.tag.Tags;
@@ -34,7 +34,11 @@ public class SenderSendInterceptor implements InstanceMethodsAroundInterceptor {
         Tags.HTTP.METHOD.set(span, httpMethod.toString());
         SpanLayer.asHttp(span);
         
-        req.getHeader().set(Config.Plugin.Propagation.HEADER_NAME, contextCarrier.serialize());
+        CarrierItem next = contextCarrier.items();
+        while (next.hasNext()) {
+            next = next.next();
+            req.getHeader().set(next.getHeadKey(), next.getHeadValue());
+        }
     }
 
     @Override

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>nutz-plugins</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.2-2017</version>
+        <version>3.2.1-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/ControllerConstructorInterceptor.java → apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/ActionConstructorInterceptor.java

@@ -5,19 +5,10 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
 import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
 
 /**
- * The <code>ControllerConstructorInterceptor</code> intercepts the Controller's constructor, in order to acquire the
- * mapping annotation, if exist.
  *
- * But, you can see we only use the first mapping value, <B>Why?</B>
- *
- * Right now, we intercept the controller by annotation as you known, so we CAN'T know which uri patten is actually
- * matched. Even we know, that costs a lot.
- *
- * If we want to resolve that, we must intercept the Nutz MVC core codes, that is not a good choice for now.
- *
- * Comment by @wu-sheng
+ * @author wendal
  */
-public class ControllerConstructorInterceptor implements InstanceConstructorInterceptor {
+public class ActionConstructorInterceptor implements InstanceConstructorInterceptor {
 
     @Override
     public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/ControllerServiceMethodInterceptor.java → apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java

@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.nutz.mvc.Mvcs;
 import org.nutz.mvc.annotation.At;
-import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.CarrierItem;
 import org.skywalking.apm.agent.core.context.ContextCarrier;
 import org.skywalking.apm.agent.core.context.ContextManager;
 import org.skywalking.apm.agent.core.context.tag.Tags;
@@ -19,11 +19,12 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptR
 import org.skywalking.apm.network.trace.component.ComponentsDefine;
 
 /**
- * The <code>ControllerServiceMethodInterceptor</code> only use the first mapping value.
+ * The <code>ActionMethodInterceptor</code> only use the first mapping value.
  *
- * @See {@link ControllerConstructorInterceptor} to explain why we are doing this.
+ * @See {@link ActionConstructorInterceptor} to explain why we are doing this.
+ * @author wendal
  */
-public class ControllerServiceMethodInterceptor implements InstanceMethodsAroundInterceptor {
+public class ActionMethodInterceptor implements InstanceMethodsAroundInterceptor {
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
         MethodInterceptResult result) throws Throwable {
@@ -41,8 +42,12 @@ public class ControllerServiceMethodInterceptor implements InstanceMethodsAround
         }
 
         HttpServletRequest request = Mvcs.getReq();
-        String tracingHeaderValue = request.getHeader(Config.Plugin.Propagation.HEADER_NAME);
-        ContextCarrier contextCarrier = new ContextCarrier().deserialize(tracingHeaderValue);
+        ContextCarrier contextCarrier = new ContextCarrier();
+        CarrierItem next = contextCarrier.items();
+        while (next.hasNext()) {
+            next = next.next();
+            next.setHeadValue(request.getHeader(next.getHeadKey()));
+        }
         AbstractSpan span = ContextManager.createEntrySpan(requestURL, contextCarrier);
         Tags.URL.set(span, request.getRequestURL().toString());
         Tags.HTTP.METHOD.set(span, request.getMethod());

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/define/AbstractControllerInstrumentation.java → apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java

 package org.skywalking.apm.plugin.nutz.mvc.define;
 
-import net.bytebuddy.description.method.MethodDescription;
-import net.bytebuddy.matcher.ElementMatcher;
+import static net.bytebuddy.matcher.ElementMatchers.any;
+import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static org.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch;
+
 import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.skywalking.apm.agent.core.plugin.match.ClassMatch;
 
-import static net.bytebuddy.matcher.ElementMatchers.any;
-import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
-import static net.bytebuddy.matcher.ElementMatchers.named;
-import static org.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class ActionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
-/**
- *
- * @author wendal
- */
-public abstract class AbstractControllerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
+    public static final String ENHANCE_ANNOTATION = "org.nutz.mvc.annotation.At";
+    
     @Override
     protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
         return new ConstructorInterceptPoint[] {
@@ -28,7 +28,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet
 
                 @Override
                 public String getConstructorInterceptor() {
-                    return "org.skywalking.apm.plugin.nutz.mvc.ControllerConstructorInterceptor";
+                    return "org.skywalking.apm.plugin.nutz.mvc.ActionConstructorInterceptor";
                 }
             }
         };
@@ -45,7 +45,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "org.skywalking.apm.plugin.nutz.mvc.ControllerServiceMethodInterceptor";
+                    return "org.skywalking.apm.plugin.nutz.mvc.ActionMethodInterceptor";
                 }
 
                 @Override
@@ -61,5 +61,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet
         return byClassAnnotationMatch(getEnhanceAnnotations());
     }
 
-    protected abstract String[] getEnhanceAnnotations();
+    protected String[] getEnhanceAnnotations() {
+        return new String[] {ENHANCE_ANNOTATION};
+    }
 }

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/skywalking/apm/plugin/nutz/mvc/define/ControllerInstrumentation.java

-package org.skywalking.apm.plugin.nutz.mvc.define;
-
-public class ControllerInstrumentation extends AbstractControllerInstrumentation {
-
-    public static final String ENHANCE_ANNOTATION = "org.nutz.mvc.annotation.At";
-
-    @Override protected String[] getEnhanceAnnotations() {
-        return new String[] {ENHANCE_ANNOTATION};
-    }
-}

apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/resources/skywalking-plugin.def

-nutz-mvc-annotation-1.x=org.skywalking.apm.plugin.nutz.mvc.define.ControllerInstrumentation
\ No newline at end of file
+nutz-mvc-annotation-1.x=org.skywalking.apm.plugin.nutz.mvc.define.ActionInstrumentation
\ No newline at end of file

apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.skywalking</groupId>
         <artifactId>apm-sdk-plugin</artifactId>
-        <version>3.2-2017</version>
+        <version>3.2.1-2017</version>
     </parent>
 
     <artifactId>nutz-plugins</artifactId>