kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support default database(not set through JDBC URL) in mysql-5.x plugin (#154)

This commit is contained in:
xu1009 2022-04-12 22:30:19 +08:00 committed by GitHub
parent a5ccbca693
commit 46d99c5d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -37,6 +37,7 @@ Release Notes.
* Fix the bug that maybe causing memory leak and repeated traceId when use gateway-2.1.x-plugin or gateway-3.x-plugin.
* Fix Grpc 1.x plugin could leak context due to gRPC cancelled.
* Add JDK ThreadPoolExecutor Plugin.
* Support default database(not set through JDBC URL) in mysql-5.x plugin.
#### Documentation

4
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionCreate5xInterceptor.java
View File

@ -18,6 +18,7 @@
package org.apache.skywalking.apm.plugin.jdbc.mysql.v5;
import java.util.Objects;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
@ -42,7 +43,8 @@ public class ConnectionCreate5xInterceptor implements StaticMethodsAroundInterce
public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
Object ret) {
if (ret instanceof EnhancedInstance) {
ConnectionInfo connectionInfo = ConnectionCache.get(allArguments[0].toString(), allArguments[1].toString(), allArguments[3].toString());
String database = Objects.isNull(allArguments[3]) ? "" : allArguments[3].toString();
ConnectionInfo connectionInfo = ConnectionCache.get(allArguments[0].toString(), allArguments[1].toString(), database);
if (connectionInfo == null) {
connectionInfo = URLParser.parser(allArguments[4].toString());
}

12
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java
View File

@ -51,4 +51,16 @@ public class ConnectionImplCreateInterceptorTest {
}, null, objectInstance);
verify(objectInstance).setSkyWalkingDynamicField(Matchers.any());
}
@Test
public void testResultIsEnhanceInstanceWithNoDatabase() throws Throwable {
interceptor.afterMethod(null, null, new Object[] {
"localhost",
3360,
null,
null,
"jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true"
}, null, objectInstance);
verify(objectInstance).setSkyWalkingDynamicField(Matchers.any());
}
}