add new classifications

Author: jaydeluca

docs/instrumentation-list.yaml

@@ -62,6 +62,8 @@ libraries:
     description: This instrumentation provides context propagation for Akka actors,
       it does not emit any telemetry on its own.
     source_path: instrumentation/akka/akka-actor-2.3
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.akka-actor-2.3
     target_versions:
@@ -73,6 +75,8 @@ libraries:
     description: This instrumentation provides context propagation for the Akka Fork-Join
       Pool, it does not emit any telemetry on its own.
     source_path: instrumentation/akka/akka-actor-fork-join-2.5
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.akka-actor-fork-join-2.5
     target_versions:
@@ -668,6 +672,8 @@ libraries:
     description: |
       This instrumentation does not emit telemetry on its own. Instead, it augments existing SERVER spans and HTTP server metrics with the HTTP route and Shenyu specific attributes.
     source_path: instrumentation/apache-shenyu-2.4
+    classification:
+    - enricher
     scope:
       name: io.opentelemetry.apache-shenyu-2.4
     target_versions:
@@ -913,6 +919,8 @@ libraries:
     description: |
       This instrumentation does not emit telemetry on its own. Instead, it hooks into the Avaje Jex Context to extract the HTTP route and attach it to existing SERVER spans and HTTP server metrics.
     source_path: instrumentation/avaje-jex-3.0
+    classification:
+    - enricher
     minimum_java_version: 21
     scope:
       name: io.opentelemetry.avaje-jex-3.0
@@ -983,6 +991,14 @@ libraries:
           type: STRING
         - name: user_agent.original
           type: STRING
+  - name: aws-lambda-events-3.11
+    source_path: instrumentation/aws-lambda/aws-lambda-events-3.11
+    scope:
+      name: io.opentelemetry.aws-lambda-events-3.11
+    target_versions:
+      library:
+      - com.amazonaws:aws-lambda-java-events:3.11.0
+      - com.amazonaws:aws-lambda-java-core:1.0.0
   - name: aws-sdk-1.11
     description: |
       This instrumentation covers the AWS SDK 1.11+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, secrets manager, SNS/SQS and step functions.
@@ -1572,6 +1588,8 @@ libraries:
     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
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.azure-core-1.14
     target_versions:
@@ -1581,6 +1599,8 @@ libraries:
     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
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.azure-core-1.19
     target_versions:
@@ -1590,6 +1610,8 @@ libraries:
     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
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.azure-core-1.36
     target_versions:
@@ -2217,6 +2239,8 @@ libraries:
     description: |
       Couchbase instrumentation is owned by the Couchbase project for versions 3+. This instrumentation automatically configures the instrumentation provided by the Couchbase library.
     source_path: instrumentation/couchbase/couchbase-3.1
+    classification:
+    - configuration
     scope:
       name: io.opentelemetry.couchbase-3.1
     target_versions:
@@ -2226,6 +2250,8 @@ libraries:
     description: |
       Couchbase instrumentation is owned by the Couchbase project for versions 3+. This instrumentation automatically configures the instrumentation provided by the Couchbase library.
     source_path: instrumentation/couchbase/couchbase-3.1.6
+    classification:
+    - configuration
     scope:
       name: io.opentelemetry.couchbase-3.1.6
     target_versions:
@@ -2235,6 +2261,8 @@ libraries:
     description: |
       Couchbase instrumentation is owned by the Couchbase project for versions 3+. This instrumentation automatically configures the instrumentation provided by the Couchbase library.
     source_path: instrumentation/couchbase/couchbase-3.2
+    classification:
+    - configuration
     scope:
       name: io.opentelemetry.couchbase-3.2
     target_versions:
@@ -2817,6 +2845,8 @@ libraries:
     description: |
       The executor instrumentation ensures that context is automatically propagated when using common Java executors (e.g., ThreadPoolExecutor, ScheduledThreadPoolExecutor, ForkJoinPool). When a task is submitted, the current context is captured and bound to the task. Then, when the task eventually runs, even if it’s on a different thread, the instrumentation reactivates that context, enabling consistent correlation across concurrent and asynchronous workflows.
     source_path: instrumentation/executors
+    classification:
+    - propagator
     scope:
       name: io.opentelemetry.executors
     target_versions:
@@ -5220,6 +5250,8 @@ libraries:
     description: |
       This instrumentation does not emit telemetry on its own. Instead, it extracts the HTTP route and attaches it to SERVER spans and HTTP server metrics.
     source_path: instrumentation/spark-2.3
+    classification:
+    - enricher
     scope:
       name: io.opentelemetry.spark-2.3
     target_versions:
@@ -5648,6 +5680,8 @@ libraries:
       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.
       NOTE: The `enduser` attributes have been deprecated and will be removed in 3.0+ of the java agent.
     source_path: instrumentation/spring/spring-security-config-6.0
+    classification:
+    - enricher
     minimum_java_version: 17
     scope:
       name: io.opentelemetry.spring-security-config-6.0

instrumentation-docs/readme.md

@@ -108,9 +108,12 @@ public class SpringWebInstrumentationModule extends InstrumentationModule
 ## Instrumentation metadata
 
 * classification
-  * `library` - Instrumentation that targets a library
-  * `internal` - Instrumentation that is used internally by the OpenTelemetry Java Agent
-  * `custom` - Utilities that are used to create custom instrumentation
+  * `library` - Instrumentation that targets a library.
+  * `internal` - Instrumentation that is used internally by the OpenTelemetry Java Agent.
+  * `custom` - Utilities that are used by end users to create custom instrumentation.
+  * `enricher` - Instrumentation that enriches the telemetry produced by other instrumentations but does not generate or emit telemetry on its own.
+  * `propagator` - Instrumentation that acts as a bridge for context propagation but does not generate or emit telemetry on its own.
+  * `configuration` - Instrumentation that configures or sets up native library instrumentation.
 * name
   * Identifier for instrumentation module, used to enable/disable
   * Configured in `InstrumentationModule` code for each module
@@ -147,7 +150,9 @@ As of now, the following fields are supported, all of which are optional:
 ```yaml
 description: "Instruments..."   # Description of the instrumentation module
 disabled_by_default: true       # Defaults to `false`
-classification: internal        # instrumentation classification: library | internal | custom
+classification:
+  - library
+  - enricher
 configurations:
   - name: otel.instrumentation.common.db-statement-sanitizer.enabled
     description: Enables statement sanitization for database queries.

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/DocGeneratorApplication.java

@@ -49,6 +49,7 @@ public static void main(String[] args) throws IOException {
     printStats(modules);
   }
 
+  @SuppressWarnings("unused") // temporary helper method used for project tracking
   private static void printStats(List<InstrumentationModule> modules) {
     List<InstrumentationModule> metadata =
         modules.stream().filter(m -> m.getMetadata() != null).toList();
@@ -86,16 +87,14 @@ private static void printStats(List<InstrumentationModule> modules) {
   }
 
   private static String getClassificationStats(List<InstrumentationModule> modules) {
+    // Flatten all classifications and count each individually
     return modules.stream()
-        .collect(
-            Collectors.groupingBy(
-                m -> m.getMetadata().getClassification(), TreeMap::new, Collectors.toList()))
+        .flatMap(m -> m.getMetadata().getClassifications().stream())
+        .map(c -> c.name().toLowerCase(Locale.ROOT))
+        .collect(Collectors.groupingBy(c -> c, TreeMap::new, Collectors.counting()))
         .entrySet()
         .stream()
-        .map(
-            entry ->
-                String.format(
-                    Locale.getDefault(FORMAT), "\t%s: %d", entry.getKey(), entry.getValue().size()))
+        .map(entry -> String.format(Locale.ROOT, "\t%s: %d", entry.getKey(), entry.getValue()))
         .collect(Collectors.joining("\n"));
   }
 

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationClassification.java

@@ -15,7 +15,10 @@
 public enum InstrumentationClassification {
   LIBRARY,
   CUSTOM,
-  INTERNAL;
+  INTERNAL,
+  ENRICHER,
+  CONFIGURATION,
+  PROPAGATOR;
 
   @Nullable
   public static InstrumentationClassification fromString(@Nullable String type) {
@@ -26,6 +29,9 @@ public static InstrumentationClassification fromString(@Nullable String type) {
       case "library" -> LIBRARY;
       case "internal" -> INTERNAL;
       case "custom" -> CUSTOM;
+      case "enricher" -> ENRICHER;
+      case "configuration" -> CONFIGURATION;
+      case "propagator" -> PROPAGATOR;
       default -> null;
     };
   }

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationMetaData.java

@@ -5,11 +5,12 @@
 
 package io.opentelemetry.instrumentation.docs.internal;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -23,35 +24,37 @@ public class InstrumentationMetaData {
   @Nullable
   private Boolean disabledByDefault;
 
-  private String classification;
+  private List<String> classifications;
 
-  private List<ConfigurationOption> configurations = Collections.emptyList();
+  private List<ConfigurationOption> configurations = emptyList();
 
   public InstrumentationMetaData() {
-    this.classification = InstrumentationClassification.LIBRARY.toString();
+    this.classifications = singletonList(InstrumentationClassification.LIBRARY.name());
   }
 
   public InstrumentationMetaData(
       @Nullable String description,
-      String classification,
+      @Nullable List<String> classifications,
       @Nullable Boolean disabledByDefault,
       @Nullable List<ConfigurationOption> configurations) {
-    this.classification = classification;
+    this.classifications =
+        Objects.requireNonNullElse(
+            classifications, singletonList(InstrumentationClassification.LIBRARY.name()));
     this.disabledByDefault = disabledByDefault;
     this.description = description;
-    this.configurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
+    this.configurations = Objects.requireNonNullElse(configurations, emptyList());
   }
 
   @Nullable
   public String getDescription() {
     return description;
   }
 
-  @Nonnull
-  public InstrumentationClassification getClassification() {
-    return Objects.requireNonNullElse(
-        InstrumentationClassification.fromString(classification),
-        InstrumentationClassification.LIBRARY);
+  public List<InstrumentationClassification> getClassifications() {
+    if (classifications == null || classifications.isEmpty()) {
+      return singletonList(InstrumentationClassification.LIBRARY);
+    }
+    return classifications.stream().map(InstrumentationClassification::fromString).toList();
   }
 
   public Boolean getDisabledByDefault() {
@@ -62,8 +65,11 @@ public void setDescription(@Nullable String description) {
     this.description = description;
   }
 
-  public void setClassification(String classification) {
-    this.classification = classification;
+  public void setClassifications(@Nullable List<String> classifications) {
+    this.classifications =
+        (classifications == null || classifications.isEmpty())
+            ? singletonList(InstrumentationClassification.LIBRARY.name())
+            : classifications;
   }
 
   public void setDisabledByDefault(@Nullable Boolean disabledByDefault) {
@@ -75,6 +81,6 @@ public List<ConfigurationOption> getConfigurations() {
   }
 
   public void setConfigurations(@Nullable List<ConfigurationOption> configurations) {
-    this.configurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
+    this.configurations = Objects.requireNonNullElse(configurations, emptyList());
   }
 }

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationMetaDataDeserializer.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.docs.internal;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import javax.annotation.Nullable;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class InstrumentationMetaDataDeserializer
+    extends JsonDeserializer<InstrumentationMetaData> {
+
+  @Override
+  public InstrumentationMetaData deserialize(JsonParser p, DeserializationContext ctx)
+      throws IOException {
+    JsonNode node = p.getCodec().readTree(p);
+
+    String description = textOrNull(node, "description");
+    Boolean disabledByDefault = boolOrNull(node, "disabled_by_default");
+
+    List<String> classifications = readClassifications(node.path("classification"));
+    List<ConfigurationOption> configurations = readConfigurations(node.path("configurations"));
+
+    return new InstrumentationMetaData(
+        description, classifications, disabledByDefault, configurations);
+  }
+
+  @Nullable
+  private static String textOrNull(JsonNode parent, String field) {
+    JsonNode n = parent.path(field);
+    return n.isMissingNode() || n.isNull() ? null : n.asText();
+  }
+
+  @Nullable
+  private static Boolean boolOrNull(JsonNode parent, String field) {
+    JsonNode n = parent.path(field);
+    return (n.isMissingNode() || n.isNull()) ? null : n.asBoolean();
+  }
+
+  private static List<String> readClassifications(JsonNode node) {
+    if (node.isMissingNode() || node.isNull()) {
+      return List.of(InstrumentationClassification.LIBRARY.name());
+    }
+    List<String> out = new ArrayList<>();
+    if (node.isArray()) {
+      for (JsonNode c : node) {
+        if (c.isTextual()) {
+          out.add(c.asText());
+        }
+      }
+    } else if (node.isTextual()) {
+      out.add(node.asText());
+    }
+    if (out.isEmpty()) {
+      out.add(InstrumentationClassification.LIBRARY.name());
+    }
+    return unmodifiableList(out);
+  }
+
+  private static List<ConfigurationOption> readConfigurations(JsonNode configs) {
+    if (!configs.isArray()) {
+      return emptyList();
+    }
+    List<ConfigurationOption> out = new ArrayList<>(configs.size());
+    int i = 0;
+    for (JsonNode cfg : configs) {
+      String name = Objects.requireNonNull(textOrNull(cfg, "name"));
+      String desc = Objects.requireNonNull(textOrNull(cfg, "description"));
+      String def = Objects.requireNonNull(textOrNull(cfg, "default"));
+      String typeStr = Objects.requireNonNull(textOrNull(cfg, "type"));
+
+      ConfigurationType type;
+      try {
+        type = ConfigurationType.valueOf(typeStr.toUpperCase(Locale.ROOT));
+      } catch (IllegalArgumentException ex) {
+        throw new IllegalArgumentException(
+            "configurations[" + i + "].type invalid: '" + typeStr + "'", ex);
+      }
+      out.add(new ConfigurationOption(name, desc, def, type));
+      i++;
+    }
+    return unmodifiableList(out);
+  }
+}