Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#9089] Update config of spring-data-r2dbc plugin #9443

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions agent/src/main/resources/profiles/local/pinpoint.config
Original file line number Diff line number Diff line change
Expand Up @@ -746,13 +746,28 @@ profiler.jdbc.postgresql.commit=true
# Allow profiling of rollback.
profiler.jdbc.postgresql.rollback=true

#
# H2
#
# Profile H2
profiler.jdbc.h2=true
profiler.jdbc.h2.tracesqlbindvalue=true

###########################################################
# MONGODB
###########################################################
profiler.mongo=true
profiler.mongo.collectjson=true
profiler.mongo.tracebsonbindvalue=true

###########################################################
# Spring Data R2DBC
###########################################################
# Postgresql, H2, MySQL, Mariadb, Oracle, MsSQL
# Use some JDBC settings.
# For example, the settings for profiler.jdbc.xxx=true/false and profiler.jdbc.xxx.tracesqlbindvalue=true/false are also used by R2DBC.
profiler.spring.data.r2dbc.enable=true

###########################################################
# Apache HTTP Client 3.x #
###########################################################
Expand Down
15 changes: 15 additions & 0 deletions agent/src/main/resources/profiles/release/pinpoint.config
Original file line number Diff line number Diff line change
Expand Up @@ -742,13 +742,28 @@ profiler.jdbc.postgresql.commit=false
# Allow profiling of rollback.
profiler.jdbc.postgresql.rollback=false

#
# H2
#
# Profile H2
profiler.jdbc.h2=true
profiler.jdbc.h2.tracesqlbindvalue=true

###########################################################
# MONGODB
###########################################################
profiler.mongo=true
profiler.mongo.collectjson=true
profiler.mongo.tracebsonbindvalue=true

###########################################################
# Spring Data R2DBC
###########################################################
# Postgresql, H2, MySQL, Mariadb, Oracle, MsSQL
# Use some JDBC settings.
# For example, the settings for profiler.jdbc.xxx=true/false and profiler.jdbc.xxx.tracesqlbindvalue=true/false are also used by R2DBC.
profiler.spring.data.r2dbc.enable=true

###########################################################
# Apache HTTP Client 3.x #
###########################################################
Expand Down
11 changes: 11 additions & 0 deletions plugins/spring-data-r2dbc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,22 @@
* Since: Pinpoint 2.5.0
* See: https://spring.io/projects/spring-data-r2dbc
* Range: org.springframework.data/spring-data-r2dbc [1.0, 1.5]
* Range: org.mariadb/r2dbc-mariadb [1.1.2]
* Range: io.r2dbc/r2dbc-h2 [0.9.1]
* Range: org.postgresql/r2dbc-postgresql [0.9.1]
* Range: dev.miku/r2dbc-mysql [0.8.2]
* Range: com.github.jasync-sql/jasync-r2dbc-mysql [2.0.8]
* Range: com.oracle.database.r2dbc/oracle-r2dbc [1.0.0]
* Range: io.r2dbc/r2dbc-mssql [0.9.0]

### Pinpoint Configuration
pinpoint.config

#### Data options.
~~~
# Postgresql, H2, MySQL, Mariadb, Oracle, MsSQL
# Use some JDBC settings.
# For example, the settings for profiler.jdbc.xxx=true/false and profiler.jdbc.xxx.tracesqlbindvalue=true/false are also used by R2DBC.
profiler.spring.data.r2dbc.enable=true
~~~

Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class SpringDataR2dbcPlugin implements ProfilerPlugin, MatchableTransform
public void setup(ProfilerPluginSetupContext context) {
SpringDataR2dbcConfiguration config = new SpringDataR2dbcConfiguration(context.getConfig());
if (Boolean.FALSE == config.isEnabled()) {
logger.info("SpringDataR2dbcPlugin disabled");
logger.info("{} disabled", this.getClass().getSimpleName());
return;
}
logger.info("{} config:{}", this.getClass().getSimpleName(), config);
Expand Down