diff --git a/oracle-10.x-plugin/pom.xml b/oracle-10.x-plugin/pom.xml index e0f620c..aafdfc8 100755 --- a/oracle-10.x-plugin/pom.xml +++ b/oracle-10.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.openskywalking java-plugin-extensions - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/Constants.java similarity index 76% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/Constants.java index 3a4e72d..bb2517c 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/Constants.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; /** * Constants variables @@ -24,7 +24,7 @@ * @author zhang xin */ public final class Constants { - public static final String STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor"; + public static final String STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor"; - public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.PreparedStatementExecuteMethodsInterceptor"; + public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.PreparedStatementExecuteMethodsInterceptor"; } diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java similarity index 97% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java index d526ac5..5ef117a 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java similarity index 97% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java index 9c8a2ba..37a567c 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java similarity index 97% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java index ea2b95c..ea645d8 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java similarity index 98% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java index c85f2bc..8db9453 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java similarity index 98% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java index b39fa3e..6d1bfc4 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle; +package io.skywalking.apm.plugin.jdbc.oracle; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java similarity index 86% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java index f51b02d..25ede20 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; +package io.skywalking.apm.plugin.jdbc.oracle.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -34,9 +34,9 @@ * {@link ConnectionInstrumentation} define that the oracle plugin intercept the following methods that the class which * extend oracle.jdbc.driver.PhysicalConnection * - * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor - * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor - * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor + * 1. Enhance prepareStatement by io.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor + * 2. Enhance prepareCall by io.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor + * 3. Enhance createStatement by io.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor * * @author zhangxin @@ -44,9 +44,9 @@ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "oracle.jdbc.driver.PhysicalConnection"; - public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor"; - public static final String CALLABLE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor"; - public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor"; + public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor"; + public static final String CALLABLE_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor"; + public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor"; public static final String T4C_CONNECTION_CLASS = "oracle.jdbc.driver.T4CConnection"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java similarity index 95% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java index 5cbbdc6..3e91065 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; +package io.skywalking.apm.plugin.jdbc.oracle.define; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java similarity index 94% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java index 1c2e50d..f91b639 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; +package io.skywalking.apm.plugin.jdbc.oracle.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -26,8 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; +import static io.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; public class OracleCallableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java similarity index 63% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java index 5aceca2..de99430 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; +package io.skywalking.apm.plugin.jdbc.oracle.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -26,8 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; +import static io.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -35,32 +35,38 @@ public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsE public static final String PREPARED_STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OraclePreparedStatementWrapper"; public static final String T4C_PREPARED_STATEMENT_CLASS = "oracle.jdbc.driver.T4CPreparedStatement"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")); - } + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute") + .or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")); + } - @Override public String getMethodsInterceptor() { - return PREPARED_STATEMENT_INTERCEPT_CLASS; - } + @Override + public String getMethodsInterceptor() { + return PREPARED_STATEMENT_INTERCEPT_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, PREPARED_STATEMENT_WRAPPER_CLASS, T4C_PREPARED_STATEMENT_CLASS); } } diff --git a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java similarity index 59% rename from oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java rename to oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java index 20784ac..1eb30bb 100644 --- a/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java +++ b/oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; +package io.skywalking.apm.plugin.jdbc.oracle.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -26,8 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; +import static io.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS; import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS; public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -35,35 +35,41 @@ public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhanceP public static final String STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OracleStatementWrapper"; public static final String T4C_STATEMENT_CLASS = "oracle.jdbc.driver.T4CStatement"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")) - .or(named("executeBatchInternal")) - .or(named("executeUpdateInternal")) - .or(named("executeQuery")); - } + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute") + .or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")) + .or(named("executeBatchInternal")) + .or(named("executeUpdateInternal")) + .or(named("executeQuery")); + } - @Override public String getMethodsInterceptor() { - return STATEMENT_INTERCEPT_CLASS; - } + @Override + public String getMethodsInterceptor() { + return STATEMENT_INTERCEPT_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, STATEMENT_WRAPPER_CLASS, T4C_STATEMENT_CLASS); } } diff --git a/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def b/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def index ee8597f..bfea56a 100644 --- a/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def +++ b/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleCallableInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OraclePrepareStatementInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleStatementInstrumentation +oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation +oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation +oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OracleCallableInstrumentation +oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OraclePrepareStatementInstrumentation +oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OracleStatementInstrumentation diff --git a/pom.xml b/pom.xml index 78dd6cc..bdcd50f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.openskywalking java-plugin-extensions - 1.0.0-SNAPSHOT + 1.0.0 oracle-10.x-plugin @@ -70,6 +70,11 @@ 1.6 + + org.codehaus.mojo + versions-maven-plugin + 2.7 + diff --git a/resin-3.x-plugin/pom.xml b/resin-3.x-plugin/pom.xml index 5a4a192..a85ecd3 100644 --- a/resin-3.x-plugin/pom.xml +++ b/resin-3.x-plugin/pom.xml @@ -25,7 +25,7 @@ org.openskywalking java-plugin-extensions - 1.0.0-SNAPSHOT + 1.0.0 org.apache.skywalking diff --git a/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java b/resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java similarity index 98% rename from resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java rename to resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java index e61fbe7..af9748d 100644 --- a/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java +++ b/resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.plugin.resin.v3; +package io.skywalking.apm.plugin.resin.v3; import com.caucho.server.connection.CauchoRequest; import com.caucho.server.http.HttpResponse; diff --git a/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java b/resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java similarity index 93% rename from resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java rename to resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java index 59d7730..efa0f98 100644 --- a/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java +++ b/resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.resin.v3.define; +package io.skywalking.apm.plugin.resin.v3.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -32,7 +32,7 @@ public class ResinV3Instrumentation extends ClassInstanceMethodsEnhancePluginDef private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation"; - private static final String METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.resin.v3.ResinV3Interceptor"; + private static final String METHOD_INTERCET_CLASS = "io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/resin-3.x-plugin/src/main/resources/skywalking-plugin.def b/resin-3.x-plugin/src/main/resources/skywalking-plugin.def index 22d888e..a69002e 100644 --- a/resin-3.x-plugin/src/main/resources/skywalking-plugin.def +++ b/resin-3.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -resin-3.x=org.apache.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation +resin-3.x=io.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation diff --git a/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java b/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java index e2d4583..d185437 100644 --- a/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java +++ b/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java @@ -22,6 +22,8 @@ import com.caucho.server.connection.CauchoRequest; import com.caucho.server.http.HttpResponse; import java.util.List; + +import io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor; import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; diff --git a/resin-4.x-plugin/pom.xml b/resin-4.x-plugin/pom.xml index c08dc75..76ff2f9 100644 --- a/resin-4.x-plugin/pom.xml +++ b/resin-4.x-plugin/pom.xml @@ -25,7 +25,7 @@ org.openskywalking java-plugin-extensions - 1.0.0-SNAPSHOT + 1.0.0 org.apache.skywalking diff --git a/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java b/resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java similarity index 98% rename from resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java rename to resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java index 6665077..020bafe 100644 --- a/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java +++ b/resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.plugin.resin.v4; +package io.skywalking.apm.plugin.resin.v4; import com.caucho.server.http.CauchoRequest; import java.lang.reflect.Method; diff --git a/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java b/resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java similarity index 93% rename from resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java rename to resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java index 915d2a9..c2548b5 100644 --- a/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java +++ b/resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.resin.v4.define; +package io.skywalking.apm.plugin.resin.v4.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -31,7 +31,7 @@ public class ResinV4Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation"; - private static final String METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.resin.v4.ResinV4Interceptor"; + private static final String METHOD_INTERCET_CLASS = "io.skywalking.apm.plugin.resin.v4.ResinV4Interceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/resin-4.x-plugin/src/main/resources/skywalking-plugin.def b/resin-4.x-plugin/src/main/resources/skywalking-plugin.def index 781a23a..37e47c6 100644 --- a/resin-4.x-plugin/src/main/resources/skywalking-plugin.def +++ b/resin-4.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -resin-4.x=org.apache.skywalking.apm.plugin.resin.v4.define.ResinV4Instrumentation +resin-4.x=io.skywalking.apm.plugin.resin.v4.define.ResinV4Instrumentation diff --git a/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java b/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java index e5b5ac1..3b5c31d 100644 --- a/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java +++ b/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java @@ -22,6 +22,8 @@ import com.caucho.server.http.CauchoRequest; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import io.skywalking.apm.plugin.resin.v4.ResinV4Interceptor; import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;