fix retrieve metric (#3044)

do not emit MaxFileSize and use first instance's properties to see if it has metadata
microsoft · Sep 15, 2023 · a8f99f3 · a8f99f3
1 parent 521b58d
commit a8f99f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveRenderedService.cs b/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveRenderedService.cs
@@ -93,7 +93,7 @@ public async Task<RetrieveRenderedResponse> RetrieveRenderedImageAsync(RetrieveR
                 "Retrieving rendered Instance for watermark {Watermark} of size {ContentLength}", instance.VersionedInstanceIdentifier.Version, fileProperties.ContentLength);
             _retrieveMeter.RetrieveInstanceCount.Add(
                 1,
-                RetrieveMeter.RetrieveInstanceCountTelemetryDimension(fileProperties.ContentLength, _retrieveConfiguration.MaxDicomFileSize, isRendered: true));
+                RetrieveMeter.RetrieveInstanceCountTelemetryDimension(fileProperties.ContentLength, isRendered: true));
 
             using Stream stream = await _blobDataStore.GetFileAsync(instance.VersionedInstanceIdentifier.Version, instance.VersionedInstanceIdentifier.Partition.Name, cancellationToken);
             sw.Start();

diff --git a/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveResourceService.cs b/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveResourceService.cs
@@ -150,7 +150,7 @@ public async Task<RetrieveResourceResponse> GetInstanceResourceAsync(RetrieveRes
             }
 
             // no transcoding
-            IAsyncEnumerable<RetrieveResourceInstance> responses = GetAsyncEnumerableStreams(retrieveInstances, isOriginalTransferSyntaxRequested, requestedTransferSyntax, message.IsOriginalVersionRequested, version, cancellationToken);
+            IAsyncEnumerable<RetrieveResourceInstance> responses = GetAsyncEnumerableStreams(retrieveInstances, isOriginalTransferSyntaxRequested, requestedTransferSyntax, message.IsOriginalVersionRequested, version, instance.InstanceProperties.HasFrameMetadata, cancellationToken);
             return new RetrieveResourceResponse(responses, validAcceptHeader.MediaType.ToString(), validAcceptHeader.IsSinglePart);
         }
         catch (DataStoreException e)
@@ -252,7 +252,7 @@ private void LogFileSize(long size, long version, bool needsTranscoding, bool ha
             version, size, needsTranscoding);
         _retrieveMeter.RetrieveInstanceCount.Add(
             1,
-            RetrieveMeter.RetrieveInstanceCountTelemetryDimension(size, _retrieveConfiguration.MaxDicomFileSize, isTranscoding: needsTranscoding, hasFrameMetadata: hasFrameMetadata));
+            RetrieveMeter.RetrieveInstanceCountTelemetryDimension(size, isTranscoding: needsTranscoding, hasFrameMetadata: hasFrameMetadata));
     }
 
     private void SetTranscodingBillingProperties(long bytesTranscoded)
@@ -297,6 +297,7 @@ private async IAsyncEnumerable<RetrieveResourceInstance> GetAsyncEnumerableStrea
         string requestedTransferSyntax,
         bool isOriginalVersionRequested,
         long requestedVersion,
+        bool hasFrameMetadata,
         [EnumeratorCancellation] CancellationToken cancellationToken)
     {
         long streamTotalLength = 0;
@@ -312,7 +313,7 @@ private async IAsyncEnumerable<RetrieveResourceInstance> GetAsyncEnumerableStrea
                     GetResponseTransferSyntax(isOriginalTransferSyntaxRequested, requestedTransferSyntax, instanceMetadata),
                     fileProperties.ContentLength);
         }
-        LogFileSize(streamTotalLength, requestedVersion, needsTranscoding: false, hasFrameMetadata: true);
+        LogFileSize(streamTotalLength, requestedVersion, needsTranscoding: false, hasFrameMetadata: hasFrameMetadata);
     }
 
     private static async IAsyncEnumerable<RetrieveResourceInstance> GetAsyncEnumerableFrameStreams(

diff --git a/src/Microsoft.Health.Dicom.Core/Features/Telemetry/RetrieveMeter.cs b/src/Microsoft.Health.Dicom.Core/Features/Telemetry/RetrieveMeter.cs
@@ -24,11 +24,10 @@ public RetrieveMeter()
 
     public Counter<long> RetrieveInstanceCount { get; }
 
-    public static KeyValuePair<string, object>[] RetrieveInstanceCountTelemetryDimension(long contentLength, long maxFileSize, bool isTranscoding = false, bool hasFrameMetadata = false, bool isRendered = false) =>
+    public static KeyValuePair<string, object>[] RetrieveInstanceCountTelemetryDimension(long contentLength, bool isTranscoding = false, bool hasFrameMetadata = false, bool isRendered = false) =>
         new[]
         {
             new KeyValuePair<string, object>("ContentLength", contentLength),
-            new KeyValuePair<string, object>("MaxFileSize", maxFileSize),
             new KeyValuePair<string, object>("IsTranscoding", isTranscoding),
             new KeyValuePair<string, object>("IsRendered", isRendered),
             new KeyValuePair<string, object>("HasFrameMetadata", hasFrameMetadata),