Improve Console Metric Exporter Output (#6388)

Co-authored-by: Rajkumar Rangaraj <[email protected]>
Co-authored-by: Piotr Kiełkowicz <[email protected]>

Author: 3 people

src/OpenTelemetry.Exporter.Console/ConsoleMetricExporter.cs

@@ -17,6 +17,20 @@ public ConsoleMetricExporter(ConsoleExporterOptions options)
 
     public override ExportResult Export(in Batch<Metric> batch)
     {
+        // Print Resource information once at the beginning of the batch
+        var resource = this.ParentProvider.GetResource();
+        if (resource != Resource.Empty)
+        {
+            this.WriteLine("Resource associated with Metrics:");
+            foreach (var resourceAttribute in resource.Attributes)
+            {
+                if (this.TagWriter.TryTransformTag(resourceAttribute.Key, resourceAttribute.Value, out var result))
+                {
+                    this.WriteLine($"\t{result.Key}: {result.Value}");
+                }
+            }
+        }
+
         foreach (var metric in batch)
         {
             var msg = new StringBuilder(Environment.NewLine);
@@ -25,7 +39,7 @@ public override ExportResult Export(in Batch<Metric> batch)
 #else
             msg.Append($"Metric Name: {metric.Name}");
 #endif
-            if (string.IsNullOrEmpty(metric.Description))
+            if (!string.IsNullOrEmpty(metric.Description))
             {
 #if NET
                 msg.Append(CultureInfo.InvariantCulture, $", Description: {metric.Description}");
@@ -34,7 +48,7 @@ public override ExportResult Export(in Batch<Metric> batch)
 #endif
             }
 
-            if (string.IsNullOrEmpty(metric.Unit))
+            if (!string.IsNullOrEmpty(metric.Unit))
             {
 #if NET
                 msg.Append(CultureInfo.InvariantCulture, $", Unit: {metric.Unit}");
@@ -43,8 +57,34 @@ public override ExportResult Export(in Batch<Metric> batch)
 #endif
             }
 
+#if NET
+            msg.Append(CultureInfo.InvariantCulture, $", Metric Type: {metric.MetricType}");
+#else
+            msg.Append($", Metric Type: {metric.MetricType}");
+#endif
+
             this.WriteLine(msg.ToString());
 
+            // Print Instrumentation scope (Meter) information once per metric
+            this.WriteLine("Instrumentation scope (Meter):");
+            this.WriteLine($"\tName: {metric.MeterName}");
+            if (!string.IsNullOrEmpty(metric.MeterVersion))
+            {
+                this.WriteLine($"\tVersion: {metric.MeterVersion}");
+            }
+
+            if (metric.MeterTags?.Any() == true)
+            {
+                this.WriteLine("\tTags:");
+                foreach (var meterTag in metric.MeterTags)
+                {
+                    if (this.TagWriter.TryTransformTag(meterTag, out var result))
+                    {
+                        this.WriteLine($"\t\t{result.Key}: {result.Value}");
+                    }
+                }
+            }
+
             foreach (ref readonly var metricPoint in metric.GetMetricPoints())
             {
                 string valueDisplay = string.Empty;
@@ -226,12 +266,6 @@ public override ExportResult Export(in Batch<Metric> batch)
                     msg.Append(' ');
                 }
 
-                msg.AppendLine();
-#if NET
-                msg.AppendLine(CultureInfo.InvariantCulture, $"Metric Type: {metric.MetricType}");
-#else
-                msg.Append($"Metric Type: {metric.MetricType}");
-#endif
                 msg.AppendLine();
 #if NET
                 msg.Append(CultureInfo.InvariantCulture, $"Value: {valueDisplay}");
@@ -247,38 +281,6 @@ public override ExportResult Export(in Batch<Metric> batch)
                 }
 
                 this.WriteLine(msg.ToString());
-
-                this.WriteLine("Instrumentation scope (Meter):");
-                this.WriteLine($"\tName: {metric.MeterName}");
-                if (!string.IsNullOrEmpty(metric.MeterVersion))
-                {
-                    this.WriteLine($"\tVersion: {metric.MeterVersion}");
-                }
-
-                if (metric.MeterTags?.Any() == true)
-                {
-                    this.WriteLine("\tTags:");
-                    foreach (var meterTag in metric.MeterTags)
-                    {
-                        if (this.TagWriter.TryTransformTag(meterTag, out var result))
-                        {
-                            this.WriteLine($"\t\t{result.Key}: {result.Value}");
-                        }
-                    }
-                }
-
-                var resource = this.ParentProvider.GetResource();
-                if (resource != Resource.Empty)
-                {
-                    this.WriteLine("Resource associated with Metric:");
-                    foreach (var resourceAttribute in resource.Attributes)
-                    {
-                        if (this.TagWriter.TryTransformTag(resourceAttribute.Key, resourceAttribute.Value, out var result))
-                        {
-                            this.WriteLine($"\t{result.Key}: {result.Value}");
-                        }
-                    }
-                }
             }
         }