-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix WithSpan annotation instrumentation (open-telemetry#929)
- Loading branch information
Showing
28 changed files
with
231 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...o/instrumentation/opentelemetryapi/anotations/AbstractTraceAnnotationInstrumentation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.opentelemetry.auto.instrumentation.opentelemetryapi.anotations; | ||
|
|
||
| import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; | ||
| import static net.bytebuddy.matcher.ElementMatchers.none; | ||
|
|
||
| import io.opentelemetry.auto.config.Config; | ||
| import io.opentelemetry.auto.config.MethodsConfigurationParser; | ||
| import io.opentelemetry.auto.tooling.Instrumenter; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import net.bytebuddy.description.ByteCodeElement; | ||
| import net.bytebuddy.description.method.MethodDescription; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
| import net.bytebuddy.matcher.ElementMatchers; | ||
|
|
||
| public abstract class AbstractTraceAnnotationInstrumentation extends Instrumenter.Default { | ||
| public AbstractTraceAnnotationInstrumentation( | ||
| String instrumentationName, String... additionalNames) { | ||
| super(instrumentationName, additionalNames); | ||
| } | ||
|
|
||
| /* | ||
| Returns a matcher for all methods that should be excluded from auto-instrumentation by | ||
| annotation-based advices. | ||
| */ | ||
| ElementMatcher.Junction<MethodDescription> configureExcludedMethods() { | ||
| ElementMatcher.Junction<MethodDescription> result = none(); | ||
|
|
||
| Map<String, Set<String>> excludedMethods = | ||
| MethodsConfigurationParser.parse(Config.get().getTraceAnnotatedMethodsExclude()); | ||
| for (Map.Entry<String, Set<String>> entry : excludedMethods.entrySet()) { | ||
| String className = entry.getKey(); | ||
| ElementMatcher.Junction<ByteCodeElement> classMather = | ||
| isDeclaredBy(ElementMatchers.<TypeDescription>named(className)); | ||
|
|
||
| ElementMatcher.Junction<MethodDescription> excludedMethodsMatcher = none(); | ||
| for (String methodName : entry.getValue()) { | ||
| excludedMethodsMatcher = excludedMethodsMatcher.or(ElementMatchers.named(methodName)); | ||
| } | ||
|
|
||
| result = result.or(classMather.and(excludedMethodsMatcher)); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...ava/io/opentelemetry/auto/instrumentation/opentelemetryapi/anotations/TraceDecorator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.opentelemetry.auto.instrumentation.opentelemetryapi.anotations; | ||
|
|
||
| import io.opentelemetry.OpenTelemetry; | ||
| import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator; | ||
| import io.opentelemetry.trace.Span; | ||
| import io.opentelemetry.trace.Tracer; | ||
| import java.lang.reflect.Method; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import unshaded.io.opentelemetry.extensions.auto.annotations.WithSpan; | ||
| import unshaded.io.opentelemetry.trace.Span.Kind; | ||
|
|
||
| public class TraceDecorator extends BaseDecorator { | ||
| public static final TraceDecorator DECORATE = new TraceDecorator(); | ||
|
|
||
| public static final Tracer TRACER = | ||
| OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.trace-annotation"); | ||
|
|
||
| private static final Logger log = LoggerFactory.getLogger(TraceDecorator.class); | ||
|
|
||
| /** | ||
| * This method is used to generate an acceptable span (operation) name based on a given method | ||
| * reference. It first checks for existence of {@link WithSpan} annotation. If it is present, then | ||
| * tries to derive name from its {@code value} attribute. Otherwise delegates to {@link | ||
| * #spanNameForMethod(Method)}. | ||
| */ | ||
| public String spanNameForMethodWithAnnotation(WithSpan annotation, Method method) { | ||
| if (annotation != null && !annotation.value().isEmpty()) { | ||
| return annotation.value(); | ||
| } | ||
| return spanNameForMethod(method); | ||
| } | ||
|
|
||
| public Span.Kind extractSpanKind(WithSpan annotation) { | ||
| Kind unshadedKind = annotation != null ? annotation.kind() : Kind.INTERNAL; | ||
| return toShadedOrNull(unshadedKind); | ||
| } | ||
|
|
||
| public static io.opentelemetry.trace.Span.Kind toShadedOrNull( | ||
| final unshaded.io.opentelemetry.trace.Span.Kind unshadedSpanKind) { | ||
| try { | ||
| return io.opentelemetry.trace.Span.Kind.valueOf(unshadedSpanKind.name()); | ||
| } catch (final IllegalArgumentException e) { | ||
| log.debug("unexpected span kind: {}", unshadedSpanKind.name()); | ||
| return io.opentelemetry.trace.Span.Kind.INTERNAL; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.