Skip to content

Commit db96efc

Browse files
JaredTan95ascrutae
JaredTan95
authored and
ascrutae
committed
update agent core 6.5.0. (#10)
1 parent 183c2cd commit db96efc

File tree

10 files changed

+40
-38
lines changed

10 files changed

+40
-38
lines changed

‎oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePlugin
4949
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

52-
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
52+
@Override
53+
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
5354
return new ConstructorInterceptPoint[0];
5455
}
5556

56-
@Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
57+
@Override
58+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
5759
return new InstanceMethodsInterceptPoint[] {
5860
new InstanceMethodsInterceptPoint() {
5961
@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {

‎oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ public class OracleCallableInstrumentation extends ClassInstanceMethodsEnhancePl
3535
public static final String CALLABLE_STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OracleCallableStatementWrapper";
3636
public static final String T4C_CALLABLE_STATMENT_CLASS = "oracle.jdbc.driver.T4CCallableStatement";
3737

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

42-
@Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
43+
@Override
44+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
4345
return new InstanceMethodsInterceptPoint[] {
4446
new InstanceMethodsInterceptPoint() {
4547
@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {

‎oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsE
3636
public static final String T4C_PREPARED_STATEMENT_CLASS = "oracle.jdbc.driver.T4CPreparedStatement";
3737

3838
@Override
39-
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
39+
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
4040
return new ConstructorInterceptPoint[0];
4141
}
4242

4343
@Override
44-
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
44+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
4545
return new InstanceMethodsInterceptPoint[]{
4646
new InstanceMethodsInterceptPoint() {
4747
@Override

‎oracle-10.x-plugin/src/main/java/io/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhanceP
3636
public static final String T4C_STATEMENT_CLASS = "oracle.jdbc.driver.T4CStatement";
3737

3838
@Override
39-
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
39+
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
4040
return new ConstructorInterceptPoint[0];
4141
}
4242

4343
@Override
44-
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
44+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
4545
return new InstanceMethodsInterceptPoint[]{
4646
new InstanceMethodsInterceptPoint() {
4747
@Override

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<skywalking.version>5.0.0-GA</skywalking.version>
21+
<skywalking.version>6.5.0</skywalking.version>
2222
<shade.package>org.apache.skywalking.apm.dependencies</shade.package>
2323
<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
2424
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public class ResinV3Instrumentation extends ClassInstanceMethodsEnhancePluginDef
3535
private static final String METHOD_INTERCET_CLASS = "io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor";
3636

3737
@Override
38-
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
38+
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
3939
return null;
4040
}
4141

4242
@Override
43-
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
43+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
4444
return new InstanceMethodsInterceptPoint[] {
4545
new InstanceMethodsInterceptPoint() {
4646
@Override

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121

2222
import com.caucho.server.connection.CauchoRequest;
2323
import com.caucho.server.http.HttpResponse;
24-
import java.util.List;
25-
2624
import io.skywalking.apm.plugin.resin.v3.ResinV3Interceptor;
27-
import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem;
25+
import java.util.List;
26+
import org.apache.skywalking.apm.agent.core.context.SW6CarrierItem;
2827
import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan;
2928
import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity;
3029
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
3130
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
3231
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
3332
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
33+
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
3434
import org.apache.skywalking.apm.agent.test.helper.SegmentHelper;
3535
import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper;
3636
import org.apache.skywalking.apm.agent.test.helper.SpanHelper;
@@ -48,12 +48,11 @@
4848
import org.mockito.Mock;
4949
import org.powermock.modules.junit4.PowerMockRunner;
5050
import org.powermock.modules.junit4.PowerMockRunnerDelegate;
51-
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
5251

52+
import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent;
5353
import static org.hamcrest.CoreMatchers.is;
5454
import static org.hamcrest.MatcherAssert.assertThat;
5555
import static org.mockito.Mockito.when;
56-
import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent;
5756

5857
/**
5958
* ResinInterceptorTest
@@ -110,7 +109,7 @@ public void testWithoutSerializedContextData() throws Throwable {
110109

111110
@Test
112111
public void testWithSerializedContextData() throws Throwable {
113-
when(request.getHeader(SW3CarrierItem.HEADER_NAME)).thenReturn("1.333.2345|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*");
112+
when(request.getHeader(SW6CarrierItem.HEADER_NAME)).thenReturn("1-I0FRQSojQVFBKkV0MFdlMHRRTlFBKg==-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu");
114113

115114
interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult);
116115
interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null);
@@ -141,8 +140,8 @@ public void testWithOccurException() throws Throwable {
141140

142141
private void assertTraceSegmentRef(TraceSegmentRef ref) {
143142
MatcherAssert.assertThat(SegmentRefHelper.getSpanId(ref), is(3));
144-
assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1));
145-
MatcherAssert.assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.333.2345"));
143+
assertThat(SegmentRefHelper.getEntryServiceInstanceId(ref), is(1));
144+
MatcherAssert.assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.234.111"));
146145
}
147146

148147
private void assertHttpSpan(AbstractTracingSpan span) {

‎resin-4.x-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<resin.version>4.0.41</resin.version>
40+
<resin.version>4.0.63</resin.version>
4141
<javax-servlet-api.version>3.0.1</javax-servlet-api.version>
4242
</properties>
4343

‎resin-4.x-plugin/src/main/java/io/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public class ResinV4Instrumentation extends ClassInstanceMethodsEnhancePluginDef
3434
private static final String METHOD_INTERCET_CLASS = "io.skywalking.apm.plugin.resin.v4.ResinV4Interceptor";
3535

3636
@Override
37-
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
37+
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
3838
return null;
3939
}
4040

4141
@Override
42-
protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
42+
public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
4343
return new InstanceMethodsInterceptPoint[] {
4444
new InstanceMethodsInterceptPoint() {
4545
@Override

‎resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,38 @@
2020
package org.apache.skywalking.apm.plugin.resin.v4;
2121

2222
import com.caucho.server.http.CauchoRequest;
23+
import io.skywalking.apm.plugin.resin.v4.ResinV4Interceptor;
2324
import java.util.List;
2425
import javax.servlet.http.HttpServletResponse;
25-
26-
import io.skywalking.apm.plugin.resin.v4.ResinV4Interceptor;
27-
import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem;
26+
import org.apache.skywalking.apm.agent.core.context.SW6CarrierItem;
27+
import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan;
28+
import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity;
2829
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
30+
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
31+
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
2932
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
33+
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
3034
import org.apache.skywalking.apm.agent.test.helper.SegmentHelper;
35+
import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper;
3136
import org.apache.skywalking.apm.agent.test.helper.SpanHelper;
37+
import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule;
3238
import org.apache.skywalking.apm.agent.test.tools.SegmentStorage;
3339
import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint;
3440
import org.apache.skywalking.apm.agent.test.tools.SpanAssert;
41+
import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner;
42+
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
3543
import org.junit.Before;
3644
import org.junit.Rule;
3745
import org.junit.Test;
3846
import org.junit.runner.RunWith;
3947
import org.mockito.Mock;
4048
import org.powermock.modules.junit4.PowerMockRunner;
4149
import org.powermock.modules.junit4.PowerMockRunnerDelegate;
42-
import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan;
43-
import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity;
44-
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
45-
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
46-
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
47-
import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper;
48-
import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule;
49-
import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner;
50-
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
5150

51+
import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent;
5252
import static org.hamcrest.CoreMatchers.is;
5353
import static org.hamcrest.MatcherAssert.assertThat;
5454
import static org.mockito.Mockito.when;
55-
import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent;
5655

5756
/**
5857
* Created by Baiyang on 2017/5/6.
@@ -111,7 +110,7 @@ public void testWithoutSerializedContextData() throws Throwable {
111110

112111
@Test
113112
public void testWithSerializedContextData() throws Throwable {
114-
when(request.getHeader(SW3CarrierItem.HEADER_NAME)).thenReturn("1.444.555|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*");
113+
when(request.getHeader(SW6CarrierItem.HEADER_NAME)).thenReturn("1-I0FRQSojQVFBKkV0MFdlMHRRTlFBKg==-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu");
115114

116115
interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult);
117116
interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null);
@@ -141,9 +140,9 @@ public void testWithOccurException() throws Throwable {
141140
}
142141

143142
private void assertTraceSegmentRef(TraceSegmentRef ref) {
144-
assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1));
143+
assertThat(SegmentRefHelper.getEntryServiceInstanceId(ref), is(1));
145144
assertThat(SegmentRefHelper.getSpanId(ref), is(3));
146-
assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.444.555"));
145+
assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.234.111"));
147146
}
148147

149148
private void assertHttpSpan(AbstractTracingSpan span) {

0 commit comments

Comments
 (0)