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

Update annotation instrumentation property name (#7196) 

Missed this when copying over the instrumentation for the old
annotations to the instrumentation for the new annotations.
This commit is contained in:
Trask Stalnaker 2022-11-16 00:33:55 -08:00 committed by GitHub
parent abc9f09efb
commit 0035f4b480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/opentelemetry-instrumentation-annotations-1.16/README.md
View File

@ -2,4 +2,4 @@
| Environment variable | Type | Default | Description | | Environment variable | Type | Default | Description |
|----------------- |------ |--------- |------------- | |----------------- |------ |--------- |------------- |
| `otel.instrumentation.opentelemetry-annotations.exclude-methods` | String | | All methods to be excluded from auto-instrumentation by annotation-based advices. | | `otel.instrumentation.opentelemetry-instrumentation-annotations.exclude-methods` | String | | All methods to be excluded from auto-instrumentation by annotation-based advices. |

2
instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/build.gradle.kts
View File

@ -35,6 +35,6 @@ tasks {
options.compilerArgs.add("-parameters") options.compilerArgs.add("-parameters")
} }
test { test {
jvmArgs("-Dotel.instrumentation.opentelemetry-annotations.exclude-methods=io.opentelemetry.test.annotation.TracedWithSpan[ignored]") jvmArgs("-Dotel.instrumentation.opentelemetry-instrumentation-annotations.exclude-methods=io.opentelemetry.test.annotation.TracedWithSpan[ignored]")
} }
} }

2
instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/WithSpanInstrumentation.java
View File

@ -41,7 +41,7 @@ import net.bytebuddy.matcher.ElementMatchers;
public class WithSpanInstrumentation implements TypeInstrumentation { public class WithSpanInstrumentation implements TypeInstrumentation {
private static final String TRACE_ANNOTATED_METHODS_EXCLUDE_CONFIG = private static final String TRACE_ANNOTATED_METHODS_EXCLUDE_CONFIG =
"otel.instrumentation.opentelemetry-annotations.exclude-methods"; "otel.instrumentation.opentelemetry-instrumentation-annotations.exclude-methods";
private final ElementMatcher.Junction<AnnotationSource> annotatedMethodMatcher; private final ElementMatcher.Junction<AnnotationSource> annotatedMethodMatcher;
private final ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher; private final ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher;