3 and 4

Author: jaydeluca

docs/instrumentation-list.yaml

@@ -2547,47 +2547,6 @@ libraries:
         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
-          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-transport-5.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.
@@ -3455,7 +3414,9 @@ libraries:
           type: STRING
   hibernate:
   - name: hibernate-3.3
-    description: This instrumentation
+    description: This instrumentation enables the generation of `INTERNAL` spans for
+      Hibernate operations, including session methods (e.g., `save`, `update`, `delete`),
+      transaction commits, and query executions.
     source_path: instrumentation/hibernate/hibernate-3.3
     scope:
       name: io.opentelemetry.hibernate-3.3
@@ -3472,16 +3433,23 @@ libraries:
     - when: default
       spans:
       - span_kind: INTERNAL
-        attributes:
-        - name: hibernate.session_id
-          type: STRING
+        attributes: []
   - name: hibernate-4.0
+    description: This instrumentation enables the generation of `INTERNAL` spans for
+      Hibernate operations, including session methods (e.g., `save`, `update`, `delete`),
+      transaction commits, and query executions.
     source_path: instrumentation/hibernate/hibernate-4.0
     scope:
       name: io.opentelemetry.hibernate-4.0
     target_versions:
       javaagent:
       - org.hibernate:hibernate-core:[4.0.0.Final,6)
+    configurations:
+    - name: otel.instrumentation.hibernate.experimental-span-attributes
+      description: Enables the addition of the experimental `hibernate.session_id`
+        span attribute.
+      type: boolean
+      default: false
   - name: hibernate-6.0
     source_path: instrumentation/hibernate/hibernate-6.0
     minimum_java_version: 11

instrumentation-docs/instrumentations.sh

@@ -7,153 +7,155 @@ set -euo pipefail
 # shellcheck disable=SC2034
 readonly INSTRUMENTATIONS=(
   # <module path (colon-separated)> : <javaagent|library> : [ gradle-task-suffix ]
-  "activej-http-6.0:javaagent:test"
-  "akka:akka-http-10.0:javaagent:test"
-  "armeria:armeria-grpc-1.14:javaagent:test"
-  "apache-httpasyncclient-4.1:javaagent:test"
-  "alibaba-druid-1.0:javaagent:test"
-  "alibaba-druid-1.0:javaagent:testStableSemconv"
-  "apache-dbcp-2.0:javaagent:test"
-  "apache-dbcp-2.0:javaagent:testStableSemconv"
-  "apache-httpclient:apache-httpclient-2.0:javaagent:test"
-  "apache-httpclient:apache-httpclient-4.0:javaagent:test"
-  "apache-httpclient:apache-httpclient-4.3:library:test"
-  "apache-httpclient:apache-httpclient-5.0:javaagent:test"
-  "apache-dubbo-2.7:javaagent:testDubbo"
-  "c3p0-0.9:javaagent:test"
-  "c3p0-0.9:javaagent:testStableSemconv"
-  "clickhouse-client-0.5:javaagent:test"
-  "clickhouse-client-0.5:javaagent:testStableSemconv"
-  "aws-sdk:aws-sdk-1.11:javaagent:test"
-  "google-http-client-1.19:javaagent:test"
-  "http-url-connection:javaagent:test"
-  "java-http-client:javaagent:test"
-  "jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
-  "jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
-  "jodd-http-4.2:javaagent:test"
-  "netty:netty-3.8:javaagent:test"
-  "netty:netty-4.0:javaagent:test"
-  "netty:netty-4.1:javaagent:test"
-  "okhttp:okhttp-2.2:javaagent:test"
-  "okhttp:okhttp-3.0:javaagent:test"
-  "pekko:pekko-http-1.0:javaagent:test"
-  "play:play-ws:play-ws-1.0:javaagent:test"
-  "play:play-ws:play-ws-2.0:javaagent:test"
-  "play:play-ws:play-ws-2.1:javaagent:test"
-  "reactor:reactor-netty:reactor-netty-0.9:javaagent:test"
-  "reactor:reactor-netty:reactor-netty-1.0:javaagent:test"
-  "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
-  "vertx:vertx-http-client:vertx-http-client-3.0:javaagent:test"
-  "vertx:vertx-http-client:vertx-http-client-4.0:javaagent:test"
-  "vertx:vertx-http-client:vertx-http-client-5.0:javaagent:test"
-  "vertx:vertx-redis-client-4.0:javaagent:test"
-  "vertx:vertx-redis-client-4.0:javaagent:testStableSemconv"
-  "vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:test"
-  "vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:testStableSemconv"
-  "vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:test"
-  "vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:testStableSemconv"
-  "aws-sdk:aws-sdk-1.11:javaagent:testStableSemconv"
-  "aws-sdk:aws-sdk-2.2:javaagent:test"
-  "aws-sdk:aws-sdk-2.2:javaagent:testStableSemconv"
-  "aws-sdk:aws-sdk-2.2:javaagent:testBedrockRuntime"
-  "hikaricp-3.0:javaagent:test"
-  "hikaricp-3.0:javaagent:testStableSemconv"
-  "tomcat:tomcat-jdbc:javaagent:test"
-  "tomcat:tomcat-jdbc:javaagent:testStableSemconv"
-  "oshi:javaagent:test"
-  "oshi:javaagent:testExperimental"
-  "vibur-dbcp-11.0:javaagent:test"
-  "vibur-dbcp-11.0:javaagent:testStableSemconv"
-  "elasticsearch:elasticsearch-api-client-7.16:javaagent:test"
-  "elasticsearch:elasticsearch-api-client-7.16:javaagent:testStableSemconv"
-  "elasticsearch:elasticsearch-rest-7.0:javaagent:test"
-  "elasticsearch:elasticsearch-rest-7.0:javaagent:testStableSemconv"
-  "elasticsearch:elasticsearch-transport-5.0:javaagent:test"
-  "elasticsearch:elasticsearch-transport-5.0:javaagent:testStableSemconv"
-  "elasticsearch:elasticsearch-transport-5.0:javaagent:testExperimental"
-  "elasticsearch:elasticsearch-transport-5.3:javaagent:test"
-  "elasticsearch:elasticsearch-transport-5.3:javaagent:testStableSemconv"
-  "elasticsearch:elasticsearch-transport-5.3:javaagent:testExperimental"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6Test"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestStableSemconv"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestExperimental"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65Test"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestStableSemconv"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestExperimental"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7Test"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestStableSemconv"
-  "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestExperimental"
-  "apache-httpclient:apache-httpclient-5.2:library:test"
-  "armeria:armeria-1.3:javaagent:test"
-  "async-http-client:async-http-client-1.9:javaagent:test"
-  "async-http-client:async-http-client-2.0:javaagent:test"
-  "apache-dubbo-2.7:javaagent:testDubbo"
-  "finagle-http-23.11:javaagent:test"
-  "finatra-2.9:javaagent:test"
-  "spring:spring-batch-3.0:javaagent:test"
-  "spring:spring-data:spring-data-1.8:javaagent:test"
-  "spring:spring-integration-4.1:javaagent:test"
-  "spring:spring-integration-4.1:javaagent:testWithRabbitInstrumentation"
-  "spring:spring-integration-4.1:javaagent:testWithProducerInstrumentation"
-  "spring:spring-jms:spring-jms-2.0:javaagent:test"
-  "spring:spring-kafka-2.7:javaagent:test"
-  "spring:spring-kafka-2.7:javaagent:testNoReceiveTelemetry"
-  "spring:spring-pulsar-1.0:javaagent:test"
-  "spring:spring-rabbit-1.0:javaagent:test"
-  "spring:spring-rmi-4.0:javaagent:test"
-  "spring:spring-scheduling-3.1:javaagent:test"
-  "spring:spring-scheduling-3.1:javaagent:testExperimental"
-  "spring:spring-web:spring-web-3.1:library:test"
-  "spring:spring-web:spring-web-6.0:javaagent:test"
-  "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
-  "spring:spring-webflux:spring-webflux-5.3:library:test"
-  "spring:spring-webmvc:spring-webmvc-3.1:javaagent:test"
-  "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
-  "spring:spring-webmvc:spring-webmvc-5.3:library:test"
-  "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
-  "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
-  "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
-  "spring:spring-webmvc:spring-webmvc-6.0:javaagent:testExperimental"
-  "openai:openai-java-1.1:javaagent:test"
-  "aws-lambda:aws-lambda-core-1.0:javaagent:test"
-  "aws-lambda:aws-lambda-events-2.2:javaagent:test"
-  "aws-lambda:aws-lambda-events-3.11:library:test"
-  "cassandra:cassandra-3.0:javaagent:test"
-  "cassandra:cassandra-3.0:javaagent:testStableSemconv"
-  "cassandra:cassandra-4.0:javaagent:test"
-  "cassandra:cassandra-4.0:javaagent:testStableSemconv"
-  "cassandra:cassandra-4.4:javaagent:test"
-  "cassandra:cassandra-4.4:javaagent:testStableSemconv"
-  "camel-2.20:javaagent:test"
-  "camel-2.20:javaagent:testStableSemconv"
-  "camel-2.20:javaagent:testExperimental"
-  "couchbase:couchbase-2.0:javaagent:test"
-  "couchbase:couchbase-2.0:javaagent:testStableSemconv"
-  "couchbase:couchbase-2.6:javaagent:test"
-  "couchbase:couchbase-2.6:javaagent:testStableSemconv"
-  "couchbase:couchbase-2.6:javaagent:testExperimental"
-  "dropwizard:dropwizard-views-0.7:javaagent:test"
-  "geode-1.4:javaagent:test"
-  "geode-1.4:javaagent:testStableSemconv"
-  "grails-3.0:javaagent:test"
-  "grizzly-2.3:javaagent:test"
-  "gwt-2.0:javaagent:test"
-  "graphql-java:graphql-java-12.0:javaagent:test"
-  "graphql-java:graphql-java-20.0:javaagent:test"
-  "graphql-java:graphql-java-20.0:javaagent:testDataFetcher"
-  "grpc-1.6:javaagent:test"
-  "grpc-1.6:javaagent:testExperimental"
+  # "activej-http-6.0:javaagent:test"
+  # "akka:akka-http-10.0:javaagent:test"
+  # "armeria:armeria-grpc-1.14:javaagent:test"
+  # "apache-httpasyncclient-4.1:javaagent:test"
+  # "alibaba-druid-1.0:javaagent:test"
+  # "alibaba-druid-1.0:javaagent:testStableSemconv"
+  # "apache-dbcp-2.0:javaagent:test"
+  # "apache-dbcp-2.0:javaagent:testStableSemconv"
+  # "apache-httpclient:apache-httpclient-2.0:javaagent:test"
+  # "apache-httpclient:apache-httpclient-4.0:javaagent:test"
+  # "apache-httpclient:apache-httpclient-4.3:library:test"
+  # "apache-httpclient:apache-httpclient-5.0:javaagent:test"
+  # "apache-dubbo-2.7:javaagent:testDubbo"
+  # "c3p0-0.9:javaagent:test"
+  # "c3p0-0.9:javaagent:testStableSemconv"
+  #"clickhouse-client-0.5:javaagent:test"
+  #"clickhouse-client-0.5:javaagent:testStableSemconv"
+  #"aws-sdk:aws-sdk-1.11:javaagent:test"
+  # "google-http-client-1.19:javaagent:test"
+  # "http-url-connection:javaagent:test"
+  # "java-http-client:javaagent:test"
+  # "jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
+  # "jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
+  # "jodd-http-4.2:javaagent:test"
+  # "netty:netty-3.8:javaagent:test"
+  # "netty:netty-4.0:javaagent:test"
+  # "netty:netty-4.1:javaagent:test"
+  # "okhttp:okhttp-2.2:javaagent:test"
+  # "okhttp:okhttp-3.0:javaagent:test"
+  # "pekko:pekko-http-1.0:javaagent:test"
+  # "play:play-ws:play-ws-1.0:javaagent:test"
+  # "play:play-ws:play-ws-2.0:javaagent:test"
+  # "play:play-ws:play-ws-2.1:javaagent:test"
+  # "reactor:reactor-netty:reactor-netty-0.9:javaagent:test"
+  # "reactor:reactor-netty:reactor-netty-1.0:javaagent:test"
+  # "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
+  # "vertx:vertx-http-client:vertx-http-client-3.0:javaagent:test"
+  # "vertx:vertx-http-client:vertx-http-client-4.0:javaagent:test"
+  # "vertx:vertx-http-client:vertx-http-client-5.0:javaagent:test"
+  #"vertx:vertx-redis-client-4.0:javaagent:test"
+  #"vertx:vertx-redis-client-4.0:javaagent:testStableSemconv"
+  #"vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:test"
+  #"vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:testStableSemconv"
+  #"vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:test"
+  #"vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:testStableSemconv"
+  #"aws-sdk:aws-sdk-1.11:javaagent:testStableSemconv"
+  #"aws-sdk:aws-sdk-2.2:javaagent:test"
+  #"aws-sdk:aws-sdk-2.2:javaagent:testStableSemconv"
+  #"aws-sdk:aws-sdk-2.2:javaagent:testBedrockRuntime"
+  # "hikaricp-3.0:javaagent:test"
+  # "hikaricp-3.0:javaagent:testStableSemconv"
+  # "tomcat:tomcat-jdbc:javaagent:test"
+  # "tomcat:tomcat-jdbc:javaagent:testStableSemconv"
+  # "oshi:javaagent:test"
+  # "oshi:javaagent:testExperimental"
+  # "vibur-dbcp-11.0:javaagent:test"
+  # "vibur-dbcp-11.0:javaagent:testStableSemconv"
+  #"elasticsearch:elasticsearch-api-client-7.16:javaagent:test"
+  #"elasticsearch:elasticsearch-api-client-7.16:javaagent:testStableSemconv"
+  # "elasticsearch:elasticsearch-rest-7.0:javaagent:test"
+  # "elasticsearch:elasticsearch-rest-7.0:javaagent:testStableSemconv"
+  # "elasticsearch:elasticsearch-transport-5.0:javaagent:test"
+  # "elasticsearch:elasticsearch-transport-5.0:javaagent:testStableSemconv"
+  # "elasticsearch:elasticsearch-transport-5.0:javaagent:testExperimental"
+  # "elasticsearch:elasticsearch-transport-5.3:javaagent:test"
+  # "elasticsearch:elasticsearch-transport-5.3:javaagent:testStableSemconv"
+  # "elasticsearch:elasticsearch-transport-5.3:javaagent:testExperimental"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6Test"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestStableSemconv"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestExperimental"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65Test"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestStableSemconv"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestExperimental"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7Test"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestStableSemconv"
+  # "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestExperimental"
+  # "apache-httpclient:apache-httpclient-5.2:library:test"
+  # "armeria:armeria-1.3:javaagent:test"
+  # "async-http-client:async-http-client-1.9:javaagent:test"
+  # "async-http-client:async-http-client-2.0:javaagent:test"
+  # "apache-dubbo-2.7:javaagent:testDubbo"
+  # "finagle-http-23.11:javaagent:test"
+  # "finatra-2.9:javaagent:test"
+  # "spring:spring-batch-3.0:javaagent:test"
+  # "spring:spring-data:spring-data-1.8:javaagent:test"
+  #"spring:spring-integration-4.1:javaagent:test"
+  #"spring:spring-integration-4.1:javaagent:testWithRabbitInstrumentation"
+  #"spring:spring-integration-4.1:javaagent:testWithProducerInstrumentation"
+  # "spring:spring-jms:spring-jms-2.0:javaagent:test"
+  #"spring:spring-kafka-2.7:javaagent:test"
+  #"spring:spring-kafka-2.7:javaagent:testNoReceiveTelemetry"
+  #"spring:spring-pulsar-1.0:javaagent:test"
+  #"spring:spring-rabbit-1.0:javaagent:test"
+  # "spring:spring-rmi-4.0:javaagent:test"
+  # "spring:spring-scheduling-3.1:javaagent:test"
+  # "spring:spring-scheduling-3.1:javaagent:testExperimental"
+  # "spring:spring-web:spring-web-3.1:library:test"
+  # "spring:spring-web:spring-web-6.0:javaagent:test"
+  # "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
+  # "spring:spring-webflux:spring-webflux-5.3:library:test"
+  # "spring:spring-webmvc:spring-webmvc-3.1:javaagent:test"
+  # "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
+  # "spring:spring-webmvc:spring-webmvc-5.3:library:test"
+  # "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
+  # "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
+  # "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
+  # "spring:spring-webmvc:spring-webmvc-6.0:javaagent:testExperimental"
+  # "openai:openai-java-1.1:javaagent:test"
+  # "aws-lambda:aws-lambda-core-1.0:javaagent:test"
+  # "aws-lambda:aws-lambda-events-2.2:javaagent:test"
+  # "aws-lambda:aws-lambda-events-3.11:library:test"
+  #"cassandra:cassandra-3.0:javaagent:test"
+  #"cassandra:cassandra-3.0:javaagent:testStableSemconv"
+  #"cassandra:cassandra-4.0:javaagent:test"
+  #"cassandra:cassandra-4.0:javaagent:testStableSemconv"
+  #"cassandra:cassandra-4.4:javaagent:test"
+  #"cassandra:cassandra-4.4:javaagent:testStableSemconv"
+  #"camel-2.20:javaagent:test"
+  #"camel-2.20:javaagent:testStableSemconv"
+  #"camel-2.20:javaagent:testExperimental"
+  # "couchbase:couchbase-2.0:javaagent:test"
+  # "couchbase:couchbase-2.0:javaagent:testStableSemconv"
+  # "couchbase:couchbase-2.6:javaagent:test"
+  # "couchbase:couchbase-2.6:javaagent:testStableSemconv"
+  # "couchbase:couchbase-2.6:javaagent:testExperimental"
+  # "dropwizard:dropwizard-views-0.7:javaagent:test"
+  # "geode-1.4:javaagent:test"
+  # "geode-1.4:javaagent:testStableSemconv"
+  # "grails-3.0:javaagent:test"
+  # "grizzly-2.3:javaagent:test"
+  #"gwt-2.0:javaagent:test"
+  # "graphql-java:graphql-java-12.0:javaagent:test"
+  # "graphql-java:graphql-java-20.0:javaagent:test"
+  # "graphql-java:graphql-java-20.0:javaagent:testDataFetcher"
+  # "grpc-1.6:javaagent:test"
+  # "grpc-1.6:javaagent:testExperimental"
+
+  "hibernate:hibernate-3.3:javaagent:test"
 )
 
 #  Some instrumentation test suites don't run ARM, so we use colima to run them in an x86_64
 #  container.
 # shellcheck disable=SC2034
 readonly COLIMA_INSTRUMENTATIONS=(
-  "spring:spring-jms:spring-jms-6.0:javaagent:test"
-  "elasticsearch:elasticsearch-rest-6.4:javaagent:test"
-  "elasticsearch:elasticsearch-rest-6.4:javaagent:testStableSemconv"
+  # "spring:spring-jms:spring-jms-6.0:javaagent:test"
+  # "elasticsearch:elasticsearch-rest-6.4:javaagent:test"
+  # "elasticsearch:elasticsearch-rest-6.4:javaagent:testStableSemconv"
   "elasticsearch:elasticsearch-rest-5.0:javaagent:test"
   "elasticsearch:elasticsearch-rest-5.0:javaagent:testStableSemconv"
-  "oracle-ucp-11.2:javaagent:test"
-  "oracle-ucp-11.2:javaagent:testStableSemconv"
+  # "oracle-ucp-11.2:javaagent:test"
+  # "oracle-ucp-11.2:javaagent:testStableSemconv"
 )