Skip to content

Commit ceee40f

Browse files
trasktrask
committed
fix
1 parent c6829bc commit ceee40f

File tree

4 files changed

+235
-42
lines changed

4 files changed

+235
-42
lines changed

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

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.javaagent.instrumentation.hibernate.ExperimentalTestHelper.experimentalSatisfies;
1616
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1717
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
18+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
1819
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
1920
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
2021
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -125,7 +126,13 @@ void testHibernateActions(Parameter parameter) {
125126
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
126127
satisfies(
127128
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
128-
equalTo(maybeStable(DB_SQL_TABLE), "Value")));
129+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
130+
satisfies(
131+
DB_QUERY_SUMMARY,
132+
val ->
133+
val.satisfiesAnyOf(
134+
v -> assertThat(v).isNull(),
135+
v -> assertThat(v).isInstanceOf(String.class)))));
129136

130137
} else {
131138
trace.hasSpansSatisfyingExactly(
@@ -156,7 +163,13 @@ void testHibernateActions(Parameter parameter) {
156163
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
157164
satisfies(
158165
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
159-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
166+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
167+
satisfies(
168+
DB_QUERY_SUMMARY,
169+
val ->
170+
val.satisfiesAnyOf(
171+
v -> assertThat(v).isNull(),
172+
v -> assertThat(v).isInstanceOf(String.class)))),
160173
span ->
161174
span.hasName("Transaction.commit")
162175
.hasKind(INTERNAL)
@@ -226,7 +239,7 @@ void testHibernatePersist() {
226239
.hasParent(trace.getSpan(0)),
227240
// persist test has an extra query for getting id of inserted element
228241
span ->
229-
span.hasName("SELECT db1.Value")
242+
span.hasName(emitStableDatabaseSemconv() ? "SELECT Value" : "SELECT db1.Value")
230243
.hasKind(CLIENT)
231244
.hasParent(trace.getSpan(1))
232245
.hasAttributesSatisfyingExactly(
@@ -240,7 +253,13 @@ void testHibernatePersist() {
240253
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
241254
satisfies(
242255
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
243-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
256+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
257+
satisfies(
258+
DB_QUERY_SUMMARY,
259+
val ->
260+
val.satisfiesAnyOf(
261+
v -> assertThat(v).isNull(),
262+
v -> assertThat(v).isInstanceOf(String.class)))),
244263
span ->
245264
span.hasName("Transaction.commit")
246265
.hasKind(INTERNAL)
@@ -264,7 +283,13 @@ void testHibernatePersist() {
264283
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
265284
satisfies(
266285
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
267-
equalTo(maybeStable(DB_SQL_TABLE), "Value"))));
286+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
287+
satisfies(
288+
DB_QUERY_SUMMARY,
289+
val ->
290+
val.satisfiesAnyOf(
291+
v -> assertThat(v).isNull(),
292+
v -> assertThat(v).isInstanceOf(String.class))))));
268293
}
269294

270295
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation
@@ -299,7 +324,7 @@ void testAttachesStateToQuery(Function<EntityManager, Query> queryBuildMethod) {
299324
HIBERNATE_SESSION_ID,
300325
val -> assertThat(val).isInstanceOf(String.class))),
301326
span ->
302-
span.hasName("SELECT db1.Value")
327+
span.hasName(emitStableDatabaseSemconv() ? "SELECT Value" : "SELECT db1.Value")
303328
.hasKind(CLIENT)
304329
.hasParent(trace.getSpan(1))
305330
.hasAttributesSatisfyingExactly(
@@ -313,7 +338,10 @@ void testAttachesStateToQuery(Function<EntityManager, Query> queryBuildMethod) {
313338
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
314339
satisfies(
315340
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
316-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
341+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
342+
equalTo(
343+
DB_QUERY_SUMMARY,
344+
emitStableDatabaseSemconv() ? "SELECT Value" : null)),
317345
span ->
318346
span.hasName("Transaction.commit")
319347
.hasKind(INTERNAL)
@@ -343,7 +371,7 @@ void testNoResultExceptionIgnored() {
343371
.hasStatus(StatusData.unset())
344372
.hasEvents(emptyList()),
345373
span ->
346-
span.hasName("SELECT db1.Value")
374+
span.hasName(emitStableDatabaseSemconv() ? "SELECT Value" : "SELECT db1.Value")
347375
.hasKind(SpanKind.CLIENT)
348376
.hasParent(trace.getSpan(0))));
349377
}

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

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.javaagent.instrumentation.hibernate.ExperimentalTestHelper.experimentalSatisfies;
1616
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1717
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
18+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
1819
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
1920
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
2021
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -83,7 +84,13 @@ void testHibernateQueryExecuteUpdateWithTransaction() {
8384
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
8485
satisfies(
8586
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
86-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
87+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
88+
satisfies(
89+
DB_QUERY_SUMMARY,
90+
val ->
91+
val.satisfiesAnyOf(
92+
v -> assertThat(v).isNull(),
93+
v -> assertThat(v).isInstanceOf(String.class)))),
8794
span ->
8895
span.hasName("Transaction.commit")
8996
.hasKind(INTERNAL)
@@ -125,7 +132,7 @@ void testHibernateQuerySingleCall(Parameter parameter) {
125132
HIBERNATE_SESSION_ID,
126133
val -> assertThat(val).isInstanceOf(String.class))),
127134
span ->
128-
span.hasName("SELECT db1.Value")
135+
span.hasName(emitStableDatabaseSemconv() ? "SELECT Value" : "SELECT db1.Value")
129136
.hasKind(CLIENT)
130137
.hasParent(trace.getSpan(1))
131138
.hasAttributesSatisfyingExactly(
@@ -137,7 +144,13 @@ void testHibernateQuerySingleCall(Parameter parameter) {
137144
emitStableDatabaseSemconv() ? null : "h2:mem:"),
138145
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("select ")),
139146
equalTo(maybeStable(DB_OPERATION), "SELECT"),
140-
equalTo(maybeStable(DB_SQL_TABLE), "Value"))));
147+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
148+
satisfies(
149+
DB_QUERY_SUMMARY,
150+
val ->
151+
val.satisfiesAnyOf(
152+
v -> assertThat(v).isNull(),
153+
v -> assertThat(v).isInstanceOf(String.class))))));
141154
}
142155

143156
private static Stream<Arguments> providesArgumentsSingleCall() {
@@ -199,7 +212,7 @@ void testHibernateQueryIterate() {
199212
HIBERNATE_SESSION_ID,
200213
val -> assertThat(val).isInstanceOf(String.class))),
201214
span ->
202-
span.hasName("SELECT db1.Value")
215+
span.hasName(emitStableDatabaseSemconv() ? "SELECT Value" : "SELECT db1.Value")
203216
.hasKind(CLIENT)
204217
.hasParent(trace.getSpan(1))
205218
.hasAttributesSatisfyingExactly(
@@ -211,7 +224,13 @@ void testHibernateQueryIterate() {
211224
emitStableDatabaseSemconv() ? null : "h2:mem:"),
212225
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("select ")),
213226
equalTo(maybeStable(DB_OPERATION), "SELECT"),
214-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
227+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
228+
satisfies(
229+
DB_QUERY_SUMMARY,
230+
val ->
231+
val.satisfiesAnyOf(
232+
v -> assertThat(v).isNull(),
233+
v -> assertThat(v).isInstanceOf(String.class)))),
215234
span ->
216235
span.hasName("Transaction.commit")
217236
.hasKind(INTERNAL)

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

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.javaagent.instrumentation.hibernate.ExperimentalTestHelper.experimentalSatisfies;
1616
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1717
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
18+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
1819
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
1920
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
2021
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -87,7 +88,13 @@ void testHibernateAction(Parameter parameter) {
8788
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
8889
satisfies(
8990
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
90-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
91+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
92+
satisfies(
93+
DB_QUERY_SUMMARY,
94+
val ->
95+
val.satisfiesAnyOf(
96+
v -> assertThat(v).isNull(),
97+
v -> assertThat(v).isInstanceOf(String.class)))),
9198
span ->
9299
span.hasName("Transaction.commit")
93100
.hasKind(INTERNAL)
@@ -196,7 +203,13 @@ void testHibernateActionStateless(Parameter parameter) {
196203
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
197204
satisfies(
198205
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
199-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
206+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
207+
satisfies(
208+
DB_QUERY_SUMMARY,
209+
val ->
210+
val.satisfiesAnyOf(
211+
v -> assertThat(v).isNull(),
212+
v -> assertThat(v).isInstanceOf(String.class)))),
200213
span ->
201214
span.hasName("Transaction.commit")
202215
.hasKind(INTERNAL)
@@ -341,7 +354,13 @@ void testHibernateReplicate(Parameter parameter) {
341354
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
342355
satisfies(
343356
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
344-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
357+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
358+
satisfies(
359+
DB_QUERY_SUMMARY,
360+
val ->
361+
val.satisfiesAnyOf(
362+
v -> assertThat(v).isNull(),
363+
v -> assertThat(v).isInstanceOf(String.class)))),
345364
span ->
346365
span.hasName("Transaction.commit")
347366
.hasKind(INTERNAL)
@@ -365,7 +384,13 @@ void testHibernateReplicate(Parameter parameter) {
365384
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
366385
satisfies(
367386
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
368-
equalTo(maybeStable(DB_SQL_TABLE), "Value"))));
387+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
388+
satisfies(
389+
DB_QUERY_SUMMARY,
390+
val ->
391+
val.satisfiesAnyOf(
392+
v -> assertThat(v).isNull(),
393+
v -> assertThat(v).isInstanceOf(String.class))))));
369394
}
370395

371396
private static Stream<Arguments> provideArgumentsHibernateReplicate() {
@@ -491,7 +516,13 @@ void testHibernateCommitAction(Parameter parameter) {
491516
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
492517
satisfies(
493518
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
494-
equalTo(maybeStable(DB_SQL_TABLE), "Value"))));
519+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
520+
satisfies(
521+
DB_QUERY_SUMMARY,
522+
val ->
523+
val.satisfiesAnyOf(
524+
v -> assertThat(v).isNull(),
525+
v -> assertThat(v).isInstanceOf(String.class))))));
495526
}
496527

497528
private static Stream<Arguments> provideArgumentsHibernateCommitAction() {
@@ -670,7 +701,13 @@ void testAttachesStateToQueryCreated(Consumer<Session> queryBuilder) {
670701
maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
671702
satisfies(
672703
maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
673-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
704+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
705+
satisfies(
706+
DB_QUERY_SUMMARY,
707+
val ->
708+
val.satisfiesAnyOf(
709+
v -> assertThat(v).isNull(),
710+
v -> assertThat(v).isInstanceOf(String.class)))),
674711
span ->
675712
span.hasName("Transaction.commit")
676713
.hasKind(INTERNAL)
@@ -765,7 +802,13 @@ void testHibernateOverlappingSessions() {
765802
maybeStable(DB_STATEMENT),
766803
stringAssert -> stringAssert.startsWith("insert")),
767804
equalTo(maybeStable(DB_OPERATION), "INSERT"),
768-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
805+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
806+
satisfies(
807+
DB_QUERY_SUMMARY,
808+
val ->
809+
val.satisfiesAnyOf(
810+
v -> assertThat(v).isNull(),
811+
v -> assertThat(v).isInstanceOf(String.class)))),
769812
span -> {
770813
span.hasName("Session.save " + Value.class.getName())
771814
.hasKind(INTERNAL)
@@ -803,7 +846,13 @@ void testHibernateOverlappingSessions() {
803846
maybeStable(DB_STATEMENT),
804847
stringAssert -> stringAssert.startsWith("insert")),
805848
equalTo(maybeStable(DB_OPERATION), "INSERT"),
806-
equalTo(maybeStable(DB_SQL_TABLE), "Value")),
849+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
850+
satisfies(
851+
DB_QUERY_SUMMARY,
852+
val ->
853+
val.satisfiesAnyOf(
854+
v -> assertThat(v).isNull(),
855+
v -> assertThat(v).isInstanceOf(String.class)))),
807856
span ->
808857
span.hasName("DELETE db1.Value")
809858
.hasKind(CLIENT)
@@ -819,7 +868,13 @@ void testHibernateOverlappingSessions() {
819868
maybeStable(DB_STATEMENT),
820869
stringAssert -> stringAssert.startsWith("delete")),
821870
equalTo(maybeStable(DB_OPERATION), "DELETE"),
822-
equalTo(maybeStable(DB_SQL_TABLE), "Value"))));
871+
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
872+
satisfies(
873+
DB_QUERY_SUMMARY,
874+
val ->
875+
val.satisfiesAnyOf(
876+
v -> assertThat(v).isNull(),
877+
v -> assertThat(v).isInstanceOf(String.class))))));
823878

824879
assertThat(sessionId1.get()).isNotEqualTo(sessionId2.get());
825880
assertThat(sessionId1.get()).isNotEqualTo(sessionId3.get());

0 commit comments

Comments
 (0)