open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove overlapping tests and fix failing unit test

This commit is contained in:
Blinkingor 2020-01-28 16:06:23 +01:00
parent 10b963d277
commit 811051d111
2 changed files with 2 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java
View File

@ -48,7 +48,7 @@ public class TraceConfigInstrumentation implements Instrumenter {
private boolean validateConfigString(String configString) { private boolean validateConfigString(String configString) {
for (String clazz : configString.split(";")) { for (String clazz : configString.split(";")) {
if (!clazz.matches(CONFIG_FORMAT)) { if (!clazz.trim().matches(CONFIG_FORMAT)) {
return false; return false;
} }
} }
@ -56,11 +56,7 @@ public class TraceConfigInstrumentation implements Instrumenter {
} }
public TraceConfigInstrumentation() { public TraceConfigInstrumentation() {
this(Config.get().getTraceMethods()); String configString = Config.get().getTraceMethods();
}
public TraceConfigInstrumentation(final String configString) {
if (configString == null || configString.trim().isEmpty()) { if (configString == null || configString.trim().isEmpty()) {
classMethodsToTrace = Collections.emptyMap(); classMethodsToTrace = Collections.emptyMap();

102
dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceConfigInstrumentationTest.groovy
View File

File diff suppressed because one or more lines are too long