Skip to content

Commit 912e2c9

Browse files
committed
Change the package name and version
1 parent 9fdd260 commit 912e2c9

24 files changed

+97
-76
lines changed

oracle-10.x-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.openskywalking</groupId>
2323
<artifactId>java-plugin-extensions</artifactId>
24-
<version>1.0.0-SNAPSHOT</version>
24+
<version>1.0.0</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/Constants.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
/**
2222
* Constants variables
2323
*
2424
* @author zhang xin
2525
*/
2626
public final class Constants {
27-
public static final String STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor";
27+
public static final String STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor";
2828

29-
public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.PreparedStatementExecuteMethodsInterceptor";
29+
public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.PreparedStatementExecuteMethodsInterceptor";
3030
}

oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
import java.lang.reflect.Method;
2222
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
import java.lang.reflect.Method;
2222
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
import java.lang.reflect.Method;
2222
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
import java.lang.reflect.Method;
2222
import org.apache.skywalking.apm.agent.core.context.ContextManager;
+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle;
19+
package io.skywalking.apm.plugin.jdbc.oracle;
2020

2121
import java.lang.reflect.Method;
2222
import org.apache.skywalking.apm.agent.core.context.ContextManager;
+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle.define;
19+
package io.skywalking.apm.plugin.jdbc.oracle.define;
2020

2121
import net.bytebuddy.description.method.MethodDescription;
2222
import net.bytebuddy.matcher.ElementMatcher;
@@ -34,19 +34,19 @@
3434
* {@link ConnectionInstrumentation} define that the oracle plugin intercept the following methods that the class which
3535
* extend oracle.jdbc.driver.PhysicalConnection
3636
*
37-
* 1. Enhance <code>prepareStatement</code> by <code>org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor</code>
38-
* 2. Enhance <code>prepareCall</code> by <code>org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor</code>
39-
* 3. Enhance <code>createStatement</code> by <code>org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor</code>
37+
* 1. Enhance <code>prepareStatement</code> by <code>io.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor</code>
38+
* 2. Enhance <code>prepareCall</code> by <code>io.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor</code>
39+
* 3. Enhance <code>createStatement</code> by <code>io.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor</code>
4040
* 4. Enhance <code>commit, rollback, close, releaseSavepoint</code> by <code>org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor</code>
4141
*
4242
* @author zhangxin
4343
*/
4444
public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
4545

4646
public static final String ENHANCE_CLASS = "oracle.jdbc.driver.PhysicalConnection";
47-
public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor";
48-
public static final String CALLABLE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor";
49-
public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor";
47+
public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor";
48+
public static final String CALLABLE_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor";
49+
public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "io.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor";
5050
public static final String T4C_CONNECTION_CLASS = "oracle.jdbc.driver.T4CConnection";
5151

5252
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919

20-
package org.apache.skywalking.apm.plugin.jdbc.oracle.define;
20+
package io.skywalking.apm.plugin.jdbc.oracle.define;
2121

2222
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
2323
import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle.define;
19+
package io.skywalking.apm.plugin.jdbc.oracle.define;
2020

2121
import net.bytebuddy.description.method.MethodDescription;
2222
import net.bytebuddy.matcher.ElementMatcher;
@@ -26,8 +26,8 @@
2626
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
2727
import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch;
2828

29+
import static io.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
2930
import static net.bytebuddy.matcher.ElementMatchers.named;
30-
import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
3131

3232
public class OracleCallableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
3333

+25-19
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle.define;
19+
package io.skywalking.apm.plugin.jdbc.oracle.define;
2020

2121
import net.bytebuddy.description.method.MethodDescription;
2222
import net.bytebuddy.matcher.ElementMatcher;
@@ -26,41 +26,47 @@
2626
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
2727
import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch;
2828

29+
import static io.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
2930
import static net.bytebuddy.matcher.ElementMatchers.named;
30-
import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
3131

3232
public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
3333

3434
public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OraclePreparedStatement";
3535
public static final String PREPARED_STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OraclePreparedStatementWrapper";
3636
public static final String T4C_PREPARED_STATEMENT_CLASS = "oracle.jdbc.driver.T4CPreparedStatement";
3737

38-
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
38+
@Override
39+
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
3940
return new ConstructorInterceptPoint[0];
4041
}
4142

42-
@Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
43-
return new InstanceMethodsInterceptPoint[] {
44-
new InstanceMethodsInterceptPoint() {
45-
@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
46-
return named("execute")
47-
.or(named("executeQuery"))
48-
.or(named("executeUpdate"))
49-
.or(named("executeLargeUpdate"));
50-
}
43+
@Override
44+
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
45+
return new InstanceMethodsInterceptPoint[]{
46+
new InstanceMethodsInterceptPoint() {
47+
@Override
48+
public ElementMatcher<MethodDescription> getMethodsMatcher() {
49+
return named("execute")
50+
.or(named("executeQuery"))
51+
.or(named("executeUpdate"))
52+
.or(named("executeLargeUpdate"));
53+
}
5154

52-
@Override public String getMethodsInterceptor() {
53-
return PREPARED_STATEMENT_INTERCEPT_CLASS;
54-
}
55+
@Override
56+
public String getMethodsInterceptor() {
57+
return PREPARED_STATEMENT_INTERCEPT_CLASS;
58+
}
5559

56-
@Override public boolean isOverrideArgs() {
57-
return false;
60+
@Override
61+
public boolean isOverrideArgs() {
62+
return false;
63+
}
5864
}
59-
}
6065
};
6166
}
6267

63-
@Override protected ClassMatch enhanceClass() {
68+
@Override
69+
protected ClassMatch enhanceClass() {
6470
return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, PREPARED_STATEMENT_WRAPPER_CLASS, T4C_PREPARED_STATEMENT_CLASS);
6571
}
6672
}
+28-22
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.jdbc.oracle.define;
19+
package io.skywalking.apm.plugin.jdbc.oracle.define;
2020

2121
import net.bytebuddy.description.method.MethodDescription;
2222
import net.bytebuddy.matcher.ElementMatcher;
@@ -26,44 +26,50 @@
2626
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
2727
import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch;
2828

29+
import static io.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS;
2930
import static net.bytebuddy.matcher.ElementMatchers.named;
30-
import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS;
3131

3232
public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
3333

3434
public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OracleStatement";
3535
public static final String STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OracleStatementWrapper";
3636
public static final String T4C_STATEMENT_CLASS = "oracle.jdbc.driver.T4CStatement";
3737

38-
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
38+
@Override
39+
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
3940
return new ConstructorInterceptPoint[0];
4041
}
4142

42-
@Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
43-
return new InstanceMethodsInterceptPoint[] {
44-
new InstanceMethodsInterceptPoint() {
45-
@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
46-
return named("execute")
47-
.or(named("executeQuery"))
48-
.or(named("executeUpdate"))
49-
.or(named("executeLargeUpdate"))
50-
.or(named("executeBatchInternal"))
51-
.or(named("executeUpdateInternal"))
52-
.or(named("executeQuery"));
53-
}
43+
@Override
44+
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
45+
return new InstanceMethodsInterceptPoint[]{
46+
new InstanceMethodsInterceptPoint() {
47+
@Override
48+
public ElementMatcher<MethodDescription> getMethodsMatcher() {
49+
return named("execute")
50+
.or(named("executeQuery"))
51+
.or(named("executeUpdate"))
52+
.or(named("executeLargeUpdate"))
53+
.or(named("executeBatchInternal"))
54+
.or(named("executeUpdateInternal"))
55+
.or(named("executeQuery"));
56+
}
5457

55-
@Override public String getMethodsInterceptor() {
56-
return STATEMENT_INTERCEPT_CLASS;
57-
}
58+
@Override
59+
public String getMethodsInterceptor() {
60+
return STATEMENT_INTERCEPT_CLASS;
61+
}
5862

59-
@Override public boolean isOverrideArgs() {
60-
return false;
63+
@Override
64+
public boolean isOverrideArgs() {
65+
return false;
66+
}
6167
}
62-
}
6368
};
6469
}
6570

66-
@Override protected ClassMatch enhanceClass() {
71+
@Override
72+
protected ClassMatch enhanceClass() {
6773
return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, STATEMENT_WRAPPER_CLASS, T4C_STATEMENT_CLASS);
6874
}
6975
}

oracle-10.x-plugin/src/main/resources/skywalking-plugin.def

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation
18-
oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation
19-
oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleCallableInstrumentation
20-
oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OraclePrepareStatementInstrumentation
21-
oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleStatementInstrumentation
17+
oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation
18+
oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation
19+
oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OracleCallableInstrumentation
20+
oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OraclePrepareStatementInstrumentation
21+
oracle-10.x=io.skywalking.apm.plugin.jdbc.oracle.define.OracleStatementInstrumentation

pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.openskywalking</groupId>
66
<artifactId>java-plugin-extensions</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
7+
<version>1.0.0</version>
88

99
<modules>
1010
<module>oracle-10.x-plugin</module>
@@ -70,6 +70,11 @@
7070
<target>1.6</target>
7171
</configuration>
7272
</plugin>
73+
<plugin>
74+
<groupId>org.codehaus.mojo</groupId>
75+
<artifactId>versions-maven-plugin</artifactId>
76+
<version>2.7</version>
77+
</plugin>
7378
</plugins>
7479
</build>
7580
</project>

resin-3.x-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.openskywalking</groupId>
2727
<artifactId>java-plugin-extensions</artifactId>
28-
<version>1.0.0-SNAPSHOT</version>
28+
<version>1.0.0</version>
2929
</parent>
3030

3131
<groupId>org.apache.skywalking</groupId>

resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919

20-
package org.apache.skywalking.apm.plugin.resin.v3;
20+
package io.skywalking.apm.plugin.resin.v3;
2121

2222
import com.caucho.server.connection.CauchoRequest;
2323
import com.caucho.server.http.HttpResponse;

resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java resin-3.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.plugin.resin.v3.define;
19+
package io.skywalking.apm.plugin.resin.v3.define;
2020

2121
import net.bytebuddy.description.method.MethodDescription;
2222
import net.bytebuddy.matcher.ElementMatcher;
@@ -32,7 +32,7 @@ public class ResinV3Instrumentation extends ClassInstanceMethodsEnhancePluginDef
3232

3333
private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation";
3434

35-
private static final String METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.resin.v3.ResinV3Interceptor";
35+
private static final String METHOD_INTERCET_CLASS = "io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor";
3636

3737
@Override
3838
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

resin-3.x-plugin/src/main/resources/skywalking-plugin.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
resin-3.x=org.apache.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation
17+
resin-3.x=io.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation

resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.caucho.server.connection.CauchoRequest;
2323
import com.caucho.server.http.HttpResponse;
2424
import java.util.List;
25+
26+
import io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor;
2527
import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem;
2628
import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan;
2729
import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity;

resin-4.x-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.openskywalking</groupId>
2727
<artifactId>java-plugin-extensions</artifactId>
28-
<version>1.0.0-SNAPSHOT</version>
28+
<version>1.0.0</version>
2929
</parent>
3030

3131
<groupId>org.apache.skywalking</groupId>

resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919

20-
package org.apache.skywalking.apm.plugin.resin.v4;
20+
package io.skywalking.apm.plugin.resin.v4;
2121

2222
import com.caucho.server.http.CauchoRequest;
2323
import java.lang.reflect.Method;

0 commit comments

Comments
 (0)