Skip to content

Cleanup tracing related properties removed in 1.9.0 #131

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 30, 2025
Merged

Cleanup tracing related properties removed in 1.9.0 #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 0 additions & 40 deletions ...ure/src/main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/p6spy/P6SpyProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.github.gavlyukovskiy.boot.jdbc.decorator.p6spy;

import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;

import java.util.regex.Pattern;

/**
Expand Down Expand Up @@ -50,11 +48,6 @@ public class P6SpyProperties {
*/
private String logFormat;

/**
* Tracing related properties
*/
private P6SpyTracing tracing = new P6SpyTracing();

/**
* Class file to use (only with logging=custom).
* The class must implement {@link com.p6spy.engine.spy.appender.FormattedLogger}
Expand Down Expand Up @@ -86,10 +79,6 @@ public String getLogFormat() {
return this.logFormat;
}

public P6SpyTracing getTracing() {
return this.tracing;
}

public String getCustomAppenderClass() {
return this.customAppenderClass;
}
Expand Down Expand Up @@ -118,10 +107,6 @@ public void setLogFormat(String logFormat) {
this.logFormat = logFormat;
}

public void setTracing(P6SpyTracing tracing) {
this.tracing = tracing;
}

public void setCustomAppenderClass(String customAppenderClass) {
this.customAppenderClass = customAppenderClass;
}
Expand All @@ -137,31 +122,6 @@ public enum P6SpyLogging {
CUSTOM
}

@Deprecated
public static class P6SpyTracing {
/**
* Report the effective sql string (with '?' replaced with real values) to tracing systems.
* <p>
* NOTE this setting does not affect the logging message.
*/
@Deprecated
private boolean includeParameterValues = true;

@Deprecated
@DeprecatedConfigurationProperty(
reason = "JDBC instrumentation is provided in Spring Cloud Sleuth",
replacement = "spring.sleuth.jdbc.p6spy.tracing.include-parameter-values"
)
public boolean isIncludeParameterValues() {
return this.includeParameterValues;
}

@Deprecated
public void setIncludeParameterValues(boolean includeParameterValues) {
this.includeParameterValues = includeParameterValues;
}
}

public static class P6SpyLogFilter {
/**
* Use regex pattern to filter log messages. Only matched messages will be logged.
Expand Down