Skip to content

Commit 1d535da

Browse files
committed
Review fixes for hibernate-6.0:javaagent
Automated code review of instrumentation/hibernate/hibernate-6.0/javaagent.
1 parent 70489f1 commit 1d535da

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ public HibernateInstrumentationModule() {
2525

2626
@Override
2727
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
28-
return hasClassesNamed(
29-
// added in 6.0
30-
"org.hibernate.query.spi.SqmQuery");
28+
// added in 6.0
29+
return hasClassesNamed("org.hibernate.query.spi.SqmQuery");
3130
}
3231

3332
@Override

instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionInstrumentation.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ public void transform(TypeTransformer transformer) {
8282
getClass().getName() + "$GetTransactionAdvice");
8383

8484
transformer.applyAdviceToMethod(
85-
returns(implementsInterface(named("org.hibernate.query.CommonQueryContract")))
86-
.or(named("org.hibernate.query.spi.QueryImplementor")),
85+
returns(implementsInterface(named("org.hibernate.query.CommonQueryContract"))),
8786
getClass().getName() + "$GetQueryAdvice");
8887
}
8988

instrumentation/hibernate/hibernate-6.0/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description: This instrumentation enables spans for Hibernate ORM operations.
33
library_link: https://hibernate.org/
44
configurations:
55
- name: otel.instrumentation.hibernate.experimental-span-attributes
6+
declarative_name: java.hibernate.experimental_span_attributes/development
67
description: Enables the experimental `hibernate.session_id` span attribute.
78
type: boolean
8-
default: false
9+
default: false

0 commit comments

Comments
 (0)