diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/BootService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java
similarity index 87%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/BootService.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java
index 3b677796c7c68efcda61c5badd666433185ce2fb..d79df0fd500aef1fa33b78e31e243e999638f660 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/BootService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
/**
* The BootService
is an interface to all services, which need to boot when plugin mechanism begins to
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/ServiceManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/ServiceManager.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/ServiceManager.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/ServiceManager.java
index c7ca626b13f6a077ef211c61738aa093cde8d903..ca7f52abd852155779bdf3e52f8145fa09236d8d 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/ServiceManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/ServiceManager.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/StatusBootService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/StatusBootService.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/StatusBootService.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/StatusBootService.java
index fba525262800b60e6f4fd86d84403f7dc42224a9..80476c3129ff813eaec5f5f93f5a2bd91d555c30 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/boot/StatusBootService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/StatusBootService.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.boot;
+package org.skywalking.apm.agent.core.boot;
/**
* The StatusBootService
is an abstract implementations of {@link BootService}, it extends {@link
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClient.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java
index ec4656f43818b297d8bae009a60d0baeaf05a387..09ac7c5b699fe5d32a2c49135873ea645ec5bf70 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClient.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClientService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClientService.java
similarity index 77%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClientService.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClientService.java
index bd3155d52ffa3832e7a00fa0e488ee4f03a2c8b1..68a6887748c6b7ec3f04e3aa6b881ecd4622e8e1 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/CollectorClientService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClientService.java
@@ -1,7 +1,7 @@
-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;
/**
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/RESTResponseStatusError.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java
similarity index 88%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/RESTResponseStatusError.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java
index 0d1524cf6b147cb6442deddb6978309f687dfd8c..9c3ba809d59df12b2fea320a3efcbecb80226674 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/client/RESTResponseStatusError.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.client;
+package org.skywalking.apm.agent.core.client;
/**
* The RESTResponseStatusError
represents the REST-Service client got an unexpected response code.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
similarity index 94%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Config.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
index 869f0f3f2ddae2a44ce9f2581b74ebd992ed205f..79f6413701f78c0564ef43e622ae09f2e49400f1 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Config.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
@@ -1,7 +1,7 @@
-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.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Constants.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Constants.java
similarity index 81%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Constants.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Constants.java
index 4b3098d5ffdd2021654d6c66a704b51ceb95bbf6..04f24c6e993daef82171eb87a890a70c7e51f9f3 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/Constants.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Constants.java
@@ -1,4 +1,4 @@
-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", "/");
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/SnifferConfigInitializer.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/SnifferConfigInitializer.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
index ca253360fe309397add72fed9726802bf9560f9b..c7871231ede29ed2c9fde7eb3031227a2772fb0d 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/conf/SnifferConfigInitializer.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
@@ -1,7 +1,7 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextCarrier.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextCarrier.java
similarity index 98%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextCarrier.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextCarrier.java
index e603d0498623257b28f499ee1f66814594a39243..278ae7d94fffebfe3fd6bd5dae07e2e564013f54 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextCarrier.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextCarrier.java
@@ -1,6 +1,6 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java
similarity index 96%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextManager.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java
index 3e244f66725420cad3ec7ae56cfea377a24c3712..32166f61a32a30741632003eb385b7ecbea3a3d4 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/ContextManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java
@@ -1,6 +1,6 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java
index 06235d57bb6fee6e73078a9fde9fc63357289cc8..d46a3a7bb9a1b896bbb94e819ca4aa020220ae56 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java
@@ -1,8 +1,8 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContextListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContextListener.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContextListener.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContextListener.java
index c4d52360474aee81e0a7c39ac76e79846103978d..20a77fd1f9d4cbeb060061a3faaab1bacfedf4a9 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/context/TracerContextListener.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContextListener.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
import org.skywalking.apm.trace.TraceSegment;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogResolver.java
similarity index 86%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogResolver.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogResolver.java
index 6e280c906fc806386a506816d1678fdb8ea5bad2..9ee08ac27f4068546813004563e61a4331113c1b 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogResolver.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogResolver.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
similarity index 75%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogger.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
index d2cf20527d02202fb9977ba441d4f509cd6d7f5f..4ea6630b0922e17747c01a977eed55e2f50be8f8 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/EasyLogger.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
@@ -1,7 +1,8 @@
-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 EasyLogger
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);
}
}
}
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/FileWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/FileWriter.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/FileWriter.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/FileWriter.java
index 9c10661455b8c40132a969e46beac2ee98ebe42f..b5de318a9a60da23a97f91f731ba2a07670ec325 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/FileWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/FileWriter.java
@@ -1,12 +1,12 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/IWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/IWriter.java
similarity index 56%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/IWriter.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/IWriter.java
index ea10fef8a1f7c0de4026ccd558ca4713a44e16e1..142aa1b5af33f9a3a473f329f01beb811c86e9c4 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/IWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/IWriter.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
public interface IWriter {
void write(String message);
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogLevel.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogLevel.java
similarity index 67%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogLevel.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogLevel.java
index a96fb9f2b52daadf15700ceb799aa259a524f4ab..5d53f3feeab42695d3dfe7a46a23fc12c8560149 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogLevel.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogLevel.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
/**
* Created by xin on 2016/12/7.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogMessageHolder.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogMessageHolder.java
similarity index 88%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogMessageHolder.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogMessageHolder.java
index c1d2b8163903dd46873b7fc8c0c3e64c759046a7..78a5061d5242184d659766e5539c2eee57271e98 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/LogMessageHolder.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/LogMessageHolder.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
/**
* The LogMessageHolder
is a {@link String} holder,
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/SystemOutWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/SystemOutWriter.java
similarity index 89%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/SystemOutWriter.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/SystemOutWriter.java
index 54156c1dbd4cfd5e3d2036f46762709b1b9ee332..e9654ba7ad34d8b8662364eda00d176544e0a19d 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/SystemOutWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/SystemOutWriter.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
import java.io.PrintStream;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/WriterFactory.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/WriterFactory.java
similarity index 63%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/WriterFactory.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/WriterFactory.java
index 5ece648d74e9768ae9d83f656e5b38d10c20f414..b90826689708d4e6502434559b9dcd50ffd80c8e 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/logging/WriterFactory.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/WriterFactory.java
@@ -1,7 +1,7 @@
-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() {
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefine.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java
index 2452bef3c9f9a4581cf2c73dd6ab1b9699c06cda..2c16b28665cef165fb1e25b9605ab0453d7abd99 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefine.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java
@@ -1,10 +1,10 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginBootstrap.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginBootstrap.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
index 74abf857458141c18b3306b5e343ca1cb438c3db..41bd8f261224c76e69fa21fde25df34521d2b477 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginBootstrap.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import net.bytebuddy.pool.TypePool;
import org.skywalking.apm.logging.ILog;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginCfg.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
similarity index 90%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginCfg.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
index 02ee1e0cb62fbd81a72d067f9c84039a9a06d4ed..151478d0d8587183e338886a522816261e1c64db 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginCfg.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
@@ -1,6 +1,6 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginException.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginException.java
similarity index 86%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginException.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginException.java
index 82b524fade03a92bbb9942b1011626c6103fcf20..eccab1e386512077e194e1095b49d645e5a33a86 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
public class PluginException extends RuntimeException {
private static final long serialVersionUID = -6020188711867490724L;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginFinder.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginFinder.java
similarity index 96%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginFinder.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginFinder.java
index 8abf8bb4dccf8542aeab029efacbe2b42485ec08..2caa7214bd5ae0d53be173d95609a5c439ba18a7 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginFinder.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginFinder.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import java.util.HashMap;
import java.util.List;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginResourcesResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginResourcesResolver.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
index 2c83a53ce5020c7bc6999e00483120174282d4af..b223364374959feca1f5fb61fd8afa01b9d4d639 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/PluginResourcesResolver.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/TracingBootstrap.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/TracingBootstrap.java
similarity index 98%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/TracingBootstrap.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/TracingBootstrap.java
index 8228eca1ff3a49eb5fea600551728abc851512c9..8ba5e4c3e1166145002807ee5f2078d4b0a95294 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/TracingBootstrap.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/TracingBootstrap.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.dynamic.ClassFileLocator;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java
index 4adade494b51e6021b90f381fca5b0b629a07c97..a887c8fd76c78cba2dce8c3bab54b84e32ce51e4 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java
similarity index 97%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatch.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java
index 0bde424ad0321e2f288d2ad492a0363e7acc1fa8..e65b735f1b8245f7c1cbadc423cffe5d4f4f6b24 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatch.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/ConstructorInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/ConstructorInterceptPoint.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java
index 8f18c5010be07daf7390d0129afe4346077a5a36..9fe797517dcb2cad135ab562b9ff6ad7b94c8981 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/ConstructorInterceptPoint.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhanceException.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java
similarity index 72%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhanceException.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java
index 60c9f193460c6967e0e36dbb92d6e4a86f49ee6c..c53a67f8e55a0fe74cc3c1347b7fdfc5806883ac 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhanceException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java
@@ -1,6 +1,6 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContext.java
similarity index 87%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContext.java
index bd35c96cbc3dae3ca84b3e15402497577ab8a21f..14034936202eb4a90d0c9457a6522d0fe38ab2c9 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContext.java
@@ -1,7 +1,7 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InstanceMethodsInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InstanceMethodsInterceptPoint.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java
index c4af14609074ca3ef3295a6bc3a193b136706d0b..1c8bef431e23dba04575b83223b73b6cab11be67 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InstanceMethodsInterceptPoint.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InterceptorException.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InterceptorException.java
similarity index 84%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InterceptorException.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InterceptorException.java
index c5a62349873e9870e1cc0e633a687e7d8c4d3b01..a604d74c84b6b29f5b0a23166eaecc70a78829f6 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/InterceptorException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/InterceptorException.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/StaticMethodsInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/StaticMethodsInterceptPoint.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java
index 71b35912c08529fb9d9f1098f12106e8e45428e1..e165669bf0d418d56d6a4f857dee9879fb7748c4 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/StaticMethodsInterceptPoint.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/assist/NoConcurrencyAccessObject.java
similarity index 83%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/assist/NoConcurrencyAccessObject.java
index 445666283c543e09a6c9167e42599a3946ac058d..48949a59981ef744edeaf0fc90cd559789427c29 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/assist/NoConcurrencyAccessObject.java
@@ -1,8 +1,8 @@
-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,
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassConstructorInterceptor.java
similarity index 90%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassConstructorInterceptor.java
index bb7d1b26ea566daca7c38f85bf29937d6a5e5279..530c2edc65d01f4ce40d0bb35d65f979a9f184a1 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassConstructorInterceptor.java
@@ -1,11 +1,11 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java
similarity index 92%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java
index b0b897d7987c7432d223acc7eef48af40129b8c3..ddc4daeca9bf04c9f28dd7cf9d77eb9d856fa0fb 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java
similarity index 81%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java
index 623aeab08a30cb7a7d8212320166f0084b39ef58..730c5ff54f6573b86ed66e7c9ccad8bf0e8aac46 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java
@@ -1,6 +1,6 @@
-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
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java
index d68fc0b3c3c3f80df52db4f573fc40532c2f74ff..c5866994080f44b437da4e94324969bcba6f878e 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java
@@ -1,8 +1,8 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java
similarity index 79%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java
index 42f850a853e2810c1370148ea1692b1066c2ec95..546e21a81957eb917a189c29ca9fc10fd71c8e7a 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java
@@ -1,7 +1,7 @@
-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
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java
index 48bf5cb2d8d1d3b99aaee76dea54bdf1dba7ca62..066d47d39014e6a6cc3b0fc810d562d2d821a594 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java
@@ -1,10 +1,10 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ConstructorInvokeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInvokeContext.java
similarity index 90%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ConstructorInvokeContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInvokeContext.java
index 0a1857a7ccb6a7ac10c48f0101148f30094d3fd9..25fb186bf05d14e99e69deac45d6f3f27158face 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/ConstructorInvokeContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInvokeContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
/**
* Constructor context.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java
similarity index 86%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java
index 49dfbbe4bf85cf4df561e2e64c19ef593bbbb421..5484527936e804099b91e48c011a10dc680acbf8 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java
@@ -1,10 +1,10 @@
-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;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldGetter.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldGetter.java
new file mode 100644
index 0000000000000000000000000000000000000000..e9630277e038155f303870b47f4696c10445aa54
--- /dev/null
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldGetter.java
@@ -0,0 +1,5 @@
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
+
+public interface FieldGetter {
+ Object getValue();
+}
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldSetter.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldSetter.java
similarity index 50%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldSetter.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldSetter.java
index 3e73e19410dc728788a4e949bd695cef4d1c42bb..373484dc7a4bbf3ec4a3ba9effde3965aa6b60dc 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldSetter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/FieldSetter.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
public interface FieldSetter {
void setValue(Object value);
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java
similarity index 78%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java
index c5456fb32763efbcd5840661046132a4efb5a10b..b5cb6d9e6e5155b32f3d4c368112da7596d545b9 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java
@@ -1,6 +1,6 @@
-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.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodInvokeContext.java
similarity index 89%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodInvokeContext.java
index 687b0e9fd5fd989053e2838d66fcf5325642fb2a..f174d3bb4b3e734c38275311604d6cd6a99e6bbf 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodInvokeContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
/**
* Instance method invoke context.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java
similarity index 92%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java
index 78bd50bf96c2f557144c81c0edd481f87c894696..bf2f7989546e7803647cf2597a8ceb70cff43ff2 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java
@@ -1,6 +1,6 @@
-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
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInterceptResult.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java
similarity index 87%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInterceptResult.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java
index 354dadf4dd6cf675cf724f9c7dcedaa39d6fe042..004561d81f3589203ae77b179dffd5b86ebadf35 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInterceptResult.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java
@@ -1,8 +1,8 @@
-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.
* The new value set to this object, by {@link MethodInterceptResult#defineReturnValue(Object)}, will override the
* origin return value.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInvokeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInvokeContext.java
similarity index 92%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInvokeContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInvokeContext.java
index 8e077c16f5d09b15faa6fca6ebe6449e5842eff2..8202ffe3479ba8e70c3241e082a3e0429cda5103 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/MethodInvokeContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInvokeContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
/**
* Method invoke context.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodInvokeContext.java
similarity index 89%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodInvokeContext.java
index 32bd50d23d16ba9100064baa70a5a5436dda1967..022c8bde8587880b26aa1a0b77ad4c0f2bbb99b8 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodInvokeContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
/**
* Static method invoke context.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java
index 5fc45ca26f881becd4e8231f5a6ef9da0a153b4e..ab0996924b178a81b0df36f792ad2ecc8b47dcbb 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
/**
* The static method's interceptor interface.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/loader/InterceptorInstanceLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/loader/InterceptorInstanceLoader.java
similarity index 95%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/loader/InterceptorInstanceLoader.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/loader/InterceptorInstanceLoader.java
index 0c662c1883973fbf810544016ba3089c25666c9d..0270b0d0ec3a0fc1f00d56d61c518d0f7d9480d2 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/loader/InterceptorInstanceLoader.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/interceptor/loader/InterceptorInstanceLoader.java
@@ -1,8 +1,8 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentHolder.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentHolder.java
similarity index 93%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentHolder.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentHolder.java
index 251eb7ceafd3267adc381339160525745e60587c..d1c7a1859d3879956561c24567726c31a955658a 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentHolder.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentHolder.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.queue;
+package org.skywalking.apm.agent.core.queue;
import com.lmax.disruptor.EventFactory;
import org.skywalking.apm.trace.TraceSegment;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentProcessQueue.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java
similarity index 92%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentProcessQueue.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java
index a8017a84fa34bfadcaac216ea781c1c1936fbc5c..419d6489449fa3249685fa3dc18a5199eccf4476 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/queue/TraceSegmentProcessQueue.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java
@@ -1,13 +1,13 @@
-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;
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/IllegalSamplingRateException.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java
similarity index 84%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/IllegalSamplingRateException.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java
index e234063a377adefe357febfaf3dcee1ab7fa19ec..8e50dd7b180083bb6e20877f7f17afe8bfb5f97e 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/IllegalSamplingRateException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.sampling;
+package org.skywalking.apm.agent.core.sampling;
/**
* Use IllegalSamplingRateException
, only if the rate can not be supported.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/SamplingService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java
similarity index 91%
rename from apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/SamplingService.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java
index ef7b6fab687b1d1111a5fceed1a874df512c1bad..e9cb7e28866a346fd9f17ce45c1226a808b08550 100644
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/sampling/SamplingService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java
@@ -1,8 +1,8 @@
-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;
diff --git a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService
new file mode 100644
index 0000000000000000000000000000000000000000..45405000c508f5e3c709844beb3917f5513828e1
--- /dev/null
+++ b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService
@@ -0,0 +1,4 @@
+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
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/boot/ServiceManagerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/boot/ServiceManagerTest.java
similarity index 75%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/boot/ServiceManagerTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/boot/ServiceManagerTest.java
index e7291c2b9f8b4dac3cccb297686454621889156e..5c8a66cdd7f9ddbcb8812e0d394dbf5860969b4e 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/boot/ServiceManagerTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/boot/ServiceManagerTest.java
@@ -1,8 +1,8 @@
-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
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/client/HTTPRestServiceTestApp.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java
similarity index 98%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/client/HTTPRestServiceTestApp.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java
index 4a96362f2cd369084b8055260c2e2a47bc96a194..0391b22a97a13be36f6bae641c3d3770da946219 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/client/HTTPRestServiceTestApp.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/conf/SnifferConfigInitializerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java
similarity index 74%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/conf/SnifferConfigInitializerTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java
index 44e4e763b8e70fc5709cfeb1c0a748bfaadf6e42..3bec24c7385df95e5f9bb2d7c5b253ae62e22a09 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/conf/SnifferConfigInitializerTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java
@@ -1,11 +1,9 @@
-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;
}
}
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextCarrierTestCase.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextCarrierTestCase.java
similarity index 98%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextCarrierTestCase.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextCarrierTestCase.java
index b5633c4e0c81cc00fea477959aa4ede388d0fb06..5546ece5075a4dbdc06165e9d0669b2cd0cbdcc6 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextCarrierTestCase.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextCarrierTestCase.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextManagerTestCase.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextManagerTestCase.java
similarity index 90%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextManagerTestCase.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextManagerTestCase.java
index 84b7fae0a5503fb70de9a22f86fa208a965f4bff..8b35f2018bde184be786e9a6d89e2bdc366f1311 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/ContextManagerTestCase.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/ContextManagerTestCase.java
@@ -1,10 +1,10 @@
-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;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TestTracerContextListener.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TestTracerContextListener.java
similarity index 88%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TestTracerContextListener.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TestTracerContextListener.java
index 046ef07c6b5cc32702d5952246f0da608e27e6b3..84b401d8439a337c49324df9343b81a396f21b76 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TestTracerContextListener.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TestTracerContextListener.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
import org.skywalking.apm.trace.TraceSegment;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TracerContextTestCase.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java
similarity index 98%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TracerContextTestCase.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java
index fc48d23d83ed2a453161494560999e23e97d0b9b..f34a838a338a15718efd3f5228f852b3fc7c42a7 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/context/TracerContextTestCase.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.context;
+package org.skywalking.apm.agent.core.context;
import org.junit.After;
import org.junit.Assert;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLogResolverTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLogResolverTest.java
similarity index 86%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLogResolverTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLogResolverTest.java
index c1af0778166f69ce26b221b9196174d8d7b490bf..171b77904e30197b14ea9f4cf629de251d0b7cca 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLogResolverTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLogResolverTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLoggerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLoggerTest.java
similarity index 89%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLoggerTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLoggerTest.java
index 59944031734e84a272580341110d5e7800dce272..e447ea9f0f62fcd2576e1c70c76e7a6bd1175e77 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/EasyLoggerTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLoggerTest.java
@@ -1,11 +1,11 @@
-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
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/FileWriterTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/FileWriterTest.java
similarity index 89%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/FileWriterTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/FileWriterTest.java
index 53b76b582c0e4d5022d6dfff7f691ac247aad8bb..3f241f09d7a02307ecd575bcd8a088650f63bd3b 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/FileWriterTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/FileWriterTest.java
@@ -1,10 +1,10 @@
-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;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/SystemOutWriterTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/SystemOutWriterTest.java
similarity index 94%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/SystemOutWriterTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/SystemOutWriterTest.java
index 3097074201debeea74a601ec968a735e5b7fb5f0..6c91de692db419f3d7bcf5f604214133a4444d5b 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/SystemOutWriterTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/SystemOutWriterTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.logging;
+package org.skywalking.apm.agent.core.logging;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/WriterFactoryTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/WriterFactoryTest.java
similarity index 91%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/WriterFactoryTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/WriterFactoryTest.java
index ad304677758c846fc895d1d0a8d6eb78eb980bd6..b43556d430acdc14407cf8f9ee295f19f2cf7198 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/logging/WriterFactoryTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/WriterFactoryTest.java
@@ -1,11 +1,11 @@
-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;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefineTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefineTest.java
similarity index 95%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefineTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefineTest.java
index f221ce246d7a3ecef53cef798c3ea52033f28130..a35ca44799947722c5140e56591a082339296e15 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefineTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefineTest.java
@@ -1,4 +1,4 @@
-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";
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockAbstractClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockAbstractClassEnhancePluginDefine.java
similarity index 91%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockAbstractClassEnhancePluginDefine.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockAbstractClassEnhancePluginDefine.java
index fdec59d2c512b57fa8521cced161433658da631a..a4e1ffba1a3f41ecb51e6a45dbff216a21356fe1 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockAbstractClassEnhancePluginDefine.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockAbstractClassEnhancePluginDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import net.bytebuddy.dynamic.DynamicType;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInstanceMethodInstrumentation.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInstanceMethodInstrumentation.java
similarity index 61%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInstanceMethodInstrumentation.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInstanceMethodInstrumentation.java
index c760cce1155cb7c68f7c00e4f13692f5d7451577..9e4462984e04b5d8a0ca53f574e6c8f4b554f6df 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInstanceMethodInstrumentation.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInstanceMethodInstrumentation.java
@@ -1,19 +1,18 @@
-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 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 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;
}
}
};
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInterceptor.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInterceptor.java
similarity index 61%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInterceptor.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInterceptor.java
index 7d118dcb5868e7a613368f4ac4a8b79640d80be0..4bd3996bac8fa7ac25d4baf5657b285921acc242 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginInterceptor.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginInterceptor.java
@@ -1,7 +1,14 @@
-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
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginStaticMethodInstrumentation.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginStaticMethodInstrumentation.java
similarity index 61%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginStaticMethodInstrumentation.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginStaticMethodInstrumentation.java
index 36415394c10e425f18def77ccc895fd0c33c6920..1e83cdac6d9960dfeed894910687ff13d98d29f9 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/MockPluginStaticMethodInstrumentation.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/MockPluginStaticMethodInstrumentation.java
@@ -1,17 +1,16 @@
-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 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;
}
}
};
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginBootstrapTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginBootstrapTest.java
similarity index 91%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginBootstrapTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginBootstrapTest.java
index 31afb9e357a8c77bf5dba2487dced839247f14d9..b67d81f3d086dd86b891c8429fa2d298d5a263c8 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginBootstrapTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginBootstrapTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginCfgTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java
similarity index 96%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginCfgTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java
index d8911945e3b049d00b9af01c005f6b2b37b9d61c..7853f3616383c964fd62d47a7a4417fef1c66d7b 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginCfgTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import org.junit.After;
import org.junit.Assert;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginFinderTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginFinderTest.java
similarity index 97%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginFinderTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginFinderTest.java
index fc33c9e69acf47a526a877177069a004da01d231..5378f9ce7b8cede2a89c1e0f46966eda0df57564 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginFinderTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginFinderTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import net.bytebuddy.dynamic.DynamicType;
import org.junit.Assert;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginResourcesResolverTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolverTest.java
similarity index 87%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginResourcesResolverTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolverTest.java
index db550b95b4e8c838948384bc2370e1c180701594..a963453c74ddffa941e23dee616a98f4b386fa03 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/PluginResourcesResolverTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolverTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/TargetObject.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/TargetObject.java
similarity index 89%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/TargetObject.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/TargetObject.java
index 91250c408af2458e01443144f19e48ebd2bec424..47383f6c866e76119e8dbf24aed9847eab9e09fe 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/TargetObject.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/TargetObject.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin;
+package org.skywalking.apm.agent.core.plugin;
public class TargetObject {
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/assist/NoConcurrencyAccessObjectTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/assist/NoConcurrencyAccessObjectTest.java
similarity index 84%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/assist/NoConcurrencyAccessObjectTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/assist/NoConcurrencyAccessObjectTest.java
index 1e87c4262f861298b4056086ffc711ad2a97cc83..e2f6a01df33871f108bb776ec12c9cc835c423d7 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/assist/NoConcurrencyAccessObjectTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/assist/NoConcurrencyAccessObjectTest.java
@@ -1,13 +1,13 @@
-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
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java
similarity index 74%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java
index b0f34563e2206d027d404b876a3f9059a1445250..7b48da04f27481acaabac62ce28e16109de749a9 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.bytebuddy;
+package org.skywalking.apm.agent.core.plugin.bytebuddy;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatchTest.java
similarity index 97%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatchTest.java
index fd91f79153d780bc8fc0293b2ecc6113ee461296..194db43fd0a273fffcfb70cd8f20db94464be77e 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatchTest.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContextTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContextTest.java
similarity index 89%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContextTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContextTest.java
index 8f9526d07156cb7c5c3d2382a994dececeacd205..b8710fffed51b2da5f8541aaccad4f5044165277 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/EnhancedClassInstanceContextTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/EnhancedClassInstanceContextTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor;
+package org.skywalking.apm.agent.core.plugin.interceptor;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/enhance/InvokeContextTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InvokeContextTest.java
similarity index 96%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/enhance/InvokeContextTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InvokeContextTest.java
index e0768bb2819e2aadf198ab0bd1d8f05f79c949b9..1f705e66c0ac2958e51fb59c967d1fd87b78d213 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/interceptor/enhance/InvokeContextTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/interceptor/enhance/InvokeContextTest.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
+package org.skywalking.apm.agent.core.plugin.interceptor.enhance;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/InterceptorInstanceLoaderTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoaderTest.java
similarity index 67%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/InterceptorInstanceLoaderTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoaderTest.java
index 0019aa8319c2081d344ac71fe352a6f7c1ab374d..96a94a07ae77dc51f8c55fb1e8903787f97abfd3 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/InterceptorInstanceLoaderTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoaderTest.java
@@ -1,8 +1,8 @@
-package org.skywalking.apm.api.plugin.loader;
+package org.skywalking.apm.agent.core.plugin.loader;
import org.junit.Assert;
import org.junit.Test;
-import org.skywalking.apm.api.plugin.interceptor.loader.InterceptorInstanceLoader;
+import org.skywalking.apm.agent.core.plugin.interceptor.loader.InterceptorInstanceLoader;
import java.lang.reflect.InvocationTargetException;
@@ -18,17 +18,17 @@ public class InterceptorInstanceLoaderTest {
return super.loadClass(name);
}
};
- Object obj = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", mockClassLoader);
+ Object obj = InterceptorInstanceLoader.load("org.skywalking.apm.agent.core.plugin.loader.NeverUsedTestClass", mockClassLoader);
Assert.assertTrue(obj != null);
- Object obj2 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", mockClassLoader);
+ Object obj2 = InterceptorInstanceLoader.load("org.skywalking.apm.agent.core.plugin.loader.NeverUsedTestClass", mockClassLoader);
Assert.assertTrue(obj != null);
Assert.assertEquals(obj, obj2);
- Object obj3 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
+ Object obj3 = InterceptorInstanceLoader.load("org.skywalking.apm.agent.core.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Assert.assertTrue(obj3 != null);
- Object obj4 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
+ Object obj4 = InterceptorInstanceLoader.load("org.skywalking.apm.agent.core.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Assert.assertTrue(obj4 != null);
Assert.assertEquals(obj3, obj4);
}
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/NeverUsedTestClass.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/NeverUsedTestClass.java
similarity index 75%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/NeverUsedTestClass.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/NeverUsedTestClass.java
index 2fe8c72a8d7254ecd79c4f049ed45fc67b47a66b..feb9a7fc1fad11e99bbca5ea6378b60943fc1e19 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/NeverUsedTestClass.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/loader/NeverUsedTestClass.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.loader;
+package org.skywalking.apm.agent.core.plugin.loader;
/**
* This class is only used in {@link InterceptorInstanceLoaderTest},
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/utility/ClassFileExtraction.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/utility/ClassFileExtraction.java
similarity index 98%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/utility/ClassFileExtraction.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/utility/ClassFileExtraction.java
index 44be5940ad1814b1cb8d43e8f2ab43fbe7ac463e..09eab05fba649d21d61a79ba3e01a3aca1960981 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/utility/ClassFileExtraction.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/utility/ClassFileExtraction.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.api.plugin.utility;
+package org.skywalking.apm.agent.core.plugin.utility;
import net.bytebuddy.ClassFileVersion;
import net.bytebuddy.asm.AsmVisitorWrapper;
diff --git a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/sampling/SamplingServiceTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/sampling/SamplingServiceTest.java
similarity index 86%
rename from apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/sampling/SamplingServiceTest.java
rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/sampling/SamplingServiceTest.java
index dab550ce037ef0c99b16298eb2e8680737b6b096..d9e514af05f38325eb12ac3716ea36043b3031f6 100644
--- a/apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/sampling/SamplingServiceTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/sampling/SamplingServiceTest.java
@@ -1,10 +1,10 @@
-package org.skywalking.apm.api.sampling;
+package org.skywalking.apm.agent.core.sampling;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Test;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
import org.skywalking.apm.trace.TraceSegment;
/**
diff --git a/apm-sniffer/apm-api/src/test/resources/sky-walking.config b/apm-sniffer/apm-agent-core/src/test/resources/sky-walking.config
similarity index 100%
rename from apm-sniffer/apm-api/src/test/resources/sky-walking.config
rename to apm-sniffer/apm-agent-core/src/test/resources/sky-walking.config
diff --git a/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def b/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def
new file mode 100644
index 0000000000000000000000000000000000000000..32e8cdffb3be77ea38db710f3b589d153816f7cf
--- /dev/null
+++ b/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def
@@ -0,0 +1 @@
+org.skywalking.apm.agent.core.plugin.MockAbstractClassEnhancePluginDefine
diff --git a/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/SkyWalkingAgent.java b/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/SkyWalkingAgent.java
index 9bdbabda6e620affcd747fe742982cbf0ab6cd4a..e8afb5d11f8c01e4bdc893d9f6166b35e2c6bbae 100644
--- a/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/SkyWalkingAgent.java
+++ b/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/SkyWalkingAgent.java
@@ -7,13 +7,13 @@ import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.utility.JavaModule;
import org.skywalking.apm.agent.junction.SkyWalkingEnhanceMatcher;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.SnifferConfigInitializer;
-import org.skywalking.apm.api.logging.EasyLogResolver;
-import org.skywalking.apm.api.plugin.AbstractClassEnhancePluginDefine;
-import org.skywalking.apm.api.plugin.PluginBootstrap;
-import org.skywalking.apm.api.plugin.PluginException;
-import org.skywalking.apm.api.plugin.PluginFinder;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.conf.SnifferConfigInitializer;
+import org.skywalking.apm.agent.core.logging.EasyLogResolver;
+import org.skywalking.apm.agent.core.plugin.AbstractClassEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.PluginBootstrap;
+import org.skywalking.apm.agent.core.plugin.PluginException;
+import org.skywalking.apm.agent.core.plugin.PluginFinder;
import org.skywalking.apm.logging.ILog;
import org.skywalking.apm.logging.LogManager;
diff --git a/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/junction/SkyWalkingEnhanceMatcher.java b/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/junction/SkyWalkingEnhanceMatcher.java
index 9314931ffc6d89529c49831feecf97456e886129..5b1b211cc8b651fe9f44ebe7c154d756c3fb906a 100644
--- a/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/junction/SkyWalkingEnhanceMatcher.java
+++ b/apm-sniffer/apm-agent/src/main/java/org/skywalking/apm/agent/junction/SkyWalkingEnhanceMatcher.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.agent.junction;
import net.bytebuddy.description.NamedElement;
-import org.skywalking.apm.api.plugin.PluginFinder;
+import org.skywalking.apm.agent.core.plugin.PluginFinder;
/**
* The matcher bases on byte-buddy {@link AbstractJunction} class.
diff --git a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldGetter.java b/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldGetter.java
deleted file mode 100644
index 8a51eaf542187053b05034a4008a67a006e9af20..0000000000000000000000000000000000000000
--- a/apm-sniffer/apm-api/src/main/java/org/skywalking/apm/api/plugin/interceptor/enhance/FieldGetter.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.skywalking.apm.api.plugin.interceptor.enhance;
-
-public interface FieldGetter {
- Object getValue();
-}
diff --git a/apm-sniffer/apm-api/src/main/resources/META-INF/services/org.skywalking.apm.api.boot.BootService b/apm-sniffer/apm-api/src/main/resources/META-INF/services/org.skywalking.apm.api.boot.BootService
deleted file mode 100644
index 7da120a1a9d69cf5a857d01d677162b916cdb5ab..0000000000000000000000000000000000000000
--- a/apm-sniffer/apm-api/src/main/resources/META-INF/services/org.skywalking.apm.api.boot.BootService
+++ /dev/null
@@ -1,4 +0,0 @@
-org.skywalking.apm.api.queue.TraceSegmentProcessQueue
-org.skywalking.apm.api.context.ContextManager
-org.skywalking.apm.api.client.CollectorClientService
-org.skywalking.apm.api.sampling.SamplingService
diff --git a/apm-sniffer/apm-api/src/test/resources/skywalking-plugin.def b/apm-sniffer/apm-api/src/test/resources/skywalking-plugin.def
deleted file mode 100644
index be31c027dd1a725b1aed2ce917edfa7acd663d66..0000000000000000000000000000000000000000
--- a/apm-sniffer/apm-api/src/test/resources/skywalking-plugin.def
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.api.plugin.MockAbstractClassEnhancePluginDefine
diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
index 4c3d057064eacd04087729135f684ca840ea68f8..0cfffb7f796ab4c7a9cbb7711645effb1ae42f50 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.plugin.dubbo;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
index 586772dda4d38826f5029b357877fb0581e25ff0..52831df6072237b10c4bfa581a823b168ca8b7a6 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
@@ -5,12 +5,12 @@ import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcContext;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.plugin.dubbox.BugFixActive;
import org.skywalking.apm.plugin.dubbox.SWBaseBean;
import org.skywalking.apm.trace.Span;
diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java
index 5346e89e61f89effbad92e1ee498e410a6ecd7fb..ebc1cf755195de54f2e3080d99e0ae2156a09778 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java
@@ -15,13 +15,13 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
import org.skywalking.apm.plugin.dubbox.BugFixActive;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
index cddea82158ab8e325fc826c2f6190a87a13e6320..ac1464382a10a104448dc1bf187d39705085a53b 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
@@ -1,12 +1,12 @@
package org.skywalking.apm.plugin.httpClient.v4;
import org.apache.http.*;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java
index faaf3889ef6ea4ef20376670e2f3f994be772f2d..ce607c449e9b629352f97e4a78f6cd95cdad55e9 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java
@@ -5,7 +5,7 @@ import net.bytebuddy.matcher.ElementMatcher;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.protocol.HttpContext;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java
index dc14e8dc9ea05555bb5b59f961efb15d3d727f15..902fbab72381f31dc2098ac42c53583cb5c832c5 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java
@@ -3,7 +3,7 @@ package org.skywalking.apm.plugin.httpClient.v4.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.http.HttpHost;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
index 5cc6dbf6ad922c3082f0ca5383cf8c6e5d286779..3317fe86951235966c9ef3f19de035f0975fdf8d 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.plugin.httpClient.v4.define;
-import org.skywalking.apm.api.plugin.interceptor.ConstructorInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import org.skywalking.apm.plugin.httpClient.v4.HttpClientExecuteInterceptor;
/**
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java
index 362f58ac248addc969f5dcca2912e4cec89ac32d..6e860d7444fd2fee1e0ecbf694200c1172392e78 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java
@@ -2,7 +2,7 @@ package org.skywalking.apm.plugin.httpClient.v4.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java
index 5be642df03f513f43987a411aa755996a9b2d104..19698297f1ca0b70b656e1df2467c987ea44f6f8 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java
@@ -5,7 +5,7 @@ import net.bytebuddy.matcher.ElementMatcher;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.protocol.HttpContext;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
index 763c218141d67fae0f01dacb9f5238040515c966..79b739a8de161856bcfe938de568fe38045d5087 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
@@ -9,10 +9,10 @@ import org.mockito.Mock;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
index 1a21d45caf80a8af6fec599e988e2262f177c45c..81ef93d06362f9cbbad6c92aa08fa8df6947d8c5 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.plugin.jdbc;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
index 80cc3d38f2d57e857df4fa547ec0dcc332febcf6..950d64d73d406e79eb8d89461827584f14761b35 100755
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.plugin.jdbc;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
index 59f163141928797d4659e497d47b369c88a03f63..053db5fefa44d0369107eb491081c3837edfa4fd 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.plugin.jdbc;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
index 5cbf055bb8462674a79d6892588ff733d6066dbd..94f6b8f45d48381f819a54705152742a2a7c87b3 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
@@ -1,7 +1,7 @@
package org.skywalking.apm.plugin.jdbc;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
index c924ba3dd59c001b3c020e7350597969296ab4cf..c7673a6137e5cb654850b5874c275ab9c6aa293c 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.plugin.jdbc.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.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.plugin.jdbc.SWConnection;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java
index 2b634feb9be83c5fc5ca5352c9b672cd4b8e70f4..a00f1993671e46db2a3c0a3729bd1560d9d08e37 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java
@@ -1,9 +1,9 @@
package org.skywalking.apm.plugin.jdbc.define;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.plugin.jdbc.SWConnection;
import java.sql.Connection;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
index ccf03fc5ff8b25631591e0a6b08c38d0539a012d..38875759b9b444e711ef6950ab519d650c33a8f0 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
@@ -9,8 +9,8 @@ import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.Span;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java
index c94aff24ebe30d06bd6690dc99ff7efdc5c65228..d547eef7f04572057e4156bca7193d8a039a18e3 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java
@@ -7,8 +7,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.TraceSegment;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWStatementTest.java
index 0b695b70372b4c932f7792bbefb71c9d8b44161a..360206b7e87086801e229be1ff89b77df31a23d2 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWStatementTest.java
@@ -8,8 +8,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.Span;
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
index 41714ea58b87b17e731caa3cf44fa78ef609b293..3b26428d466ce8c712a865bae807a100fef2df6b 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
@@ -9,8 +9,8 @@ import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.Span;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java
index c8dd67f81e10c73f2d43d321463938d61d709825..7cffbbec8ae7f5c0f16b11437359b0b2fcf9720f 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import redis.clients.jedis.HostAndPort;
import static org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor.*;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java
index 158d7163f76b54b20f0797915cba95cc73dbd31d..7d551fd6ec49f29fa3dde3c14d8dfc1d9a02bf25 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import redis.clients.jedis.HostAndPort;
import java.util.Set;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java
index 7b2b360ee39de2eb4c9634a3dc5b08ff4e29def8..e3359e926e8540b63344c99139a47e95e5e9c551 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import redis.clients.jedis.JedisShardInfo;
/**
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java
index 8cd5aa891c219ac11335bc85a81b1139911036c2..816a62154b57aee06e43fa10d6d6bf8248ece75f 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
/**
* {@link JedisClusterConstructorWithHostAndPortArgInterceptor} record the host
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java
index bf35940a0ca0294bbb11be94c28292dc6cfcfa52..377d3a235b449e9e84db52cfa37f39ccd475808e 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import java.net.URI;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
index caaa845ef397fa151f53f7bd064b479f65660a19..ca225470c44c835cce5609b2fe692396ec30f820 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
@@ -1,12 +1,12 @@
package org.skywalking.apm.plugin.jedis.v2;
-import org.skywalking.apm.api.context.ContextManager;
-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.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextManager;
+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;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
index 33702c15912fd2bd9e7b7bccd75ed7cedbfdf428..a3f73c45c173d26a99d090168ac425593720f07f 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
@@ -2,10 +2,10 @@ package org.skywalking.apm.plugin.jedis.v2.define;
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.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import org.skywalking.apm.plugin.jedis.v2.JedisClusterConstructorWithHostAndPortArgInterceptor;
import org.skywalking.apm.plugin.jedis.v2.JedisClusterConstructorWithListHostAndPortArgInterceptor;
import org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor;
@@ -13,7 +13,7 @@ import org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor;
import java.util.Set;
import static net.bytebuddy.matcher.ElementMatchers.*;
-import static org.skywalking.apm.api.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
+import static org.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
/**
* {@link JedisClusterInstrumentation} presents that skywalking intercepts all constructors and methods of {@link
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
index 718e66d3ead41345aa48065d383dabb3ee2fd9ee..466c5a203084460b9f4a2a99cf30a4d11a930eb4 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
@@ -3,10 +3,10 @@ package org.skywalking.apm.plugin.jedis.v2.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatchers;
-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.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import org.skywalking.apm.plugin.jedis.v2.JedisConstructorWithShardInfoArgInterceptor;
import org.skywalking.apm.plugin.jedis.v2.JedisConstructorWithUriArgInterceptor;
import org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor;
@@ -14,7 +14,7 @@ import org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor;
import java.net.URI;
import static net.bytebuddy.matcher.ElementMatchers.*;
-import static org.skywalking.apm.api.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
+import static org.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
/**
* {@link JedisInstrumentation} presents that skywalking intercept all constructors and methods of {@link
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
index 13845b1c1d56a5a20a9c9eedd0a61d0212e0ca42..7292e37c995c0c66f5f5ae4603e699e340cad949 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
@@ -6,8 +6,8 @@ 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.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
import redis.clients.jedis.HostAndPort;
import static org.mockito.Mockito.*;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
index 951d5ed5b716976b6f53af464cd0759dbacccd36..1e20b517f775f744511abbed1d392d58d1aa4159 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
@@ -6,8 +6,8 @@ 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.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
import redis.clients.jedis.HostAndPort;
import java.util.HashSet;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
index 25e72615ff424b82971e74caa0e0f6dba4923187..d15f5c276673fdb29d6d9261b2bf3832bb271e67 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
@@ -6,8 +6,8 @@ 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.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
import redis.clients.jedis.JedisShardInfo;
import static org.mockito.Mockito.*;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
index 7d14e4edc789953eccb0e210002c5bdc1df8460f..bf6408fbb5159fc19611a7bad7470a7926a4499e 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
@@ -5,8 +5,8 @@ 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.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
import static org.mockito.Mockito.*;
import static org.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor.*;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
index 797a6bcc7ce6fc55803d99f5cc85a845c4681c8b..86b7adc7e267fd2688f2f6948ac8bee1de7144b0 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
@@ -6,8 +6,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
import java.net.URI;
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java
index d73c8455f8e024dd90c8688f46a3917bc88b7480..cd2a464fe1dc6b8e424afa8f2781305abd5b4349 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java
@@ -8,10 +8,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
index 8b95580dc35fe74651e9735739e940add1b7965f..98d7b11a3a73491e3cfcdd0c61413a13aaf78a4c 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
@@ -7,12 +7,12 @@ import com.mongodb.bulk.UpdateRequest;
import com.mongodb.bulk.WriteRequest;
import com.mongodb.operation.*;
import org.bson.BsonDocument;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptor.java
index f178549d4558a948b6a05d5466a1bc375d0252e7..e30ebf2aefb1c883248fdfab70c3f24b8753415b 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptor.java
@@ -3,10 +3,10 @@ package org.skywalking.apm.plugin.mongodb.v3;
import com.mongodb.ReadPreference;
import com.mongodb.ServerAddress;
import com.mongodb.binding.ReadBinding;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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;
/**
* {@link MongoDBReadBindingInterceptor} record the host and port information
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptor.java
index 3eff268f0c69e20e2d085caec8aed4695cfa4be1..42c83ead937793dc560f74f7f3deeef07b5294a5 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptor.java
@@ -2,10 +2,10 @@ package org.skywalking.apm.plugin.mongodb.v3;
import com.mongodb.ServerAddress;
import com.mongodb.binding.WriteBinding;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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;
/**
* {@link MongoDBWriteBindingInterceptor} record the host and port information from {@link
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
index 35d4488eb57eda6da43a2fced5e116044398a925..9ac6bac127628d4b11cf215577d3bef5be06ab7e 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.plugin.mongodb.v3.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.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.plugin.mongodb.v3.MongoDBMethodInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptorTest.java
index b46a96f62ff326fb560e3060c4a874b3a0e3775e..782340fff0f265ec744cb2b8bbea91cecd68d155 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptorTest.java
@@ -14,11 +14,11 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.api.mockito.PowerMockito;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptorTest.java
index d49f2330fc6f2e13583447a8a36f657b1ab28f0b..cc2cca305b1607391560456a041fdda9806847cd 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBReadBindingInterceptorTest.java
@@ -11,8 +11,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-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.enhance.InstanceMethodInvokeContext;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptorTest.java
index a295a5c37aa55970187b6219ac5627229d920969..320e1ad3ec417341d3fb178d1a446844256290b8 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteBindingInterceptorTest.java
@@ -11,8 +11,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-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.enhance.InstanceMethodInvokeContext;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteMethodInterceptorTest.java
index b1db5e6d12c68e8eba5f3ba5cdd3f94e1ffbad64..083fa0fcb7f208077d7f9077fce6936cbbc6a115 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteMethodInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBWriteMethodInterceptorTest.java
@@ -15,11 +15,11 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.api.mockito.PowerMockito;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.conf.Config;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
index 81dc9b71e6aebabf7e16a745ab901d186af1c386..845f04ece436d0576c90e3ad87e217b4e671123d 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
@@ -3,10 +3,14 @@ package org.skywalking.apm.plugin.motan;
import com.weibo.api.motan.rpc.Request;
import com.weibo.api.motan.rpc.Response;
import com.weibo.api.motan.rpc.URL;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.*;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptor.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptor.java
index d2787cec7bbbc196b90ea5c46fcdecb97f928dd2..08b0437bbbf701b7bd622ed5e104cd0cb2a9a674 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptor.java
@@ -2,13 +2,13 @@ package org.skywalking.apm.plugin.motan;
import com.weibo.api.motan.rpc.Request;
import com.weibo.api.motan.rpc.Response;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
index 138653e579f15b48286f9fe5caab771200a5321c..f6fbc0fade7e135609408e7a888f2ffc2eb1bd18 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.plugin.motan.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.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.plugin.motan.MotanProviderInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
index 2fea8106e8f9569c46b59a1e4d748e0d46cc3751..bb126a69526337c02af7e9fedb3e49ff0e113fce 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
@@ -3,9 +3,9 @@ package org.skywalking.apm.plugin.motan.define;
import com.weibo.api.motan.rpc.Request;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.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.plugin.motan.MotanConsumerInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.any;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
index ccfb4bc36fe669572bdc4fc3d567dc45b085dfac..a710cf25a712b44cbc12e4f9b3c46449d40c479a 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
@@ -11,10 +11,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java
index 0f26cf8dfe3fd8171ec8d2be2107df4403c100f0..5ff94b1bf6bb8d5de252a1c94c056c5f634964ab 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java
@@ -11,11 +11,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml
index 5b78392d2819b4c06a95ec46e58a3742a97625a3..accc48abbd6d4e3ecefd2fd561aecd37357828ff 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -31,7 +31,7 @@
org.skywalking
- apm-api
+ apm-agent-core
${project.version}
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
index 27ace8f52814b259c4663f3a0343ee48f2efb26d..847bc57f25706615e77d9757e1a5e945e75ffbb5 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
@@ -1,12 +1,12 @@
package org.skywalking.apm.plugin.tomcat78x;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
-import org.skywalking.apm.api.util.StringUtil;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.util.StringUtil;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.TraceSegment;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
index de92bca2495d4108b3c2af83743bd75f50d334f0..0a4bb45520cde094ea4b06fd8fc2049ba1be710a 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
@@ -4,9 +4,9 @@ import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-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.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.plugin.tomcat78x.TomcatInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptorTest.java
index 9aa2135ae9960b8bcd2d9d04e2c52f1fccb01543..39bdd4d07f9364398830f605592ff03ee98f7656 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptorTest.java
@@ -7,11 +7,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.skywalking.apm.api.boot.ServiceManager;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.boot.ServiceManager;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.trace.LogData;
diff --git a/apm-sniffer/apm-sniffer-mock/pom.xml b/apm-sniffer/apm-sniffer-mock/pom.xml
index e41b318745502023a639ffd376be62ea4ac2e1c5..bb8ded40bd22c332321936029a6b10a2555e40ea 100644
--- a/apm-sniffer/apm-sniffer-mock/pom.xml
+++ b/apm-sniffer/apm-sniffer-mock/pom.xml
@@ -16,7 +16,7 @@
org.skywalking
- apm-api
+ apm-agent-core
${project.version}
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/context/MockTracerContextListener.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/context/MockTracerContextListener.java
index 98f06f7cde694e5e3d0d158945c86d63a7ddcb8a..99ae09f6340cbefbf303189dc7ef0b1ef7d988bf 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/context/MockTracerContextListener.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/context/MockTracerContextListener.java
@@ -1,8 +1,8 @@
package org.skywalking.apm.sniffer.mock.context;
import org.junit.Assert;
-import org.skywalking.apm.api.context.TracerContext;
-import org.skywalking.apm.api.context.TracerContextListener;
+import org.skywalking.apm.agent.core.context.TracerContext;
+import org.skywalking.apm.agent.core.context.TracerContextListener;
import org.skywalking.apm.trace.TraceSegment;
import java.util.ArrayList;
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/TraceSegmentBuilderFactory.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/TraceSegmentBuilderFactory.java
index ae52c0d54b66085ad9865c2c9eff61ac396616d5..c442058aba50074acae09224603d39fa65442ab7 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/TraceSegmentBuilderFactory.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/TraceSegmentBuilderFactory.java
@@ -1,6 +1,6 @@
package org.skywalking.apm.sniffer.mock.trace;
-import org.skywalking.apm.api.context.TracerContext;
+import org.skywalking.apm.agent.core.context.TracerContext;
import org.skywalking.apm.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.trace.builders.trace.*;
import org.skywalking.apm.trace.TraceSegment;
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
index 0f8aed9a1d4cebe5552bbf55471aae247158527d..e60eaa2c8e518728265ebd2a5b2bad36d8b56fd7 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
@@ -1,6 +1,6 @@
package org.skywalking.apm.sniffer.mock.trace.builders.span;
-import org.skywalking.apm.api.context.ContextManager;
+import org.skywalking.apm.agent.core.context.ContextManager;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
index 2059c10118bdde6ee817287ca5b01c0ebbf0e0e7..e8afc69047d8b17ca8a9ba7a763977b6d0ad6d3d 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
@@ -1,6 +1,6 @@
package org.skywalking.apm.sniffer.mock.trace.builders.span;
-import org.skywalking.apm.api.context.ContextManager;
+import org.skywalking.apm.agent.core.context.ContextManager;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
index c010114f313319027e71f4aab8471155e3353800..c3c85d427c7d39f78e459828c8f9d86b5fcb41d3 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
@@ -1,6 +1,6 @@
package org.skywalking.apm.sniffer.mock.trace.builders.span;
-import org.skywalking.apm.api.context.ContextManager;
+import org.skywalking.apm.agent.core.context.ContextManager;
import org.skywalking.apm.trace.Span;
import org.skywalking.apm.trace.tag.Tags;
diff --git a/apm-sniffer/apm-sniffer-mock/src/test/java/org/skywalking/apm/sniffer/mock/MockTracerContextListenerTestCase.java b/apm-sniffer/apm-sniffer-mock/src/test/java/org/skywalking/apm/sniffer/mock/MockTracerContextListenerTestCase.java
index fd301102d068d3778ce8882facef78417d650ce8..d7998c0e593b4e4c9cdcb7f403c58453212449e5 100644
--- a/apm-sniffer/apm-sniffer-mock/src/test/java/org/skywalking/apm/sniffer/mock/MockTracerContextListenerTestCase.java
+++ b/apm-sniffer/apm-sniffer-mock/src/test/java/org/skywalking/apm/sniffer/mock/MockTracerContextListenerTestCase.java
@@ -3,7 +3,7 @@ package org.skywalking.apm.sniffer.mock;
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.sniffer.mock.context.MockTracerContextListener;
import org.skywalking.apm.sniffer.mock.context.SegmentAssert;
import org.skywalking.apm.sniffer.mock.trace.TraceSegmentBuilderFactory;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java
index 57197500b975b8b611175751b2bc59ab8141b07b..e834e634de828d34eeeb5acb16cbe0e0624a55b6 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.log.log4j.v1.x;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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;
/**
* Created by wusheng on 2016/12/7.
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
index 792c48944506bd7812bf391375b016a9c8214abe..d65ba170029bb0aaea6de3e1e52b2328c6be6894 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.toolkit.activation.log.log4j.v1.x;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
index d21eb7d61d6606946cc3044edab8471ad31f92b3..e0f3cb1b0f7f3f63008a8ac2181cf304d47306a7 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
@@ -2,8 +2,8 @@ package org.skywalking.apm.toolkit.activation.log.log4j.v2.x;
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;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java
index 98ebc9805cadf504f09df24ebbe98ea8c43fb838..30fb39a52a6a5835d1c117cc9110a4038e5b5653 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.log.log4j.v2.x;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.StaticMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.context.ContextManager;
+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;
/**
* Created by wusheng on 2016/12/7.
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
index 4c5d22d12048757bfedfed242e9a6d905f294b41..dc52023d0ba43fc20bad2c69239787f9da8c0bd3 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
@@ -2,10 +2,10 @@ package org.skywalking.apm.toolkit.activation.log.logback.v1.x;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-import org.skywalking.apm.api.plugin.interceptor.ConstructorInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.InstanceMethodsInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.StaticMethodsInterceptPoint;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+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.StaticMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java
index 6e90b55286ce1c7ab952f3939d60765e4bc11c41..9ea8b8f567f1edafb2bd7f55d581b72294bb09d2 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.log.logback.v1.x;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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;
/**
* Created by wusheng on 2016/12/7.
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
index 062c96b97c4366ce7406784a37955474683d95f5..9a9a1d28f1f41aae9bdfcdeb0ce6d7ee66912bb4 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.toolkit.activation.opentracing.span;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import java.util.Map;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java
index eda1480baefeb887e28e07bc6ccbf700a72ec040..1d001843f3320aee00ad15c78d44c7421c4af0a7 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.opentracing.span.interceptor;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.toolkit.opentracing.SkyWalkingSpan;
/**
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java
index ec90a1cfed8863d2f31588d1105e419d2e2006f6..91eeb5db449ceaa7dbdf5c4417dd00cd136d22e9 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java
@@ -1,9 +1,9 @@
package org.skywalking.apm.toolkit.activation.opentracing.span.interceptor;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.ConstructorInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ConstructorInvokeContext;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import org.skywalking.apm.toolkit.opentracing.SkyWalkingSpan;
import org.skywalking.apm.trace.Span;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java
index b68165d4dd7f62933bd17ee610d04d461605d575..e9e100875aaafd88b2fea109e28eceba83c08d47 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.opentracing.span.interceptor;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.toolkit.opentracing.SkyWalkingSpan;
/**
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java
index e4ebbd8529ab931eb37fa9599c53d6470b20259e..5c1f84d0789286e8592673448beccc04456deb4b 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java
@@ -1,11 +1,11 @@
package org.skywalking.apm.toolkit.activation.opentracing.span.interceptor;
import io.opentracing.tag.Tags;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.toolkit.opentracing.SkyWalkingSpan;
/**
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java
index 4287d6ff01c18708f8d0d1a8cac5428c35e373f8..91379b1c0678d75b9bda91dac405cc9b5a209793 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java
@@ -2,9 +2,9 @@ package org.skywalking.apm.toolkit.activation.opentracing.tracer;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
-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.interceptor.ConstructorInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessContextInterceptor.java
index dcc77dd0446712c0f6ed0b12e378101d8f196060..84ba24da9ff3f322f1c4408b496dd5087f6b1348 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessContextInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessContextInterceptor.java
@@ -1,11 +1,11 @@
package org.skywalking.apm.toolkit.activation.opentracing.tracer.interceptor;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.toolkit.opentracing.SkyWalkingTracer;
/**
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerInjectFormatCrossProcessContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerInjectFormatCrossProcessContextInterceptor.java
index e8d2f62a7bfcfb195b42d6e0ad2ba4df50f96553..e01af530f4ff60c1b26ffdd3b63d0900c5471257 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerInjectFormatCrossProcessContextInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/tracer/interceptor/TracerInjectFormatCrossProcessContextInterceptor.java
@@ -1,11 +1,11 @@
package org.skywalking.apm.toolkit.activation.opentracing.tracer.interceptor;
-import org.skywalking.apm.api.context.ContextCarrier;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
+import org.skywalking.apm.agent.core.context.ContextCarrier;
+import org.skywalking.apm.agent.core.context.ContextManager;
+import org.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext;
+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.toolkit.opentracing.SkyWalkingTracer;
/**
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
index a0a0cf6f3cca964abb98a9167f8e158a4af2cd91..532e242fcf4df3d7bf42b41a454d5438ed5b8608 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
@@ -2,8 +2,8 @@ package org.skywalking.apm.toolkit.activation.trace;
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;
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
index c1e022a8f59dce3ae4b216aabbd49bc472f09b2b..5a1a82293e946471be96fd4a345c3aeafcda96f3 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
@@ -1,10 +1,10 @@
package org.skywalking.apm.toolkit.activation.trace;
-import org.skywalking.apm.api.context.ContextManager;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInterceptResult;
-import org.skywalking.apm.api.plugin.interceptor.enhance.MethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.StaticMethodInvokeContext;
-import org.skywalking.apm.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
+import org.skywalking.apm.agent.core.context.ContextManager;
+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.logging.ILog;
import org.skywalking.apm.logging.LogManager;
diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml
index 936c42a8ea7ff9b62f3c882bad0bddddb8d52882..67f6000f423d52993ebe2429fdecd87f701b6728 100644
--- a/apm-sniffer/apm-toolkit-activation/pom.xml
+++ b/apm-sniffer/apm-toolkit-activation/pom.xml
@@ -22,7 +22,7 @@
org.skywalking
- apm-api
+ apm-agent-core
${project.version}
diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml
index b101c46ab51d5780a0f3f7e4e8b29ecd022c3e72..ef022e2ca0577af9e9aebbcd61ba4c82a89f26b7 100644
--- a/apm-sniffer/pom.xml
+++ b/apm-sniffer/pom.xml
@@ -14,7 +14,7 @@
apm-agent
- apm-api
+ apm-agent-core
apm-sdk-plugin
apm-toolkit-activation
apm-sniffer-mock