diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/AkkaSystem.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/AkkaSystem.java index 962d580d0..a5f007210 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/AkkaSystem.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/AkkaSystem.java @@ -6,7 +6,7 @@ import com.typesafe.config.ConfigFactory; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.cluster.ClusterConfig; import org.skywalking.apm.collector.cluster.Const; diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java index 229dd39a7..c5c3c7a85 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java @@ -1,6 +1,6 @@ package org.skywalking.apm.collector.cluster; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.config.ConfigProvider; /** diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java index b45911f51..7746883ab 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java @@ -34,7 +34,7 @@ public enum ConfigInitializer { for (ConfigProvider provider : configProviders) { logger.info("configProvider provider name: %s", provider.getClass().getName()); Class configClass = provider.configClass(); - org.skywalking.apm.api.util.ConfigInitializer.initialize(properties, configClass); + org.skywalking.apm.util.ConfigInitializer.initialize(properties, configClass); } } } diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java index 51a840b2c..47e1f150e 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java @@ -1,6 +1,6 @@ package org.skywalking.apm.collector.worker.config; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.config.ConfigProvider; /** diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java index 436ffb98f..1bf719bc1 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java @@ -1,6 +1,6 @@ package org.skywalking.apm.collector.worker.config; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.config.ConfigProvider; /** diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java index aea7a3a68..d41ac2144 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java @@ -4,7 +4,7 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.actor.*; import org.skywalking.apm.collector.actor.selector.RollingSelector; import org.skywalking.apm.collector.actor.selector.WorkerSelector; diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentPost.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentPost.java index 218030401..70e6fdda8 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentPost.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentPost.java @@ -2,7 +2,7 @@ package org.skywalking.apm.collector.worker.segment; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.actor.ClusterWorkerContext; import org.skywalking.apm.collector.actor.LocalWorkerContext; import org.skywalking.apm.collector.actor.ProviderNotFoundException; diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java index b59bc6f74..92fbcdda6 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java @@ -1,6 +1,6 @@ package org.skywalking.apm.collector.worker.tools; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.StringUtil; import org.skywalking.apm.collector.worker.Const; import org.skywalking.apm.collector.worker.segment.entity.Span; import org.skywalking.apm.collector.worker.segment.entity.tag.Tags; diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/GlobalIdGenerator.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/GlobalIdGenerator.java index 75f980de9..50e612305 100644 --- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/GlobalIdGenerator.java +++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/GlobalIdGenerator.java @@ -1,7 +1,7 @@ package org.skywalking.apm.trace; -import org.skywalking.apm.api.util.MachineInfo; -import org.skywalking.apm.api.util.StringUtil; +import org.skywalking.apm.util.MachineInfo; +import org.skywalking.apm.util.StringUtil; import java.util.UUID; diff --git a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/ConfigInitializer.java b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java similarity index 98% rename from apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/ConfigInitializer.java rename to apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java index 607a9ff71..a210636ec 100644 --- a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/ConfigInitializer.java +++ b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.api.util; +package org.skywalking.apm.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/MachineInfo.java b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/MachineInfo.java similarity index 97% rename from apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/MachineInfo.java rename to apm-commons/apm-util/src/main/java/org/skywalking/apm/util/MachineInfo.java index bbec72592..e31d66301 100644 --- a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/MachineInfo.java +++ b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/MachineInfo.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.api.util; +package org.skywalking.apm.util; import java.lang.management.ManagementFactory; import java.net.InetAddress; diff --git a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/StringUtil.java b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/StringUtil.java similarity index 96% rename from apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/StringUtil.java rename to apm-commons/apm-util/src/main/java/org/skywalking/apm/util/StringUtil.java index a8c9879eb..22a4c447f 100644 --- a/apm-commons/apm-util/src/main/java/org/skywalking/apm/api/util/StringUtil.java +++ b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/StringUtil.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.api.util; +package org.skywalking.apm.util; public final class StringUtil { public static boolean isEmpty(String str) { diff --git a/apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/ConfigInitializerTest.java b/apm-commons/apm-util/src/test/java/org/skywalking/apm/util/ConfigInitializerTest.java similarity index 98% rename from apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/ConfigInitializerTest.java rename to apm-commons/apm-util/src/test/java/org/skywalking/apm/util/ConfigInitializerTest.java index 04a74b38b..1c76bc71c 100644 --- a/apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/ConfigInitializerTest.java +++ b/apm-commons/apm-util/src/test/java/org/skywalking/apm/util/ConfigInitializerTest.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.api.util; +package org.skywalking.apm.util; import org.junit.Assert; import org.junit.Before; diff --git a/apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/StringUtilTest.java b/apm-commons/apm-util/src/test/java/org/skywalking/apm/util/StringUtilTest.java similarity index 94% rename from apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/StringUtilTest.java rename to apm-commons/apm-util/src/test/java/org/skywalking/apm/util/StringUtilTest.java index d442788c5..9ec153e49 100644 --- a/apm-commons/apm-util/src/test/java/org/skywalking/apm/api/util/StringUtilTest.java +++ b/apm-commons/apm-util/src/test/java/org/skywalking/apm/util/StringUtilTest.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.api.util; +package org.skywalking.apm.util; import org.junit.Assert; import org.junit.Test; diff --git a/apm-sniffer/apm-api/pom.xml b/apm-sniffer/apm-agent-core/pom.xml similarity index 98% rename from apm-sniffer/apm-api/pom.xml rename to apm-sniffer/apm-agent-core/pom.xml index 09b431d74..edbc0034d 100644 --- a/apm-sniffer/apm-api/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -8,10 +8,10 @@ 3.1-2017 - apm-api + apm-agent-core jar - apm-api + apm-agent-core http://maven.apache.org 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 3b677796c..d79df0fd5 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 c7ca626b1..ca7f52abd 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 fba525262..80476c312 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 ec4656f43..09ac7c5b6 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 bd3155d52..68a688774 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 0d1524cf6..9c3ba809d 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 869f0f3f2..79f641370 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 4b3098d5f..04f24c6e9 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 ca253360f..c7871231e 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 e603d0498..278ae7d94 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 3e244f667..32166f61a 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 06235d57b..d46a3a7bb 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 c4d523604..20a77fd1f 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 6e280c906..9ee08ac27 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 d2cf20527..4ea6630b0 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 9c1066145..b5de318a9 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 ea10fef8a..142aa1b5a 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 a96fb9f2b..5d53f3fee 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 c1d2b8163..78a5061d5 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 54156c1db..e9654ba7a 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 5ece648d7..b90826689 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 2452bef3c..2c16b2866 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 74abf8574..41bd8f261 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 02ee1e0cb..151478d0d 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 82b524fad..eccab1e38 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 8abf8bb4d..2caa7214b 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 2c83a53ce..b22336437 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 8228eca1f..8ba5e4c3e 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 4adade494..a887c8fd7 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 0bde424ad..e65b735f1 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 8f18c5010..9fe797517 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 60c9f1934..c53a67f8e 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 bd35c96cb..140349362 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 c4af14609..1c8bef431 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 c5a623498..a604d74c8 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 71b35912c..e165669bf 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 445666283..48949a599 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 bb7d1b26e..530c2edc6 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 b0b897d79..ddc4daeca 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 623aeab08..730c5ff54 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 d68fc0b3c..c58669940 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 42f850a85..546e21a81 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 48bf5cb2d..066d47d39 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 0a1857a7c..25fb186bf 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 49dfbbe4b..548452793 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 000000000..e9630277e --- /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 3e73e1941..373484dc7 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 c5456fb32..b5cb6d9e6 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 687b0e9fd..f174d3bb4 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 78bd50bf9..bf2f79895 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 354dadf4d..004561d81 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 8e077c16f..8202ffe34 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 32bd50d23..022c8bde8 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 5fc45ca26..ab0996924 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 0c662c188..0270b0d0e 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 251eb7cea..d1c7a1859 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 a8017a84f..419d64894 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 e234063a3..8e50dd7b1 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 ef7b6fab6..e9cb7e288 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 000000000..45405000c --- /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 e7291c2b9..5c8a66cdd 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 4a96362f2..0391b22a9 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 44e4e763b..3bec24c73 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 b5633c4e0..5546ece50 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 84b7fae0a..8b35f2018 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 046ef07c6..84b401d84 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 fc48d23d8..f34a838a3 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 c1af07781..171b77904 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 599440317..e447ea9f0 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 53b76b582..3f241f09d 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 309707420..6c91de692 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 ad3046777..b43556d43 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 f221ce246..a35ca4479 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 fdec59d2c..a4e1ffba1 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 c760cce11..9e4462984 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 7d118dcb5..4bd3996ba 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; +package org.skywalking.apm.agent.core.plugin; -import org.skywalking.apm.api.plugin.interceptor.EnhancedClassInstanceContext; -import org.skywalking.apm.api.plugin.interceptor.enhance.*; +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 36415394c..1e83cdac6 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 31afb9e35..b67d81f3d 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 d8911945e..7853f3616 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 fc33c9e69..5378f9ce7 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 db550b95b..a963453c7 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 91250c408..47383f6c8 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 1e87c4262..e2f6a01df 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 b0f34563e..7b48da04f 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 fd91f7915..194db43fd 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 8f9526d07..b8710fffe 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 e0768bb28..1f705e66c 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 0019aa831..96a94a07a 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 2fe8c72a8..feb9a7fc1 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 44be5940a..09eab05fb 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 dab550ce0..d9e514af0 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 000000000..32e8cdffb --- /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 9bdbabda6..e8afb5d11 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 9314931ff..5b1b211cc 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 8a51eaf54..000000000 --- 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 7da120a1a..000000000 --- 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 be31c027d..000000000 --- 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 4c3d05706..0cfffb7f7 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 586772dda..52831df60 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 5346e89e6..ebc1cf755 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 cddea8215..ac1464382 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 faaf3889e..ce607c449 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 dc14e8dc9..902fbab72 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 5cc6dbf6a..3317fe869 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 362f58ac2..6e860d744 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 5be642df0..19698297f 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 763c21814..79b739a8d 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 1a21d45ca..81ef93d06 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 80cc3d38f..950d64d73 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 59f163141..053db5fef 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 5cbf055bb..94f6b8f45 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 c924ba3dd..c7673a613 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 2b634feb9..a00f19936 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 ccf03fc5f..38875759b 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 c94aff24e..d547eef7f 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 0b695b703..360206b7e 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 41714ea58..3b26428d4 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 c8dd67f81..7cffbbec8 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 158d7163f..7d551fd6e 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 7b2b360ee..e3359e926 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 8cd5aa891..816a62154 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 bf35940a0..377d3a235 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 caaa845ef..ca225470c 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 33702c159..a3f73c45c 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 718e66d3e..466c5a203 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 13845b1c1..7292e37c9 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 951d5ed5b..1e20b517f 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 25e72615f..d15f5c276 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 7d14e4edc..bf6408fbb 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 797a6bcc7..86b7adc7e 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 d73c8455f..cd2a464fe 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 8b95580dc..98d7b11a3 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 f178549d4..e30ebf2ae 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 3eff268f0..42c83ead9 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 35d4488eb..9ac6bac12 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 b46a96f62..782340fff 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 d49f2330f..cc2cca305 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 a295a5c37..320e1ad3e 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 b1db5e6d1..083fa0fcb 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 81dc9b71e..845f04ece 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 d2787cec7..08b0437bb 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 138653e57..f6fbc0fad 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 2fea8106e..bb126a695 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 ccfb4bc36..a710cf25a 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 0f26cf8df..5ff94b1bf 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 5b78392d2..accc48abb 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 27ace8f52..847bc57f2 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 de92bca24..0a4bb4552 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 9aa2135ae..39bdd4d07 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 e41b31874..bb8ded40b 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 98f06f7cd..99ae09f63 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 ae52c0d54..c442058ab 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 0f8aed9a1..e60eaa2c8 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 2059c1011..e8afc6904 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 c010114f3..c3c85d427 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 fd301102d..d7998c0e5 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 57197500b..e834e634d 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 792c48944..d65ba1700 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 d21eb7d61..e0f3cb1b0 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 98ebc9805..30fb39a52 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 4c5d22d12..dc52023d0 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 6e90b5528..9ea8b8f56 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 062c96b97..9a9a1d28f 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 eda1480ba..1d001843f 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 ec90a1cfe..91eeb5db4 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 b68165d4d..e9e100875 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 e4ebbd852..5c1f84d07 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 4287d6ff0..91379b1c0 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 dcc77dd04..84ba24da9 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 e8d2f62a7..e01af530f 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 a0a0cf6f3..532e242fc 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 c1e022a8f..5a1a82293 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 936c42a8e..67f6000f4 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 b101c46ab..ef022e2ca 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