review

Author: trask

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

@@ -90,8 +90,7 @@ public String getStoredProcedureName() {
    * instead which returns null for CALL operations.
    *
    * @deprecated Use {@link #getCollectionName()} for db.collection.name attribute, or {@link
-   *     #getStoredProcedureName()} for stored procedure name. This method may be used for span
-   *     names where both table and procedure names are needed.
+   *     #getStoredProcedureName()} for stored procedure name.
    */
   @Deprecated
   @Nullable

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

@@ -360,7 +360,7 @@ void shouldExtractMultiQueryBatchAttributes() {
 
   @Test
   void shouldExtractHeterogeneousMultiQueryBatchAttributes() {
-    // given - batch with different operations (INSERT and DELETE)
+    // given
     Map<String, Object> request = new HashMap<>();
     request.put("db.name", "potatoes");
     request.put(
@@ -380,8 +380,7 @@ void shouldExtractHeterogeneousMultiQueryBatchAttributes() {
     AttributesBuilder endAttributes = Attributes.builder();
     underTest.onEnd(endAttributes, context, request, null, null);
 
-    // then - operation should be "BATCH" (not "BATCH INSERT" or "BATCH DELETE")
-    // and query summary should also be "BATCH" since operations differ
+    // then
     if (SemconvStability.emitStableDatabaseSemconv() && SemconvStability.emitOldDatabaseSemconv()) {
       assertThat(startAttributes.build())
           .containsOnly(

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

@@ -93,8 +93,7 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent) {
 
   @SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation
   static void assertClientSpan(SpanDataAssert span, SpanData parent, String verb) {
-    String spanName = emitStableDatabaseSemconv() ? verb + " Value" : verb + " db1.Value";
-    span.hasName(spanName)
+    span.hasName(emitStableDatabaseSemconv() ? verb + " Value" : verb + " db1.Value")
         .hasKind(SpanKind.CLIENT)
         .hasParent(parent)
         .hasAttributesSatisfyingExactly(
@@ -107,7 +106,7 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent, String verb)
                 stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
             equalTo(maybeStable(DB_OPERATION), verb),
             equalTo(maybeStable(DB_SQL_TABLE), "Value"),
-            equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? spanName : null));
+            equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? verb + " Value" : null));
   }
 
   static SpanDataAssert assertSessionSpan(SpanDataAssert span, SpanData parent, String spanName) {