Use milliseconds for metrics, support prefix for metric name, rename stage to operation

docs/Debugging.md

@@ -6,12 +6,12 @@ An instance of [Application Insights](https://docs.microsoft.com/en-us/azure/azu
 
 ### Telemetry Collected
 All telemetry below can be viewed in [Application Insights](https://docs.microsoft.com/en-us/azure/azure-monitor/app/app-insights-overview).  Select the [metrics](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/metrics-charts) section.  The telemetry documented will fall under the **custom** category.
-* **MeasurementIngestionLatency**: The difference between the ingestion time on the event hub end point and received by the FHIR conversion function.  Measured in seconds.
+* **MeasurementIngestionLatency**: The difference between the ingestion time on the event hub end point and received by the FHIR conversion function.  Measured in milliseconds.
 * **MeasurementGroup**: The number of unique groupings of measurements across type, device, patient, and configured time period generated by the FHIR conversion function.  Should directly correlate to the number of observations being created or updated.
 * **Measurement**: The number of raw value readings received by the FHIR conversion function.
 * **DeviceEvent**: The number of raw events received by the connector prior to any normalization.
 * **NormalizedEvent**: The number of mapped normalized values outputted from the normalization step.
-* **DeviceEventProcessingLatency**: The time between an event's ingestion and being processed for normalization.  A large value here indicates a backlog of events being processed for normalization.  Measured in seconds.
+* **DeviceEventProcessingLatency**: The time between an event's ingestion and being processed for normalization.  A large value here indicates a backlog of events being processed for normalization.  Measured in milliseconds.
 * **Handled Exceptions**: The number of handled exceptions for a given category. In order to not stall the pipeline certain non recoverable errors are categorized and then recorded as telemetry.  The current exceptions handled are:
 
     |Exception|Description

src/func/Microsoft.Health.Fhir.Ingest.Host/IomtConnectorFunctions.cs

@@ -46,7 +46,7 @@ public async Task<IActionResult> MeasurementCollectionToFhir(
             catch (Exception ex)
             {
                 _logger.LogMetric(
-                    IomtMetrics.UnhandledException(ex.GetType().Name, ConnectorStage.FHIRConversion),
+                    IomtMetrics.UnhandledException(ex.GetType().Name, ConnectorOperation.FHIRConversion),
                     1);
                 throw;
             }
@@ -77,7 +77,7 @@ public async Task NormalizeDeviceData(
             catch (Exception ex)
             {
                 _logger.LogMetric(
-                    IomtMetrics.UnhandledException(ex.GetType().Name, ConnectorStage.Normalization),
+                    IomtMetrics.UnhandledException(ex.GetType().Name, ConnectorOperation.Normalization),
                     1);
                 throw;
             }

src/lib/Microsoft.Health.Common/Telemetry/Metric.cs

@@ -15,8 +15,16 @@ public Metric(string name, IDictionary<string, object> dimensions)
             Dimensions = dimensions;
         }
 
-        public string Name { get; }
+        public string Name { get; set; }
 
         public IDictionary<string, object> Dimensions { get; }
+
+        public void AddPrefixToName(string prefix)
+        {
+            if (!Name.StartsWith(prefix, System.StringComparison.CurrentCulture))
+            {
+                Name = $"{prefix}{Name}";
+            }
+        }
     }
 }

src/lib/Microsoft.Health.Common/Telemetry/Metrics/Dimensions/ConnectorStage.cs → src/lib/Microsoft.Health.Common/Telemetry/Metrics/Dimensions/ConnectorOperation.cs

@@ -5,31 +5,31 @@
 
 namespace Microsoft.Health.Common.Telemetry
 {
-    public static class ConnectorStage
+    public static class ConnectorOperation
     {
         /// <summary>
         /// The setup stage of the IoMT Connector
         /// </summary>
-        public static string Setup => nameof(ConnectorStage.Setup);
+        public static string Setup => nameof(ConnectorOperation.Setup);
 
         /// <summary>
         /// The normalization stage of the IoMT Connector
         /// </summary>
-        public static string Normalization => nameof(ConnectorStage.Normalization);
+        public static string Normalization => nameof(ConnectorOperation.Normalization);
 
         /// <summary>
         /// The grouping stage of the IoMT Connector
         /// </summary>
-        public static string Grouping => nameof(ConnectorStage.Grouping);
+        public static string Grouping => nameof(ConnectorOperation.Grouping);
 
         /// <summary>
         /// The FHIR conversion stage of the IoMT Connector
         /// </summary>
-        public static string FHIRConversion => nameof(ConnectorStage.FHIRConversion);
+        public static string FHIRConversion => nameof(ConnectorOperation.FHIRConversion);
 
         /// <summary>
         /// If a stage is not determined.
         /// </summary>
-        public static string Unknown => nameof(ConnectorStage.Unknown);
+        public static string Unknown => nameof(ConnectorOperation.Unknown);
     }
 }

src/lib/Microsoft.Health.Common/Telemetry/Metrics/Dimensions/DimensionNames.cs

@@ -20,7 +20,7 @@ public static class DimensionNames
         /// <summary>
         /// A metric dimension that represents each ingestion stage of the IoMT Connector.
         /// </summary>
-        public static string Stage => nameof(DimensionNames.Stage);
+        public static string Operation => nameof(DimensionNames.Operation);
 
         /// <summary>
         /// A metric dimension for a error type.

src/lib/Microsoft.Health.Extensions.Fhir/MultipleResourceFoundException.cs

@@ -42,7 +42,7 @@ public MultipleResourceFoundException(string message, Exception innerException)
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.FHIRResourceError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Warning },
-                { DimensionNames.Stage, ConnectorStage.FHIRConversion },
+                { DimensionNames.Operation, ConnectorOperation.FHIRConversion },
             });
     }
 }

src/lib/Microsoft.Health.Fhir.Ingest.Template/TemplateNotFoundException.cs

@@ -21,7 +21,7 @@ public class TemplateNotFoundException :
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.GeneralError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Critical },
-                { DimensionNames.Stage, ConnectorStage.Unknown },
+                { DimensionNames.Operation, ConnectorOperation.Unknown },
             });
 
         public TemplateNotFoundException(string message)

src/lib/Microsoft.Health.Fhir.Ingest/Data/CorrelationIdNotDefinedException.cs

@@ -35,7 +35,7 @@ public CorrelationIdNotDefinedException()
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.DeviceMessageError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Critical },
-                { DimensionNames.Stage, ConnectorStage.Grouping },
+                { DimensionNames.Operation, ConnectorOperation.Grouping },
            });
     }
 }

src/lib/Microsoft.Health.Fhir.Ingest/FhirResourceNotFoundException.cs

@@ -46,7 +46,7 @@ public FhirResourceNotFoundException(string message, Exception innerException)
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.FHIRResourceError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Warning },
-                { DimensionNames.Stage, ConnectorStage.FHIRConversion },
+                { DimensionNames.Operation, ConnectorOperation.FHIRConversion },
             });
     }
 }

src/lib/Microsoft.Health.Fhir.Ingest/ResourceIdentityNotDefinedException.cs

@@ -46,7 +46,7 @@ public ResourceIdentityNotDefinedException(string message, Exception innerExcept
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.FHIRResourceError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Warning },
-                { DimensionNames.Stage, ConnectorStage.FHIRConversion },
+                { DimensionNames.Operation, ConnectorOperation.FHIRConversion },
             });
     }
 }

src/lib/Microsoft.Health.Fhir.Ingest/Service/MeasurementEventNormalizationService.cs

@@ -80,7 +80,7 @@ private async Task StartConsumer(ISourceBlock<EventData> producer, IAsyncCollect
                     {
                         _log.LogMetric(
                             IomtMetrics.DeviceEventProcessingLatency(),
-                            (DateTime.UtcNow - evt.SystemProperties.EnqueuedTimeUtc).TotalSeconds);
+                            (DateTime.UtcNow - evt.SystemProperties.EnqueuedTimeUtc).TotalMilliseconds);
 
                         var token = _converter.Convert(evt);
                         foreach (var measurement in _contentTemplate.GetMeasurements(token))

src/lib/Microsoft.Health.Fhir.Ingest/Service/MeasurementFhirImportService.cs

@@ -53,7 +53,7 @@ public async Task ProcessStreamAsync(Stream data, string templateDefinition, ITe
                             }
                             catch (Exception ex)
                             {
-                                if (!Options.ExceptionService.HandleException(ex, log, ConnectorStage.FHIRConversion))
+                                if (!Options.ExceptionService.HandleException(ex, log, ConnectorOperation.FHIRConversion))
                                 {
                                     log.LogError(ex);
                                     throw;
@@ -109,7 +109,7 @@ await Task.Run(() =>
                         continue;
                     }
 
-                    var latency = (nowRef - m.IngestionTimeUtc.Value).TotalSeconds;
+                    var latency = (nowRef - m.IngestionTimeUtc.Value).TotalMilliseconds;
 
                     log.LogMetric(
                         IomtMetrics.MeasurementIngestionLatency(),

src/lib/Microsoft.Health.Fhir.Ingest/Service/PatientDeviceMismatchException.cs

@@ -35,7 +35,7 @@ public PatientDeviceMismatchException()
                 { DimensionNames.Category, Category.Errors },
                 { DimensionNames.ErrorType, ErrorType.FHIRResourceError },
                 { DimensionNames.ErrorSeverity, ErrorSeverity.Warning },
-                { DimensionNames.Stage, ConnectorStage.FHIRConversion },
+                { DimensionNames.Operation, ConnectorOperation.FHIRConversion },
             });
     }
 }

src/lib/Microsoft.Health.Fhir.Ingest/Telemetry/Metrics/IomtMetrics.cs

@@ -18,15 +18,15 @@ public static class IomtMetrics
         private static string _categoryDimension = DimensionNames.Category;
         private static string _errorTypeDimension = DimensionNames.ErrorType;
         private static string _errorSeverityDimension = DimensionNames.ErrorSeverity;
-        private static string _stageDimension = DimensionNames.Stage;
+        private static string _operationDimension = DimensionNames.Operation;
 
         private static Metric _measurementIngestionLatency = new Metric(
             "MeasurementIngestionLatency",
             new Dictionary<string, object>
             {
                 { _nameDimension, "MeasurementIngestionLatency" },
                 { _categoryDimension, Category.Latency },
-                { _stageDimension, ConnectorStage.FHIRConversion },
+                { _operationDimension, ConnectorOperation.FHIRConversion },
             });
 
         private static Metric _measurementGroup = new Metric(
@@ -35,7 +35,7 @@ public static class IomtMetrics
             {
                 { _nameDimension, "MeasurementGroup" },
                 { _categoryDimension, Category.Traffic },
-                { _stageDimension, ConnectorStage.FHIRConversion },
+                { _operationDimension, ConnectorOperation.FHIRConversion },
             });
 
         private static Metric _measurement = new Metric(
@@ -44,7 +44,7 @@ public static class IomtMetrics
             {
                 { _nameDimension, "Measurement" },
                 { _categoryDimension, Category.Traffic },
-                { _stageDimension, ConnectorStage.FHIRConversion },
+                { _operationDimension, ConnectorOperation.FHIRConversion },
             });
 
         private static Metric _deviceEvent = new Metric(
@@ -53,7 +53,7 @@ public static class IomtMetrics
             {
                 { _nameDimension, "DeviceEvent" },
                 { _categoryDimension, Category.Traffic },
-                { _stageDimension, ConnectorStage.Normalization },
+                { _operationDimension, ConnectorOperation.Normalization },
             });
 
         private static Metric _normalizedEvent = new Metric(
@@ -62,7 +62,7 @@ public static class IomtMetrics
             {
                 { _nameDimension, "NormalizedEvent" },
                 { _categoryDimension, Category.Traffic },
-                { _stageDimension, ConnectorStage.Normalization },
+                { _operationDimension, ConnectorOperation.Normalization },
             });
 
         private static Metric _deviceEventProcessingLatency = new Metric(
@@ -71,7 +71,7 @@ public static class IomtMetrics
             {
                 { _nameDimension, "DeviceEventProcessingLatency" },
                 { _categoryDimension, Category.Latency },
-                { _stageDimension, ConnectorStage.Normalization },
+                { _operationDimension, ConnectorOperation.Normalization },
             });
 
         private static Metric _notSupported = new Metric(
@@ -82,7 +82,7 @@ public static class IomtMetrics
                 { _categoryDimension, Category.Errors },
                 { _errorTypeDimension, ErrorType.FHIRResourceError },
                 { _errorSeverityDimension, ErrorSeverity.Warning },
-                { _stageDimension, ConnectorStage.FHIRConversion },
+                { _operationDimension, ConnectorOperation.FHIRConversion },
             });
 
         /// <summary>
@@ -145,14 +145,14 @@ public static Metric UnhandledException(string exceptionName, string connectorSt
         {
             EnsureArg.IsNotNull(exceptionName);
             return new Metric(
-                exceptionName,
+                "UnhandledException",
                 new Dictionary<string, object>
                 {
                     { _nameDimension, exceptionName },
                     { _categoryDimension, Category.Errors },
                     { _errorTypeDimension, ErrorType.GeneralError },
                     { _errorSeverityDimension, ErrorSeverity.Critical },
-                    { _stageDimension, connectorStage },
+                    { _operationDimension, connectorStage },
                 });
         }
 
@@ -165,7 +165,7 @@ public static Metric HandledException(string exceptionName, string connectorStag
                     { _nameDimension, exceptionName },
                     { _categoryDimension, Category.Errors },
                     { _errorTypeDimension, ErrorType.GeneralError },
-                    { _stageDimension, connectorStage },
+                    { _operationDimension, connectorStage },
                 });
         }
     }

test/Microsoft.Health.Fhir.Ingest.UnitTests/Service/MeasurementFhirImportServiceTests.cs

@@ -107,7 +107,7 @@ public async void GivenExceptionDuringParseStreamAsync_WhenParseStreamAsyncAndEx
 
             options.TemplateFactory.Received(1).Create(string.Empty);
             await fhirService.ReceivedWithAnyArgs(2).ProcessAsync(default, default);
-            options.ExceptionService.Received(2).HandleException(exception, log, ConnectorStage.FHIRConversion);
+            options.ExceptionService.Received(2).HandleException(exception, log, ConnectorOperation.FHIRConversion);
         }
 
         [Fact]

test/Microsoft.Health.Fhir.Ingest.UnitTests/Telemetry/ExceptionTelemetryProcessorTests.cs

@@ -28,7 +28,7 @@ public void GivenHandledExceptionTypes_WhenHandleExpection_ThenMetricLoggedAndTr
             var ex = Activator.CreateInstance(exType) as Exception;
 
             var exProcessor = new ExceptionTelemetryProcessor();
-            var handled = exProcessor.HandleException(ex, log, ConnectorStage.FHIRConversion);
+            var handled = exProcessor.HandleException(ex, log, ConnectorOperation.FHIRConversion);
             Assert.True(handled);
 
             log.ReceivedWithAnyArgs(1).LogMetric(null, default(double));
@@ -42,7 +42,7 @@ public void GivenUnhandledExceptionTypes_WhenHandleExpection_ThenNoMetricLoggedA
             var ex = Activator.CreateInstance(exType) as Exception;
 
             var exProcessor = new ExceptionTelemetryProcessor();
-            var handled = exProcessor.HandleException(ex, log, ConnectorStage.FHIRConversion);
+            var handled = exProcessor.HandleException(ex, log, ConnectorOperation.FHIRConversion);
             Assert.False(handled);
 
             log.DidNotReceiveWithAnyArgs().LogMetric(null, default(double));