Add metrics for fhir observations created or updated

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

@@ -0,0 +1,20 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+namespace Microsoft.Health.Fhir.Ingest.Data
+{
+    public enum ResourceOperation
+    {
+        /// <summary>
+        /// FHIR resource created
+        /// </summary>
+        Created,
+
+        /// <summary>
+        /// FHIR resource updated
+        /// </summary>
+        Updated,
+    }
+}

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

@@ -21,5 +21,10 @@ public enum ResourceType
         /// Encounter Resource
         /// </summary>
         Encounter,
+
+        /// <summary>
+        /// Observation Resource
+        /// </summary>
+        Observation,
     }
 }

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

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using EnsureThat;
 using Microsoft.Health.Common.Telemetry;
+using Microsoft.Health.Fhir.Ingest.Data;
 
 namespace Microsoft.Health.Fhir.Ingest.Telemetry
 {
@@ -175,6 +176,23 @@ public static Metric NotSupported()
             return _notSupported;
         }
 
+        /// <summary>
+        /// A metric for when a FHIR resource has been saved.
+        /// </summary>
+        /// <param name="resourceType">The type of FHIR resource that was saved.</param>
+        /// <param name="resourceOperation">The operation performed on the FHIR resource.</param>
+        public static Metric FhirResourceSaved(ResourceType resourceType, ResourceOperation resourceOperation)
+        {
+            return new Metric(
+                "FhirResourceSaved",
+                new Dictionary<string, object>
+                {
+                    { _nameDimension, $"{resourceType}{resourceOperation}" },
+                    { _categoryDimension, Category.Traffic },
+                    { _operationDimension, ConnectorOperation.FHIRConversion },
+                });
+        }
+
         public static Metric UnhandledException(string exceptionName, string connectorStage)
         {
             EnsureArg.IsNotNull(exceptionName);

src/lib/Microsoft.Health.Fhir.R4.Ingest/Service/R4FhirImportService.cs

@@ -12,7 +12,9 @@
 using Microsoft.Health.Extensions.Fhir;
 using Microsoft.Health.Extensions.Fhir.Search;
 using Microsoft.Health.Fhir.Ingest.Data;
+using Microsoft.Health.Fhir.Ingest.Telemetry;
 using Microsoft.Health.Fhir.Ingest.Template;
+using Microsoft.Health.Logging.Telemetry;
 using Polly;
 using Model = Hl7.Fhir.Model;
 
@@ -24,12 +26,14 @@ public class R4FhirImportService :
         private readonly FhirClient _client;
         private readonly IFhirTemplateProcessor<ILookupTemplate<IFhirTemplate>, Model.Observation> _fhirTemplateProcessor;
         private readonly IMemoryCache _observationCache;
+        private readonly ITelemetryLogger _logger;
 
-        public R4FhirImportService(IResourceIdentityService resourceIdentityService, FhirClient fhirClient, IFhirTemplateProcessor<ILookupTemplate<IFhirTemplate>, Model.Observation> fhirTemplateProcessor, IMemoryCache observationCache)
+        public R4FhirImportService(IResourceIdentityService resourceIdentityService, FhirClient fhirClient, IFhirTemplateProcessor<ILookupTemplate<IFhirTemplate>, Model.Observation> fhirTemplateProcessor, IMemoryCache observationCache, ITelemetryLogger logger)
         {
             _fhirTemplateProcessor = EnsureArg.IsNotNull(fhirTemplateProcessor, nameof(fhirTemplateProcessor));
             _client = EnsureArg.IsNotNull(fhirClient, nameof(fhirClient));
             _observationCache = EnsureArg.IsNotNull(observationCache, nameof(observationCache));
+            _logger = EnsureArg.IsNotNull(logger, nameof(logger));
 
             ResourceIdentityService = EnsureArg.IsNotNull(resourceIdentityService, nameof(resourceIdentityService));
         }
@@ -64,6 +68,7 @@ public virtual async Task<string> SaveObservationAsync(ILookupTemplate<IFhirTemp
             {
                 var newObservation = GenerateObservation(config, observationGroup, identifier, ids);
                 result = await _client.CreateAsync(newObservation).ConfigureAwait(false);
+                _logger.LogMetric(IomtMetrics.FhirResourceSaved(ResourceType.Observation, ResourceOperation.Created), 1);
             }
             else
             {
@@ -87,6 +92,7 @@ public virtual async Task<string> SaveObservationAsync(ILookupTemplate<IFhirTemp
                 }
 
                 result = policyResult.Result;
+                _logger.LogMetric(IomtMetrics.FhirResourceSaved(ResourceType.Observation, ResourceOperation.Updated), 1);
             }
 
             _observationCache.CreateEntry(cacheKey)

test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Service/R4FhirImportServiceTests.cs

@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Health.Fhir.Ingest.Data;
 using Microsoft.Health.Fhir.Ingest.Template;
+using Microsoft.Health.Logging.Telemetry;
 using Microsoft.Health.Tests.Common;
 using NSubstitute;
 using Xunit;
@@ -43,7 +44,9 @@ public async void GivenValidData_WhenProcessAsync_ThenSaveObservationInvokedForE
             var measurementGroup = Substitute.For<IMeasurementGroup>();
             var config = Substitute.For<ILookupTemplate<IFhirTemplate>>();
 
-            var service = Substitute.ForPartsOf<R4FhirImportService>(identityService, fhirClient, templateProcessor, cache)
+            var logger = Substitute.For<ITelemetryLogger>();
+
+            var service = Substitute.ForPartsOf<R4FhirImportService>(identityService, fhirClient, templateProcessor, cache, logger)
                 .Mock(m => m.SaveObservationAsync(default, default, default).ReturnsForAnyArgs(string.Empty));
 
             await service.ProcessAsync(config, measurementGroup);
@@ -76,7 +79,9 @@ public async void GivenNotFoundObservation_WhenSaveObservationAsync_ThenCreateIn
             var cache = Substitute.For<IMemoryCache>();
             var config = Substitute.For<ILookupTemplate<IFhirTemplate>>();
 
-            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache);
+            var logger = Substitute.For<ITelemetryLogger>();
+
+            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache, logger);
 
             var result = await service.SaveObservationAsync(config, observationGroup, ids);
 
@@ -121,7 +126,9 @@ public async void GivenFoundObservation_WhenSaveObservationAsync_ThenUpdateInvok
             var cache = Substitute.For<IMemoryCache>();
             var config = Substitute.For<ILookupTemplate<IFhirTemplate>>();
 
-            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache);
+            var logger = Substitute.For<ITelemetryLogger>();
+
+            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache, logger);
 
             var result = await service.SaveObservationAsync(config, observationGroup, ids);
 
@@ -179,7 +186,9 @@ public async void GivenFoundObservationAndConflictOnSave_WhenSaveObservationAsyn
             var cache = Substitute.For<IMemoryCache>();
             var config = Substitute.For<ILookupTemplate<IFhirTemplate>>();
 
-            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache);
+            var logger = Substitute.For<ITelemetryLogger>();
+
+            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache, logger);
 
             var result = await service.SaveObservationAsync(config, observationGroup, ids);
 
@@ -205,7 +214,9 @@ public void GivenValidTemplate_WhenGenerateObservation_ExpectedReferencesSet_Tes
             var identifer = new Model.Identifier();
             var config = Substitute.For<ILookupTemplate<IFhirTemplate>>();
 
-            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache);
+            var logger = Substitute.For<ITelemetryLogger>();
+
+            var service = new R4FhirImportService(identityService, fhirClient, templateProcessor, cache, logger);
 
             var result = service.GenerateObservation(config, observationGroup, identifer, ids);