Skip to content

Normalize external annotations javaagent package name #397

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

Closed
trask wants to merge 1 commit into from
Closed

Normalize external annotations javaagent package name #397

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions ...mentation/extannotations/IncludeTest.java → ...ion/external/annotations/IncludeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS;
import static io.opentelemetry.javaagent.instrumentation.external.annotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/external-annotations/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks {
includeTestsMatching("ConfiguredTraceAnnotationsTest")
}
include("**/ConfiguredTraceAnnotationsTest.*")
jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass\$InterestingMethod")
jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.external.annotations.OuterClass\$InterestingMethod")
}

val testDeclarativeConfigInclude by registering(Test::class) {
Expand All @@ -68,7 +68,7 @@ tasks {
}
include("**/TracedMethodsExclusionTest.*")
jvmArgs(
"-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]"
"-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.external.annotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]"
)
}

Expand Down
4 changes: 2 additions & 2 deletions ...ns/ExternalAnnotationInstrumentation.java → ...ns/ExternalAnnotationInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationSingletons.instrumenter;
import static io.opentelemetry.javaagent.instrumentation.external.annotations.ExternalAnnotationSingletons.instrumenter;
import static java.util.Arrays.asList;
import static java.util.Collections.emptySet;
import static java.util.logging.Level.WARNING;
Expand Down
2 changes: 1 addition & 1 deletion ...ernalAnnotationInstrumentationModule.java → ...ernalAnnotationInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static java.util.Collections.singletonList;

Expand Down
2 changes: 1 addition & 1 deletion ...tations/ExternalAnnotationSingletons.java → ...tations/ExternalAnnotationSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
Expand Down
2 changes: 1 addition & 1 deletion ...tions/ConfiguredTraceAnnotationsTest.java → ...tions/ConfiguredTraceAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
2 changes: 1 addition & 1 deletion ...umentation/extannotations/OuterClass.java → ...tion/external/annotations/OuterClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Expand Down
2 changes: 1 addition & 1 deletion ...tation/extannotations/SayTracedHello.java → .../external/annotations/SayTracedHello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import io.opentelemetry.api.trace.Span;
import java.util.concurrent.Callable;
Expand Down
2 changes: 1 addition & 1 deletion .../extannotations/TraceAnnotationsTest.java → ...nal/annotations/TraceAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
Expand Down
2 changes: 1 addition & 1 deletion ...on/extannotations/TraceProvidersTest.java → ...ernal/annotations/TraceProvidersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
Expand Down
2 changes: 1 addition & 1 deletion ...notations/TracedMethodsExclusionTest.java → ...notations/TracedMethodsExclusionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.extannotations;
package io.opentelemetry.javaagent.instrumentation.external.annotations;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ instrumentation/development:
java:
external_annotations:
exclude_methods:
- class: io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest$TestClass
- class: io.opentelemetry.javaagent.instrumentation.external.annotations.TracedMethodsExclusionTest$TestClass
methods:
- excluded
- annotatedButExcluded
2 changes: 1 addition & 1 deletion ...ntation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ instrumentation/development:
java:
external_annotations:
include:
- io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass$InterestingMethod
- io.opentelemetry.javaagent.instrumentation.external.annotations.OuterClass$InterestingMethod