Skip to content

Commit 92292a5

Browse files
authored
Fix JDBCPluginConfig.Plugin.JDBC.SQL_BODY_MAX_LENGTH was not working in some plugins (#784)
1 parent c30b98d commit 92292a5

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Release Notes.
2323
* Support kafka-clients-3.9.x intercept.
2424
* Upgrade kafka-clients version in optional-reporter-plugins to 3.9.1.
2525
* Fix AbstractLogger replaceParam when the replaced string contains a replacement marker.
26+
* Fix `JDBCPluginConfig.Plugin.JDBC.SQL_BODY_MAX_LENGTH` was not working in some plugins.
2627

2728
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
2829

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
2424
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
2525
import org.apache.skywalking.apm.agent.core.context.ContextManager;
26+
import org.apache.skywalking.apm.plugin.jdbc.SqlBodyUtil;
2627

2728
/**
2829
* {@link CallableStatementTracing} create an exit span when the client call the method in the class that extend {@link
@@ -38,7 +39,7 @@ public static <R> R execute(java.sql.CallableStatement realStatement, Connection
3839
Tags.DB_TYPE.set(span, connectInfo.getDBType());
3940
SpanLayer.asDB(span);
4041
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
41-
Tags.DB_STATEMENT.set(span, sql);
42+
Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(sql));
4243
span.setComponent(connectInfo.getComponent());
4344
return exec.exe(realStatement, sql);
4445
} catch (SQLException e) {

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
2727
import org.apache.skywalking.apm.plugin.jdbc.JDBCPluginConfig;
2828
import org.apache.skywalking.apm.plugin.jdbc.PreparedStatementParameterBuilder;
29+
import org.apache.skywalking.apm.plugin.jdbc.SqlBodyUtil;
2930
import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos;
3031

3132
/**
@@ -42,7 +43,7 @@ public static <R> R execute(java.sql.PreparedStatement realStatement, Connection
4243
try {
4344
Tags.DB_TYPE.set(span, connectInfo.getDBType());
4445
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
45-
Tags.DB_STATEMENT.set(span, sql);
46+
Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(sql));
4647
span.setComponent(connectInfo.getComponent());
4748
SpanLayer.asDB(span);
4849
if (JDBCPluginConfig.Plugin.JDBC.TRACE_SQL_PARAMETERS && Objects.nonNull(statementEnhanceInfos)) {

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.skywalking.apm.agent.core.context.tag.Tags;
2424
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
2525
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
26+
import org.apache.skywalking.apm.plugin.jdbc.SqlBodyUtil;
2627

2728
/**
2829
* {@link PreparedStatementTracing} create an exit span when the client call the method in the class that extend {@link
@@ -36,7 +37,7 @@ public static <R> R execute(java.sql.Statement realStatement, ConnectionInfo con
3637
.getDatabasePeer());
3738
Tags.DB_TYPE.set(span, connectInfo.getDBType());
3839
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
39-
Tags.DB_STATEMENT.set(span, sql);
40+
Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(sql));
4041
span.setComponent(connectInfo.getComponent());
4142
SpanLayer.asDB(span);
4243
return exec.exe(realStatement, sql);

0 commit comments

Comments
 (0)