Skip to content

Commit 85a3ea8

Browse files
lauritlaurit
committed
fix test
1 parent db0324e commit 85a3ea8

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void emptyRepository() {
9090
.hasParent(trace.getSpan(0))
9191
.hasAttributesSatisfyingExactly(
9292
equalTo(
93-
DB_SYSTEM,
93+
maybeStable(DB_SYSTEM),
9494
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
9595
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
9696
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
@@ -124,7 +124,7 @@ void crud() {
124124
.hasParent(trace.getSpan(0))
125125
.hasAttributesSatisfyingExactly(
126126
equalTo(
127-
DB_SYSTEM,
127+
maybeStable(DB_SYSTEM),
128128
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
129129
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
130130
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
@@ -142,7 +142,7 @@ void crud() {
142142
.hasParent(trace.getSpan(0))
143143
.hasAttributesSatisfyingExactly(
144144
equalTo(
145-
DB_SYSTEM,
145+
maybeStable(DB_SYSTEM),
146146
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
147147
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
148148
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
@@ -173,7 +173,7 @@ void crud() {
173173
.hasParent(trace.getSpan(0))
174174
.hasAttributesSatisfyingExactly(
175175
equalTo(
176-
DB_SYSTEM,
176+
maybeStable(DB_SYSTEM),
177177
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
178178
equalTo(maybeStable(DB_OPERATION), "GetAction"),
179179
equalTo(stringKey("elasticsearch.action"), "GetAction"),
@@ -207,7 +207,7 @@ void crud() {
207207
.hasParent(trace.getSpan(0))
208208
.hasAttributesSatisfyingExactly(
209209
equalTo(
210-
DB_SYSTEM,
210+
maybeStable(DB_SYSTEM),
211211
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
212212
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
213213
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
@@ -225,7 +225,7 @@ void crud() {
225225
.hasParent(trace.getSpan(0))
226226
.hasAttributesSatisfyingExactly(
227227
equalTo(
228-
DB_SYSTEM,
228+
maybeStable(DB_SYSTEM),
229229
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
230230
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
231231
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
@@ -251,7 +251,7 @@ void crud() {
251251
.hasParent(trace.getSpan(0))
252252
.hasAttributesSatisfyingExactly(
253253
equalTo(
254-
DB_SYSTEM,
254+
maybeStable(DB_SYSTEM),
255255
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
256256
equalTo(maybeStable(DB_OPERATION), "GetAction"),
257257
equalTo(stringKey("elasticsearch.action"), "GetAction"),
@@ -283,7 +283,7 @@ void crud() {
283283
.hasParent(trace.getSpan(0))
284284
.hasAttributesSatisfyingExactly(
285285
equalTo(
286-
DB_SYSTEM,
286+
maybeStable(DB_SYSTEM),
287287
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
288288
equalTo(maybeStable(DB_OPERATION), "DeleteAction"),
289289
equalTo(stringKey("elasticsearch.action"), "DeleteAction"),
@@ -300,7 +300,7 @@ void crud() {
300300
.hasParent(trace.getSpan(0))
301301
.hasAttributesSatisfyingExactly(
302302
equalTo(
303-
DB_SYSTEM,
303+
maybeStable(DB_SYSTEM),
304304
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
305305
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
306306
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
@@ -326,7 +326,7 @@ void crud() {
326326
.hasParent(trace.getSpan(0))
327327
.hasAttributesSatisfyingExactly(
328328
equalTo(
329-
DB_SYSTEM,
329+
maybeStable(DB_SYSTEM),
330330
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
331331
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
332332
equalTo(stringKey("elasticsearch.action"), "SearchAction"),

‎instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void elasticsearchError() {
174174
.hasException(expectedException)
175175
.hasAttributesSatisfyingExactly(
176176
equalTo(
177-
DB_SYSTEM,
177+
maybeStable(DB_SYSTEM),
178178
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
179179
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
180180
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
@@ -229,7 +229,7 @@ void elasticsearchGet() {
229229
.hasNoParent()
230230
.hasAttributesSatisfyingExactly(
231231
equalTo(
232-
DB_SYSTEM,
232+
maybeStable(DB_SYSTEM),
233233
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
234234
equalTo(maybeStable(DB_OPERATION), "CreateIndexAction"),
235235
equalTo(stringKey("elasticsearch.action"), "CreateIndexAction"),
@@ -243,7 +243,7 @@ void elasticsearchGet() {
243243
.hasNoParent()
244244
.hasAttributesSatisfyingExactly(
245245
equalTo(
246-
DB_SYSTEM,
246+
maybeStable(DB_SYSTEM),
247247
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
248248
equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"),
249249
equalTo(stringKey("elasticsearch.action"), "ClusterHealthAction"),
@@ -256,7 +256,7 @@ void elasticsearchGet() {
256256
.hasNoParent()
257257
.hasAttributesSatisfyingExactly(
258258
equalTo(
259-
DB_SYSTEM,
259+
maybeStable(DB_SYSTEM),
260260
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
261261
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
262262
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
@@ -271,7 +271,7 @@ void elasticsearchGet() {
271271
.hasNoParent()
272272
.hasAttributesSatisfyingExactly(
273273
equalTo(
274-
DB_SYSTEM,
274+
maybeStable(DB_SYSTEM),
275275
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
276276
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
277277
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
@@ -291,7 +291,7 @@ void elasticsearchGet() {
291291
.hasNoParent()
292292
.hasAttributesSatisfyingExactly(
293293
equalTo(
294-
DB_SYSTEM,
294+
maybeStable(DB_SYSTEM),
295295
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
296296
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
297297
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
@@ -308,7 +308,7 @@ void elasticsearchGet() {
308308
.hasNoParent()
309309
.hasAttributesSatisfyingExactly(
310310
equalTo(
311-
DB_SYSTEM,
311+
maybeStable(DB_SYSTEM),
312312
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
313313
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
314314
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
@@ -392,7 +392,7 @@ void resultsExtractor() {
392392
.hasNoParent()
393393
.hasAttributesSatisfyingExactly(
394394
equalTo(
395-
DB_SYSTEM,
395+
maybeStable(DB_SYSTEM),
396396
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
397397
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
398398
equalTo(stringKey("elasticsearch.action"), "SearchAction"),

0 commit comments

Comments
 (0)