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

Rename otel.trace.classes.excludes to otel.javaagent.exclude-classes (#1747) 

* Rename otel.trace.classes.excludes

* Spotless
This commit is contained in:
Trask Stalnaker 2020-11-25 06:53:49 -08:00 committed by GitHub
parent 6f0c6c2f45
commit 325238f128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/suppressing-instrumentation.md
View File

@ -26,6 +26,6 @@ which could have unknown side-effects.
If you find yourself needing to use this, it would be great if you could drop us an issue explaining why,
so that we can try to come up with a better solution to address your need.
| System property | Environment variable | Purpose |
|-----------------------|-----------------------|---------------------------------------------------------------------------------------------------|
| otel.trace.classes.exclude | OTEL_TRACE_CLASSES_EXCLUDE | Suppresses all instrumentation for specific classes, format is "my.package.MyClass,my.package2.*" |
| System property | Environment variable | Purpose |
|--------------------------------|--------------------------------|---------------------------------------------------------------------------------------------------|
| otel.javaagent.exclude-classes | OTEL_JAVAAGENT_EXCLUDE_CLASSES | Suppresses all instrumentation for specific classes, format is "my.package.MyClass,my.package2.*" |

10
instrumentation/external-annotations/src/test/groovy/TraceProvidersTest.groovy
View File

@ -4,22 +4,12 @@
*/
import io.opentelemetry.instrumentation.test.AgentTestRunner
import io.opentelemetry.instrumentation.test.utils.ConfigUtils
import io.opentelemetry.test.annotation.SayTracedHello
/**
* This test verifies that Otel supports various 3rd-party trace annotations
*/
class TraceProvidersTest extends AgentTestRunner {
//Don't bother to instrument inner closures of this test class
static final PREVIOUS_CONFIG = ConfigUtils.updateConfigAndResetInstrumentation {
it.remove("otel.trace.annotations")
it.setProperty("otel.trace.classes.exclude", TraceProvidersTest.name + "*")
}
def cleanupSpec() {
ConfigUtils.setConfig(PREVIOUS_CONFIG)
}
def "should support #provider"(String provider) {
setup:

2
instrumentation/external-annotations/src/test/groovy/TracedMethodsExclusionTest.groovy
View File

@ -9,8 +9,6 @@ import io.opentracing.contrib.dropwizard.Trace
class TracedMethodsExclusionTest extends AgentTestRunner {
static final PREVIOUS_CONFIG = ConfigUtils.updateConfigAndResetInstrumentation {
// remove trace annotations in case previous tests have set it
it.remove("otel.trace.annotations")
it.setProperty("otel.trace.methods", "${TestClass.name}[included,excluded]")
it.setProperty("otel.trace.annotated.methods.exclude", "${TestClass.name}[excluded,annotatedButExcluded]")
}

1
instrumentation/opentelemetry-api-1.0/src/test/groovy/WithSpanInstrumentationTest.groovy
View File

@ -13,7 +13,6 @@ import io.opentelemetry.test.annotation.TracedWithSpan
*/
class WithSpanInstrumentationTest extends AgentTestRunner {
static final PREVIOUS_CONFIG = ConfigUtils.updateConfigAndResetInstrumentation {
it.setProperty("otel.trace.classes.exclude", WithSpanInstrumentationTest.name + "*")
it.setProperty("otel.trace.annotated.methods.exclude", "${TracedWithSpan.name}[ignored]")
}

2
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
View File

@ -46,7 +46,7 @@ public class AgentInstaller {
private static final Logger log = LoggerFactory.getLogger(AgentInstaller.class);
private static final String JAVAAGENT_ENABLED_CONFIG = "otel.javaagent.enabled";
private static final String EXCLUDED_CLASSES_CONFIG = "otel.trace.classes.exclude";
private static final String EXCLUDED_CLASSES_CONFIG = "otel.javaagent.exclude-classes";
private static final Map<String, List<Runnable>> CLASS_LOAD_CALLBACKS = new HashMap<>();
private static volatile Instrumentation INSTRUMENTATION;

2
testing-common/src/test/groovy/AgentTestRunnerTest.groovy
View File

@ -18,7 +18,7 @@ class AgentTestRunnerTest extends AgentTestRunner {
private static final boolean AGENT_INSTALLED_IN_CLINIT
static final PREVIOUS_CONFIG = ConfigUtils.updateConfig {
it.setProperty("otel.trace.classes.exclude",
it.setProperty("otel.javaagent.exclude-classes",
"config.exclude.packagename.*, config.exclude.SomeClass,config.exclude.SomeClass\$NestedClass")
}