Skip to content

Commit a93e10f

Browse files
trasktrask
committed
script DB_USER
1 parent f1098a2 commit a93e10f

File tree

18 files changed

+66
-62
lines changed

18 files changed

+66
-62
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) {
7272
.hasAttributesSatisfyingExactly(
7373
equalTo(DB_SYSTEM, "h2"),
7474
equalTo(maybeStable(DB_NAME), "db1"),
75-
equalTo(DB_USER, "sa"),
75+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
7676
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
7777
satisfies(maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
7878
satisfies(maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
@@ -87,7 +87,7 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, Str
8787
.hasAttributesSatisfyingExactly(
8888
equalTo(DB_SYSTEM, "h2"),
8989
equalTo(maybeStable(DB_NAME), "db1"),
90-
equalTo(DB_USER, "sa"),
90+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
9191
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
9292
satisfies(
9393
maybeStable(DB_STATEMENT),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void testCriteria(String methodName, Consumer<Criteria> interaction) {
7676
.hasAttributesSatisfyingExactly(
7777
equalTo(DB_SYSTEM, "h2"),
7878
equalTo(maybeStable(DB_NAME), "db1"),
79-
equalTo(DB_USER, "sa"),
79+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
8080
equalTo(
8181
DB_CONNECTION_STRING,
8282
emitStableDatabaseSemconv() ? null : "h2:mem:"),

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void testHibernateActions(Parameter parameter) {
110110
.hasAttributesSatisfyingExactly(
111111
equalTo(DB_SYSTEM, "h2"),
112112
equalTo(maybeStable(DB_NAME), "db1"),
113-
equalTo(DB_USER, "sa"),
113+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
114114
equalTo(
115115
DB_CONNECTION_STRING,
116116
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -141,7 +141,7 @@ void testHibernateActions(Parameter parameter) {
141141
.hasAttributesSatisfyingExactly(
142142
equalTo(DB_SYSTEM, "h2"),
143143
equalTo(maybeStable(DB_NAME), "db1"),
144-
equalTo(DB_USER, "sa"),
144+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
145145
equalTo(
146146
DB_CONNECTION_STRING,
147147
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -227,7 +227,7 @@ void testHibernatePersist() {
227227
.hasAttributesSatisfyingExactly(
228228
equalTo(DB_SYSTEM, "h2"),
229229
equalTo(maybeStable(DB_NAME), "db1"),
230-
equalTo(DB_USER, "sa"),
230+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
231231
equalTo(
232232
DB_CONNECTION_STRING,
233233
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -253,7 +253,7 @@ void testHibernatePersist() {
253253
.hasAttributesSatisfyingExactly(
254254
equalTo(DB_SYSTEM, "h2"),
255255
equalTo(maybeStable(DB_NAME), "db1"),
256-
equalTo(DB_USER, "sa"),
256+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
257257
equalTo(
258258
DB_CONNECTION_STRING,
259259
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -302,7 +302,7 @@ void testAttachesStateToQuery(Function<EntityManager, Query> queryBuildMethod) {
302302
.hasAttributesSatisfyingExactly(
303303
equalTo(DB_SYSTEM, "h2"),
304304
equalTo(maybeStable(DB_NAME), "db1"),
305-
equalTo(DB_USER, "sa"),
305+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
306306
equalTo(
307307
DB_CONNECTION_STRING,
308308
emitStableDatabaseSemconv() ? null : "h2:mem:"),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void testHibernateQueryExecuteUpdateWithTransaction() {
7171
.hasAttributesSatisfyingExactly(
7272
equalTo(DB_SYSTEM, "h2"),
7373
equalTo(maybeStable(DB_NAME), "db1"),
74-
equalTo(DB_USER, "sa"),
74+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
7575
equalTo(
7676
DB_CONNECTION_STRING,
7777
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -129,7 +129,7 @@ void testHibernateQuerySingleCall(Parameter parameter) {
129129
.hasAttributesSatisfyingExactly(
130130
equalTo(DB_SYSTEM, "h2"),
131131
equalTo(maybeStable(DB_NAME), "db1"),
132-
equalTo(DB_USER, "sa"),
132+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
133133
equalTo(
134134
DB_CONNECTION_STRING,
135135
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -203,7 +203,7 @@ void testHibernateQueryIterate() {
203203
.hasAttributesSatisfyingExactly(
204204
equalTo(DB_SYSTEM, "h2"),
205205
equalTo(maybeStable(DB_NAME), "db1"),
206-
equalTo(DB_USER, "sa"),
206+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
207207
equalTo(
208208
DB_CONNECTION_STRING,
209209
emitStableDatabaseSemconv() ? null : "h2:mem:"),

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void testHibernateAction(Parameter parameter) {
7474
.hasAttributesSatisfyingExactly(
7575
equalTo(DB_SYSTEM, "h2"),
7676
equalTo(maybeStable(DB_NAME), "db1"),
77-
equalTo(DB_USER, "sa"),
77+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
7878
equalTo(
7979
DB_CONNECTION_STRING,
8080
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -185,7 +185,7 @@ void testHibernateActionStateless(Parameter parameter) {
185185
.hasAttributesSatisfyingExactly(
186186
equalTo(DB_SYSTEM, "h2"),
187187
equalTo(maybeStable(DB_NAME), "db1"),
188-
equalTo(DB_USER, "sa"),
188+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
189189
equalTo(
190190
DB_CONNECTION_STRING,
191191
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -332,7 +332,7 @@ void testHibernateReplicate(Parameter parameter) {
332332
.hasAttributesSatisfyingExactly(
333333
equalTo(DB_SYSTEM, "h2"),
334334
equalTo(maybeStable(DB_NAME), "db1"),
335-
equalTo(DB_USER, "sa"),
335+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
336336
equalTo(
337337
DB_CONNECTION_STRING,
338338
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -358,7 +358,7 @@ void testHibernateReplicate(Parameter parameter) {
358358
.hasAttributesSatisfyingExactly(
359359
equalTo(DB_SYSTEM, "h2"),
360360
equalTo(maybeStable(DB_NAME), "db1"),
361-
equalTo(DB_USER, "sa"),
361+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
362362
equalTo(
363363
DB_CONNECTION_STRING,
364364
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -492,7 +492,7 @@ void testHibernateCommitAction(Parameter parameter) {
492492
.hasAttributesSatisfyingExactly(
493493
equalTo(DB_SYSTEM, "h2"),
494494
equalTo(maybeStable(DB_NAME), "db1"),
495-
equalTo(DB_USER, "sa"),
495+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
496496
equalTo(
497497
DB_CONNECTION_STRING,
498498
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -671,7 +671,7 @@ void testAttachesStateToQueryCreated(Consumer<Session> queryBuilder) {
671671
.hasAttributesSatisfyingExactly(
672672
equalTo(DB_SYSTEM, "h2"),
673673
equalTo(maybeStable(DB_NAME), "db1"),
674-
equalTo(DB_USER, "sa"),
674+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
675675
equalTo(
676676
DB_CONNECTION_STRING,
677677
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -772,7 +772,7 @@ void testHibernateOverlappingSessions() {
772772
.hasAttributesSatisfyingExactly(
773773
equalTo(DB_SYSTEM, "h2"),
774774
equalTo(maybeStable(DB_NAME), "db1"),
775-
equalTo(DB_USER, "sa"),
775+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
776776
equalTo(
777777
DB_CONNECTION_STRING,
778778
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -818,7 +818,7 @@ void testHibernateOverlappingSessions() {
818818
.hasAttributesSatisfyingExactly(
819819
equalTo(DB_SYSTEM, "h2"),
820820
equalTo(maybeStable(DB_NAME), "db1"),
821-
equalTo(DB_USER, "sa"),
821+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
822822
equalTo(
823823
DB_CONNECTION_STRING,
824824
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -834,7 +834,7 @@ void testHibernateOverlappingSessions() {
834834
.hasAttributesSatisfyingExactly(
835835
equalTo(DB_SYSTEM, "h2"),
836836
equalTo(maybeStable(DB_NAME), "db1"),
837-
equalTo(DB_USER, "sa"),
837+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
838838
equalTo(
839839
DB_CONNECTION_STRING,
840840
emitStableDatabaseSemconv() ? null : "h2:mem:"),

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void testCrud() {
7676
.hasAttributesSatisfyingExactly(
7777
equalTo(DB_SYSTEM, "hsqldb"),
7878
equalTo(maybeStable(DB_NAME), "test"),
79-
equalTo(DB_USER, "sa"),
79+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
8080
equalTo(
8181
DB_CONNECTION_STRING,
8282
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -133,7 +133,7 @@ void testCrud() {
133133
.hasAttributesSatisfyingExactly(
134134
equalTo(DB_SYSTEM, "hsqldb"),
135135
equalTo(maybeStable(DB_NAME), "test"),
136-
equalTo(DB_USER, "sa"),
136+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
137137
equalTo(
138138
DB_CONNECTION_STRING,
139139
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -178,7 +178,7 @@ void testCrud() {
178178
.hasAttributesSatisfyingExactly(
179179
equalTo(DB_SYSTEM, "hsqldb"),
180180
equalTo(maybeStable(DB_NAME), "test"),
181-
equalTo(DB_USER, "sa"),
181+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
182182
equalTo(
183183
maybeStable(DB_STATEMENT),
184184
"call next value for hibernate_sequence"),
@@ -204,7 +204,7 @@ void testCrud() {
204204
.hasAttributesSatisfyingExactly(
205205
equalTo(DB_SYSTEM, "hsqldb"),
206206
equalTo(maybeStable(DB_NAME), "test"),
207-
equalTo(DB_USER, "sa"),
207+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
208208
equalTo(
209209
DB_CONNECTION_STRING,
210210
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -253,7 +253,7 @@ void testCrud() {
253253
.hasAttributesSatisfyingExactly(
254254
equalTo(DB_SYSTEM, "hsqldb"),
255255
equalTo(maybeStable(DB_NAME), "test"),
256-
equalTo(DB_USER, "sa"),
256+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
257257
equalTo(
258258
DB_CONNECTION_STRING,
259259
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -283,7 +283,7 @@ void testCrud() {
283283
.hasAttributesSatisfyingExactly(
284284
equalTo(DB_SYSTEM, "hsqldb"),
285285
equalTo(maybeStable(DB_NAME), "test"),
286-
equalTo(DB_USER, "sa"),
286+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
287287
equalTo(
288288
DB_CONNECTION_STRING,
289289
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -323,7 +323,7 @@ void testCrud() {
323323
.hasAttributesSatisfyingExactly(
324324
equalTo(DB_SYSTEM, "hsqldb"),
325325
equalTo(maybeStable(DB_NAME), "test"),
326-
equalTo(DB_USER, "sa"),
326+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
327327
equalTo(
328328
DB_CONNECTION_STRING,
329329
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -363,7 +363,7 @@ void testCrud() {
363363
.hasAttributesSatisfyingExactly(
364364
equalTo(DB_SYSTEM, "hsqldb"),
365365
equalTo(maybeStable(DB_NAME), "test"),
366-
equalTo(DB_USER, "sa"),
366+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
367367
equalTo(
368368
DB_CONNECTION_STRING,
369369
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -397,7 +397,7 @@ void testCrud() {
397397
.hasAttributesSatisfyingExactly(
398398
equalTo(DB_SYSTEM, "hsqldb"),
399399
equalTo(maybeStable(DB_NAME), "test"),
400-
equalTo(DB_USER, "sa"),
400+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
401401
equalTo(
402402
DB_CONNECTION_STRING,
403403
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -430,7 +430,7 @@ void testCrud() {
430430
.hasAttributesSatisfyingExactly(
431431
equalTo(DB_SYSTEM, "hsqldb"),
432432
equalTo(maybeStable(DB_NAME), "test"),
433-
equalTo(DB_USER, "sa"),
433+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
434434
equalTo(
435435
DB_CONNECTION_STRING,
436436
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),
@@ -472,7 +472,7 @@ void testCrud() {
472472
.hasAttributesSatisfyingExactly(
473473
equalTo(DB_SYSTEM, "hsqldb"),
474474
equalTo(maybeStable(DB_NAME), "test"),
475-
equalTo(DB_USER, "sa"),
475+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
476476
equalTo(
477477
DB_CONNECTION_STRING,
478478
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void testCriteriaQuery(Consumer<Query<Value>> interaction) {
8686
.hasAttributesSatisfyingExactly(
8787
equalTo(DB_SYSTEM, "h2"),
8888
equalTo(maybeStable(DB_NAME), "db1"),
89-
equalTo(DB_USER, "sa"),
89+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
9090
equalTo(
9191
DB_CONNECTION_STRING,
9292
emitStableDatabaseSemconv() ? null : "h2:mem:"),

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void testAttachesStateToQuery(Parameter parameter) {
148148
.hasAttributesSatisfyingExactly(
149149
equalTo(DB_SYSTEM, "h2"),
150150
equalTo(maybeStable(DB_NAME), "db1"),
151-
equalTo(DB_USER, "sa"),
151+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
152152
equalTo(
153153
DB_CONNECTION_STRING,
154154
emitStableDatabaseSemconv() ? null : "h2:mem:"),
@@ -304,7 +304,7 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par
304304
.hasAttributesSatisfyingExactly(
305305
equalTo(DB_SYSTEM, "h2"),
306306
equalTo(maybeStable(DB_NAME), "db1"),
307-
equalTo(DB_USER, "sa"),
307+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
308308
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
309309
satisfies(maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
310310
satisfies(maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),
@@ -320,7 +320,7 @@ private static SpanDataAssert assertClientSpan(
320320
.hasAttributesSatisfyingExactly(
321321
equalTo(DB_SYSTEM, "h2"),
322322
equalTo(maybeStable(DB_NAME), "db1"),
323-
equalTo(DB_USER, "sa"),
323+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
324324
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
325325
satisfies(maybeStable(DB_STATEMENT), val -> val.isInstanceOf(String.class)),
326326
satisfies(maybeStable(DB_OPERATION), val -> val.isInstanceOf(String.class)),

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void testProcedureCall() {
111111
.hasAttributesSatisfyingExactly(
112112
equalTo(DB_SYSTEM, "hsqldb"),
113113
equalTo(maybeStable(DB_NAME), "test"),
114-
equalTo(DB_USER, "sa"),
114+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
115115
equalTo(
116116
DB_CONNECTION_STRING,
117117
emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),

0 commit comments

Comments
 (0)