PR comments addressed

Author: onurkybsi

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java

@@ -652,24 +652,23 @@ private static String toLabelValue(AttributeType type, Object attributeValue) {
       case BOOLEAN:
       case LONG:
       case DOUBLE:
+        return attributeValue.toString();
       case BOOLEAN_ARRAY:
       case LONG_ARRAY:
       case DOUBLE_ARRAY:
-        return attributeValue.toString();
-
       case STRING_ARRAY:
         if (attributeValue instanceof List) {
           return ((List<?>) attributeValue)
               .stream()
-                  .map(Object::toString)
-                  .map(Otel2PrometheusConverter::toJsonValidStr)
+                  .map(String::valueOf)
+                  .map(it -> AttributeType.STRING_ARRAY.equals(type) ? toJsonValidStr(it) : it)
                   .collect(Collectors.toList())
                   .toString();
         } else {
           LOGGER.log(
               Level.WARNING,
-              "Unexpected label value of {0} for AttributeType.STRING_ARRAY, toString() is being used as fallback value...",
-              attributeValue.getClass());
+              "Unexpected label value of {0} for {1}, toString() is being used as fallback value...",
+              new Object[] {attributeValue.getClass(), type.name()});
           return attributeValue.toString();
         }
     }

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

@@ -9,6 +9,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributeType;
 import io.opentelemetry.api.common.Attributes;
@@ -164,29 +166,41 @@ void labelValueSerialization_Primitives() {
   }
 
   @Test
-  void labelValueSerialization_NonPrimitives() {
+  void labelValueSerialization_NonPrimitives() throws JsonProcessingException {
+    List<String> stringArrayValue =
+        Arrays.asList("stringValue1", "\"+\\\\\\+\b+\f+\n+\r+\t+" + (char) 0);
+    List<Boolean> booleanArrayValue = Arrays.asList(true, false);
+    List<Long> longArrayValue = Arrays.asList(Long.MIN_VALUE, Long.MAX_VALUE);
+    List<Double> doubleArrayValue = Arrays.asList(Double.MIN_VALUE, Double.MAX_VALUE);
     Attributes attributes =
         Attributes.builder()
-            .put(
-                AttributeKey.stringArrayKey("stringKey"),
-                Arrays.asList("stringValue1", "\"+\\\\\\+\b+\f+\n+\r+\t+" + (char) 0))
-            .put(AttributeKey.booleanArrayKey("booleanKey"), Arrays.asList(true, false))
-            .put(AttributeKey.longArrayKey("longKey"), Arrays.asList(12345L, 6789L))
-            .put(AttributeKey.doubleArrayKey("doubleKey"), Arrays.asList(0.12345, 0.6789))
+            .put(AttributeKey.stringArrayKey("stringKey"), stringArrayValue)
+            .put(AttributeKey.booleanArrayKey("booleanKey"), booleanArrayValue)
+            .put(AttributeKey.longArrayKey("longKey"), longArrayValue)
+            .put(AttributeKey.doubleArrayKey("doubleKey"), doubleArrayValue)
             .build();
     MetricData metricData =
         createSampleMetricData("sample", "1", MetricDataType.LONG_SUM, attributes, null);
 
     MetricSnapshots snapshots = converter.convert(Collections.singletonList(metricData));
 
-    assertThat(snapshots.get(0).getDataPoints().get(0).getLabels().get("stringKey"))
-        .isEqualTo("[\"stringValue1\", \"\\\"+\\\\\\\\\\\\+\\b+\\f+\\n+\\r+\\t+\\u0000\"]");
-    assertThat(snapshots.get(0).getDataPoints().get(0).getLabels().get("booleanKey"))
-        .isEqualTo("[true, false]");
-    assertThat(snapshots.get(0).getDataPoints().get(0).getLabels().get("longKey"))
-        .isEqualTo("[12345, 6789]");
-    assertThat(snapshots.get(0).getDataPoints().get(0).getLabels().get("doubleKey"))
-        .isEqualTo("[0.12345, 0.6789]");
+    ObjectMapper objectMapper = new ObjectMapper();
+    assertThat(
+            objectMapper.readTree(
+                snapshots.get(0).getDataPoints().get(0).getLabels().get("stringKey")))
+        .isEqualTo(objectMapper.valueToTree(stringArrayValue));
+    assertThat(
+            objectMapper.readTree(
+                snapshots.get(0).getDataPoints().get(0).getLabels().get("booleanKey")))
+        .isEqualTo(objectMapper.valueToTree(booleanArrayValue));
+    assertThat(
+            objectMapper.readTree(
+                snapshots.get(0).getDataPoints().get(0).getLabels().get("longKey")))
+        .isEqualTo(objectMapper.valueToTree(longArrayValue));
+    assertThat(
+            objectMapper.readTree(
+                snapshots.get(0).getDataPoints().get(0).getLabels().get("doubleKey")))
+        .isEqualTo(objectMapper.valueToTree(doubleArrayValue));
   }
 
   @Test