merge

Author: jaydeluca

docs/instrumentation-list.yaml

@@ -2547,6 +2547,47 @@ 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.
@@ -3434,6 +3475,12 @@ libraries:
       spans:
       - span_kind: INTERNAL
         attributes: []
+    - when: otel.instrumentation.hibernate.experimental-span-attributes=true
+      spans:
+      - span_kind: INTERNAL
+        attributes:
+        - name: hibernate.session_id
+          type: STRING
   - name: hibernate-4.0
     description: This instrumentation enables the generation of `INTERNAL` spans for
       Hibernate operations, including session methods (e.g., `save`, `update`, `delete`),
@@ -3450,6 +3497,17 @@ libraries:
         span attribute.
       type: boolean
       default: false
+    telemetry:
+    - when: default
+      spans:
+      - span_kind: INTERNAL
+        attributes: []
+    - when: otel.instrumentation.hibernate.experimental-span-attributes=true
+      spans:
+      - span_kind: INTERNAL
+        attributes:
+        - name: hibernate.session_id
+          type: STRING
   - name: hibernate-6.0
     source_path: instrumentation/hibernate/hibernate-6.0
     minimum_java_version: 11
@@ -3458,6 +3516,17 @@ libraries:
     target_versions:
       javaagent:
       - org.hibernate:hibernate-core:[6.0.0.Final,)
+    telemetry:
+    - when: default
+      spans:
+      - span_kind: INTERNAL
+        attributes: []
+    - when: otel.instrumentation.hibernate.experimental-span-attributes=true
+      spans:
+      - span_kind: INTERNAL
+        attributes:
+        - name: hibernate.session_id
+          type: STRING
   - name: hibernate-procedure-call-4.3
     source_path: instrumentation/hibernate/hibernate-procedure-call-4.3
     scope:

instrumentation-docs/instrumentations.sh

@@ -66,8 +66,8 @@ readonly INSTRUMENTATIONS=(
   # "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-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"
@@ -145,6 +145,13 @@ readonly INSTRUMENTATIONS=(
   # "grpc-1.6:javaagent:testExperimental"
 
   "hibernate:hibernate-3.3:javaagent:test"
+  "hibernate:hibernate-3.3:javaagent:testExperimental"
+
+  "hibernate:hibernate-4.0:javaagent:test"
+  "hibernate:hibernate-4.0:javaagent:testExperimental"
+
+  "hibernate:hibernate-6.0:javaagent:test"
+  "hibernate:hibernate-6.0:javaagent:testExperimental"
 )
 
 #  Some instrumentation test suites don't run ARM, so we use colima to run them in an x86_64

instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java

@@ -8,6 +8,8 @@
 import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName;
+import static io.opentelemetry.javaagent.instrumentation.hibernate.ExperimentalTestHelper.experimental;
+import static io.opentelemetry.javaagent.instrumentation.hibernate.ExperimentalTestHelper.experimentalSatisfies;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
@@ -18,6 +20,7 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
 import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Named.named;
 
@@ -94,10 +97,11 @@ void testHibernateAction(Parameter parameter) {
                     assertTransactionCommitSpan(
                         span,
                         trace.getSpan(0),
-                        trace
-                            .getSpan(1)
-                            .getAttributes()
-                            .get(AttributeKey.stringKey("hibernate.session_id"))));
+                        experimental(
+                            trace
+                                .getSpan(1)
+                                .getAttributes()
+                                .get(AttributeKey.stringKey("hibernate.session_id")))));
           } else {
             trace.hasSpansSatisfyingExactlyInAnyOrder(
                 span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
@@ -113,10 +117,11 @@ void testHibernateAction(Parameter parameter) {
                     assertTransactionCommitSpan(
                         span,
                         trace.getSpan(0),
-                        trace
-                            .getSpan(1)
-                            .getAttributes()
-                            .get(AttributeKey.stringKey("hibernate.session_id"))));
+                        experimental(
+                            trace
+                                .getSpan(1)
+                                .getAttributes()
+                                .get(AttributeKey.stringKey("hibernate.session_id")))));
           }
         });
   }
@@ -161,10 +166,11 @@ void testAttachesStateToQuery(Parameter parameter) {
                     assertTransactionCommitSpan(
                         span,
                         trace.getSpan(0),
-                        trace
-                            .getSpan(1)
-                            .getAttributes()
-                            .get(AttributeKey.stringKey("hibernate.session_id")))));
+                        experimental(
+                            trace
+                                .getSpan(1)
+                                .getAttributes()
+                                .get(AttributeKey.stringKey("hibernate.session_id"))))));
   }
 
   @Test
@@ -356,9 +362,9 @@ private static SpanDataAssert assertSessionSpan(
         .hasKind(SpanKind.INTERNAL)
         .hasParent(parent)
         .hasAttributesSatisfyingExactly(
-            satisfies(
+            experimentalSatisfies(
                 AttributeKey.stringKey("hibernate.session_id"),
-                val -> val.isInstanceOf(String.class)));
+                val -> assertThat(val).isInstanceOf(String.class)));
   }
 
   private static SpanDataAssert assertTransactionCommitSpan(