Convert external-annotations javaagent tests from groovy to java#9557
Merged
trask merged 3 commits intoSep 29, 2023
Merged
Conversation
laurit
reviewed
Sep 29, 2023
| InvocationTargetException { | ||
|
|
||
| Class<?> cls = | ||
| Class.forName("io.opentelemetry.javaagent.instrumentation.extannotations.SayTracedHello"); |
Contributor
There was a problem hiding this comment.
I think you don't need the Class.forName here, could directly use SayTraceHello.class. Or you could do something like
@ParameterizedTest
@EnumSource(TraceProvider.class)
void testShouldSupportProvider(TraceProvider provider) {
provider.test();
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("SayTracedHello." + provider.testMethodName())
.hasAttributesSatisfyingExactly(
equalTo(
SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()),
equalTo(SemanticAttributes.CODE_FUNCTION, provider.testMethodName()),
equalTo(stringKey("providerAttr"), provider.name()))));
}
@SuppressWarnings("ImmutableEnumChecker")
private enum TraceProvider {
AppOptics((sayTracedHello) -> sayTracedHello.appoptics()),
Datadog((sayTracedHello) -> sayTracedHello.datadog()),
Dropwizard((sayTracedHello) -> sayTracedHello.dropwizard()),
KamonOld((sayTracedHello) -> sayTracedHello.kamonold()),
KamonNew((sayTracedHello) -> sayTracedHello.kamonnew()),
NewRelic((sayTracedHello) -> sayTracedHello.newrelic()),
SignalFx((sayTracedHello) -> sayTracedHello.signalfx()),
Sleuth((sayTracedHello) -> sayTracedHello.sleuth()),
Tracelytics((sayTracedHello) -> sayTracedHello.tracelytics());
final Consumer<SayTracedHello> test;
TraceProvider(Consumer<SayTracedHello> test) {
this.test = test;
}
void test() {
test.accept(new SayTracedHello());
}
String testMethodName() {
return name().toLowerCase(Locale.ROOT);
}
}
Member
Author
There was a problem hiding this comment.
🤯 that is a much more elegant approach, thank you!
…mentation into external-annotations-conversion
Contributor
The usual solution is to make that method package private and add |
laurit
approved these changes
Sep 29, 2023
6 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related to #7195
I was also looking at the
javaagent-unit-tests, but the existing test in groovy accesses a method that is not visible in Java. I am trying to think of a way to rethink the approach to the test, but open to suggestions if anyone can think of a way