Typo-squatting: log the original uploaded package Id rather than normalized one (#6482)

* log the original uploaded package Id rather than normalized one

* Add unit test

Author: zhhyu

src/NuGetGallery/Services/TyposquattingService.cs

@@ -67,13 +67,13 @@ public bool IsUploadedPackageIdTyposquatting(string uploadedPackageId, User uplo
 
             var algorithmProcessingStopwatch = Stopwatch.StartNew();
             var threshold = GetThreshold(uploadedPackageId);
-            uploadedPackageId = TyposquattingStringNormalization.NormalizeString(uploadedPackageId);
+            var normalizedUploadedPackageId = TyposquattingStringNormalization.NormalizeString(uploadedPackageId);
 
             var collisionIds = new ConcurrentBag<string>();
             Parallel.ForEach(packagesCheckList, (packageId, loopState) =>
             {
                 string normalizedPackageId = TyposquattingStringNormalization.NormalizeString(packageId);
-                if (TyposquattingDistanceCalculation.IsDistanceLessThanThreshold(uploadedPackageId, normalizedPackageId, threshold))
+                if (TyposquattingDistanceCalculation.IsDistanceLessThanThreshold(normalizedUploadedPackageId, normalizedPackageId, threshold))
                 {
                     collisionIds.Add(packageId);
                 }

tests/NuGetGallery.Facts/Services/TyposquattingServiceFacts.cs

@@ -318,6 +318,38 @@ public void CheckIsTyposquattingBlockUserNotEnabled()
             Assert.Equal("microsoft_netframework_v1", typosquattingCheckCollisionIds[0]);
         }
 
+        [Fact]
+        public void CheckTelemetryServiceLogOriginalUploadedPackageId()
+        {
+            // Arrange
+            var uploadedPackageId = "microsoft_netframework.v1";
+            var newService = new TyposquattingService(_contentObjectService.Object, _packageService.Object, _reservedNamespaceService.Object, _telemetryService.Object);
+
+            // Act
+            var typosquattingCheckResult = newService.IsUploadedPackageIdTyposquatting(uploadedPackageId, _uploadedPackageOwner, out List<string> typosquattingCheckCollisionIds);
+
+            // Assert
+            _telemetryService.Verify(
+                x => x.TrackMetricForTyposquattingChecklistRetrievalTime(uploadedPackageId, It.IsAny<TimeSpan>()),
+                Times.Once);
+
+            _telemetryService.Verify(
+                x => x.TrackMetricForTyposquattingAlgorithmProcessingTime(uploadedPackageId, It.IsAny<TimeSpan>()),
+                Times.Once);
+
+            _telemetryService.Verify(
+                x => x.TrackMetricForTyposquattingCheckResultAndTotalTime(
+                    uploadedPackageId,
+                    It.IsAny<TimeSpan>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<List<string>>(),
+                    It.IsAny<int>()),
+                Times.Once);
+
+            _telemetryService.Verify(
+                x => x.TrackMetricForTyposquattingOwnersCheckTime(uploadedPackageId, It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
 
         [Theory]
         [InlineData("Microsoft_NetFramework_v1", "Microsoft.NetFramework.v1", 0)]