diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
index c71206c9dca0..76b74ad1a170 100644
--- a/docs/instrumentation-list.yaml
+++ b/docs/instrumentation-list.yaml
@@ -221,46 +221,6 @@ libraries:
           type: STRING
         - name: state
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.idle.max
-        description: The maximum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.idle.min
-        description: The minimum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.pending_requests
-        description: The number of current pending requests for an open connection.
-        type: LONG_SUM
-        unit: request
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   apache:
   - name: apache-dbcp-2.0
     description: |
@@ -308,39 +268,6 @@ libraries:
           type: STRING
         - name: state
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.idle.max
-        description: The maximum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.idle.min
-        description: The minimum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   - name: apache-dubbo-2.7
     description: The Apache Dubbo instrumentation provides client and server spans
       for Apache Dubbo RPC calls. Each call produces a span named after the Dubbo
@@ -1156,112 +1083,6 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: aws.agent
-          type: STRING
-        - name: aws.bucket.name
-          type: STRING
-        - name: aws.dynamodb.table_names
-          type: STRING_ARRAY
-        - name: aws.lambda.function.arn
-          type: STRING
-        - name: aws.lambda.function.name
-          type: STRING
-        - name: aws.lambda.resource_mapping.id
-          type: STRING
-        - name: aws.queue.name
-          type: STRING
-        - name: aws.queue.url
-          type: STRING
-        - name: aws.request_id
-          type: STRING
-        - name: aws.sns.topic.arn
-          type: STRING
-        - name: aws.step_functions.activity.arn
-          type: STRING
-        - name: aws.step_functions.state_machine.arn
-          type: STRING
-        - name: aws.stream.name
-          type: STRING
-        - name: aws.table.name
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: messaging.destination.name
-          type: STRING
-        - name: network.protocol.version
-          type: STRING
-        - name: rpc.method
-          type: STRING
-        - name: rpc.service
-          type: STRING
-        - name: rpc.system
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-      - span_kind: CONSUMER
-        attributes:
-        - name: aws.agent
-          type: STRING
-        - name: aws.queue.url
-          type: STRING
-        - name: aws.request_id
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: messaging.destination.name
-          type: STRING
-        - name: messaging.message.id
-          type: STRING
-        - name: messaging.operation
-          type: STRING
-        - name: messaging.system
-          type: STRING
-        - name: network.protocol.version
-          type: STRING
-        - name: rpc.method
-          type: STRING
-        - name: rpc.service
-          type: STRING
-        - name: rpc.system
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
   - name: aws-sdk-2.2
     description: |
       This instrumentation covers the AWS SDK 2.2+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, SNS/SQS and Bedrock.
@@ -1321,10 +1142,10 @@ libraries:
         attributes:
         - name: gen_ai.operation.name
           type: STRING
-        - name: gen_ai.request.model
-          type: STRING
         - name: gen_ai.provider.name
           type: STRING
+        - name: gen_ai.request.model
+          type: STRING
       - name: gen_ai.client.token.usage
         description: Measures number of input and output tokens used.
         type: HISTOGRAM
@@ -1332,10 +1153,10 @@ libraries:
         attributes:
         - name: gen_ai.operation.name
           type: STRING
-        - name: gen_ai.request.model
-          type: STRING
         - name: gen_ai.provider.name
           type: STRING
+        - name: gen_ai.request.model
+          type: STRING
         - name: gen_ai.token.type
           type: STRING
       spans:
@@ -1385,6 +1206,8 @@ libraries:
           type: STRING
         - name: gen_ai.operation.name
           type: STRING
+        - name: gen_ai.provider.name
+          type: STRING
         - name: gen_ai.request.max_tokens
           type: LONG
         - name: gen_ai.request.model
@@ -1397,8 +1220,6 @@ libraries:
           type: DOUBLE
         - name: gen_ai.response.finish_reasons
           type: STRING_ARRAY
-        - name: gen_ai.provider.name
-          type: STRING
         - name: gen_ai.usage.input_tokens
           type: LONG
         - name: gen_ai.usage.output_tokens
@@ -1433,6 +1254,8 @@ libraries:
           type: LONG
         - name: messaging.destination.name
           type: STRING
+        - name: messaging.header.Test_Message_Header
+          type: STRING_ARRAY
         - name: messaging.message.id
           type: STRING
         - name: messaging.operation
@@ -1465,6 +1288,8 @@ libraries:
           type: LONG
         - name: messaging.destination.name
           type: STRING
+        - name: messaging.header.Test_Message_Header
+          type: STRING_ARRAY
         - name: messaging.message.id
           type: STRING
         - name: messaging.operation
@@ -1483,324 +1308,95 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
+  azure:
+  - name: azure-core-1.14
+    description: This instrumentation enables context propagation for the Azure Core
+      library, it does not emit any telemetry on its own.
+    source_path: instrumentation/azure-core/azure-core-1.14
+    scope:
+      name: io.opentelemetry.azure-core-1.14
+    target_versions:
+      javaagent:
+      - com.azure:azure-core:[1.14.0,1.19.0)
+  - name: azure-core-1.19
+    description: This instrumentation enables context propagation for the Azure Core
+      library, it does not emit any telemetry on its own.
+    source_path: instrumentation/azure-core/azure-core-1.19
+    scope:
+      name: io.opentelemetry.azure-core-1.19
+    target_versions:
+      javaagent:
+      - com.azure:azure-core:[1.19.0,1.36.0)
+  - name: azure-core-1.36
+    description: This instrumentation enables context propagation for the Azure Core
+      library, it does not emit any telemetry on its own.
+    source_path: instrumentation/azure-core/azure-core-1.36
+    scope:
+      name: io.opentelemetry.azure-core-1.36
+    target_versions:
+      javaagent:
+      - com.azure:azure-core:[1.36.0,)
+  c3p0:
+  - name: c3p0-0.9
+    description: The c3p0 instrumentation provides connection pool metrics for c3p0
+      data sources.
+    source_path: instrumentation/c3p0-0.9
+    scope:
+      name: io.opentelemetry.c3p0-0.9
+    target_versions:
+      javaagent:
+      - com.mchange:c3p0:(,)
+      library:
+      - com.mchange:c3p0:0.9.2
+    telemetry:
+    - when: default
       metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
+      - name: db.client.connections.pending_requests
+        description: The number of pending requests for an open connection, cumulative
+          for the entire pool.
+        type: LONG_SUM
+        unit: requests
         attributes:
-        - name: db.operation.name
+        - name: pool.name
           type: STRING
-        - name: db.system.name
+      - name: db.client.connections.usage
+        description: The number of connections that are currently in state described
+          by the state attribute.
+        type: LONG_SUM
+        unit: connections
+        attributes:
+        - name: pool.name
+          type: STRING
+        - name: state
           type: STRING
+  camel:
+  - name: camel-2.20
+    description: |
+      This instrumentation enables tracing for Apache Camel 2.x applications by generating spans for each route execution. For Camel versions 3.5 and newer, users should instead use the native 'camel-opentelemetry' component provided directly by the Camel project.
+    source_path: instrumentation/camel-2.20
+    scope:
+      name: io.opentelemetry.camel-2.20
+    target_versions:
+      javaagent:
+      - org.apache.camel:camel-core:[2.19,3)
+    configurations:
+    - name: otel.instrumentation.camel.experimental-span-attributes
+      description: |
+        Enable the capture of experimental `camel.uri`, `camel.kafka.partitionKey`, `camel.kafka.key` and `camel.kafka.offset` span attributes.
+      type: boolean
+      default: false
+    telemetry:
+    - when: default
       spans:
       - span_kind: CLIENT
         attributes:
-        - name: aws.agent
-          type: STRING
-        - name: aws.bucket.name
+        - name: db.name
           type: STRING
-        - name: aws.dynamodb.global_secondary_indexes
+        - name: db.statement
           type: STRING
-        - name: aws.dynamodb.limit
+        - name: db.system
           type: STRING
-        - name: aws.dynamodb.provisioned_throughput.read_capacity_units
-          type: STRING
-        - name: aws.dynamodb.provisioned_throughput.write_capacity_units
-          type: STRING
-        - name: aws.dynamodb.select
-          type: STRING
-        - name: aws.lambda.function.arn
-          type: STRING
-        - name: aws.lambda.function.name
-          type: STRING
-        - name: aws.lambda.resource_mapping.id
-          type: STRING
-        - name: aws.queue.name
-          type: STRING
-        - name: aws.queue.url
-          type: STRING
-        - name: aws.request_id
-          type: STRING
-        - name: aws.secretsmanager.secret.arn
-          type: STRING
-        - name: aws.sns.topic.arn
-          type: STRING
-        - name: aws.step_functions.activity.arn
-          type: STRING
-        - name: aws.step_functions.state_machine.arn
-          type: STRING
-        - name: aws.stream.name
-          type: STRING
-        - name: aws.table.name
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: messaging.destination.name
-          type: STRING
-        - name: rpc.method
-          type: STRING
-        - name: rpc.service
-          type: STRING
-        - name: rpc.system
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-      - span_kind: CONSUMER
-        attributes:
-        - name: aws.agent
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: messaging.batch.message_count
-          type: LONG
-        - name: messaging.destination.name
-          type: STRING
-        - name: messaging.message.id
-          type: STRING
-        - name: messaging.operation
-          type: STRING
-        - name: messaging.system
-          type: STRING
-        - name: rpc.method
-          type: STRING
-        - name: rpc.service
-          type: STRING
-        - name: rpc.system
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-      - span_kind: PRODUCER
-        attributes:
-        - name: aws.agent
-          type: STRING
-        - name: aws.queue.url
-          type: STRING
-        - name: aws.request_id
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: messaging.destination.name
-          type: STRING
-        - name: messaging.message.id
-          type: STRING
-        - name: messaging.operation
-          type: STRING
-        - name: messaging.system
-          type: STRING
-        - name: rpc.method
-          type: STRING
-        - name: rpc.service
-          type: STRING
-        - name: rpc.system
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-  azure:
-  - name: azure-core-1.14
-    description: This instrumentation enables context propagation for the Azure Core
-      library, it does not emit any telemetry on its own.
-    source_path: instrumentation/azure-core/azure-core-1.14
-    scope:
-      name: io.opentelemetry.azure-core-1.14
-    target_versions:
-      javaagent:
-      - com.azure:azure-core:[1.14.0,1.19.0)
-  - name: azure-core-1.19
-    description: This instrumentation enables context propagation for the Azure Core
-      library, it does not emit any telemetry on its own.
-    source_path: instrumentation/azure-core/azure-core-1.19
-    scope:
-      name: io.opentelemetry.azure-core-1.19
-    target_versions:
-      javaagent:
-      - com.azure:azure-core:[1.19.0,1.36.0)
-  - name: azure-core-1.36
-    description: This instrumentation enables context propagation for the Azure Core
-      library, it does not emit any telemetry on its own.
-    source_path: instrumentation/azure-core/azure-core-1.36
-    scope:
-      name: io.opentelemetry.azure-core-1.36
-    target_versions:
-      javaagent:
-      - com.azure:azure-core:[1.36.0,)
-  c3p0:
-  - name: c3p0-0.9
-    description: The c3p0 instrumentation provides connection pool metrics for c3p0
-      data sources.
-    source_path: instrumentation/c3p0-0.9
-    scope:
-      name: io.opentelemetry.c3p0-0.9
-    target_versions:
-      javaagent:
-      - com.mchange:c3p0:(,)
-      library:
-      - com.mchange:c3p0:0.9.2
-    telemetry:
-    - when: default
-      metrics:
-      - name: db.client.connections.pending_requests
-        description: The number of pending requests for an open connection, cumulative
-          for the entire pool.
-        type: LONG_SUM
-        unit: requests
-        attributes:
-        - name: pool.name
-          type: STRING
-      - name: db.client.connections.usage
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connections
-        attributes:
-        - name: pool.name
-          type: STRING
-        - name: state
-          type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.pending_requests
-        description: The number of current pending requests for an open connection.
-        type: LONG_SUM
-        unit: request
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-  camel:
-  - name: camel-2.20
-    description: |
-      This instrumentation enables tracing for Apache Camel 2.x applications by generating spans for each route execution. For Camel versions 3.5 and newer, users should instead use the native 'camel-opentelemetry' component provided directly by the Camel project.
-    source_path: instrumentation/camel-2.20
-    scope:
-      name: io.opentelemetry.camel-2.20
-    target_versions:
-      javaagent:
-      - org.apache.camel:camel-core:[2.19,3)
-    configurations:
-    - name: otel.instrumentation.camel.experimental-span-attributes
-      description: |
-        Enable the capture of experimental `camel.uri`, `camel.kafka.partitionKey`, `camel.kafka.key` and `camel.kafka.offset` span attributes.
-      type: boolean
-      default: false
-    telemetry:
-    - when: default
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.name
-          type: STRING
-        - name: db.statement
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: url.full
-          type: STRING
-      - span_kind: INTERNAL
-        attributes:
-        - name: http.request.method
-          type: STRING
-        - name: messaging.destination.name
-          type: STRING
-        - name: messaging.message.id
-          type: STRING
-        - name: url.full
-          type: STRING
-      - span_kind: SERVER
-        attributes:
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: url.full
-          type: STRING
-    - when: otel.instrumentation.camel.experimental-span-attributes=true
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: camel.uri
-          type: STRING
-        - name: db.name
-          type: STRING
-        - name: db.statement
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: url.full
-          type: STRING
-      - span_kind: INTERNAL
-        attributes:
-        - name: camel.uri
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: messaging.destination.name
-          type: STRING
-        - name: messaging.message.id
-          type: STRING
-        - name: url.full
-          type: STRING
-      - span_kind: SERVER
-        attributes:
-        - name: camel.uri
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: http.response.status_code
-          type: LONG
-        - name: url.full
-          type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: http.request.method
+        - name: http.request.method
           type: STRING
         - name: http.response.status_code
           type: LONG
@@ -1864,30 +1460,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: network.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   - name: cassandra-4.0
     description: |
       Instruments the Cassandra database client, providing database client spans and metrics for Cassandra queries.
@@ -1921,49 +1493,13 @@ libraries:
           type: LONG
         - name: db.cassandra.table
           type: STRING
-        - name: db.name
-          type: STRING
-        - name: db.operation
-          type: STRING
-        - name: db.statement
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: network.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: cassandra.consistency.level
-          type: STRING
-        - name: cassandra.coordinator.dc
-          type: STRING
-        - name: cassandra.coordinator.id
-          type: STRING
-        - name: cassandra.page.size
-          type: LONG
-        - name: cassandra.query.idempotent
-          type: BOOLEAN
-        - name: cassandra.speculative_execution.count
-          type: LONG
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
+        - name: db.name
           type: STRING
-        - name: db.operation.name
+        - name: db.operation
           type: STRING
-        - name: db.query.text
+        - name: db.statement
           type: STRING
-        - name: db.system.name
+        - name: db.system
           type: STRING
         - name: network.peer.address
           type: STRING
@@ -2028,42 +1564,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: cassandra.consistency.level
-          type: STRING
-        - name: cassandra.coordinator.dc
-          type: STRING
-        - name: cassandra.coordinator.id
-          type: STRING
-        - name: cassandra.page.size
-          type: LONG
-        - name: cassandra.query.idempotent
-          type: BOOLEAN
-        - name: cassandra.speculative_execution.count
-          type: LONG
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: network.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   clickhouse:
   - name: clickhouse-client-0.5
     description: Instruments the V1 ClickHouseClient, providing database client spans
@@ -2096,42 +1596,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.response.status_code
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   couchbase:
   - name: couchbase-2.0
     description: |
@@ -2155,28 +1619,6 @@ libraries:
           type: STRING
         - name: db.system
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
   - name: couchbase-2.6
     description: |
       This instrumentation enables database CLIENT spans and metrics for Couchbase 2.6 operations. It automatically traces key-value operations (get, upsert, replace, remove), view queries, N1QL queries, and cluster management operations.
@@ -2211,60 +1653,6 @@ libraries:
           type: LONG
         - name: network.type
           type: STRING
-    - when: otel.instrumentation.couchbase.experimental-span-attributes=true
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: couchbase.local.address
-          type: STRING
-        - name: couchbase.operation_id
-          type: STRING
-        - name: db.name
-          type: STRING
-        - name: db.operation
-          type: STRING
-        - name: db.statement
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: network.type
-          type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: network.type
-          type: STRING
   - name: couchbase-3.1
     description: |
       Couchbase instrumentation is owned by the Couchbase project for versions 3+. This instrumentation automatically configures the instrumentation provided by the Couchbase library.
@@ -2360,40 +1748,6 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.elasticsearch.path_parts.id
-          type: STRING
-        - name: db.elasticsearch.path_parts.index
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
   - name: elasticsearch-rest-5.0
     description: This instrumentation enables database CLIENT spans and metrics for
       Elasticsearch REST clients.
@@ -2420,94 +1774,7 @@ libraries:
       spans:
       - span_kind: CLIENT
         attributes:
-        - name: db.system
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.system.name
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-  - name: elasticsearch-rest-6.4
-    description: This instrumentation enables database CLIENT spans and metrics for
-      Elasticsearch REST clients.
-    source_path: instrumentation/elasticsearch/elasticsearch-rest-6.4
-    scope:
-      name: io.opentelemetry.elasticsearch-rest-6.4
-    target_versions:
-      javaagent:
-      - org.elasticsearch.client:elasticsearch-rest-client:[6.4,7.0)
-    configurations:
-    - name: otel.instrumentation.elasticsearch.capture-search-query
-      description: |
-        Enable the capture of search query bodies. It is important to note that Elasticsearch queries may contain personal or sensitive information.
-      type: boolean
-      default: false
-    - name: otel.instrumentation.http.known-methods
-      description: |
-        Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.
-      type: list
-      default: CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
-    telemetry:
-    - when: default
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.system
-          type: STRING
-        - name: http.request.method
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-        - name: url.full
-          type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.system.name
+        - name: db.system
           type: STRING
         - name: http.request.method
           type: STRING
@@ -2517,17 +1784,15 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
-  - name: elasticsearch-rest-7.0
+  - name: elasticsearch-rest-6.4
     description: This instrumentation enables database CLIENT spans and metrics for
       Elasticsearch REST clients.
-    source_path: instrumentation/elasticsearch/elasticsearch-rest-7.0
+    source_path: instrumentation/elasticsearch/elasticsearch-rest-6.4
     scope:
-      name: io.opentelemetry.elasticsearch-rest-7.0
+      name: io.opentelemetry.elasticsearch-rest-6.4
     target_versions:
       javaagent:
-      - org.elasticsearch.client:elasticsearch-rest-client:[7.0,)
-      library:
-      - org.elasticsearch.client:elasticsearch-rest-client:7.0.0
+      - org.elasticsearch.client:elasticsearch-rest-client:[6.4,7.0)
     configurations:
     - name: otel.instrumentation.elasticsearch.capture-search-query
       description: |
@@ -2554,23 +1819,34 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.system.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
+  - name: elasticsearch-rest-7.0
+    description: This instrumentation enables database CLIENT spans and metrics for
+      Elasticsearch REST clients.
+    source_path: instrumentation/elasticsearch/elasticsearch-rest-7.0
+    scope:
+      name: io.opentelemetry.elasticsearch-rest-7.0
+    target_versions:
+      javaagent:
+      - org.elasticsearch.client:elasticsearch-rest-client:[7.0,)
+      library:
+      - org.elasticsearch.client:elasticsearch-rest-client:7.0.0
+    configurations:
+    - name: otel.instrumentation.elasticsearch.capture-search-query
+      description: |
+        Enable the capture of search query bodies. It is important to note that Elasticsearch queries may contain personal or sensitive information.
+      type: boolean
+      default: false
+    - name: otel.instrumentation.http.known-methods
+      description: |
+        Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.
+      type: list
+      default: CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
+    telemetry:
+    - when: default
       spans:
       - span_kind: CLIENT
         attributes:
-        - name: db.system.name
+        - name: db.system
           type: STRING
         - name: http.request.method
           type: STRING
@@ -2614,64 +1890,6 @@ libraries:
           type: STRING
         - name: network.peer.port
           type: LONG
-    - when: otel.instrumentation.elasticsearch.experimental-span-attributes=true
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.operation
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: elasticsearch.action
-          type: STRING
-        - name: elasticsearch.id
-          type: STRING
-        - name: elasticsearch.request
-          type: STRING
-        - name: elasticsearch.request.indices
-          type: STRING
-        - name: elasticsearch.request.write.type
-          type: STRING
-        - name: elasticsearch.response.status
-          type: LONG
-        - name: elasticsearch.shard.replication.failed
-          type: LONG
-        - name: elasticsearch.shard.replication.successful
-          type: LONG
-        - name: elasticsearch.shard.replication.total
-          type: LONG
-        - name: elasticsearch.type
-          type: STRING
-        - name: elasticsearch.version
-          type: LONG
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
   - name: elasticsearch-transport-5.3
     description: |
       This instrumentation enables CLIENT spans and metrics for Elasticsearch transport client requests. Each call produces a span named after the Elasticsearch action, enriched with transport-specific attributes.
@@ -2701,74 +1919,6 @@ libraries:
           type: STRING
         - name: network.peer.port
           type: LONG
-    - when: otel.instrumentation.elasticsearch.experimental-span-attributes=true
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.operation
-          type: STRING
-        - name: db.system
-          type: STRING
-        - name: elasticsearch.action
-          type: STRING
-        - name: elasticsearch.id
-          type: STRING
-        - name: elasticsearch.request
-          type: STRING
-        - name: elasticsearch.request.indices
-          type: STRING
-        - name: elasticsearch.request.search.types
-          type: STRING
-        - name: elasticsearch.request.write.type
-          type: STRING
-        - name: elasticsearch.request.write.version
-          type: LONG
-        - name: elasticsearch.response.status
-          type: LONG
-        - name: elasticsearch.shard.broadcast.failed
-          type: LONG
-        - name: elasticsearch.shard.broadcast.successful
-          type: LONG
-        - name: elasticsearch.shard.broadcast.total
-          type: LONG
-        - name: elasticsearch.shard.replication.failed
-          type: LONG
-        - name: elasticsearch.shard.replication.successful
-          type: LONG
-        - name: elasticsearch.shard.replication.total
-          type: LONG
-        - name: elasticsearch.type
-          type: STRING
-        - name: elasticsearch.version
-          type: LONG
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
   - name: elasticsearch-transport-6.0
     description: |
       This instrumentation enables CLIENT spans and metrics for Elasticsearch transport client requests. Each call produces a span named after the Elasticsearch action, enriched with transport-specific attributes.
@@ -2943,30 +2093,6 @@ libraries:
           type: STRING
         - name: db.system
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
   google:
   - name: google-http-client-1.19
     description: This instrumentation enables HTTP CLIENT spans and metrics for Google
@@ -3131,20 +2257,6 @@ libraries:
           type: STRING
         - name: graphql.operation.type
           type: STRING
-    - when: otel.instrumentation.graphql.data-fetcher.enabled=true
-      spans:
-      - span_kind: INTERNAL
-        attributes:
-        - name: graphql.document
-          type: STRING
-        - name: graphql.field.name
-          type: STRING
-        - name: graphql.field.path
-          type: STRING
-        - name: graphql.operation.name
-          type: STRING
-        - name: graphql.operation.type
-          type: STRING
   grizzly:
   - name: grizzly-2.3
     description: This instrumentation enables HTTP SERVER spans and metrics for Grizzly
@@ -3379,69 +2491,6 @@ libraries:
         attributes:
         - name: pool.name
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.create_time
-        description: The time it took to create a new connection.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.idle.min
-        description: The minimum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.pending_requests
-        description: The number of current pending requests for an open connection.
-        type: LONG_SUM
-        unit: request
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.timeouts
-        description: The number of connection timeouts that have occurred trying to
-          obtain a connection from the pool.
-        type: LONG_SUM
-        unit: timeout
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.use_time
-        description: The time between borrowing a connection and returning it to the
-          pool.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.wait_time
-        description: The time it took to obtain an open connection from the pool.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   http:
   - name: http-url-connection
     source_path: instrumentation/http-url-connection
@@ -4646,12 +3695,12 @@ libraries:
         attributes:
         - name: gen_ai.operation.name
           type: STRING
+        - name: gen_ai.provider.name
+          type: STRING
         - name: gen_ai.request.model
           type: STRING
         - name: gen_ai.response.model
           type: STRING
-        - name: gen_ai.provider.name
-          type: STRING
       - name: gen_ai.client.token.usage
         description: Measures number of input and output tokens used.
         type: HISTOGRAM
@@ -4659,12 +3708,12 @@ libraries:
         attributes:
         - name: gen_ai.operation.name
           type: STRING
+        - name: gen_ai.provider.name
+          type: STRING
         - name: gen_ai.request.model
           type: STRING
         - name: gen_ai.response.model
           type: STRING
-        - name: gen_ai.provider.name
-          type: STRING
         - name: gen_ai.token.type
           type: STRING
       spans:
@@ -4672,20 +3721,22 @@ libraries:
         attributes:
         - name: gen_ai.operation.name
           type: STRING
+        - name: gen_ai.provider.name
+          type: STRING
         - name: gen_ai.request.encoding_formats
           type: STRING_ARRAY
         - name: gen_ai.request.model
           type: STRING
         - name: gen_ai.response.model
           type: STRING
-        - name: gen_ai.provider.name
-          type: STRING
         - name: gen_ai.usage.input_tokens
           type: LONG
       - span_kind: INTERNAL
         attributes:
         - name: gen_ai.operation.name
           type: STRING
+        - name: gen_ai.provider.name
+          type: STRING
         - name: gen_ai.request.frequency_penalty
           type: DOUBLE
         - name: gen_ai.request.max_tokens
@@ -4708,8 +3759,6 @@ libraries:
           type: STRING
         - name: gen_ai.response.model
           type: STRING
-        - name: gen_ai.provider.name
-          type: STRING
         - name: gen_ai.usage.input_tokens
           type: LONG
         - name: gen_ai.usage.output_tokens
@@ -4772,32 +3821,6 @@ libraries:
           type: STRING
         - name: state
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.pending_requests
-        description: The number of current pending requests for an open connection.
-        type: LONG_SUM
-        unit: request
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   oshi:
   - name: oshi
     description: When the OSHI library is detected on the classpath, this instrumentation
@@ -4878,81 +3901,6 @@ libraries:
           type: STRING
         - name: direction
           type: STRING
-    - when: otel.instrumentation.oshi.experimental-metrics.enabled=true
-      metrics:
-      - name: runtime.java.cpu_time
-        description: Runtime Java CPU time
-        type: LONG_GAUGE
-        unit: ms
-        attributes:
-        - name: type
-          type: STRING
-      - name: runtime.java.memory
-        description: Runtime Java memory
-        type: LONG_SUM
-        unit: By
-        attributes:
-        - name: type
-          type: STRING
-      - name: system.disk.io
-        description: System disk IO
-        type: LONG_SUM
-        unit: By
-        attributes:
-        - name: device
-          type: STRING
-        - name: direction
-          type: STRING
-      - name: system.disk.operations
-        description: System disk operations
-        type: LONG_SUM
-        unit: operations
-        attributes:
-        - name: device
-          type: STRING
-        - name: direction
-          type: STRING
-      - name: system.memory.usage
-        description: System memory usage
-        type: LONG_SUM
-        unit: By
-        attributes:
-        - name: state
-          type: STRING
-      - name: system.memory.utilization
-        description: System memory utilization
-        type: DOUBLE_GAUGE
-        unit: '1'
-        attributes:
-        - name: state
-          type: STRING
-      - name: system.network.errors
-        description: System network errors
-        type: LONG_SUM
-        unit: errors
-        attributes:
-        - name: device
-          type: STRING
-        - name: direction
-          type: STRING
-      - name: system.network.io
-        description: System network IO
-        type: LONG_SUM
-        unit: By
-        attributes:
-        - name: device
-          type: STRING
-        - name: direction
-          type: STRING
-      - name: system.network.packets
-        description: System network packets
-        type: LONG_SUM
-        unit: packets
-        attributes:
-        - name: device
-          type: STRING
-        - name: direction
-          type: STRING
   payara:
   - name: payara
     source_path: instrumentation/payara
@@ -5669,16 +4617,8 @@ libraries:
       spans:
       - span_kind: CONSUMER
         attributes:
-        - name: messaging.operation
-          type: STRING
-    - when: otel.instrumentation.spring-integration.producer.enabled=true
-      spans:
-      - span_kind: CONSUMER
-        attributes:
-        - name: messaging.operation
-          type: STRING
-      - span_kind: PRODUCER
-        attributes:
+        - name: messaging.header.Test_Message_Header
+          type: STRING_ARRAY
         - name: messaging.operation
           type: STRING
   - name: spring-jms-2.0
@@ -5740,6 +4680,10 @@ libraries:
         attributes:
         - name: messaging.destination.name
           type: STRING
+        - name: messaging.header.Test_Message_Header
+          type: STRING_ARRAY
+        - name: messaging.header.Test_Message_Int_Header
+          type: STRING_ARRAY
         - name: messaging.message.id
           type: STRING
         - name: messaging.operation
@@ -5878,6 +4822,8 @@ libraries:
         attributes:
         - name: messaging.destination.name
           type: STRING
+        - name: messaging.header.Test_Message_Header
+          type: STRING_ARRAY
         - name: messaging.message.body.size
           type: LONG
         - name: messaging.operation
@@ -5935,16 +4881,6 @@ libraries:
           type: STRING
         - name: code.namespace
           type: STRING
-    - when: otel.instrumentation.spring-scheduling.experimental-span-attributes=true
-      spans:
-      - span_kind: INTERNAL
-        attributes:
-        - name: code.function
-          type: STRING
-        - name: code.namespace
-          type: STRING
-        - name: job.system
-          type: STRING
   - name: spring-security-config-6.0
     description: |
       This instrumentation does not emit any telemetry on its own. Instead, it captures enduser attributes, and is only enabled when at least one of the `enduser` configurations is enabled.
@@ -6200,16 +5136,6 @@ libraries:
           type: STRING
         - name: code.namespace
           type: STRING
-    - when: otel.instrumentation.spring-webmvc.experimental-span-attributes=true
-      spans:
-      - span_kind: INTERNAL
-        attributes:
-        - name: code.function
-          type: STRING
-        - name: code.namespace
-          type: STRING
-        - name: spring-webmvc.view.type
-          type: STRING
   - name: spring-webmvc-5.3
     description: |
       This instrumentation provides a library integration for Spring WebMVC controllers, that enables the creation of HTTP server spans and metrics for requests processed by the Spring servlet container.
@@ -6300,16 +5226,6 @@ libraries:
           type: STRING
         - name: code.namespace
           type: STRING
-    - when: otel.instrumentation.spring-webmvc.experimental-span-attributes=true
-      spans:
-      - span_kind: INTERNAL
-        attributes:
-        - name: code.function
-          type: STRING
-        - name: code.namespace
-          type: STRING
-        - name: spring-webmvc.view.type
-          type: STRING
   - name: spring-ws-2.0
     disabled_by_default: true
     source_path: instrumentation/spring/spring-ws-2.0
@@ -6415,46 +5331,6 @@ libraries:
           type: STRING
         - name: state
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.idle.max
-        description: The maximum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.idle.min
-        description: The minimum number of idle open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-      - name: db.client.connection.pending_requests
-        description: The number of current pending requests for an open connection.
-        type: LONG_SUM
-        unit: request
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   twilio:
   - name: twilio-6.6
     source_path: instrumentation/twilio-6.6
@@ -6651,46 +5527,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
-        - name: network.peer.address
-          type: STRING
-        - name: network.peer.port
-          type: LONG
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   - name: vertx-rx-java-3.5
     source_path: instrumentation/vertx/vertx-rx-java-3.5
     scope:
@@ -6724,42 +5560,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.response.status_code
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   - name: vertx-sql-client-5.0
     source_path: instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0
     minimum_java_version: 11
@@ -6787,42 +5587,6 @@ libraries:
           type: STRING
         - name: server.port
           type: LONG
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.operation.duration
-        description: Duration of database client operations.
-        type: HISTOGRAM
-        unit: s
-        attributes:
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
-      spans:
-      - span_kind: CLIENT
-        attributes:
-        - name: db.collection.name
-          type: STRING
-        - name: db.namespace
-          type: STRING
-        - name: db.operation.name
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.response.status_code
-          type: STRING
-        - name: error.type
-          type: STRING
-        - name: server.address
-          type: STRING
-        - name: server.port
-          type: LONG
   - name: vertx-web-3.0
     source_path: instrumentation/vertx/vertx-web-3.0
     scope:
@@ -6862,25 +5626,6 @@ libraries:
           type: STRING
         - name: state
           type: STRING
-    - when: otel.semconv-stability.opt-in=database
-      metrics:
-      - name: db.client.connection.count
-        description: The number of connections that are currently in state described
-          by the state attribute.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
-        - name: db.client.connection.state
-          type: STRING
-      - name: db.client.connection.max
-        description: The maximum number of open connections allowed.
-        type: LONG_SUM
-        unit: connection
-        attributes:
-        - name: db.client.connection.pool.name
-          type: STRING
   wicket:
   - name: wicket-8.0
     source_path: instrumentation/wicket-8.0