Merge pull request #182 from wu-sheng/feature/181

Rename the "apm-api" module to "apm-agent-core”. 

apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/AkkaSystem.java

@@ -6,7 +6,7 @@ import com.typesafe.config.ConfigFactory;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.cluster.ClusterConfig;
 import org.skywalking.apm.collector.cluster.Const;
 

apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java

 package org.skywalking.apm.collector.cluster;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.config.ConfigProvider;
 
 /**

apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java

@@ -34,7 +34,7 @@ public enum ConfigInitializer {
         for (ConfigProvider provider : configProviders) {
             logger.info("configProvider provider name: %s", provider.getClass().getName());
             Class configClass = provider.configClass();
-            org.skywalking.apm.api.util.ConfigInitializer.initialize(properties, configClass);
+            org.skywalking.apm.util.ConfigInitializer.initialize(properties, configClass);
         }
     }
 }

apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java

 package org.skywalking.apm.collector.worker.config;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.config.ConfigProvider;
 
 /**

apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java

 package org.skywalking.apm.collector.worker.config;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.config.ConfigProvider;
 
 /**

apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java

@@ -4,7 +4,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.actor.*;
 import org.skywalking.apm.collector.actor.selector.RollingSelector;
 import org.skywalking.apm.collector.actor.selector.WorkerSelector;

apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentPost.java

@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.worker.segment;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.actor.ClusterWorkerContext;
 import org.skywalking.apm.collector.actor.LocalWorkerContext;
 import org.skywalking.apm.collector.actor.ProviderNotFoundException;

apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java

 package org.skywalking.apm.collector.worker.tools;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.collector.worker.Const;
 import org.skywalking.apm.collector.worker.segment.entity.Span;
 import org.skywalking.apm.collector.worker.segment.entity.tag.Tags;

apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/GlobalIdGenerator.java

 package org.skywalking.apm.trace;
 
-import org.skywalking.apm.api.util.MachineInfo;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.MachineInfo;
+import org.skywalking.apm.util.StringUtil;
 
 import java.util.UUID;
 

apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/ConfigInitializer.java → apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java

-package org.skywalking.apm.api.util;
+package org.skywalking.apm.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/MachineInfo.java → apm-commons/apm-util/src/main/java/org/skywalking/apm/util/MachineInfo.java

-package org.skywalking.apm.api.util;
+package org.skywalking.apm.util;
 
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;

apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/StringUtil.java → apm-commons/apm-util/src/main/java/org/skywalking/apm/util/StringUtil.java

-package org.skywalking.apm.api.util;
+package org.skywalking.apm.util;
 
 public final class StringUtil {
     public static boolean isEmpty(String str) {

apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/ConfigInitializerTest.java → apm-commons/apm-util/src/test/java/org/skywalking/apm/util/ConfigInitializerTest.java

-package org.skywalking.apm.api.util;
+package org.skywalking.apm.util;
 
 import org.junit.Assert;
 import org.junit.Before;

apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/StringUtilTest.java → apm-commons/apm-util/src/test/java/org/skywalking/apm/util/StringUtilTest.java

-package org.skywalking.apm.api.util;
+package org.skywalking.apm.util;
 
 import org.junit.Assert;
 import org.junit.Test;

apm-sniffer/apm-api/pom.xml → apm-sniffer/apm-agent-core/pom.xml

@@ -8,10 +8,10 @@
         <version>3.1-2017</version>
     </parent>
 
-    <artifactId>apm-api</artifactId>
+    <artifactId>apm-agent-core</artifactId>
     <packaging>jar</packaging>
 
-    <name>apm-api</name>
+    <name>apm-agent-core</name>
     <url>http://maven.apache.org</url>
 
     <properties>

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/BootService.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java

-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
 
 /**
  * The <code>BootService</code> is an interface to all services, which need to boot when plugin mechanism begins to

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/ServiceManager.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/ServiceManager.java

-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
 
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/StatusBootService.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/StatusBootService.java

-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
 
 /**
  * The <code>StatusBootService</code> is an abstract implementations of {@link BootService}, it extends {@link

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClient.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java

-package org.skywalking.apm.api.client;
+package org.skywalking.apm.agent.core.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -8,9 +8,9 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.queue.TraceSegmentProcessQueue;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.queue.TraceSegmentProcessQueue;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 import org.skywalking.apm.trace.SegmentsMessage;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClientService.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClientService.java

-package org.skywalking.apm.api.client;
+package org.skywalking.apm.agent.core.client;
 
-import org.skywalking.apm.api.boot.StatusBootService;
-import org.skywalking.apm.api.queue.TraceSegmentProcessQueue;
+import org.skywalking.apm.agent.core.queue.TraceSegmentProcessQueue;
+import org.skywalking.apm.agent.core.boot.StatusBootService;
 import org.skywalking.apm.trace.TraceSegment;
 
 /**

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/RESTResponseStatusError.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java

-package org.skywalking.apm.api.client;
+package org.skywalking.apm.agent.core.client;
 
 /**
  * The <code>RESTResponseStatusError</code> represents the REST-Service client got an unexpected response code.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Config.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java

-package org.skywalking.apm.api.conf;
+package org.skywalking.apm.agent.core.conf;
 
-import org.skywalking.apm.api.logging.LogLevel;
-import org.skywalking.apm.api.logging.WriterFactory;
+import org.skywalking.apm.agent.core.logging.LogLevel;
+import org.skywalking.apm.agent.core.logging.WriterFactory;
 
 /**
  * This is the core config in sniffer agent.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Constants.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Constants.java

-package org.skywalking.apm.api.conf;
+package org.skywalking.apm.agent.core.conf;
 
 public class Constants {
     public static String PATH_SEPARATOR = System.getProperty("file.separator", "/");

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/SnifferConfigInitializer.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java

-package org.skywalking.apm.api.conf;
+package org.skywalking.apm.agent.core.conf;
 
-import org.skywalking.apm.api.util.ConfigInitializer;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
+import org.skywalking.apm.util.ConfigInitializer;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextCarrier.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextCarrier.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.trace.Span;
 import org.skywalking.apm.trace.TraceId.DistributedTraceId;
 import org.skywalking.apm.trace.TraceId.PropagatedTraceId;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextManager.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
-import org.skywalking.apm.api.boot.BootService;
+import org.skywalking.apm.agent.core.boot.BootService;
 import org.skywalking.apm.trace.Span;
 import org.skywalking.apm.trace.TraceSegment;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.sampling.SamplingService;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.sampling.SamplingService;
 import org.skywalking.apm.trace.Span;
 import org.skywalking.apm.trace.TraceSegment;
 import org.skywalking.apm.trace.TraceSegmentRef;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContextListener.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContextListener.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
 import org.skywalking.apm.trace.TraceSegment;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogResolver.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogResolver.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogResolver;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogger.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
-import org.skywalking.apm.api.conf.Constants;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.conf.Constants;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.logging.ILog;
 
 import java.io.ByteArrayOutputStream;
@@ -10,9 +11,6 @@ import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static org.skywalking.apm.api.conf.Config.Logging.LEVEL;
-import static org.skywalking.apm.api.logging.LogLevel.*;
-
 /**
  * The <code>EasyLogger</code> is a simple implementation of {@link ILog}.
  *
@@ -72,71 +70,71 @@ public class EasyLogger implements ILog {
     @Override
     public void info(String format) {
         if (isInfoEnable())
-            logger(INFO, format, null);
+            logger(LogLevel.INFO, format, null);
     }
 
     @Override
     public void info(String format, Object... arguments) {
         if (isInfoEnable())
-            logger(INFO, replaceParam(format, arguments), null);
+            logger(LogLevel.INFO, replaceParam(format, arguments), null);
     }
 
     @Override
     public void warn(String format, Object... arguments) {
         if (isWarnEnable())
-            logger(WARN, replaceParam(format, arguments), null);
+            logger(LogLevel.WARN, replaceParam(format, arguments), null);
     }
 
     @Override
     public void error(String format, Throwable e) {
         if (isErrorEnable())
-            logger(ERROR, format, e);
+            logger(LogLevel.ERROR, format, e);
     }
 
     @Override
     public void error(Throwable e, String format, Object... arguments) {
         if (isErrorEnable())
-            logger(ERROR, replaceParam(format, arguments), e);
+            logger(LogLevel.ERROR, replaceParam(format, arguments), e);
     }
 
     @Override
     public boolean isDebugEnable() {
-        return DEBUG.compareTo(LEVEL) >= 0;
+        return LogLevel.DEBUG.compareTo(Config.Logging.LEVEL) >= 0;
     }
 
     @Override
     public boolean isInfoEnable() {
-        return INFO.compareTo(LEVEL) >= 0;
+        return LogLevel.INFO.compareTo(Config.Logging.LEVEL) >= 0;
     }
 
     @Override
     public boolean isWarnEnable() {
-        return WARN.compareTo(LEVEL) >= 0;
+        return LogLevel.WARN.compareTo(Config.Logging.LEVEL) >= 0;
     }
 
     @Override
     public boolean isErrorEnable() {
-        return ERROR.compareTo(LEVEL) >= 0;
+        return LogLevel.ERROR.compareTo(Config.Logging.LEVEL) >= 0;
     }
 
     @Override
     public void debug(String format) {
         if (isDebugEnable()) {
-            logger(DEBUG, format, null);
+            logger(LogLevel.DEBUG, format, null);
         }
     }
 
     @Override
     public void debug(String format, Object... arguments) {
         if (isDebugEnable()) {
-            logger(DEBUG, replaceParam(format, arguments), null);
+            logger(LogLevel.DEBUG, replaceParam(format, arguments), null);
         }
     }
 
     @Override
     public void error(String format) {
         if (isErrorEnable()) {
-            logger(ERROR, format, null);
+            logger(LogLevel.ERROR, format, null);
         }
     }
 }

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/FileWriter.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/FileWriter.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import com.lmax.disruptor.EventFactory;
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.lmax.disruptor.util.DaemonThreadFactory;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.conf.Constants;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.conf.Constants;
 
 import java.io.File;
 import java.io.FileNotFoundException;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/IWriter.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/IWriter.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 public interface IWriter {
     void write(String message);

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogLevel.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogLevel.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 /**
  * Created by xin on 2016/12/7.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogMessageHolder.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogMessageHolder.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 /**
  * The <code>LogMessageHolder</code> is a {@link String} holder,

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/SystemOutWriter.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/SystemOutWriter.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import java.io.PrintStream;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/WriterFactory.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/WriterFactory.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.util.StringUtil;
 
 public class WriterFactory {
     public static IWriter getLogWriter() {

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefine.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.pool.TypePool;
 import net.bytebuddy.pool.TypePool.Resolution;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassEnhancePluginDefine;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine;
+import org.skywalking.apm.util.StringUtil;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginBootstrap.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.pool.TypePool;
 import org.skywalking.apm.logging.ILog;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginCfg.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.util.StringUtil;
 
 import java.io.BufferedReader;
 import java.io.IOException;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginException.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginException.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 public class PluginException extends RuntimeException {
     private static final long serialVersionUID = -6020188711867490724L;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginFinder.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginFinder.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import java.util.HashMap;
 import java.util.List;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginResourcesResolver.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/TracingBootstrap.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/TracingBootstrap.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.dynamic.ClassFileLocator;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java

-package org.skywalking.apm.api.plugin.bytebuddy;
+package org.skywalking.apm.agent.core.plugin.bytebuddy;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatch.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java

-package org.skywalking.apm.api.plugin.bytebuddy;
+package org.skywalking.apm.agent.core.plugin.bytebuddy;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.method.ParameterList;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/ConstructorInterceptPoint.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhanceException.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
-import org.skywalking.apm.api.plugin.PluginException;
+import org.skywalking.apm.agent.core.plugin.PluginException;
 
 public class EnhanceException extends PluginException {
     private static final long serialVersionUID = -2234782755784217255L;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContext.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
-import org.skywalking.apm.api.plugin.AbstractClassEnhancePluginDefine;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.AbstractClassEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InstanceMethodsInterceptPoint.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InterceptorException.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InterceptorException.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
 public class InterceptorException extends RuntimeException {
     private static final long serialVersionUID = 7846035239994885019L;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/StaticMethodsInterceptPoint.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java

-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/assist/NoConcurrencyAccessObject.java

-package org.skywalking.apm.api.plugin.interceptor.assist;
+package org.skywalking.apm.agent.core.plugin.interceptor.assist;
 
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.InterceptorException;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.InterceptorException;
 
 /**
  * {@link NoConcurrencyAccessObject} is method invocation counter,

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassConstructorInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 import net.bytebuddy.implementation.bind.annotation.AllArguments;
 import net.bytebuddy.implementation.bind.annotation.FieldProxy;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
 import net.bytebuddy.implementation.bind.annotation.This;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.loader.InterceptorInstanceLoader;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.loader.InterceptorInstanceLoader;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.dynamic.DynamicType;
@@ -6,10 +6,14 @@ import net.bytebuddy.implementation.MethodDelegation;
 import net.bytebuddy.implementation.SuperMethodCall;
 import net.bytebuddy.implementation.bind.annotation.FieldProxy;
 import net.bytebuddy.matcher.ElementMatchers;
-import org.skywalking.apm.api.plugin.AbstractClassEnhancePluginDefine;
-import org.skywalking.apm.api.plugin.PluginException;
-import org.skywalking.apm.api.plugin.interceptor.*;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.plugin.PluginException;
+import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhanceException;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint;
+import org.skywalking.apm.util.StringUtil;
+import org.skywalking.apm.agent.core.plugin.AbstractClassEnhancePluginDefine;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
-import org.skywalking.apm.api.plugin.interceptor.StaticMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint;
 
 /**
  * Plugins, which only need enhance class static methods. Actually, inherit from {@link

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 import net.bytebuddy.implementation.bind.annotation.*;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.loader.InterceptorInstanceLoader;
+import org.skywalking.apm.agent.core.plugin.interceptor.loader.InterceptorInstanceLoader;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
-import org.skywalking.apm.api.plugin.interceptor.ConstructorInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 
 /**
  * Plugins, which only need enhance class static methods. Actually, inherit from {@link

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 import net.bytebuddy.implementation.bind.annotation.AllArguments;
 import net.bytebuddy.implementation.bind.annotation.Origin;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
-import org.skywalking.apm.api.plugin.interceptor.loader.InterceptorInstanceLoader;
+import org.skywalking.apm.agent.core.plugin.interceptor.loader.InterceptorInstanceLoader;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ConstructorInvokeContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInvokeContext.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * Constructor context.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 import net.bytebuddy.implementation.bind.annotation.AllArguments;
 import net.bytebuddy.implementation.bind.annotation.FieldProxy;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
 import net.bytebuddy.implementation.bind.annotation.This;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldGetter.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldGetter.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 public interface FieldGetter {
     Object getValue();

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldSetter.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldSetter.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 public interface FieldSetter {
     void setValue(Object value);

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
 
 /**
  * The instance constructor's interceptor interface.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodInvokeContext.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * Instance method invoke context.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
 
 /**
  * A interceptor, which intercept method's invocation. The target methods will be defined in {@link

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInterceptResult.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * This is a method return value manipulator. When a interceptor's method, such as {@link
- * InstanceMethodsAroundInterceptor#beforeMethod(org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext, InstanceMethodInvokeContext,
+ * InstanceMethodsAroundInterceptor#beforeMethod(org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext, InstanceMethodInvokeContext,
  * MethodInterceptResult)}, has this as a method argument, the interceptor can manipulate the method's return value. <p>
  * The new value set to this object, by {@link MethodInterceptResult#defineReturnValue(Object)}, will override the
  * origin return value.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInvokeContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInvokeContext.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * Method invoke context.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodInvokeContext.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * Static method invoke context.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java

-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
 
 /**
  * The static method's interceptor interface.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/loader/InterceptorInstanceLoader.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/loader/InterceptorInstanceLoader.java

-package org.skywalking.apm.api.plugin.interceptor.loader;
+package org.skywalking.apm.agent.core.plugin.interceptor.loader;
 
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentHolder.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentHolder.java

-package org.skywalking.apm.api.queue;
+package org.skywalking.apm.agent.core.queue;
 
 import com.lmax.disruptor.EventFactory;
 import org.skywalking.apm.trace.TraceSegment;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentProcessQueue.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java

-package org.skywalking.apm.api.queue;
+package org.skywalking.apm.agent.core.queue;
 
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.lmax.disruptor.util.DaemonThreadFactory;
-import org.skywalking.apm.api.boot.StatusBootService;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.context.TracerContextListener;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.boot.StatusBootService;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.context.TracerContextListener;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 import org.skywalking.apm.trace.TraceSegment;

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/IllegalSamplingRateException.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java

-package org.skywalking.apm.api.sampling;
+package org.skywalking.apm.agent.core.sampling;
 
 /**
  * Use <code>IllegalSamplingRateException</code>, only if the rate can not be supported.

apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/SamplingService.java → apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java

-package org.skywalking.apm.api.sampling;
+package org.skywalking.apm.agent.core.sampling;
 
-import org.skywalking.apm.api.boot.BootService;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.ContextCarrier;
+import org.skywalking.apm.agent.core.boot.BootService;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
 import org.skywalking.apm.logging.ILog;
 import org.skywalking.apm.logging.LogManager;
 import org.skywalking.apm.trace.TraceSegment;

apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService

+org.skywalking.apm.agent.core.queue.TraceSegmentProcessQueue
+org.skywalking.apm.agent.core.context.ContextManager
+org.skywalking.apm.agent.core.client.CollectorClientService
+org.skywalking.apm.agent.core.sampling.SamplingService

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/boot/ServiceManagerTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/boot/ServiceManagerTest.java

-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.skywalking.apm.api.context.ContextManager;
+import org.skywalking.apm.agent.core.context.ContextManager;
 
 /**
  * @author wusheng

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/client/HTTPRestServiceTestApp.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java

-package org.skywalking.apm.api.client;
+package org.skywalking.apm.agent.core.client;
 
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/conf/SnifferConfigInitializerTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java

-package org.skywalking.apm.api.conf;
+package org.skywalking.apm.agent.core.conf;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
-
-import static org.skywalking.apm.api.logging.LogLevel.DEBUG;
-import static org.skywalking.apm.api.logging.LogLevel.INFO;
+import org.skywalking.apm.agent.core.logging.LogLevel;
 
 /**
  * @author wusheng
@@ -24,11 +22,11 @@ public class SnifferConfigInitializerTest {
         Assert.assertNotNull(Config.Logging.FILE_NAME);
         Assert.assertNotNull(Config.Logging.MAX_FILE_SIZE);
         Assert.assertNotNull(Config.Logging.FILE_NAME);
-        Assert.assertEquals(INFO, Config.Logging.LEVEL);
+        Assert.assertEquals(LogLevel.INFO, Config.Logging.LEVEL);
     }
 
     @AfterClass
     public static void clear() {
-        Config.Logging.LEVEL = DEBUG;
+        Config.Logging.LEVEL = LogLevel.DEBUG;
     }
 }

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextCarrierTestCase.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextCarrierTestCase.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
 import org.junit.Assert;
 import org.junit.Test;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextManagerTestCase.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextManagerTestCase.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.skywalking.apm.api.boot.ServiceManager;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
 import org.skywalking.apm.trace.Span;
 import org.skywalking.apm.trace.TraceSegment;
 import org.skywalking.apm.trace.tag.Tags;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TestTracerContextListener.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TestTracerContextListener.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
 import org.skywalking.apm.trace.TraceSegment;
 

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TracerContextTestCase.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java

-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
 
 import org.junit.After;
 import org.junit.Assert;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLogResolverTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLogResolverTest.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.junit.Assert;
 import org.junit.Test;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLoggerTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLoggerTest.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.skywalking.apm.api.conf.Constants;
+import org.skywalking.apm.agent.core.conf.Constants;
 
 import java.io.PrintStream;
 
@@ -60,7 +60,7 @@ public class EasyLoggerTest {
         String formatLines = logger.format(exception);
         String[] lines = formatLines.split(Constants.LINE_SEPARATOR);
         Assert.assertEquals("java.lang.NullPointerException", lines[1]);
-        Assert.assertEquals("\tat org.skywalking.apm.api.logging.EasyLoggerTest.testFormat(EasyLoggerTest.java:58)", lines[2]);
+        Assert.assertEquals("\tat org.skywalking.apm.agent.core.logging.EasyLoggerTest.testFormat(EasyLoggerTest.java:58)", lines[2]);
     }
 
     @AfterClass

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/FileWriterTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/FileWriterTest.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.conf.Constants;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.conf.Constants;
 
 import java.io.File;
 import java.io.IOException;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/SystemOutWriterTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/SystemOutWriterTest.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/WriterFactoryTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/WriterFactoryTest.java

-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.skywalking.apm.api.conf.Config;
+import org.skywalking.apm.agent.core.conf.Config;
 
 import java.io.PrintStream;
 

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefineTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefineTest.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.agent.ByteBuddyAgent;
 import net.bytebuddy.agent.builder.AgentBuilder;
@@ -12,7 +12,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.plugin.utility.ClassFileExtraction;
+import org.skywalking.apm.agent.core.plugin.utility.ClassFileExtraction;
 
 import java.lang.instrument.ClassFileTransformer;
 
@@ -21,8 +21,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(PowerMockRunner.class)
 public class AbstractClassEnhancePluginDefineTest {
-    static final String WEAVE_CLASS = "org.skywalking.apm.api.plugin.TargetObject";
-    static final String INTERCEPTOR_CLASS = "org.skywalking.apm.api.plugin.MockPluginInterceptor";
+    static final String WEAVE_CLASS = "org.skywalking.apm.agent.core.plugin.pluginTargetObject";
+    static final String INTERCEPTOR_CLASS = "org.skywalking.apm.agent.core.plugin.MockPluginInterceptor";
     static final String WEAVE_INSTANCE_METHOD_NAME = "instanceMethod";
     static final String WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME = "instanceMethodWithException";
     static final String WEAVE_STATIC_METHOD_NAME = "staticMethod";

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockAbstractClassEnhancePluginDefine.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockAbstractClassEnhancePluginDefine.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.dynamic.DynamicType;
 

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInstanceMethodInstrumentation.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInstanceMethodInstrumentation.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.skywalking.apm.api.plugin.bytebuddy.AllObjectDefaultMethodsMatch;
-import org.skywalking.apm.api.plugin.interceptor.ConstructorInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.bytebuddy.AllObjectDefaultMethodsMatch;
+import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 
 import static net.bytebuddy.matcher.ElementMatchers.*;
-import static org.skywalking.apm.api.plugin.AbstractClassEnhancePluginDefineTest.*;
 
 public class MockPluginInstanceMethodInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
     @Override
     protected String enhanceClassName() {
-        return WEAVE_CLASS;
+        return AbstractClassEnhancePluginDefineTest.WEAVE_CLASS;
     }
 
     @Override
@@ -27,7 +26,7 @@ public class MockPluginInstanceMethodInstrumentation extends ClassInstanceMethod
 
                 @Override
                 public String getConstructorInterceptor() {
-                    return INTERCEPTOR_CLASS;
+                    return AbstractClassEnhancePluginDefineTest.INTERCEPTOR_CLASS;
                 }
             }
         };
@@ -39,23 +38,23 @@ public class MockPluginInstanceMethodInstrumentation extends ClassInstanceMethod
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
-                    return named(WEAVE_INSTANCE_METHOD_NAME).and(not(AllObjectDefaultMethodsMatch.INSTANCE));
+                    return named(AbstractClassEnhancePluginDefineTest.WEAVE_INSTANCE_METHOD_NAME).and(not(AllObjectDefaultMethodsMatch.INSTANCE));
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return INTERCEPTOR_CLASS;
+                    return AbstractClassEnhancePluginDefineTest.INTERCEPTOR_CLASS;
                 }
             },
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
-                    return named(WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME);
+                    return named(AbstractClassEnhancePluginDefineTest.WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return INTERCEPTOR_CLASS;
+                    return AbstractClassEnhancePluginDefineTest.INTERCEPTOR_CLASS;
                 }
             }
         };

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInterceptor.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInterceptor.java

-package org.skywalking.apm.api.plugin;
-
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.*;
+package org.skywalking.apm.agent.core.plugin;
+
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
 
 public class MockPluginInterceptor implements InstanceMethodsAroundInterceptor, StaticMethodsAroundInterceptor, InstanceConstructorInterceptor {
     @Override

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginStaticMethodInstrumentation.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginStaticMethodInstrumentation.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.skywalking.apm.api.plugin.interceptor.StaticMethodsInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassStaticMethodsEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassStaticMethodsEnhancePluginDefine;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static org.skywalking.apm.api.plugin.AbstractClassEnhancePluginDefineTest.*;
 
 public class MockPluginStaticMethodInstrumentation extends ClassStaticMethodsEnhancePluginDefine {
     @Override
     protected String enhanceClassName() {
-        return WEAVE_CLASS;
+        return AbstractClassEnhancePluginDefineTest.WEAVE_CLASS;
     }
 
     @Override
@@ -20,12 +19,12 @@ public class MockPluginStaticMethodInstrumentation extends ClassStaticMethodsEnh
             new StaticMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
-                    return named(WEAVE_STATIC_METHOD_NAME);
+                    return named(AbstractClassEnhancePluginDefineTest.WEAVE_STATIC_METHOD_NAME);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return INTERCEPTOR_CLASS;
+                    return AbstractClassEnhancePluginDefineTest.INTERCEPTOR_CLASS;
                 }
             }
         };

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginBootstrapTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginBootstrapTest.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import org.junit.Assert;
 import org.junit.Test;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginCfgTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import org.junit.After;
 import org.junit.Assert;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginFinderTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginFinderTest.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import net.bytebuddy.dynamic.DynamicType;
 import org.junit.Assert;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginResourcesResolverTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolverTest.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 import org.junit.Assert;
 import org.junit.Test;

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/TargetObject.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/TargetObject.java

-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
 
 public class TargetObject {
 

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/assist/NoConcurrencyAccessObjectTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/assist/NoConcurrencyAccessObjectTest.java

-package org.skywalking.apm.api.plugin.assist;
+package org.skywalking.apm.agent.core.plugin.assist;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.assist.NoConcurrencyAccessObject;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.assist.NoConcurrencyAccessObject;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
 
 /**
  * @author wusheng

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java

-package org.skywalking.apm.api.plugin.bytebuddy;
+package org.skywalking.apm.agent.core.plugin.bytebuddy;
 
 import org.junit.Test;
 

apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java → apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatchTest.java

-package org.skywalking.apm.api.plugin.bytebuddy;
+package org.skywalking.apm.agent.core.plugin.bytebuddy;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.method.ParameterDescription;