Skip to content

Commit a79b44c

Browse files
trasktrask
committed
up
1 parent bc6f29b commit a79b44c

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientSpanNameExtractor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@ protected String computeSpanName(
4949
@Nullable String collectionName,
5050
@Nullable String storedProcedureName) {
5151
// Use whichever identifier is available (they're mutually exclusive)
52-
String identifier = collectionName != null ? collectionName : storedProcedureName;
52+
String mainIdentifier = collectionName != null ? collectionName : storedProcedureName;
5353

5454
if (operation == null) {
5555
return dbName == null ? DEFAULT_SPAN_NAME : dbName;
5656
}
5757

5858
StringBuilder name = new StringBuilder(operation);
59-
if (dbName != null || identifier != null) {
59+
if (dbName != null || mainIdentifier != null) {
6060
name.append(' ');
6161
}
6262
// skip db name if identifier already has a db name prefixed to it
63-
if (dbName != null && (identifier == null || identifier.indexOf('.') == -1)) {
63+
if (dbName != null && (mainIdentifier == null || mainIdentifier.indexOf('.') == -1)) {
6464
name.append(dbName);
65-
if (identifier != null) {
65+
if (mainIdentifier != null) {
6666
name.append('.');
6767
}
6868
}
69-
if (identifier != null) {
70-
name.append(identifier);
69+
if (mainIdentifier != null) {
70+
name.append(mainIdentifier);
7171
}
7272
return name.toString();
7373
}

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientSpanNameExtractorTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ void shouldExtractFullSpanName() {
3737
String spanName = underTest.extract(dbRequest);
3838

3939
// then
40-
// For stable semconv, span name is the query summary (without namespace)
41-
// For old semconv, span name includes the namespace
4240
assertEquals(
4341
SemconvStability.emitStableDatabaseSemconv() ? "SELECT table" : "SELECT database.table",
4442
spanName);
@@ -157,8 +155,6 @@ void shouldExtractFullSpanNameForBatch() {
157155
String spanName = underTest.extract(dbRequest);
158156

159157
// then
160-
// For stable semconv, multi-query batch uses query summary
161-
// For old semconv, only namespace is used
162158
assertEquals(
163159
SemconvStability.emitStableDatabaseSemconv() ? "BATCH INSERT table" : "database", spanName);
164160
}
@@ -181,8 +177,6 @@ void shouldExtractFullSpanNameForSingleQueryBatch() {
181177
String spanName = underTest.extract(dbRequest);
182178

183179
// then
184-
// For stable semconv, single-query batch uses query summary with BATCH prefix
185-
// For old semconv, it uses the full span name format with namespace
186180
assertEquals(
187181
SemconvStability.emitStableDatabaseSemconv()
188182
? "BATCH INSERT table"

‎instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumenterContextTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public Collection<String> getRawQueryTexts(Object request) {
6767
// replace cached sanitization result to verify it is used
6868
sanitizedMap.put(
6969
testQuery,
70-
SqlStatementInfo.create("SELECT name2 FROM test2 WHERE id = ?", "SELECT", "test2", null));
70+
SqlStatementInfo.create(
71+
"SELECT name2 FROM test2 WHERE id = ?", "SELECT", "test2", "SELECT test2"));
7172
{
7273
AttributesBuilder builder = Attributes.builder();
7374
attributesExtractor.onStart(builder, Context.root(), null);

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent) {
9494
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation
9595
static void assertClientSpan(SpanDataAssert span, SpanData parent, String verb) {
9696
String spanName = emitStableDatabaseSemconv() ? verb + " Value" : verb + " db1.Value";
97-
String querySummary = emitStableDatabaseSemconv() ? verb + " Value" : null;
9897
span.hasName(spanName)
9998
.hasKind(SpanKind.CLIENT)
10099
.hasParent(parent)
@@ -108,7 +107,7 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent, String verb)
108107
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
109108
equalTo(maybeStable(DB_OPERATION), verb),
110109
equalTo(maybeStable(DB_SQL_TABLE), "Value"),
111-
equalTo(DB_QUERY_SUMMARY, querySummary));
110+
equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? spanName : null));
112111
}
113112

114113
static SpanDataAssert assertSessionSpan(SpanDataAssert span, SpanData parent, String spanName) {

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,20 @@ void buildWithDefaults() throws SQLException {
5757
testing.runWithSpan(
5858
"parent", () -> dataSource.getConnection().createStatement().execute("SELECT 1;"));
5959

60-
String spanName = SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : "SELECT dbname";
6160
testing.waitAndAssertTraces(
6261
trace ->
6362
trace.hasSpansSatisfyingExactly(
6463
span -> span.hasName("parent"),
6564
span ->
66-
span.hasName(spanName)
65+
span.hasName(
66+
SemconvStability.emitStableDatabaseSemconv()
67+
? "SELECT"
68+
: "SELECT dbname")
6769
.hasAttributesSatisfying(
6870
equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"),
6971
equalTo(
7072
DB_QUERY_SUMMARY,
71-
SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));
73+
SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : null))));
7274

7375
assertDurationMetric(
7476
testing,
@@ -227,18 +229,20 @@ void buildWithSanitizationDisabled() throws SQLException {
227229
testing.runWithSpan(
228230
"parent", () -> dataSource.getConnection().createStatement().execute("SELECT 1;"));
229231

230-
String spanName = SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : "SELECT dbname";
231232
testing.waitAndAssertTraces(
232233
trace ->
233234
trace.hasSpansSatisfyingExactly(
234235
span -> span.hasName("parent"),
235236
span ->
236-
span.hasName(spanName)
237+
span.hasName(
238+
SemconvStability.emitStableDatabaseSemconv()
239+
? "SELECT"
240+
: "SELECT dbname")
237241
.hasAttributesSatisfying(
238242
equalTo(maybeStable(DB_STATEMENT), "SELECT 1;"),
239243
equalTo(
240244
DB_QUERY_SUMMARY,
241-
SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));
245+
SemconvStability.emitStableDatabaseSemconv() ? "SELECT" : null))));
242246
}
243247

244248
@Test

0 commit comments

Comments
 (0)