Skip to content

Commit c5970ae

Browse files
trasktrask
committed
updates
1 parent 505d0bb commit c5970ae

File tree

6 files changed

+199
-108
lines changed

6 files changed

+199
-108
lines changed

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,14 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent) {
8181
satisfies(maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
8282
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
8383
satisfies(
84-
DB_QUERY_SUMMARY, val -> val.satisfiesAnyOf(v -> {}, v -> assertThat(v).isNull())));
84+
DB_QUERY_SUMMARY,
85+
val -> {
86+
if (emitStableDatabaseSemconv()) {
87+
val.isInstanceOf(String.class);
88+
} else {
89+
val.isNull();
90+
}
91+
}));
8592
}
8693

8794
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,13 @@ void testHibernateActions(Parameter parameter) {
129129
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
130130
satisfies(
131131
DB_QUERY_SUMMARY,
132-
val ->
133-
val.satisfiesAnyOf(
134-
v -> assertThat(v).isNull(),
135-
v -> assertThat(v).isInstanceOf(String.class)))));
132+
val -> {
133+
if (emitStableDatabaseSemconv()) {
134+
val.isInstanceOf(String.class);
135+
} else {
136+
val.isNull();
137+
}
138+
})));
136139

137140
} else {
138141
trace.hasSpansSatisfyingExactly(
@@ -166,10 +169,13 @@ void testHibernateActions(Parameter parameter) {
166169
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
167170
satisfies(
168171
DB_QUERY_SUMMARY,
169-
val ->
170-
val.satisfiesAnyOf(
171-
v -> assertThat(v).isNull(),
172-
v -> assertThat(v).isInstanceOf(String.class)))),
172+
val -> {
173+
if (emitStableDatabaseSemconv()) {
174+
val.isInstanceOf(String.class);
175+
} else {
176+
val.isNull();
177+
}
178+
})),
173179
span ->
174180
span.hasName("Transaction.commit")
175181
.hasKind(INTERNAL)
@@ -256,10 +262,13 @@ void testHibernatePersist() {
256262
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
257263
satisfies(
258264
DB_QUERY_SUMMARY,
259-
val ->
260-
val.satisfiesAnyOf(
261-
v -> assertThat(v).isNull(),
262-
v -> assertThat(v).isInstanceOf(String.class)))),
265+
val -> {
266+
if (emitStableDatabaseSemconv()) {
267+
val.isInstanceOf(String.class);
268+
} else {
269+
val.isNull();
270+
}
271+
})),
263272
span ->
264273
span.hasName("Transaction.commit")
265274
.hasKind(INTERNAL)
@@ -286,10 +295,13 @@ void testHibernatePersist() {
286295
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
287296
satisfies(
288297
DB_QUERY_SUMMARY,
289-
val ->
290-
val.satisfiesAnyOf(
291-
v -> assertThat(v).isNull(),
292-
v -> assertThat(v).isInstanceOf(String.class))))));
298+
val -> {
299+
if (emitStableDatabaseSemconv()) {
300+
val.isInstanceOf(String.class);
301+
} else {
302+
val.isNull();
303+
}
304+
}))));
293305
}
294306

295307
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,13 @@ void testHibernateQueryExecuteUpdateWithTransaction() {
8787
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
8888
satisfies(
8989
DB_QUERY_SUMMARY,
90-
val ->
91-
val.satisfiesAnyOf(
92-
v -> assertThat(v).isNull(),
93-
v -> assertThat(v).isInstanceOf(String.class)))),
90+
val -> {
91+
if (emitStableDatabaseSemconv()) {
92+
val.isInstanceOf(String.class);
93+
} else {
94+
val.isNull();
95+
}
96+
})),
9497
span ->
9598
span.hasName("Transaction.commit")
9699
.hasKind(INTERNAL)
@@ -147,10 +150,13 @@ void testHibernateQuerySingleCall(Parameter parameter) {
147150
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
148151
satisfies(
149152
DB_QUERY_SUMMARY,
150-
val ->
151-
val.satisfiesAnyOf(
152-
v -> assertThat(v).isNull(),
153-
v -> assertThat(v).isInstanceOf(String.class))))));
153+
val -> {
154+
if (emitStableDatabaseSemconv()) {
155+
val.isInstanceOf(String.class);
156+
} else {
157+
val.isNull();
158+
}
159+
}))));
154160
}
155161

156162
private static Stream<Arguments> providesArgumentsSingleCall() {
@@ -227,10 +233,13 @@ void testHibernateQueryIterate() {
227233
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
228234
satisfies(
229235
DB_QUERY_SUMMARY,
230-
val ->
231-
val.satisfiesAnyOf(
232-
v -> assertThat(v).isNull(),
233-
v -> assertThat(v).isInstanceOf(String.class)))),
236+
val -> {
237+
if (emitStableDatabaseSemconv()) {
238+
val.isInstanceOf(String.class);
239+
} else {
240+
val.isNull();
241+
}
242+
})),
234243
span ->
235244
span.hasName("Transaction.commit")
236245
.hasKind(INTERNAL)

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java‎

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,13 @@ void testHibernateAction(Parameter parameter) {
9191
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
9292
satisfies(
9393
DB_QUERY_SUMMARY,
94-
val ->
95-
val.satisfiesAnyOf(
96-
v -> assertThat(v).isNull(),
97-
v -> assertThat(v).isInstanceOf(String.class)))),
94+
val -> {
95+
if (emitStableDatabaseSemconv()) {
96+
val.isInstanceOf(String.class);
97+
} else {
98+
val.isNull();
99+
}
100+
})),
98101
span ->
99102
span.hasName("Transaction.commit")
100103
.hasKind(INTERNAL)
@@ -206,10 +209,13 @@ void testHibernateActionStateless(Parameter parameter) {
206209
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
207210
satisfies(
208211
DB_QUERY_SUMMARY,
209-
val ->
210-
val.satisfiesAnyOf(
211-
v -> assertThat(v).isNull(),
212-
v -> assertThat(v).isInstanceOf(String.class)))),
212+
val -> {
213+
if (emitStableDatabaseSemconv()) {
214+
val.isInstanceOf(String.class);
215+
} else {
216+
val.isNull();
217+
}
218+
})),
213219
span ->
214220
span.hasName("Transaction.commit")
215221
.hasKind(INTERNAL)
@@ -357,10 +363,13 @@ void testHibernateReplicate(Parameter parameter) {
357363
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
358364
satisfies(
359365
DB_QUERY_SUMMARY,
360-
val ->
361-
val.satisfiesAnyOf(
362-
v -> assertThat(v).isNull(),
363-
v -> assertThat(v).isInstanceOf(String.class)))),
366+
val -> {
367+
if (emitStableDatabaseSemconv()) {
368+
val.isInstanceOf(String.class);
369+
} else {
370+
val.isNull();
371+
}
372+
})),
364373
span ->
365374
span.hasName("Transaction.commit")
366375
.hasKind(INTERNAL)
@@ -387,10 +396,13 @@ void testHibernateReplicate(Parameter parameter) {
387396
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
388397
satisfies(
389398
DB_QUERY_SUMMARY,
390-
val ->
391-
val.satisfiesAnyOf(
392-
v -> assertThat(v).isNull(),
393-
v -> assertThat(v).isInstanceOf(String.class))))));
399+
val -> {
400+
if (emitStableDatabaseSemconv()) {
401+
val.isInstanceOf(String.class);
402+
} else {
403+
val.isNull();
404+
}
405+
}))));
394406
}
395407

396408
private static Stream<Arguments> provideArgumentsHibernateReplicate() {
@@ -519,10 +531,13 @@ void testHibernateCommitAction(Parameter parameter) {
519531
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
520532
satisfies(
521533
DB_QUERY_SUMMARY,
522-
val ->
523-
val.satisfiesAnyOf(
524-
v -> assertThat(v).isNull(),
525-
v -> assertThat(v).isInstanceOf(String.class))))));
534+
val -> {
535+
if (emitStableDatabaseSemconv()) {
536+
val.isInstanceOf(String.class);
537+
} else {
538+
val.isNull();
539+
}
540+
}))));
526541
}
527542

528543
private static Stream<Arguments> provideArgumentsHibernateCommitAction() {
@@ -704,10 +719,13 @@ void testAttachesStateToQueryCreated(Consumer<Session> queryBuilder) {
704719
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
705720
satisfies(
706721
DB_QUERY_SUMMARY,
707-
val ->
708-
val.satisfiesAnyOf(
709-
v -> assertThat(v).isNull(),
710-
v -> assertThat(v).isInstanceOf(String.class)))),
722+
val -> {
723+
if (emitStableDatabaseSemconv()) {
724+
val.isInstanceOf(String.class);
725+
} else {
726+
val.isNull();
727+
}
728+
})),
711729
span ->
712730
span.hasName("Transaction.commit")
713731
.hasKind(INTERNAL)
@@ -805,10 +823,13 @@ void testHibernateOverlappingSessions() {
805823
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
806824
satisfies(
807825
DB_QUERY_SUMMARY,
808-
val ->
809-
val.satisfiesAnyOf(
810-
v -> assertThat(v).isNull(),
811-
v -> assertThat(v).isInstanceOf(String.class)))),
826+
val -> {
827+
if (emitStableDatabaseSemconv()) {
828+
val.isInstanceOf(String.class);
829+
} else {
830+
val.isNull();
831+
}
832+
})),
812833
span -> {
813834
span.hasName("Session.save " + Value.class.getName())
814835
.hasKind(INTERNAL)
@@ -849,10 +870,13 @@ void testHibernateOverlappingSessions() {
849870
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
850871
satisfies(
851872
DB_QUERY_SUMMARY,
852-
val ->
853-
val.satisfiesAnyOf(
854-
v -> assertThat(v).isNull(),
855-
v -> assertThat(v).isInstanceOf(String.class)))),
873+
val -> {
874+
if (emitStableDatabaseSemconv()) {
875+
val.isInstanceOf(String.class);
876+
} else {
877+
val.isNull();
878+
}
879+
})),
856880
span ->
857881
span.hasName("DELETE db1.Value")
858882
.hasKind(CLIENT)
@@ -871,10 +895,13 @@ void testHibernateOverlappingSessions() {
871895
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
872896
satisfies(
873897
DB_QUERY_SUMMARY,
874-
val ->
875-
val.satisfiesAnyOf(
876-
v -> assertThat(v).isNull(),
877-
v -> assertThat(v).isInstanceOf(String.class))))));
898+
val -> {
899+
if (emitStableDatabaseSemconv()) {
900+
val.isInstanceOf(String.class);
901+
} else {
902+
val.isNull();
903+
}
904+
}))));
878905

879906
assertThat(sessionId1.get()).isNotEqualTo(sessionId2.get());
880907
assertThat(sessionId1.get()).isNotEqualTo(sessionId3.get());

0 commit comments

Comments
 (0)