More clean up

samsp-msft · Aug 31, 2023 · 59e1729 · 59e1729
1 parent 179f386
commit 59e1729
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 44 deletions.
diff --git a/OTLPView/DataModel/Common.cs b/OTLPView/DataModel/Common.cs
@@ -57,31 +57,11 @@ public string ShortApplicationName
     public MeterResult GetOrAddMeter(string meterName, Func<string, MeterResult> itemFactory) => _meters.GetOrAdd(meterName, _ => itemFactory.Invoke(meterName));
     #endregion
 
-
     #region Traces
 
     private readonly ConcurrentDictionary<string, TraceScope> _scopes = new();
     public IReadOnlyDictionary<string, TraceScope> Scopes => _scopes;
 
     public TraceScope GetOrAddTrace(string scopeName, Func<string, TraceScope> itemFactory) => _scopes.GetOrAdd(scopeName, _ => itemFactory.Invoke(scopeName));
     #endregion
-
-
-
-
-}
-
-public static class CommonHelpers
-{
-    public static string GetServiceId(this Resource resource)
-    {
-        foreach (var attribute in resource.Attributes)
-        {
-            if (attribute.Key == OtlpApplication.SERVICE_INSTANCE_ID)
-            {
-                return attribute.Value.ValueString();
-            }
-        }
-        return null;
-    }
 }
diff --git a/OTLPView/Extensions/Helpers.cs b/OTLPView/Extensions/Helpers.cs
@@ -2,6 +2,12 @@ namespace OTLPView.Extensions;
 
 public static class Helpers
 {
+    public static string? GetServiceId(this Resource resource) =>
+        resource.Attributes
+            .FirstOrDefault(attr => attr.Key == OtlpApplication.SERVICE_INSTANCE_ID)
+            ?.Value
+            .ValueString();
+
     public static bool FindStringValue(this RepeatedField<KeyValue> attributes, string key, out string? value)
     {
         value = null;

diff --git a/OTLPView/Pages/Metrics.razor.cs b/OTLPView/Pages/Metrics.razor.cs
@@ -83,6 +83,9 @@ public string IsMetricSelected(Counter o, string cssClass) =>
 
     public void SelectedCounterChanged(object item)
     {
-        State.SelectedMetric = item as Counter;
+        if (item is Counter counter)
+        {
+            State.SelectedMetric = counter;
+        }
     }
 }
diff --git a/OTLPView/Shared/DimensionedCounterView.razor.cs b/OTLPView/Shared/DimensionedCounterView.razor.cs
@@ -6,8 +6,8 @@ public sealed partial class DimensionedCounterView
     private string[] chartLabels;
     private List<ChartSeries> chartValues;
 
-    [Parameter]
-    public DimensionScope Dimension
+    [Parameter, EditorRequired]
+    public required DimensionScope Dimension
     {
         get => _dimension;
         set
@@ -24,8 +24,8 @@ public DimensionScope Dimension
         }
     }
 
-    [Parameter]
-    public Counter Counter { get; set; }
+    [Parameter, EditorRequired]
+    public required Counter Counter { get; set; }
 
     protected override void OnInitialized()
     {
@@ -51,12 +51,14 @@ private double[] CalcChartValues(DimensionScope dimension)
             var end = CalcOffset(point.End);
             if (start is not null && end is not null)
             {
-                for (int i = start.GetValueOrDefault(0); i <= end.GetValueOrDefault(17); i++)
+                for (var i = start.GetValueOrDefault(0); i <= end.GetValueOrDefault(17); i++)
                 {
-                    if (point as MetricValue<long> != null)
-                    { values[i] = Math.Max((point as MetricValue<long>).Value, values[i]); }
-                    else
-                    { values[i] = Math.Max((point as MetricValue<double>).Value, values[i]); }
+                    values[i] = point switch
+                    {
+                        MetricValue<long> @longMetric => Math.Max(@longMetric.Value, values[i]),
+                        MetricValue<double> doubleMetric => Math.Max(doubleMetric.Value, values[i]),
+                        _ => values[i]
+                    };
                 }
             }
         }

diff --git a/OTLPView/Shared/DimensionedHistogramView.razor b/OTLPView/Shared/DimensionedHistogramView.razor
@@ -13,13 +13,13 @@
             @if (mValue is HistogramValue)
             {
                 var hValue = mValue as HistogramValue;
-        <div class="HistogramValue">
-            <span class="HistogramValueProperty">Count:</span>
-            <span class="HistogramValuePropertyValue">@hValue.Count</span>
-            <span class="HistogramValueProperty">Sum:</span>
-            <span class="HistogramValuePropertyValue">@hValue.Sum</span>
-             <span class="HistogramValueProperty">Buckets:</span>
-            @if (hValue.Values is not null)
+                <div class="HistogramValue">
+                    <span class="HistogramValueProperty">Count:</span>
+                    <span class="HistogramValuePropertyValue">@hValue.Count</span>
+                    <span class="HistogramValueProperty">Sum:</span>
+                    <span class="HistogramValuePropertyValue">@hValue.Sum</span>
+                    <span class="HistogramValueProperty">Buckets:</span>
+                    @if (hValue.Values is not null)
                     {
                         foreach (var v in hValue.Values)
                         {
@@ -32,14 +32,11 @@
             {
                 <span class="MetricPointValue">@mValue.ToString()</span>
             }
-
         }
     </div>
 </div>
 
 @code {
-    [Parameter]
-    public DimensionScope Dimension { get; set; }
-
-
+    [Parameter, EditorRequired]
+    public required DimensionScope Dimension { get; set; }
 }
diff --git a/OTLPView/Shared/TraceSpanView.razor b/OTLPView/Shared/TraceSpanView.razor
@@ -13,8 +13,6 @@
         </div>
     </div>
     <div class="ChildSpans">
-
-
         @foreach (var s in Span.ChildSpans)
         {
             <TraceSpanView Span="@s" />