Add SdkMeterProvider toString method (#4464)

* Add SdkMeterProvider toString method * Fix build * Ignore null values in InstrumentSelector / View #toString()
open-telemetry · May 13, 2022 · 078d55a · 078d55a
1 parent 0d234f5
commit 078d55a
Show file tree

Hide file tree

Showing 20 changed files with 416 additions and 103 deletions.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt
@@ -1,2 +1,13 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.metrics.export.PeriodicMetricReader  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
+***  MODIFIED CLASS: PUBLIC ABSTRACT io.opentelemetry.sdk.metrics.InstrumentSelector  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) FINAL(+) java.lang.String toString()
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.metrics.SdkMeterProvider  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
+***  MODIFIED CLASS: PUBLIC ABSTRACT io.opentelemetry.sdk.metrics.View  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) FINAL(+) java.lang.String toString()
diff --git a/...s/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java b/...s/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java
@@ -147,6 +147,11 @@ public void close() {
     shutdown().join(10, TimeUnit.SECONDS);
   }
 
+  @Override
+  public String toString() {
+    return "PrometheusHttpServer{address=" + server.getAddress() + "}";
+  }
+
   // Visible for testing.
   InetSocketAddress getAddress() {
     return server.getAddress();

diff --git a/...ometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java b/...ometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java
@@ -163,6 +163,12 @@ void fetchHealth() {
     assertThat(response.contentUtf8()).isEqualTo("Exporter is Healthy.");
   }
 
+  @Test
+  void stringRepresentation() {
+    assertThat(prometheusServer.toString())
+        .isEqualTo("PrometheusHttpServer{address=" + prometheusServer.getAddress() + "}");
+  }
+
   private static ImmutableList<MetricData> generateTestData() {
     return ImmutableList.of(
         ImmutableMetricData.createLongSum(

diff --git a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java b/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java
@@ -76,8 +76,13 @@ public ContextPropagators getPropagators() {
 
   @Override
   public String toString() {
-    // TODO(anuraaga): Add metrics / logs / propagators
-    return "OpenTelemetrySdk{" + "tracerProvider=" + tracerProvider.unobfuscate() + '}';
+    // TODO(anuraaga): Add logs / propagators
+    return "OpenTelemetrySdk{"
+        + "tracerProvider="
+        + tracerProvider.unobfuscate()
+        + ", meterProvider="
+        + meterProvider.unobfuscate()
+        + "}";
   }
 
   /**