Fix flaky spring scheduling tests #12469
Merged
Conversation
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
github-actions
bot
added
the
test native
laurit
commented
Oct 18, 2024
| @@ -39,7 +39,7 @@ | |||
| */ | |||
| @Aspect | |||
| final class SpringSchedulingInstrumentationAspect { | |||
| public static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-scheduling-3.1"; | |||
| private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-boot-autoconfigure"; | |||
There was a problem hiding this comment.
Instrumentation name should align with the module that contains the instrumentation code. It would probably be better to move this code elsewhere. cc @zeitlinger @jeanbisutti
laurit
commented
Oct 18, 2024
| OpenTelemetry.class, | ||
| R2DbcInstrumentationAutoConfigurationTest::openTelemetry); | ||
|
|
||
| private static OpenTelemetry openTelemetry() { |
There was a problem hiding this comment.
an alternative would be to move this wrapping to the LibraryTestRunner @trask WDYT?
There was a problem hiding this comment.
moving it makes sense to me, since LibraryTestRunner manages the SDK lifecycle
trask
approved these changes
Oct 18, 2024
| OpenTelemetry.class, | ||
| R2DbcInstrumentationAutoConfigurationTest::openTelemetry); | ||
|
|
||
| private static OpenTelemetry openTelemetry() { |
There was a problem hiding this comment.
moving it makes sense to me, since LibraryTestRunner manages the SDK lifecycle
laurit
commented
Oct 18, 2024
| @@ -91,10 +97,8 @@ private LibraryTestRunner() { | |||
| @Override | |||
| public void beforeTestClass() { | |||
| // just in case: if there was any test that modified the global instance, reset it | |||
| if (GlobalOpenTelemetry.get() != openTelemetry) { | |||
There was a problem hiding this comment.
I removed this check because I think it will always be true because GlobalOpenTelemetry wraps the instance used in set.
trask
approved these changes
Oct 18, 2024
jaydeluca
approved these changes
Oct 18, 2024
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.
https://ge.opentelemetry.io/s/ywwfjwk44fa66/tests/task/:instrumentation:spring:spring-boot-autoconfigure:test/details/io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling.SchedulingInstrumentationAspectTest/schedules()?top-execution=1