Skip to content

Commit 2c47267

Browse files
committed
add db client metrics for JDBC, vertx, r2dbc, cassandra, add tests
1 parent 63af1d6 commit 2c47267

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,12 @@ public void testBasicStatement(
385385
equalTo(maybeStable(DB_SQL_TABLE), table))));
386386

387387
assertDurationMetric(
388-
testing, "io.opentelemetry.jdbc", DB_SYSTEM, DB_COLLECTION_NAME, DB_NAMESPACE, DB_OPERATION_NAME);
388+
testing,
389+
"io.opentelemetry.jdbc",
390+
DB_SYSTEM,
391+
DB_COLLECTION_NAME,
392+
DB_NAMESPACE,
393+
DB_OPERATION_NAME);
389394
}
390395

391396
static Stream<Arguments> preparedStatementStream() throws SQLException {

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ void buildWithDefaults() throws SQLException {
5252
.hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"))));
5353

5454
assertDurationMetric(
55-
testing, "io.opentelemetry.jdbc", DB_NAMESPACE, DB_OPERATION_NAME, DB_SYSTEM, SERVER_ADDRESS, SERVER_PORT);
55+
testing,
56+
"io.opentelemetry.jdbc",
57+
DB_NAMESPACE,
58+
DB_OPERATION_NAME,
59+
DB_SYSTEM,
60+
SERVER_ADDRESS,
61+
SERVER_PORT);
5662
}
5763

5864
@Test

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/DbClientMetricsTestUtil.java

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,26 @@ public class DbClientMetricsTestUtil {
1616
private DbClientMetricsTestUtil() {}
1717

1818
public static void assertDurationMetric(
19-
InstrumentationExtension testing, String instrumentationName, AttributeKey<?>... expectedKeys) {
19+
InstrumentationExtension testing,
20+
String instrumentationName,
21+
AttributeKey<?>... expectedKeys) {
2022
if (!emitStableDatabaseSemconv()) {
2123
return;
2224
}
2325
testing.waitAndAssertMetrics(
2426
instrumentationName,
2527
metrics ->
26-
metrics.hasName("db.client.operation.duration")
27-
.hasUnit("s")
28-
.hasDescription("Duration of database client operations.")
29-
.hasHistogramSatisfying(
30-
histogram ->
31-
histogram.hasPointsSatisfying(
32-
point ->
33-
point.hasAttributesSatisfying(
34-
attributes ->
35-
assertThat(attributes.asMap())
36-
.containsOnlyKeys(expectedKeys)))));
28+
metrics
29+
.hasName("db.client.operation.duration")
30+
.hasUnit("s")
31+
.hasDescription("Duration of database client operations.")
32+
.hasHistogramSatisfying(
33+
histogram ->
34+
histogram.hasPointsSatisfying(
35+
point ->
36+
point.hasAttributesSatisfying(
37+
attributes ->
38+
assertThat(attributes.asMap())
39+
.containsOnlyKeys(expectedKeys)))));
3740
}
3841
}

0 commit comments

Comments
 (0)