Tweaks.

open-telemetry · Feb 15, 2024 · 7a8669c · 7a8669c
1 parent 39230c9
commit 7a8669c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/OpenTelemetry.Exporter.Console/ConsoleMetricExporter.cs b/src/OpenTelemetry.Exporter.Console/ConsoleMetricExporter.cs
@@ -192,23 +192,26 @@ public override ExportResult Export(in Batch<Metric> batch)
                 {
                     foreach (ref readonly var exemplar in exemplars)
                     {
+                        exemplarString.Append("Timestamp: ");
+                        exemplarString.Append(exemplar.Timestamp.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ", CultureInfo.InvariantCulture));
                         if (metricType.IsDouble())
                         {
-                            exemplarString.Append("Value: ");
+                            exemplarString.Append(" Value: ");
                             exemplarString.Append(exemplar.DoubleValue);
                         }
                         else if (metricType.IsLong())
                         {
-                            exemplarString.Append("Value: ");
+                            exemplarString.Append(" Value: ");
                             exemplarString.Append(exemplar.LongValue);
                         }
 
-                        exemplarString.Append(" Timestamp: ");
-                        exemplarString.Append(exemplar.Timestamp.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ", CultureInfo.InvariantCulture));
-                        exemplarString.Append(" TraceId: ");
-                        exemplarString.Append(exemplar.TraceId);
-                        exemplarString.Append(" SpanId: ");
-                        exemplarString.Append(exemplar.SpanId);
+                        if (exemplar.TraceId.HasValue)
+                        {
+                            exemplarString.Append(" TraceId: ");
+                            exemplarString.Append(exemplar.TraceId.Value.ToHexString());
+                            exemplarString.Append(" SpanId: ");
+                            exemplarString.Append(exemplar.SpanId.Value.ToHexString());
+                        }
 
                         bool appendedTagString = false;
                         foreach (var tag in exemplar.FilteredTags)

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/MetricItemExtensions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/MetricItemExtensions.cs
@@ -356,6 +356,7 @@ private static void AddScopeAttributes(IEnumerable<KeyValuePair<string, object>>
     }
 
     private static OtlpMetrics.Exemplar ToOtlpExemplar<T>(T value, in Metrics.Exemplar exemplar)
+        where T : struct
     {
         var otlpExemplar = new OtlpMetrics.Exemplar
         {
@@ -365,10 +366,10 @@ private static OtlpMetrics.Exemplar ToOtlpExemplar<T>(T value, in Metrics.Exempl
         if (exemplar.TraceId.HasValue)
         {
             byte[] traceIdBytes = new byte[16];
-            exemplar.TraceId?.CopyTo(traceIdBytes);
+            exemplar.TraceId.Value.CopyTo(traceIdBytes);
 
             byte[] spanIdBytes = new byte[8];
-            exemplar.SpanId?.CopyTo(spanIdBytes);
+            exemplar.SpanId.Value.CopyTo(spanIdBytes);
 
             otlpExemplar.TraceId = UnsafeByteOperations.UnsafeWrap(traceIdBytes);
             otlpExemplar.SpanId = UnsafeByteOperations.UnsafeWrap(spanIdBytes);