Clarify DB batch operation and collection notes

docs/db/cassandra.md

@@ -83,8 +83,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 

docs/db/cosmosdb.md

@@ -403,8 +403,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 

docs/db/database-metrics.md

@@ -104,8 +104,9 @@ The collection name SHOULD NOT be extracted from `db.query.text`,
 when the database system supports query text with multiple collections
 in non-batch operations.
 
-For batch operations, if the individual operations are known to have the same
-collection name then that collection name SHOULD be used.
+For batch operations, when the individual collection names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that collection name SHOULD be used.
 
 **[4] `db.namespace`:** If a database system has multiple namespace components, they SHOULD be concatenated from the most general to the most specific namespace component, using `|` as a separator between the components. Any missing components (and their associated separators) SHOULD be omitted.
 Semantic conventions for individual database systems SHOULD document what `db.namespace` means in the context of that system.
@@ -123,8 +124,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 
@@ -293,8 +295,9 @@ The collection name SHOULD NOT be extracted from `db.query.text`,
 when the database system supports query text with multiple collections
 in non-batch operations.
 
-For batch operations, if the individual operations are known to have the same
-collection name then that collection name SHOULD be used.
+For batch operations, when the individual collection names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that collection name SHOULD be used.
 
 **[4] `db.namespace`:** If a database system has multiple namespace components, they SHOULD be concatenated from the most general to the most specific namespace component, using `|` as a separator between the components. Any missing components (and their associated separators) SHOULD be omitted.
 Semantic conventions for individual database systems SHOULD document what `db.namespace` means in the context of that system.
@@ -312,8 +315,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 

docs/db/database-spans.md

@@ -141,8 +141,9 @@ The collection name SHOULD NOT be extracted from `db.query.text`,
 when the database system supports query text with multiple collections
 in non-batch operations.
 
-For batch operations, if the individual operations are known to have the same
-collection name then that collection name SHOULD be used.
+For batch operations, when the individual collection names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that collection name SHOULD be used.
 
 **[4] `db.namespace`:** If a database system has multiple namespace components, they SHOULD be concatenated from the most general to the most specific namespace component, using `|` as a separator between the components. Any missing components (and their associated separators) SHOULD be omitted.
 Semantic conventions for individual database systems SHOULD document what `db.namespace` means in the context of that system.
@@ -160,8 +161,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 

docs/registry/attributes/db.md

@@ -37,8 +37,9 @@ The collection name SHOULD NOT be extracted from `db.query.text`,
 when the database system supports query text with multiple collections
 in non-batch operations.
 
-For batch operations, if the individual operations are known to have the same
-collection name then that collection name SHOULD be used.
+For batch operations, when the individual collection names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that collection name SHOULD be used.
 
 **[2] `db.namespace`:** If a database system has multiple namespace components, they SHOULD be concatenated from the most general to the most specific namespace component, using `|` as a separator between the components. Any missing components (and their associated separators) SHOULD be omitted.
 Semantic conventions for individual database systems SHOULD document what `db.namespace` means in the context of that system.
@@ -77,8 +78,9 @@ in non-batch operations.
 If spaces can occur in the operation name, multiple consecutive spaces
 SHOULD be normalized to a single space.
 
-For batch operations, if the individual operations are known to have the same operation name
-then that operation name SHOULD be used prepended by `BATCH `,
+For batch operations, when the individual operation names are known to be the same
+(without extracting them from `db.query.text`; see above),
+that operation name SHOULD be used prepended by `BATCH `,
 otherwise `db.operation.name` SHOULD be `BATCH` or some other database
 system specific term if more applicable.
 

model/db/registry.yaml

@@ -17,8 +17,9 @@ groups:
           when the database system supports query text with multiple collections
           in non-batch operations.
 
-          For batch operations, if the individual operations are known to have the same
-          collection name then that collection name SHOULD be used.
+          For batch operations, when the individual collection names are known to be the same
+          (without extracting them from `db.query.text`; see above),
+          that collection name SHOULD be used.
         examples: ["public.users", "customers"]
       - id: db.namespace
         type: string
@@ -52,8 +53,9 @@ groups:
           If spaces can occur in the operation name, multiple consecutive spaces
           SHOULD be normalized to a single space.
 
-          For batch operations, if the individual operations are known to have the same operation name
-          then that operation name SHOULD be used prepended by `BATCH `,
+          For batch operations, when the individual operation names are known to be the same
+          (without extracting them from `db.query.text`; see above),
+          that operation name SHOULD be used prepended by `BATCH `,
           otherwise `db.operation.name` SHOULD be `BATCH` or some other database
           system specific term if more applicable.
         examples: ["findAndModify", "HMSET", "SELECT"]