Add back note about batch operations

docs/database/cassandra.md

@@ -61,6 +61,7 @@ For batch operations, if the individual operations are known to have the same op
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
 
 **[10]:** SHOULD be collected by default only if there is sanitization that excludes sensitive information.
 

docs/database/cosmosdb.md

@@ -59,13 +59,11 @@ For batch operations, if the individual operations are known to have the same op
 
 **[6]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
-
-**[7]:** For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
-
+**[7]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
 
 **[8]:** SHOULD be collected by default only if there is sanitization that excludes sensitive information.
 
-
 **[9]:** When observed from the client side, and when communicating through an intermediary, `server.address` SHOULD represent the server address behind any intermediaries, for example proxies, if it's available.
 
 **[10]:** The user-agent value is generated by SDK which is a combination of<br> `sdk_version` : Current version of SDK. e.g. 'cosmos-netstandard-sdk/3.23.0'<br> `direct_pkg_version` : Direct package version used by Cosmos DB SDK. e.g. '3.23.1'<br> `number_of_client_instances` : Number of cosmos client instances created by the application. e.g. '1'<br> `type_of_machine_architecture` : Machine architecture. e.g. 'X64'<br> `operating_system` : Operating System. e.g. 'Linux 5.4.0-1098-azure 104 18'<br> `runtime_framework` : Runtime Framework. e.g. '.NET Core 3.1.32'<br> `failover_information` : Generated key to determine if region failover enabled.

docs/database/database-spans.md

@@ -137,6 +137,7 @@ For batch operations, if the individual operations are known to have the same op
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
 
 **[11]:** SHOULD be collected by default only if there is sanitization that excludes sensitive information.
 

docs/database/mssql.md

@@ -53,6 +53,7 @@ In the case of `EXEC`, this SHOULD be the stored procedure name that is being ex
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
 
 **[10]:** SHOULD be collected by default only if there is sanitization that excludes sensitive information.
 

docs/database/sql.md

@@ -92,6 +92,7 @@ In the case of `EXEC`, this SHOULD be the stored procedure name that is being ex
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
 
 **[10]:** SHOULD be collected by default only if there is sanitization that excludes sensitive information.
 

model/trace/database.yaml

@@ -13,7 +13,7 @@ groups:
             Parameterized query text SHOULD be collected by default
             (the query parameter values themselves are opt-in,
             see [`db.query.parameter.<key>`](../../docs/attributes-registry/db.md)).
-        note:
+        note: >
           For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
 
           Even though parameterized query text can potentially have sensitive data, by using a parameterized query
@@ -28,7 +28,12 @@ groups:
     brief: This group defines the attributes used to perform database client calls.
     attributes:
       - ref: db.query.text
-        note: For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+        note: >
+          For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext)
+
+          For batch operations, if the individual operations are known to have the same query text
+          then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated
+          with separator `; ` or some other database system specific separator if more applicable.
         requirement_level:
           recommended: >
             SHOULD be collected by default only if there is sanitization that excludes sensitive information.