add test

Author: zeitlinger

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java

@@ -38,7 +38,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -52,7 +51,9 @@ class Otel2PrometheusConverterTest {
 
   private static final Pattern PATTERN =
       Pattern.compile(
-          "# HELP (?<help>.*)\n# TYPE (?<type>.*)\n(?<metricName>.*)\\{otel_scope_name=\"scope\"}(.|\\n)*");
+          "(.|\\n)*# HELP (?<help>.*)\n# TYPE (?<type>.*)\n(?<metricName>.*)\\{"
+              + "otel_scope_foo=\"bar\",otel_scope_name=\"scope\","
+              + "otel_scope_schema_url=\"schemaUrl\",otel_scope_version=\"version\"}(.|\\n)*");
 
   private final Otel2PrometheusConverter converter =
       new Otel2PrometheusConverter(true, /* allowedResourceAttributesFilter= */ null);
@@ -67,16 +68,17 @@ void metricMetadata(
     ExpositionFormats.init().getPrometheusTextFormatWriter().write(out, snapshots);
     String expositionFormat = new String(out.toByteArray(), StandardCharsets.UTF_8);
 
-    // Uncomment to debug exposition format output
-    // System.out.println(expositionFormat);
-
-    Matcher matcher = PATTERN.matcher(expositionFormat);
-    assertThat(matcher.matches()).isTrue();
-    assertThat(matcher.group("help")).isEqualTo(expectedHelp);
-    assertThat(matcher.group("type")).isEqualTo(expectedType);
-    // Note: Summaries and histograms produce output which matches METRIC_NAME_PATTERN multiple
-    // times. The pattern ends up matching against the first.
-    assertThat(matcher.group("metricName")).isEqualTo(expectedMetricName);
+    assertThat(expositionFormat)
+        .matchesSatisfying(
+            PATTERN,
+            matcher -> {
+              assertThat(matcher.group("help")).isEqualTo(expectedHelp);
+              assertThat(matcher.group("type")).isEqualTo(expectedType);
+              // Note: Summaries and histograms produce output which matches METRIC_NAME_PATTERN
+              // multiple
+              // times. The pattern ends up matching against the first.
+              assertThat(matcher.group("metricName")).isEqualTo(expectedMetricName);
+            });
   }
 
   @ParameterizedTest
@@ -160,7 +162,9 @@ private static Stream<Arguments> resourceAttributesAdditionArgs() {
                   : "my_metric_units",
 
               // "cluster" attribute is added (due to reg expr specified) and only it
-              "cluster=\"mycluster\",foo1=\"bar1\",foo2=\"bar2\",otel_scope_name=\"scope\""));
+              "cluster=\"mycluster\",foo1=\"bar1\",foo2=\"bar2\",otel_scope_foo=\"bar\","
+                  + "otel_scope_name=\"scope\",otel_scope_schema_url=\"schemaUrl\","
+                  + "otel_scope_version=\"version\""));
     }
 
     // Resource attributes which also exists in the metric labels are not added twice
@@ -179,7 +183,8 @@ private static Stream<Arguments> resourceAttributesAdditionArgs() {
 
             // "cluster" attribute is present only once and the value is taken
             // from the metric attributes and not the resource attributes
-            "cluster=\"mycluster2\",foo2=\"bar2\",otel_scope_name=\"scope\""));
+            "cluster=\"mycluster2\",foo2=\"bar2\",otel_scope_foo=\"bar\",otel_scope_name=\"scope\","
+                + "otel_scope_schema_url=\"schemaUrl\",otel_scope_version=\"version\""));
 
     // Empty attributes
     arguments.add(
@@ -194,7 +199,8 @@ private static Stream<Arguments> resourceAttributesAdditionArgs() {
                         stringKey("host"), "localhost", stringKey("cluster"), "mycluster"))),
             /* allowedResourceAttributesFilter= */ Predicates.startsWith("clu"),
             "my_metric_units",
-            "cluster=\"mycluster\",otel_scope_name=\"scope\""));
+            "cluster=\"mycluster\",otel_scope_foo=\"bar\",otel_scope_name=\"scope\","
+                + "otel_scope_schema_url=\"schemaUrl\",otel_scope_version=\"version\""));
 
     return arguments.stream();
   }
@@ -314,11 +320,17 @@ static MetricData createSampleMetricData(
     Attributes attributesToUse = attributes == null ? Attributes.empty() : attributes;
     Resource resourceToUse = resource == null ? Resource.getDefault() : resource;
 
+    InstrumentationScopeInfo scope =
+        InstrumentationScopeInfo.builder("scope")
+            .setVersion("version")
+            .setSchemaUrl("schemaUrl")
+            .setAttributes(Attributes.of(stringKey("foo"), "bar"))
+            .build();
     switch (metricDataType) {
       case SUMMARY:
         return ImmutableMetricData.createDoubleSummary(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -329,7 +341,7 @@ static MetricData createSampleMetricData(
       case LONG_SUM:
         return ImmutableMetricData.createLongSum(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -341,7 +353,7 @@ static MetricData createSampleMetricData(
       case DOUBLE_SUM:
         return ImmutableMetricData.createDoubleSum(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -353,7 +365,7 @@ static MetricData createSampleMetricData(
       case LONG_GAUGE:
         return ImmutableMetricData.createLongGauge(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -363,7 +375,7 @@ static MetricData createSampleMetricData(
       case DOUBLE_GAUGE:
         return ImmutableMetricData.createDoubleGauge(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -373,7 +385,7 @@ static MetricData createSampleMetricData(
       case HISTOGRAM:
         return ImmutableMetricData.createDoubleHistogram(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,
@@ -394,7 +406,7 @@ static MetricData createSampleMetricData(
       case EXPONENTIAL_HISTOGRAM:
         return ImmutableMetricData.createExponentialHistogram(
             resourceToUse,
-            InstrumentationScopeInfo.create("scope"),
+            scope,
             metricName,
             "description",
             metricUnit,