simplify

Author: jaydeluca

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

@@ -96,7 +96,6 @@ public static class Metric {
     private String name;
     private String description;
     private String type;
-    private String instrumentType;
 
     @Nullable
     @JsonProperty("is_monotonic")
@@ -114,7 +113,6 @@ public Metric(
       this.name = name;
       this.description = description;
       this.type = type;
-      this.instrumentType = "";
       this.isMonotonic = null;
       this.unit = unit;
       this.attributes = attributes;
@@ -124,30 +122,12 @@ public Metric(
         String name,
         String description,
         String type,
-        String instrumentType,
-        String unit,
-        List<TelemetryAttribute> attributes) {
-      this.name = name;
-      this.description = description;
-      this.type = type;
-      this.instrumentType = instrumentType;
-      this.isMonotonic = null;
-      this.unit = unit;
-      this.attributes = attributes;
-    }
-
-    public Metric(
-        String name,
-        String description,
-        String type,
-        String instrumentType,
         @Nullable Boolean isMonotonic,
         String unit,
         List<TelemetryAttribute> attributes) {
       this.name = name;
       this.description = description;
       this.type = type;
-      this.instrumentType = instrumentType;
       this.isMonotonic = isMonotonic;
       this.unit = unit;
       this.attributes = attributes;
@@ -157,7 +137,6 @@ public Metric() {
       this.name = "";
       this.description = "";
       this.type = "";
-      this.instrumentType = "";
       this.unit = "";
       this.attributes = new ArrayList<>();
     }
@@ -187,11 +166,38 @@ public void setType(String type) {
     }
 
     public String getInstrumentType() {
-      return instrumentType;
+      return inferInstrumentType(this.type, this.isMonotonic);
     }
 
-    public void setInstrumentType(String instrumentType) {
-      this.instrumentType = instrumentType;
+    /**
+     * Infers the InstrumentType from the MetricDataType string and isMonotonic flag.
+     *
+     * @param metricDataType the MetricDataType string (e.g., "LONG_SUM", "DOUBLE_GAUGE")
+     * @param isMonotonic whether the metric is monotonic (for SUM types), null if not applicable
+     * @return the inferred InstrumentType string
+     */
+    private static String inferInstrumentType(
+        String metricDataType, @Nullable Boolean isMonotonic) {
+      if (metricDataType == null || metricDataType.isEmpty()) {
+        return "";
+      }
+
+      return switch (metricDataType) {
+        case "HISTOGRAM", "EXPONENTIAL_HISTOGRAM", "SUMMARY" -> "histogram";
+        case "LONG_GAUGE", "DOUBLE_GAUGE" -> "gauge";
+        case "LONG_SUM", "DOUBLE_SUM" -> {
+          // Use isMonotonic flag to distinguish between COUNTER and UP_DOWN_COUNTER
+          if (isMonotonic != null && isMonotonic) {
+            yield "counter";
+          } else if (isMonotonic != null) {
+            yield "updowncounter";
+          } else {
+            // Unknown, default to counter
+            yield "counter";
+          }
+        }
+        default -> "";
+      };
     }
 
     @Nullable
@@ -229,7 +235,6 @@ public static class Builder {
       private String name = "";
       private String description = "";
       private String type = "";
-      private String instrumentType = "";
       @Nullable private Boolean isMonotonic = null;
       private String unit = "";
       private List<TelemetryAttribute> attributes = new ArrayList<>();
@@ -252,12 +257,6 @@ public Builder type(String type) {
         return this;
       }
 
-      @CanIgnoreReturnValue
-      public Builder instrumentType(String instrumentType) {
-        this.instrumentType = instrumentType;
-        return this;
-      }
-
       @CanIgnoreReturnValue
       public Builder isMonotonic(@Nullable Boolean isMonotonic) {
         this.isMonotonic = isMonotonic;
@@ -277,7 +276,7 @@ public Builder attributes(List<TelemetryAttribute> attributes) {
       }
 
       public Metric build() {
-        return new Metric(name, description, type, instrumentType, isMonotonic, unit, attributes);
+        return new Metric(name, description, type, isMonotonic, unit, attributes);
       }
     }
 

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedMetricsParser.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
 
 /**
  * This class is responsible for parsing metric-* files from the `.telemetry` directory of an
@@ -124,9 +123,7 @@ private static Map<String, EmittedMetrics> aggregateMetricsByScope(
             new EmittedMetrics.MetricsByScope(
                 scopeEntry.getKey(), new ArrayList<>(scopeEntry.getValue().values())));
       }
-      EmittedMetrics emittedMetrics = new EmittedMetrics(when, mergedScopes);
-      enrichMetricsWithInstrumentType(emittedMetrics);
-      result.put(when, emittedMetrics);
+      result.put(when, new EmittedMetrics(when, mergedScopes));
     }
     return result;
   }
@@ -164,69 +161,10 @@ public static Map<String, EmittedMetrics> parseMetrics(Map<String, StringBuilder
         deduplicatedScopes.add(
             new EmittedMetrics.MetricsByScope(scope, new ArrayList<>(dedupedMetrics.values())));
       }
-      EmittedMetrics emittedMetrics = new EmittedMetrics(when, deduplicatedScopes);
-      enrichMetricsWithInstrumentType(emittedMetrics);
-      metricsMap.put(when, emittedMetrics);
+      metricsMap.put(when, new EmittedMetrics(when, deduplicatedScopes));
     }
     return metricsMap;
   }
 
-  /**
-   * Infers the InstrumentType from the MetricDataType string and isMonotonic flag, since MetricData
-   * only contains the aggregated type (e.g., LONG_SUM, DOUBLE_GAUGE)
-   *
-   * @param metricDataType the MetricDataType string (e.g., "LONG_SUM", "DOUBLE_GAUGE")
-   * @param isMonotonic whether the metric is monotonic (for SUM types), null if not applicable
-   * @return the inferred InstrumentType string
-   */
-  private static String inferInstrumentType(String metricDataType, @Nullable Boolean isMonotonic) {
-    if (metricDataType == null || metricDataType.isEmpty()) {
-      return "UNKNOWN";
-    }
-
-    return switch (metricDataType) {
-      case "HISTOGRAM", "EXPONENTIAL_HISTOGRAM", "SUMMARY" -> "histogram";
-      case "LONG_GAUGE", "DOUBLE_GAUGE" -> "gauge";
-      case "LONG_SUM", "DOUBLE_SUM" -> {
-        // Use isMonotonic flag to distinguish between COUNTER and UP_DOWN_COUNTER
-        if (isMonotonic != null && isMonotonic) {
-          yield "counter";
-        } else if (isMonotonic != null) {
-          yield "updowncounter";
-        } else {
-          // Unknown, default to counter
-          yield "counter";
-        }
-      }
-      default -> "UNKNOWN";
-    };
-  }
-
-  /**
-   * Populates the instrumentType field for each metric based on its MetricDataType and isMonotonic
-   * flag. This is called after parsing the YAML to enrich the metric data with inferred instrument
-   * types.
-   *
-   * @param metrics the EmittedMetrics object to enrich
-   */
-  private static void enrichMetricsWithInstrumentType(EmittedMetrics metrics) {
-    if (metrics.getMetricsByScope() == null) {
-      return;
-    }
-
-    for (EmittedMetrics.MetricsByScope scope : metrics.getMetricsByScope()) {
-      if (scope.getMetrics() == null) {
-        continue;
-      }
-
-      for (EmittedMetrics.Metric metric : scope.getMetrics()) {
-        if (metric.getInstrumentType() == null || metric.getInstrumentType().isEmpty()) {
-          String inferredType = inferInstrumentType(metric.getType(), metric.getIsMonotonic());
-          metric.setInstrumentType(inferredType);
-        }
-      }
-    }
-  }
-
   private EmittedMetricsParser() {}
 }

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/MetricParser.java

@@ -120,7 +120,6 @@ public static Map<String, Map<String, AggregatedMetricInfo>> aggregateMetrics(
                             metric.getName(),
                             metric.getDescription(),
                             metric.getType(),
-                            metric.getInstrumentType(),
                             metric.getIsMonotonic(),
                             metric.getUnit()));
             if (metric.getAttributes() != null) {
@@ -153,7 +152,6 @@ public static Map<String, List<EmittedMetrics.Metric>> buildFilteredMetrics(
                   .name(aggInfo.name)
                   .description(aggInfo.description)
                   .type(aggInfo.type)
-                  .instrumentType(aggInfo.instrumentType)
                   .isMonotonic(aggInfo.isMonotonic)
                   .unit(aggInfo.unit)
                   .attributes(new ArrayList<>(aggInfo.attributes))
@@ -168,7 +166,6 @@ static class AggregatedMetricInfo {
       final String name;
       final String description;
       final String type;
-      final String instrumentType;
       @Nullable final Boolean isMonotonic;
       final String unit;
       final Set<TelemetryAttribute> attributes = new HashSet<>();
@@ -177,13 +174,11 @@ static class AggregatedMetricInfo {
           String name,
           String description,
           String type,
-          String instrumentType,
           @Nullable Boolean isMonotonic,
           String unit) {
         this.name = name;
         this.description = description;
         this.type = type;
-        this.instrumentType = instrumentType;
         this.isMonotonic = isMonotonic;
         this.unit = unit;
       }

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/utils/YamlHelperTest.java

@@ -388,7 +388,8 @@ void testMetricsParsing() throws Exception {
               metrics:
               - name: db.client.operation.duration
                 description: Duration of database client operations.
-                type: HISTOGRAM
+                instrument: histogram
+                data_type: HISTOGRAM
                 unit: s
                 attributes:
                 - name: db.namespace
@@ -406,6 +407,73 @@ void testMetricsParsing() throws Exception {
     assertThat(expectedYaml).isEqualTo(stringWriter.toString());
   }
 
+  @Test
+  void testMetricsWithDifferentInstrumentTypes() throws Exception {
+    List<InstrumentationModule> modules = new ArrayList<>();
+
+    List<EmittedMetrics.Metric> metrics =
+        List.of(
+            new EmittedMetrics.Metric("test.histogram", "desc", "HISTOGRAM", "s", emptyList()),
+            new EmittedMetrics.Metric("test.counter", "desc", "LONG_SUM", true, "1", emptyList()),
+            new EmittedMetrics.Metric(
+                "test.updowncounter", "desc", "LONG_SUM", false, "1", emptyList()),
+            new EmittedMetrics.Metric("test.gauge", "desc", "DOUBLE_GAUGE", "{test}", emptyList()));
+
+    modules.add(
+        new InstrumentationModule.Builder()
+            .srcPath("instrumentation/test/test-1.0")
+            .instrumentationName("test-1.0")
+            .namespace("test")
+            .group("test")
+            .metrics(Map.of("default", metrics))
+            .build());
+
+    StringWriter stringWriter = new StringWriter();
+    BufferedWriter writer = new BufferedWriter(stringWriter);
+
+    YamlHelper.generateInstrumentationYaml(modules, writer);
+    writer.flush();
+
+    String expectedYaml =
+        """
+        libraries:
+          test:
+          - name: test-1.0
+            source_path: instrumentation/test/test-1.0
+            scope:
+              name: io.opentelemetry.test-1.0
+            telemetry:
+            - when: default
+              metrics:
+              - name: test.counter
+                description: desc
+                instrument: counter
+                data_type: LONG_SUM
+                unit: '1'
+                attributes: []
+              - name: test.gauge
+                description: desc
+                instrument: gauge
+                data_type: DOUBLE_GAUGE
+                unit: '{test}'
+                attributes: []
+              - name: test.histogram
+                description: desc
+                instrument: histogram
+                data_type: HISTOGRAM
+                unit: s
+                attributes: []
+              - name: test.updowncounter
+                description: desc
+                instrument: updowncounter
+                data_type: LONG_SUM
+                unit: '1'
+                attributes: []
+        """;
+
+    assertThat(expectedYaml).isEqualTo(stringWriter.toString());
+  }
+
   @Test
   void testSpanParsing() throws Exception {
     List<InstrumentationModule> modules = new ArrayList<>();