Merge branch 'main' into add_metric_annotation_instrument

Author: Duncan-tree-zhou

docs/instrumentation-list.yaml

@@ -43,6 +43,10 @@ protected final InstrumentationExtension testing() {
     return testing;
   }
 
+  protected boolean isExperimentalSpanAttributesEnabled() {
+    return true;
+  }
+
   @Test
   void success() {
     AbstractTraced<T, U> traced = newTraced();
@@ -92,7 +96,10 @@ void canceled() {
 
     List<AttributeAssertion> attributeAssertions =
         codeFunctionAssertions(traced.getClass(), "completable");
-    attributeAssertions.add(equalTo(booleanKey(canceledKey()), true));
+
+    if (isExperimentalSpanAttributesEnabled()) {
+      attributeAssertions.add(equalTo(booleanKey(canceledKey()), true));
+    }
 
     testing.waitAndAssertTraces(
         trace ->

instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java

@@ -12,11 +12,6 @@ muzzle {
   }
 }
 
-tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.guava.experimental-span-attributes=true")
-}
-
 dependencies {
   bootstrap(project(":instrumentation:executors:bootstrap"))
 
@@ -47,7 +42,14 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
   }
 
+  val testExperimental by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.instrumentation.guava.experimental-span-attributes=true")
+  }
+
   check {
-    dependsOn(testStableSemconv, testBothSemconv)
+    dependsOn(testStableSemconv, testBothSemconv, testExperimental)
   }
 }

instrumentation/guava-10.0/javaagent/build.gradle.kts

@@ -14,6 +14,9 @@
 abstract class BaseGuavaWithSpanTest
     extends AbstractWithSpanTest<SettableFuture<String>, ListenableFuture<String>> {
 
+  static final boolean isExperimentalEnabled =
+      Boolean.getBoolean("otel.instrumentation.guava.experimental-span-attributes");
+
   @Override
   protected void complete(SettableFuture<String> future, String value) {
     future.set(value);
@@ -43,4 +46,9 @@ protected Throwable unwrapError(Throwable t) {
   protected String canceledKey() {
     return "guava.canceled";
   }
+
+  @Override
+  protected boolean isExperimentalSpanAttributesEnabled() {
+    return isExperimentalEnabled;
+  }
 }

instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/BaseGuavaWithSpanTest.java

@@ -0,0 +1,11 @@
+description: >
+  This instrumentation enables context propagation for Guava ListenableFuture, it does not emit
+  any telemetry on its own.
+features:
+  - CONTEXT_PROPAGATION
+library_link: https://github.com/google/guava
+configurations:
+  - name: otel.instrumentation.guava.experimental-span-attributes
+    description: Enables experimental span attribute `guava.canceled` for cancelled operations.
+    type: boolean
+    default: false

instrumentation/guava-10.0/metadata.yaml

@@ -1,9 +1,7 @@
-description: >
-  This instrumentation enables the generation of spans for Hibernate operations, including
-  session methods (e.g., `save`, `update`, `delete`), transaction commits, and query executions.
-library_link: https://github.com/hibernate/hibernate-orm
+description: This instrumentation enables spans for Hibernate ORM operations.
+library_link: https://hibernate.org/
 configurations:
   - name: otel.instrumentation.hibernate.experimental-span-attributes
+    description: Enables the experimental `hibernate.session_id` span attribute.
     type: boolean
-    description: Enables the addition of the experimental `hibernate.session_id` span attribute.
-    default: false
+    default: false

instrumentation/hibernate/hibernate-3.3/metadata.yaml

@@ -1,9 +1,7 @@
-description: >
-  This instrumentation enables the generation of spans for Hibernate operations, including
-  session methods (e.g., `save`, `update`, `delete`), transaction commits, and query executions.
-library_link: https://github.com/hibernate/hibernate-orm
+description: This instrumentation enables spans for Hibernate ORM operations.
+library_link: https://hibernate.org/
 configurations:
   - name: otel.instrumentation.hibernate.experimental-span-attributes
+    description: Enables the experimental `hibernate.session_id` span attribute.
     type: boolean
-    description: Enables the addition of the experimental `hibernate.session_id` span attribute.
-    default: false
+    default: false

instrumentation/hibernate/hibernate-4.0/metadata.yaml

@@ -1,9 +1,7 @@
-description: >
-  This instrumentation enables the generation of spans for Hibernate operations, including
-  session methods (e.g., `save`, `update`, `delete`), transaction commits, and query executions.
-library_link: https://github.com/hibernate/hibernate-orm
+description: This instrumentation enables spans for Hibernate ORM operations.
+library_link: https://hibernate.org/
 configurations:
   - name: otel.instrumentation.hibernate.experimental-span-attributes
+    description: Enables the experimental `hibernate.session_id` span attribute.
     type: boolean
-    description: Enables the addition of the experimental `hibernate.session_id` span attribute.
-    default: false
+    default: false

instrumentation/hibernate/hibernate-6.0/metadata.yaml

@@ -1,7 +1,7 @@
-description: This instrumentation enables the generation of spans for Hibernate stored procedure calls.
-library_link: https://github.com/hibernate/hibernate-orm
+description: This instrumentation enables spans for Hibernate stored procedure calls.
+library_link: https://hibernate.org/
 configurations:
   - name: otel.instrumentation.hibernate.experimental-span-attributes
+    description: Enables the experimental `hibernate.session_id` span attribute.
     type: boolean
-    description: Enables the addition of the experimental `hibernate.session_id` span attribute.
-    default: false
+    default: false

instrumentation/hibernate/hibernate-procedure-call-4.3/metadata.yaml

@@ -1,4 +1,6 @@
 description: >
-  This instrumentation does not emit any telemetry on its own. Instead, it enables context
-  propagation for Hibernate Reactive asynchronous operations.
+  This instrumentation enables context propagation for Hibernate Reactive, it does not emit any
+  telemetry on its own.
 library_link: https://hibernate.org/reactive/
+features:
+  - CONTEXT_PROPAGATION