Skip to content

Commit 7951410

Browse files
trasktrask
committed
Database semconv stable tests
1 parent 0de105a commit 7951410

File tree

48 files changed

+801
-554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+801
-554
lines changed

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.instrumentation.awssdk.v2_2;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1112
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -184,7 +185,7 @@ public void testSendDynamoDbRequestWithRetries() {
184185
equalTo(AwsIncubatingAttributes.AWS_REQUEST_ID, requestId),
185186
equalTo(stringKey("aws.table.name"), "sometable"),
186187
equalTo(DB_SYSTEM, "dynamodb"),
187-
equalTo(DB_OPERATION, operation));
188+
equalTo(maybeStable(DB_OPERATION), operation));
188189
if (isRecordIndividualHttpErrorEnabled()) {
189190
span.hasEventsSatisfyingExactly(
190191
event ->

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
1112
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
@@ -119,9 +120,9 @@ void testCassandra() {
119120
equalTo(
120121
stringKey("camel.uri"),
121122
"cql://" + host + ":" + cassandraPort + "/test"),
122-
equalTo(DB_NAME, "test"),
123+
equalTo(maybeStable(DB_NAME), "test"),
123124
equalTo(
124-
DB_STATEMENT,
125+
maybeStable(DB_STATEMENT),
125126
"select * from test.users where id=? ALLOW FILTERING"),
126127
equalTo(DB_SYSTEM, "cassandra"))));
127128
}

‎instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.clickhouse;
77

8+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
89
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
910
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1011
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
@@ -341,10 +342,10 @@ void testParameterizedQueryInput() throws ClickHouseException {
341342
private static List<AttributeAssertion> attributeAssertions(String statement, String operation) {
342343
return asList(
343344
equalTo(DB_SYSTEM, DbIncubatingAttributes.DbSystemIncubatingValues.CLICKHOUSE),
344-
equalTo(DB_NAME, dbName),
345+
equalTo(maybeStable(DB_NAME), dbName),
345346
equalTo(SERVER_ADDRESS, host),
346347
equalTo(SERVER_PORT, port),
347-
equalTo(DB_STATEMENT, statement),
348-
equalTo(DB_OPERATION, operation));
348+
equalTo(maybeStable(DB_STATEMENT), statement),
349+
equalTo(maybeStable(DB_OPERATION), operation));
349350
}
350351
}

‎instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.apiclient;
77

88
import static io.opentelemetry.instrumentation.testing.GlobalTraceUtil.runWithSpan;
9+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
1112
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
@@ -94,7 +95,7 @@ public void elasticsearchStatus() throws IOException {
9495
.hasNoParent()
9596
.hasAttributesSatisfyingExactly(
9697
equalTo(DB_SYSTEM, "elasticsearch"),
97-
equalTo(DB_OPERATION, "info"),
98+
equalTo(maybeStable(DB_OPERATION), "info"),
9899
equalTo(HTTP_REQUEST_METHOD, "GET"),
99100
equalTo(URL_FULL, httpHost.toURI() + "/"),
100101
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
@@ -130,7 +131,7 @@ public void elasticsearchIndex() throws IOException {
130131
.hasNoParent()
131132
.hasAttributesSatisfyingExactly(
132133
equalTo(DB_SYSTEM, "elasticsearch"),
133-
equalTo(DB_OPERATION, "index"),
134+
equalTo(maybeStable(DB_OPERATION), "index"),
134135
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
135136
equalTo(SERVER_PORT, httpHost.getPort()),
136137
equalTo(HTTP_REQUEST_METHOD, "PUT"),
@@ -191,7 +192,7 @@ public void elasticsearchStatusAsync() throws Exception {
191192
.hasParent(trace.getSpan(0))
192193
.hasAttributesSatisfyingExactly(
193194
equalTo(DB_SYSTEM, "elasticsearch"),
194-
equalTo(DB_OPERATION, "info"),
195+
equalTo(maybeStable(DB_OPERATION), "info"),
195196
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
196197
equalTo(SERVER_PORT, httpHost.getPort()),
197198
equalTo(HTTP_REQUEST_METHOD, "GET"),

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.longKey;
99
import static io.opentelemetry.api.common.AttributeKey.stringKey;
10+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
1112
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1213
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -91,7 +92,7 @@ void emptyRepository() {
9192
equalTo(
9293
DB_SYSTEM,
9394
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
94-
equalTo(DB_OPERATION, "SearchAction"),
95+
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
9596
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
9697
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
9798
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -125,7 +126,7 @@ void crud() {
125126
equalTo(
126127
DB_SYSTEM,
127128
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
128-
equalTo(DB_OPERATION, "IndexAction"),
129+
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
129130
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
130131
equalTo(stringKey("elasticsearch.request"), "IndexRequest"),
131132
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -143,7 +144,7 @@ void crud() {
143144
equalTo(
144145
DB_SYSTEM,
145146
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
146-
equalTo(DB_OPERATION, "RefreshAction"),
147+
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
147148
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
148149
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
149150
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -174,7 +175,7 @@ void crud() {
174175
equalTo(
175176
DB_SYSTEM,
176177
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
177-
equalTo(DB_OPERATION, "GetAction"),
178+
equalTo(maybeStable(DB_OPERATION), "GetAction"),
178179
equalTo(stringKey("elasticsearch.action"), "GetAction"),
179180
equalTo(stringKey("elasticsearch.request"), "GetRequest"),
180181
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -208,7 +209,7 @@ void crud() {
208209
equalTo(
209210
DB_SYSTEM,
210211
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
211-
equalTo(DB_OPERATION, "IndexAction"),
212+
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
212213
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
213214
equalTo(stringKey("elasticsearch.request"), "IndexRequest"),
214215
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -226,7 +227,7 @@ void crud() {
226227
equalTo(
227228
DB_SYSTEM,
228229
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
229-
equalTo(DB_OPERATION, "RefreshAction"),
230+
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
230231
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
231232
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
232233
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -252,7 +253,7 @@ void crud() {
252253
equalTo(
253254
DB_SYSTEM,
254255
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
255-
equalTo(DB_OPERATION, "GetAction"),
256+
equalTo(maybeStable(DB_OPERATION), "GetAction"),
256257
equalTo(stringKey("elasticsearch.action"), "GetAction"),
257258
equalTo(stringKey("elasticsearch.request"), "GetRequest"),
258259
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -284,7 +285,7 @@ void crud() {
284285
equalTo(
285286
DB_SYSTEM,
286287
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
287-
equalTo(DB_OPERATION, "DeleteAction"),
288+
equalTo(maybeStable(DB_OPERATION), "DeleteAction"),
288289
equalTo(stringKey("elasticsearch.action"), "DeleteAction"),
289290
equalTo(stringKey("elasticsearch.request"), "DeleteRequest"),
290291
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -301,7 +302,7 @@ void crud() {
301302
equalTo(
302303
DB_SYSTEM,
303304
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
304-
equalTo(DB_OPERATION, "RefreshAction"),
305+
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
305306
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
306307
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
307308
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
@@ -327,7 +328,7 @@ void crud() {
327328
equalTo(
328329
DB_SYSTEM,
329330
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
330-
equalTo(DB_OPERATION, "SearchAction"),
331+
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
331332
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
332333
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
333334
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.longKey;
99
import static io.opentelemetry.api.common.AttributeKey.stringKey;
10+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1112
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
1213
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
@@ -175,7 +176,7 @@ void elasticsearchError() {
175176
equalTo(
176177
DB_SYSTEM,
177178
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
178-
equalTo(DB_OPERATION, "RefreshAction"),
179+
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
179180
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
180181
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
181182
equalTo(stringKey("elasticsearch.request.indices"), indexName))));
@@ -230,7 +231,7 @@ void elasticsearchGet() {
230231
equalTo(
231232
DB_SYSTEM,
232233
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
233-
equalTo(DB_OPERATION, "CreateIndexAction"),
234+
equalTo(maybeStable(DB_OPERATION), "CreateIndexAction"),
234235
equalTo(stringKey("elasticsearch.action"), "CreateIndexAction"),
235236
equalTo(stringKey("elasticsearch.request"), "CreateIndexRequest"),
236237
equalTo(stringKey("elasticsearch.request.indices"), indexName))),
@@ -244,7 +245,7 @@ void elasticsearchGet() {
244245
equalTo(
245246
DB_SYSTEM,
246247
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
247-
equalTo(DB_OPERATION, "ClusterHealthAction"),
248+
equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"),
248249
equalTo(stringKey("elasticsearch.action"), "ClusterHealthAction"),
249250
equalTo(stringKey("elasticsearch.request"), "ClusterHealthRequest"))),
250251
trace ->
@@ -257,7 +258,7 @@ void elasticsearchGet() {
257258
equalTo(
258259
DB_SYSTEM,
259260
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
260-
equalTo(DB_OPERATION, "SearchAction"),
261+
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
261262
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
262263
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
263264
equalTo(stringKey("elasticsearch.request.indices"), indexName),
@@ -272,7 +273,7 @@ void elasticsearchGet() {
272273
equalTo(
273274
DB_SYSTEM,
274275
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
275-
equalTo(DB_OPERATION, "IndexAction"),
276+
equalTo(maybeStable(DB_OPERATION), "IndexAction"),
276277
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
277278
equalTo(stringKey("elasticsearch.request"), "IndexRequest"),
278279
equalTo(stringKey("elasticsearch.request.indices"), indexName),
@@ -292,7 +293,7 @@ void elasticsearchGet() {
292293
equalTo(
293294
DB_SYSTEM,
294295
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
295-
equalTo(DB_OPERATION, "RefreshAction"),
296+
equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
296297
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
297298
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
298299
equalTo(stringKey("elasticsearch.request.indices"), indexName),
@@ -309,7 +310,7 @@ void elasticsearchGet() {
309310
equalTo(
310311
DB_SYSTEM,
311312
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
312-
equalTo(DB_OPERATION, "SearchAction"),
313+
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
313314
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
314315
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
315316
equalTo(stringKey("elasticsearch.request.indices"), indexName),
@@ -393,7 +394,7 @@ void resultsExtractor() {
393394
equalTo(
394395
DB_SYSTEM,
395396
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
396-
equalTo(DB_OPERATION, "SearchAction"),
397+
equalTo(maybeStable(DB_OPERATION), "SearchAction"),
397398
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
398399
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
399400
equalTo(stringKey("elasticsearch.request.indices"), indexName))));

0 commit comments

Comments
 (0)