Skip to content

Commit b7451ce

Browse files
trasktrask
committed
fix
1 parent 7f81435 commit b7451ce

File tree

3 files changed

+62
-15
lines changed

3 files changed

+62
-15
lines changed

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

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
1212
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
1313
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
14+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
1415
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
1516
import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
1617
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
@@ -56,13 +57,18 @@ void buildWithDefaults() throws SQLException {
5657
testing.runWithSpan(
5758
"parent", () -> dataSource.getConnection().createStatement().execute("SELECT 1;"));
5859

60+
String spanName = SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : "SELECT dbname";
5961
testing.waitAndAssertTraces(
6062
trace ->
6163
trace.hasSpansSatisfyingExactly(
6264
span -> span.hasName("parent"),
6365
span ->
64-
span.hasName("SELECT dbname")
65-
.hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"))));
66+
span.hasName(spanName)
67+
.hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"))
68+
.hasAttribute(
69+
equalTo(
70+
DB_QUERY_SUMMARY,
71+
SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));
6672

6773
assertDurationMetric(
6874
testing,
@@ -99,12 +105,13 @@ void error() throws SQLException {
99105
trace.hasSpansSatisfyingExactly(
100106
span -> span.hasName("parent"),
101107
span ->
102-
span.hasName("SELECT dbname")
108+
span.hasName("SELECT")
103109
.hasAttributesSatisfyingExactly(
104110
equalTo(DB_SYSTEM_NAME, "postgresql"),
105111
equalTo(DB_OPERATION_NAME, "SELECT"),
106112
equalTo(DB_NAMESPACE, "dbname"),
107113
equalTo(DB_QUERY_TEXT, "SELECT ?;"),
114+
equalTo(DB_QUERY_SUMMARY, "SELECT"),
108115
equalTo(DB_RESPONSE_STATUS_CODE, "42"),
109116
equalTo(SERVER_ADDRESS, "127.0.0.1"),
110117
equalTo(SERVER_PORT, 5432),
@@ -155,7 +162,12 @@ void buildWithDataSourceInstrumenterDisabled() throws SQLException {
155162
testing.waitAndAssertTraces(
156163
trace ->
157164
trace.hasSpansSatisfyingExactly(
158-
span -> span.hasName("parent"), span -> span.hasName("SELECT dbname")));
165+
span -> span.hasName("parent"),
166+
span ->
167+
span.hasName(
168+
SemconvStability.emitStableDatabaseSemconv()
169+
? "SELECT"
170+
: "SELECT dbname")));
159171
}
160172

161173
@Test
@@ -215,13 +227,18 @@ void buildWithSanitizationDisabled() throws SQLException {
215227
testing.runWithSpan(
216228
"parent", () -> dataSource.getConnection().createStatement().execute("SELECT 1;"));
217229

230+
String spanName = SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : "SELECT dbname";
218231
testing.waitAndAssertTraces(
219232
trace ->
220233
trace.hasSpansSatisfyingExactly(
221234
span -> span.hasName("parent"),
222235
span ->
223-
span.hasName("SELECT dbname")
224-
.hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT 1;"))));
236+
span.hasName(spanName)
237+
.hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT 1;"))
238+
.hasAttribute(
239+
equalTo(
240+
DB_QUERY_SUMMARY,
241+
SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));
225242
}
226243

227244
@Test
@@ -260,7 +277,7 @@ void batchStatement() throws SQLException {
260277
span ->
261278
span.hasName(
262279
SemconvStability.emitStableDatabaseSemconv()
263-
? "BATCH INSERT dbname.test"
280+
? "BATCH INSERT test"
264281
: "dbname")
265282
.hasAttributesSatisfying(
266283
equalTo(maybeStable(DB_NAME), "dbname"),
@@ -279,6 +296,11 @@ void batchStatement() throws SQLException {
279296
: null),
280297
equalTo(
281298
DB_OPERATION_BATCH_SIZE,
282-
SemconvStability.emitStableDatabaseSemconv() ? 2L : null))));
299+
SemconvStability.emitStableDatabaseSemconv() ? 2L : null),
300+
equalTo(
301+
DB_QUERY_SUMMARY,
302+
SemconvStability.emitStableDatabaseSemconv()
303+
? "INSERT test"
304+
: null))));
283305
}
284306
}

‎instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractPreparedStatementParametersTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
2020
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
2121

22+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
23+
2224
import com.google.common.collect.ImmutableMap;
2325
import com.google.common.collect.Maps;
2426
import io.opentelemetry.api.trace.SpanKind;
@@ -86,7 +88,7 @@ static Stream<Arguments> preparedStatementStream() throws SQLException {
8688
null,
8789
"SELECT 3, ?",
8890
"SELECT 3, ?",
89-
"SELECT " + dbNameLower,
91+
emitStableDatabaseSemconv() ? "SELECT" : "SELECT " + dbNameLower,
9092
"h2:mem:",
9193
null),
9294
Arguments.of(
@@ -632,7 +634,10 @@ DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
632634
equalTo(maybeStable(DB_SQL_TABLE), table),
633635
equalTo(
634636
DB_QUERY_PARAMETER.getAttributeKey("0"),
635-
expectedParameterValue))));
637+
expectedParameterValue),
638+
equalTo(
639+
DB_QUERY_SUMMARY,
640+
emitStableDatabaseSemconv() ? spanName : null))));
636641
}
637642

638643
public interface ThrowingConsumer<T, E extends Throwable> {

‎instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractSqlCommenterTest.java‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ void testSqlCommenterStatement() throws SQLException {
4848
trace ->
4949
trace.hasSpansSatisfyingExactly(
5050
span -> span.hasName("parent").hasNoParent(),
51-
span -> span.hasName("SELECT dbname").hasParent(trace.getSpan(0))));
51+
span ->
52+
span.hasName(
53+
SemconvStability.emitStableDatabaseSemconv()
54+
? "SELECT"
55+
: "SELECT dbname")
56+
.hasParent(trace.getSpan(0))));
5257

5358
assertThat(executedSql).hasSize(1);
5459
assertThat(executedSql.get(0)).contains(query).contains("traceparent");
@@ -81,7 +86,12 @@ void testSqlCommenterStatementUpdate(boolean largeUpdate) throws SQLException {
8186
trace ->
8287
trace.hasSpansSatisfyingExactly(
8388
span -> span.hasName("parent").hasNoParent(),
84-
span -> span.hasName("INSERT dbname.test").hasParent(trace.getSpan(0))));
89+
span ->
90+
span.hasName(
91+
SemconvStability.emitStableDatabaseSemconv()
92+
? "INSERT test"
93+
: "INSERT dbname.test")
94+
.hasParent(trace.getSpan(0))));
8595

8696
assertThat(executedSql).hasSize(1);
8797
assertThat(executedSql.get(0)).contains(query).contains("traceparent");
@@ -118,7 +128,7 @@ void testSqlCommenterStatementBatch(boolean largeUpdate) throws SQLException {
118128
span ->
119129
span.hasName(
120130
SemconvStability.emitStableDatabaseSemconv()
121-
? "BATCH INSERT dbname.test"
131+
? "BATCH INSERT test"
122132
: "dbname")
123133
.hasParent(trace.getSpan(0))));
124134

@@ -149,7 +159,12 @@ void testSqlCommenterPreparedStatement() throws SQLException {
149159
trace ->
150160
trace.hasSpansSatisfyingExactly(
151161
span -> span.hasName("parent").hasNoParent(),
152-
span -> span.hasName("SELECT dbname").hasParent(trace.getSpan(0))));
162+
span ->
163+
span.hasName(
164+
SemconvStability.emitStableDatabaseSemconv()
165+
? "SELECT"
166+
: "SELECT dbname")
167+
.hasParent(trace.getSpan(0))));
153168

154169
assertThat(executedSql).hasSize(1);
155170
assertThat(executedSql.get(0)).contains(query).contains("traceparent");
@@ -182,7 +197,12 @@ void testSqlCommenterPreparedStatementUpdate(boolean largeUpdate) throws SQLExce
182197
trace ->
183198
trace.hasSpansSatisfyingExactly(
184199
span -> span.hasName("parent").hasNoParent(),
185-
span -> span.hasName("INSERT dbname.test").hasParent(trace.getSpan(0))));
200+
span ->
201+
span.hasName(
202+
SemconvStability.emitStableDatabaseSemconv()
203+
? "INSERT test"
204+
: "INSERT dbname.test")
205+
.hasParent(trace.getSpan(0))));
186206

187207
assertThat(executedSql).hasSize(1);
188208
assertThat(executedSql.get(0)).contains(query).contains("traceparent");

0 commit comments

Comments
 (0)