Skip to content

Commit 40dd390

Browse files
trasktrask
committed
updates
1 parent c5970ae commit 40dd390

File tree

4 files changed

+32
-128
lines changed

4 files changed

+32
-128
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,9 @@ void testHibernatePersist() {
260260
satisfies(
261261
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
262262
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
263-
satisfies(
263+
equalTo(
264264
DB_QUERY_SUMMARY,
265-
val -> {
266-
if (emitStableDatabaseSemconv()) {
267-
val.isInstanceOf(String.class);
268-
} else {
269-
val.isNull();
270-
}
271-
})),
265+
emitStableDatabaseSemconv() ? "SELECT Value" : null)),
272266
span ->
273267
span.hasName("Transaction.commit")
274268
.hasKind(INTERNAL)

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,9 @@ void testHibernateQuerySingleCall(Parameter parameter) {
148148
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("select ")),
149149
equalTo(maybeStable(DB_OPERATION), "SELECT"),
150150
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
151-
satisfies(
151+
equalTo(
152152
DB_QUERY_SUMMARY,
153-
val -> {
154-
if (emitStableDatabaseSemconv()) {
155-
val.isInstanceOf(String.class);
156-
} else {
157-
val.isNull();
158-
}
159-
}))));
153+
emitStableDatabaseSemconv() ? "SELECT Value" : null))));
160154
}
161155

162156
private static Stream<Arguments> providesArgumentsSingleCall() {
@@ -231,15 +225,9 @@ void testHibernateQueryIterate() {
231225
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("select ")),
232226
equalTo(maybeStable(DB_OPERATION), "SELECT"),
233227
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
234-
satisfies(
228+
equalTo(
235229
DB_QUERY_SUMMARY,
236-
val -> {
237-
if (emitStableDatabaseSemconv()) {
238-
val.isInstanceOf(String.class);
239-
} else {
240-
val.isNull();
241-
}
242-
})),
230+
emitStableDatabaseSemconv() ? "SELECT Value" : null)),
243231
span ->
244232
span.hasName("Transaction.commit")
245233
.hasKind(INTERNAL)

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

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -821,15 +821,9 @@ void testHibernateOverlappingSessions() {
821821
stringAssert -> stringAssert.startsWith("insert")),
822822
equalTo(maybeStable(DB_OPERATION), "INSERT"),
823823
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
824-
satisfies(
824+
equalTo(
825825
DB_QUERY_SUMMARY,
826-
val -> {
827-
if (emitStableDatabaseSemconv()) {
828-
val.isInstanceOf(String.class);
829-
} else {
830-
val.isNull();
831-
}
832-
})),
826+
emitStableDatabaseSemconv() ? "INSERT Value" : null)),
833827
span -> {
834828
span.hasName("Session.save " + Value.class.getName())
835829
.hasKind(INTERNAL)
@@ -868,15 +862,9 @@ void testHibernateOverlappingSessions() {
868862
stringAssert -> stringAssert.startsWith("insert")),
869863
equalTo(maybeStable(DB_OPERATION), "INSERT"),
870864
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
871-
satisfies(
865+
equalTo(
872866
DB_QUERY_SUMMARY,
873-
val -> {
874-
if (emitStableDatabaseSemconv()) {
875-
val.isInstanceOf(String.class);
876-
} else {
877-
val.isNull();
878-
}
879-
})),
867+
emitStableDatabaseSemconv() ? "INSERT Value" : null)),
880868
span ->
881869
span.hasName("DELETE db1.Value")
882870
.hasKind(CLIENT)
@@ -893,15 +881,9 @@ void testHibernateOverlappingSessions() {
893881
stringAssert -> stringAssert.startsWith("delete")),
894882
equalTo(maybeStable(DB_OPERATION), "DELETE"),
895883
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
896-
satisfies(
884+
equalTo(
897885
DB_QUERY_SUMMARY,
898-
val -> {
899-
if (emitStableDatabaseSemconv()) {
900-
val.isInstanceOf(String.class);
901-
} else {
902-
val.isNull();
903-
}
904-
}))));
886+
emitStableDatabaseSemconv() ? "DELETE Value" : null))));
905887

906888
assertThat(sessionId1.get()).isNotEqualTo(sessionId2.get());
907889
assertThat(sessionId1.get()).isNotEqualTo(sessionId3.get());

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java‎

Lines changed: 20 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,9 @@ void testCrud() {
9494
"select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName(.*)from Customer(.*)"))),
9595
equalTo(maybeStable(DB_OPERATION), "SELECT"),
9696
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
97-
satisfies(
97+
equalTo(
9898
DB_QUERY_SUMMARY,
99-
val -> {
100-
if (emitStableDatabaseSemconv()) {
101-
val.isInstanceOf(String.class);
102-
} else {
103-
val.isNull();
104-
}
105-
})),
99+
emitStableDatabaseSemconv() ? "SELECT Customer" : null)),
106100
span ->
107101
span.hasName("Transaction.commit")
108102
.hasKind(INTERNAL)
@@ -164,15 +158,9 @@ void testCrud() {
164158
"insert into Customer (.*) values \\(.*, \\?, \\?\\)"))),
165159
equalTo(maybeStable(DB_OPERATION), "INSERT"),
166160
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
167-
satisfies(
161+
equalTo(
168162
DB_QUERY_SUMMARY,
169-
val -> {
170-
if (emitStableDatabaseSemconv()) {
171-
val.isInstanceOf(String.class);
172-
} else {
173-
val.isNull();
174-
}
175-
})),
163+
emitStableDatabaseSemconv() ? "INSERT Customer" : null)),
176164
span ->
177165
span.hasName("Transaction.commit")
178166
.hasKind(INTERNAL)
@@ -249,15 +237,9 @@ void testCrud() {
249237
"insert into Customer (.*) values \\(.* \\?, \\?\\)"))),
250238
equalTo(maybeStable(DB_OPERATION), "INSERT"),
251239
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
252-
satisfies(
240+
equalTo(
253241
DB_QUERY_SUMMARY,
254-
val -> {
255-
if (emitStableDatabaseSemconv()) {
256-
val.isInstanceOf(String.class);
257-
} else {
258-
val.isNull();
259-
}
260-
})));
242+
emitStableDatabaseSemconv() ? "INSERT Customer" : null)));
261243
}
262244
});
263245
testing.clearData();
@@ -310,15 +292,9 @@ void testCrud() {
310292
"select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))),
311293
equalTo(maybeStable(DB_OPERATION), "SELECT"),
312294
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
313-
satisfies(
295+
equalTo(
314296
DB_QUERY_SUMMARY,
315-
val -> {
316-
if (emitStableDatabaseSemconv()) {
317-
val.isInstanceOf(String.class);
318-
} else {
319-
val.isNull();
320-
}
321-
})),
297+
emitStableDatabaseSemconv() ? "SELECT Customer" : null)),
322298
span ->
323299
span.hasName("Transaction.commit")
324300
.hasKind(INTERNAL)
@@ -350,15 +326,9 @@ void testCrud() {
350326
"update Customer set firstName=?, lastName=? where id=?"),
351327
equalTo(maybeStable(DB_OPERATION), "UPDATE"),
352328
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
353-
satisfies(
329+
equalTo(
354330
DB_QUERY_SUMMARY,
355-
val -> {
356-
if (emitStableDatabaseSemconv()) {
357-
val.isInstanceOf(String.class);
358-
} else {
359-
val.isNull();
360-
}
361-
}))));
331+
emitStableDatabaseSemconv() ? "UPDATE Customer" : null))));
362332
testing.clearData();
363333

364334
Customer foundCustomer =
@@ -405,15 +375,9 @@ void testCrud() {
405375
"select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)(where ([^.]+).lastName=\\?)"))),
406376
equalTo(maybeStable(DB_OPERATION), "SELECT"),
407377
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
408-
satisfies(
378+
equalTo(
409379
DB_QUERY_SUMMARY,
410-
val -> {
411-
if (emitStableDatabaseSemconv()) {
412-
val.isInstanceOf(String.class);
413-
} else {
414-
val.isNull();
415-
}
416-
}))));
380+
emitStableDatabaseSemconv() ? "SELECT Customer" : null))));
417381
testing.clearData();
418382

419383
testing.runWithSpan("parent", () -> repo.delete(foundCustomer));
@@ -457,15 +421,9 @@ void testCrud() {
457421
"select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))),
458422
equalTo(maybeStable(DB_OPERATION), "SELECT"),
459423
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
460-
satisfies(
424+
equalTo(
461425
DB_QUERY_SUMMARY,
462-
val -> {
463-
if (emitStableDatabaseSemconv()) {
464-
val.isInstanceOf(String.class);
465-
} else {
466-
val.isNull();
467-
}
468-
})),
426+
emitStableDatabaseSemconv() ? "SELECT Customer" : null)),
469427
span ->
470428
span.hasName("Session.delete spring.jpa.Customer")
471429
.hasKind(INTERNAL)
@@ -498,15 +456,9 @@ void testCrud() {
498456
equalTo(maybeStable(DB_STATEMENT), "delete from Customer where id=?"),
499457
equalTo(maybeStable(DB_OPERATION), "DELETE"),
500458
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
501-
satisfies(
459+
equalTo(
502460
DB_QUERY_SUMMARY,
503-
val -> {
504-
if (emitStableDatabaseSemconv()) {
505-
val.isInstanceOf(String.class);
506-
} else {
507-
val.isNull();
508-
}
509-
})));
461+
emitStableDatabaseSemconv() ? "DELETE Customer" : null)));
510462

511463
} else {
512464
String findAction;
@@ -548,15 +500,9 @@ void testCrud() {
548500
"select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))),
549501
equalTo(maybeStable(DB_OPERATION), "SELECT"),
550502
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
551-
satisfies(
503+
equalTo(
552504
DB_QUERY_SUMMARY,
553-
val -> {
554-
if (emitStableDatabaseSemconv()) {
555-
val.isInstanceOf(String.class);
556-
} else {
557-
val.isNull();
558-
}
559-
})),
505+
emitStableDatabaseSemconv() ? "SELECT Customer" : null)),
560506
span ->
561507
span.hasName("Session.merge spring.jpa.Customer")
562508
.hasKind(INTERNAL)
@@ -597,15 +543,9 @@ void testCrud() {
597543
equalTo(maybeStable(DB_STATEMENT), "delete from Customer where id=?"),
598544
equalTo(maybeStable(DB_OPERATION), "DELETE"),
599545
equalTo(maybeStable(DB_SQL_TABLE), "Customer"),
600-
satisfies(
546+
equalTo(
601547
DB_QUERY_SUMMARY,
602-
val -> {
603-
if (emitStableDatabaseSemconv()) {
604-
val.isInstanceOf(String.class);
605-
} else {
606-
val.isNull();
607-
}
608-
})));
548+
emitStableDatabaseSemconv() ? "DELETE Customer" : null)));
609549
}
610550
});
611551
}

0 commit comments

Comments
 (0)