Skip to content
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

Jump to bottom

Make the JDBC driver config work with the OTel starter #9625

Merged
merged 9 commits into from
Oct 23, 2023
Merged

Make the JDBC driver config work with the OTel starter #9625

merged 9 commits into from
Oct 23, 2023

Conversation

jeanbisutti
Copy link
Member

No description provided.

@jeanbisutti jeanbisutti requested a review from a team October 8, 2023 20:22
jeanbisutti
jeanbisutti commented Oct 8, 2023
View reviewed changes
smoke-tests-otel-starter/build.gradle.kts

tasks.test {
useJUnitPlatform()
setForkEvery(1)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tested with @DirtiesContext without success (telemetry missing for one test). Perhaps this topic could be revisited later with the help of #8962 and #8963.

@jeanbisutti jeanbisutti requested a review from trask October 13, 2023 14:49
@jeanbisutti jeanbisutti mentioned this pull request Oct 13, 2023
Merged
@jeanbisutti
Copy link
Member Author

@open-telemetry/java-instrumentation-maintainers and @open-telemetry/java-instrumentation-approvers, would you have other comments?

@jeanbisutti
Copy link
Member Author

I have tried to do an implementation in the same way as for logging with an ApplicationListener, but is does not work.

@jeanbisutti jeanbisutti requested a review from brunobat October 20, 2023 10:32
trask
trask reviewed Oct 20, 2023
View reviewed changes
instrumentation/jdbc/library/README.md Outdated Show resolved Hide resolved
...tion/spring/autoconfigure/instrumentation/jdbc/OpenTelemetryJdbcDriverAutoConfiguration.java Show resolved Hide resolved
...tion/spring/autoconfigure/instrumentation/jdbc/OpenTelemetryJdbcDriverAutoConfiguration.java
Comment on lines +23 to +26
@Bean
OpenTelemetryInjector injectOtelIntoJdbcDriver() {
return openTelemetry -> OpenTelemetryDriver.install(openTelemetry);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can the approach used for logging work here?

opentelemetry-java-instrumentation/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java

Lines 29 to 36 in 0ec55db

@Bean
ApplicationListener<ApplicationReadyEvent> log4jOtelAppenderInitializer(
OpenTelemetry openTelemetry) {
return event -> {
io.opentelemetry.instrumentation.log4j.appender.v2_17.OpenTelemetryAppender.install(
openTelemetry);
};
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the first thing I have tried. It does not work.

@trask trask added this to the v1.32.0 milestone Oct 20, 2023
brunobat
brunobat approved these changes Oct 23, 2023
View reviewed changes
Copy link

@brunobat brunobat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested it with Quarkus with no side effects. Thanks @jeanbisutti !

@jeanbisutti
Copy link
Member Author

I've tested it with Quarkus with no side effects. Thanks @jeanbisutti !

Thank you @brunobat for having tested that these changes won't break things on Quarkus!

mateuszrzeszutek
mateuszrzeszutek approved these changes Oct 23, 2023
View reviewed changes
...on/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java Outdated
@@ -48,6 +52,8 @@ public final class OpenTelemetryDriver implements Driver {
// visible for testing
static final OpenTelemetryDriver INSTANCE = new OpenTelemetryDriver();

private OpenTelemetry openTelemetry = OpenTelemetry.noop();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be volatile?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not ure about all the use cases of the OpenTelemetryDriver. So, I have added volatile to be more confident. Thank you. I have noticed that volatile is not used for logging here and here, but it's perhaps less problematic.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have noticed that volatile is not used for logging here and here, but it's perhaps less problematic.

ideally those should be volatile also since could be accessed across different threads, would you mind sending a separate PR to update them?

@trask trask merged commit e6ec4f5 into open-telemetry:main Oct 23, 2023
46 checks passed
@jeanbisutti jeanbisutti mentioned this pull request Oct 23, 2023
Merged
@jeanbisutti jeanbisutti mentioned this pull request Oct 23, 2023
Merged
Abhishekkr3003 pushed a commit to Abhishekkr3003/opentelemetry-java-instrumentation that referenced this pull request Nov 7, 2023
@jeanbisutti @trask @Abhishekkr3003
Make the JDBC driver config work with the OTel starter (open-telemetr…
a611d4a 
…y#9625)

Co-authored-by: Trask Stalnaker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kenfinnigan kenfinnigan kenfinnigan left review comments

@mateuszrzeszutek mateuszrzeszutek mateuszrzeszutek approved these changes

@brunobat brunobat brunobat approved these changes

@trask trask trask approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.32.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jeanbisutti @trask @kenfinnigan @brunobat @mateuszrzeszutek