Skip to content

Commit 9b99a54

Browse files
trasktrask
authored
Use db system constants in tests (#16255)
1 parent 466d3bb commit 9b99a54

44 files changed

Lines changed: 278 additions & 233 deletions

File tree

Some content is hidden

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

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ These are the supported libraries and frameworks:
9191
| [Java Http Server](https://docs.oracle.com/en/java/javase/21/docs/api/jdk.httpserver/module-summary.html) | Java 8+ | [opentelemetry-java-http-server](../instrumentation/java-http-server/library) | [HTTP Server Spans], [HTTP Server Metrics] |
9292
| [java.util.logging](https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html) | Java 8+ | N/A | none |
9393
| [Java Platform](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ManagementFactory.html) | Java 8+ | [opentelemetry-runtime-telemetry-java8](../instrumentation/runtime-telemetry/runtime-telemetry-java8/library),<br>[opentelemetry-runtime-telemetry-java17](../instrumentation/runtime-telemetry/runtime-telemetry-java17/library),<br>[opentelemetry-resources](../instrumentation/resources/library) | [JVM Runtime Metrics] |
94-
| [Javalin](https://javalin.io/) | 5.0+ | N/A | Provides `http.route` [2] |
94+
| [Javalin](https://javalin.io/) | 5.0+ (not including 7.0+ yet) | N/A | Provides `http.route` [2] |
9595
| [JAX-RS](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html) | 0.5+ | N/A | Provides `http.route` [2], Controller Spans [3] |
9696
| [JAX-RS Client](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/client/package-summary.html) | 1.1+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
9797
| [JAX-WS](https://jakarta.ee/specifications/xml-web-services/2.3/apidocs/javax/xml/ws/package-summary.html) | 2.0+ (not including 3.0+ yet) | N/A | Provides `http.route` [2], Controller Spans [3] |

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
1515
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
1616
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
17+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
1718

1819
import com.datastax.oss.driver.api.core.CqlSession;
1920
import com.google.common.collect.ImmutableMap;
@@ -129,6 +130,6 @@ void testCassandra() {
129130
equalTo(
130131
DB_QUERY_SUMMARY,
131132
emitStableDatabaseSemconv() ? "SELECT test.users" : null),
132-
equalTo(maybeStable(DB_SYSTEM), "cassandra"))));
133+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA))));
133134
}
134135
}

‎instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
2020
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
2121
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
22+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
2223
import static org.junit.jupiter.api.Named.named;
2324

2425
import com.datastax.driver.core.Cluster;
@@ -115,7 +116,7 @@ void syncTest(Parameter parameter) {
115116
equalTo(SERVER_PORT, cassandraPort),
116117
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
117118
equalTo(NETWORK_PEER_PORT, cassandraPort),
118-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
119+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
119120
equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace),
120121
equalTo(
121122
DB_QUERY_SUMMARY,
@@ -134,7 +135,7 @@ void syncTest(Parameter parameter) {
134135
equalTo(SERVER_PORT, cassandraPort),
135136
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
136137
equalTo(NETWORK_PEER_PORT, cassandraPort),
137-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
138+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
138139
equalTo(maybeStable(DB_NAME), parameter.keyspace),
139140
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
140141
equalTo(
@@ -160,7 +161,7 @@ void syncTest(Parameter parameter) {
160161
equalTo(SERVER_PORT, cassandraPort),
161162
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
162163
equalTo(NETWORK_PEER_PORT, cassandraPort),
163-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
164+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
164165
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
165166
equalTo(
166167
DB_QUERY_SUMMARY,
@@ -209,7 +210,7 @@ void asyncTest(Parameter parameter) {
209210
equalTo(SERVER_PORT, cassandraPort),
210211
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
211212
equalTo(NETWORK_PEER_PORT, cassandraPort),
212-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
213+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
213214
equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace),
214215
equalTo(
215216
DB_QUERY_SUMMARY,
@@ -229,7 +230,7 @@ void asyncTest(Parameter parameter) {
229230
equalTo(SERVER_PORT, cassandraPort),
230231
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
231232
equalTo(NETWORK_PEER_PORT, cassandraPort),
232-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
233+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
233234
equalTo(maybeStable(DB_NAME), parameter.keyspace),
234235
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
235236
equalTo(
@@ -260,7 +261,7 @@ void asyncTest(Parameter parameter) {
260261
equalTo(SERVER_PORT, cassandraPort),
261262
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
262263
equalTo(NETWORK_PEER_PORT, cassandraPort),
263-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
264+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
264265
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
265266
equalTo(
266267
DB_QUERY_SUMMARY,

‎instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
2929
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
3030
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
31+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
3132
import static org.assertj.core.api.Assertions.assertThat;
3233
import static org.junit.jupiter.api.Named.named;
3334

@@ -138,7 +139,7 @@ void syncTest(Parameter parameter) {
138139
equalTo(SERVER_PORT, cassandraPort),
139140
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
140141
equalTo(NETWORK_PEER_PORT, cassandraPort),
141-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
142+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
142143
equalTo(maybeStable(DB_NAME), parameter.keyspace),
143144
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
144145
equalTo(
@@ -199,7 +200,7 @@ void asyncTest(Parameter parameter) throws Exception {
199200
equalTo(SERVER_PORT, cassandraPort),
200201
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
201202
equalTo(NETWORK_PEER_PORT, cassandraPort),
202-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
203+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
203204
equalTo(maybeStable(DB_NAME), parameter.keyspace),
204205
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
205206
equalTo(

‎instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
2727
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
2828
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
29+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
2930
import static org.assertj.core.api.Assertions.assertThat;
3031
import static org.junit.jupiter.api.Named.named;
3132

@@ -74,7 +75,7 @@ void reactiveTest(Parameter parameter) {
7475
equalTo(SERVER_PORT, cassandraPort),
7576
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
7677
equalTo(NETWORK_PEER_PORT, cassandraPort),
77-
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
78+
equalTo(maybeStable(DB_SYSTEM), CASSANDRA),
7879
equalTo(maybeStable(DB_NAME), parameter.keyspace),
7980
equalTo(maybeStable(DB_STATEMENT), parameter.expectedQueryText),
8081
equalTo(

‎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
@@ -21,6 +21,7 @@
2121
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
2222
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
2323
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
24+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.ELASTICSEARCH;
2425
import static java.util.concurrent.TimeUnit.SECONDS;
2526
import static org.assertj.core.api.Assertions.assertThat;
2627

@@ -104,7 +105,7 @@ void elasticsearchStatus() throws IOException {
104105
.hasKind(SpanKind.CLIENT)
105106
.hasNoParent()
106107
.hasAttributesSatisfyingExactly(
107-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
108+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
108109
equalTo(maybeStable(DB_OPERATION), "info"),
109110
equalTo(HTTP_REQUEST_METHOD, "GET"),
110111
equalTo(URL_FULL, httpHost.toURI() + "/"),
@@ -141,7 +142,7 @@ void elasticsearchIndex() throws IOException {
141142
.hasKind(SpanKind.CLIENT)
142143
.hasNoParent()
143144
.hasAttributesSatisfyingExactly(
144-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
145+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
145146
equalTo(maybeStable(DB_OPERATION), "index"),
146147
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
147148
equalTo(SERVER_PORT, httpHost.getPort()),
@@ -208,7 +209,7 @@ void elasticsearchStatusAsync() throws Exception {
208209
.hasKind(SpanKind.CLIENT)
209210
.hasParent(trace.getSpan(0))
210211
.hasAttributesSatisfyingExactly(
211-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
212+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
212213
equalTo(maybeStable(DB_OPERATION), "info"),
213214
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
214215
equalTo(SERVER_PORT, httpHost.getPort()),

‎instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1919
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
20+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.ELASTICSEARCH;
2021
import static org.assertj.core.api.Assertions.assertThat;
2122

2223
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -104,7 +105,7 @@ void elasticsearchStatus() throws IOException {
104105
.hasKind(SpanKind.CLIENT)
105106
.hasNoParent()
106107
.hasAttributesSatisfyingExactly(
107-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
108+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
108109
equalTo(HTTP_REQUEST_METHOD, "GET"),
109110
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
110111
equalTo(SERVER_PORT, httpHost.getPort()),
@@ -179,7 +180,7 @@ public void onFailure(Exception e) {
179180
.hasKind(SpanKind.CLIENT)
180181
.hasParent(trace.getSpan(0))
181182
.hasAttributesSatisfyingExactly(
182-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
183+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
183184
equalTo(HTTP_REQUEST_METHOD, "GET"),
184185
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
185186
equalTo(SERVER_PORT, httpHost.getPort()),

‎instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1919
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
20+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.ELASTICSEARCH;
2021
import static org.assertj.core.api.Assertions.assertThat;
2122

2223
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -95,7 +96,7 @@ void elasticsearchStatus() throws IOException {
9596
.hasKind(SpanKind.CLIENT)
9697
.hasNoParent()
9798
.hasAttributesSatisfyingExactly(
98-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
99+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
99100
equalTo(HTTP_REQUEST_METHOD, "GET"),
100101
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
101102
equalTo(SERVER_PORT, httpHost.getPort()),
@@ -170,7 +171,7 @@ public void onFailure(Exception e) {
170171
.hasKind(SpanKind.CLIENT)
171172
.hasParent(trace.getSpan(0))
172173
.hasAttributesSatisfyingExactly(
173-
equalTo(maybeStable(DB_SYSTEM), "elasticsearch"),
174+
equalTo(maybeStable(DB_SYSTEM), ELASTICSEARCH),
174175
equalTo(HTTP_REQUEST_METHOD, "GET"),
175176
equalTo(SERVER_ADDRESS, httpHost.getHostName()),
176177
equalTo(SERVER_PORT, httpHost.getPort()),

0 commit comments

Comments
 (0)