Merge pull request NuGet#19 from TheCakeIsNaOH/disable-telemetry

(NuGet#9) Disable telemetry emission
TheCakeIsNaOH · Jan 12, 2023 · f1e5db2 · f1e5db2
2 parents 7512130 + 45435a8
commit f1e5db2
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 22 deletions.
diff --git a/src/NuGet.Core/NuGet.Common/Telemetry/TelemetryActivity.cs b/src/NuGet.Core/NuGet.Common/Telemetry/TelemetryActivity.cs
@@ -51,13 +51,27 @@ private TelemetryActivity(Guid parentId, TelemetryEvent telemetryEvent, Guid ope
         /// End with <see cref="EndIntervalMeasure(string)"/>
         /// The intervals cannot overlap. For non-overlapping intervals <see cref="StartIndependentInterval(string)"/>
         /// </summary>
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Conditional("TELEMETRYCONDITION")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void StartIntervalMeasure()
         {
             _intervalWatch.Restart();
         }
 
         /// <summary> End interval measure. </summary>
         /// <param name="propertyName"> Property name to represents the interval. </param>
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Conditional("TELEMETRYCONDITION")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void EndIntervalMeasure(string propertyName)
         {
             _intervalWatch.Stop();
@@ -129,7 +143,15 @@ protected virtual void Dispose(bool disposing)
                         TelemetryEvent[interval.Item1] = interval.Item2.TotalSeconds;
                     }
 
-                    NuGetTelemetryService.EmitTelemetryEvent(TelemetryEvent);
+                    //////////////////////////////////////////////////////////
+                    // Start - Chocolatey Specific Modification
+                    //////////////////////////////////////////////////////////
+
+                    //NuGetTelemetryService.EmitTelemetryEvent(TelemetryEvent);
+
+                    //////////////////////////////////////////////////////////
+                    // End - Chocolatey Specific Modification
+                    //////////////////////////////////////////////////////////
                 }
 
                 _telemetryActivity?.Dispose();
@@ -140,6 +162,13 @@ protected virtual void Dispose(bool disposing)
 
         /// <summary> Emit a singular telemetry event. </summary>
         /// <param name="TelemetryEvent"> Telemetry event. </param>
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Conditional("TELEMETRYCONDITION")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public static void EmitTelemetryEvent(TelemetryEvent TelemetryEvent)
         {
             NuGetTelemetryService?.EmitTelemetryEvent(TelemetryEvent);

diff --git a/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/Actions/UIActionEngineTests.cs b/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/Actions/UIActionEngineTests.cs
@@ -214,7 +214,13 @@ public static IEnumerable<object[]> GetInstallActionTestData()
             }
         }
 
-        [Theory]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Theory(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         [MemberData(nameof(GetInstallActionTestData))]
         public async Task CreateInstallAction_OnInstallingProject_EmitsPkgWasTransitiveTelemetryAndTabAndIsSolutionPropertiesAsync(ContractsItemFilter activeTab, bool isSolutionLevel, string packageIdToInstall, bool? expectedPkgWasTransitive)
         {

diff --git a/...lients.Tests/NuGet.PackageManagement.VisualStudio.Test/CpsPackageReferenceProjectTests.cs b/...lients.Tests/NuGet.PackageManagement.VisualStudio.Test/CpsPackageReferenceProjectTests.cs
@@ -2386,7 +2386,13 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             }
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task TestPackageManager_RaiseTelemetryEvents()
         {
             // set up telemetry service

diff --git a/...ests/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetPackageSearchServiceTests.cs b/...ests/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetPackageSearchServiceTests.cs
@@ -433,7 +433,13 @@ public async Task CreatePackageFeedAsync_WithTransitiveOriginsExpFlag_OnlyInstal
             Assert.Null(recommender);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task CreatePackageFeedAsync_ProjectPMUIInstalledTab_EmitsCounterfactualTelemetryAsync()
         {
             // Arrange

diff --git a/...sts/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetProjectManagerServiceTests.cs b/...sts/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetProjectManagerServiceTests.cs
@@ -368,7 +368,13 @@ await PerformOperationAsync(async (projectManager) =>
             }
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task GetInstalledPackagesAsync_WhenProjectReturnsNullPackageReference_NullIsRemoved()
         {
             const string projectName = "a";
@@ -799,7 +805,13 @@ private async Task GetInstalledAndTransitivePackagesAsync_TransitiveOriginsWithL
                 x => Assert.Equal(x.Identity, new PackageIdentity("packageX", NuGetVersion.Parse("3.0.0"))));
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         private async Task GetInstalledAndTransitivePackagesAsync_WithCpsPackageReferenceProject_OneTransitiveReferenceAndEmitsCounterfactualTelemetryAsync()
         {
             // packageA_2.0.0 -> packageB_1.0.0

diff --git a/...ts.Tests/NuGet.PackageManagement.VisualStudio.Test/Telemetry/TelemetryOnceEmitterTests.cs b/...ts.Tests/NuGet.PackageManagement.VisualStudio.Test/Telemetry/TelemetryOnceEmitterTests.cs
@@ -38,7 +38,13 @@ public void TelemetryOnceEmitter_NullOrEmptyEventName_Throws(string eventName)
             Assert.Throws<ArgumentException>(() => new TelemetryOnceEmitter(eventName));
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void EmitIfNeeded_TwoCalls_EmitsTelemetryOnce()
         {
             // Arrange
@@ -54,7 +60,13 @@ public void EmitIfNeeded_TwoCalls_EmitsTelemetryOnce()
             Assert.Equal(1, _telemetryEvents.Count);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task EmitIfNeeded_MultipleThreads_EmitsOnceAsync()
         {
             // Arrange
@@ -84,7 +96,13 @@ public async Task EmitIfNeeded_MultipleThreads_EmitsOnceAsync()
             Assert.Contains(_telemetryEvents, e => e.Name == logger.EventName);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////]
         public void Reset_WithAlreadyEmitted_Restarts()
         {
             // Arrange

diff --git a/...Get.Core.Tests/NuGet.Commands.Test/RestoreCommand/OriginalCaseGlobalPackageFolderTests.cs b/...Get.Core.Tests/NuGet.Commands.Test/RestoreCommand/OriginalCaseGlobalPackageFolderTests.cs
@@ -187,7 +187,13 @@ await target.CopyPackagesToOriginalCaseAsync(
             }
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task CopyPackagesToOriginalCaseAsync_EmitsTelemetryWithParentIdAsync()
         {
             // Set up telemetry service

diff --git a/test/NuGet.Core.Tests/NuGet.Commands.Test/RestoreCommandTests.cs b/test/NuGet.Core.Tests/NuGet.Commands.Test/RestoreCommandTests.cs
@@ -2692,7 +2692,13 @@ public async Task RestoreCommand_CentralVersion_ErrorWhenVersionOverrideUsedButI
             }
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task ExecuteAsync_WithSinglePackage_PopulatesCorrectTelemetry()
         {
             // Arrange
@@ -2765,7 +2771,13 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             projectInformationEvent["FallbackFoldersCount"].Should().Be(0);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task ExecuteAsync_WithSinglePackage_WhenNoOping_PopulatesCorrectTelemetry()
         {
             // Arrange
@@ -2841,7 +2853,13 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             projectInformationEvent["FallbackFoldersCount"].Should().Be(0);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public async Task ExecuteAsync_WithPartiallyPopulatedGlobalPackagesFolder_PopulatesNewlyInstalledPackagesTelemetry()
         {
             // Arrange

diff --git a/test/NuGet.Core.Tests/NuGet.Common.Test/TelemetryActivityTests.cs b/test/NuGet.Core.Tests/NuGet.Common.Test/TelemetryActivityTests.cs
@@ -35,7 +35,13 @@ public TelemetryActivityTests()
             TelemetryActivity.NuGetTelemetryService = _telemetryService.Object;
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_WithOperationIdAndWithoutParentId_EmitsOperationIdAndNotParentId()
         {
             Guid operationId;
@@ -49,7 +55,13 @@ public void Dispose_WithOperationIdAndWithoutParentId_EmitsOperationIdAndNotPare
             Assert.Equal(operationId.ToString(), _telemetryEvent["OperationId"]);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_WithOperationIdAndParentId_EmitsOperationIdAndParentId()
         {
             var parentId = Guid.NewGuid();
@@ -64,7 +76,13 @@ public void Dispose_WithOperationIdAndParentId_EmitsOperationIdAndParentId()
             Assert.Equal(operationId.ToString(), _telemetryEvent["OperationId"]);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_WithIntervalMeasure_EmitsIntervalMeasure()
         {
             const string measureName = "testInterval";
@@ -83,7 +101,13 @@ public void Dispose_WithIntervalMeasure_EmitsIntervalMeasure()
             Assert.True(actualCount >= secondsToWait, $"The telemetry duration count should at least be {secondsToWait} seconds.");
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_WithEmptyParentId_EmitsNoParentId()
         {
             var parentId = Guid.Empty;
@@ -95,7 +119,13 @@ public void Dispose_WithEmptyParentId_EmitsNoParentId()
             Assert.Null(_telemetryEvent["ParentId"]);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_Always_EmitsStartTime()
         {
             using (var telemetry = TelemetryActivity.Create(CreateNewTelemetryEvent()))
@@ -109,7 +139,13 @@ public void Dispose_Always_EmitsStartTime()
             TelemetryUtility.VerifyDateTimeFormat(startTime);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_Always_EmitsEndTime()
         {
             using (var telemetry = TelemetryActivity.Create(CreateNewTelemetryEvent()))
@@ -123,7 +159,13 @@ public void Dispose_Always_EmitsEndTime()
             TelemetryUtility.VerifyDateTimeFormat(endTime);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_Always_EmitsDuration()
         {
             using (var telemetry = TelemetryActivity.Create(CreateNewTelemetryEvent()))
@@ -156,7 +198,13 @@ public void Dispose_will_dispose_activity()
             Assert.True(_activityDisposed);
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_IndependentInterval_EmitsIntervalMeasure()
         {
             const string measureName = nameof(Dispose_IndependentInterval_EmitsIntervalMeasure);
@@ -176,7 +224,13 @@ public void Dispose_IndependentInterval_EmitsIntervalMeasure()
             Assert.True(actualCount >= secondsToWait, $"The telemetry duration count should at least be {secondsToWait} seconds.");
         }
 
-        [Fact]
+        //////////////////////////////////////////////////////////
+        // Start - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
+        [Fact(Skip = "Intentionally broken by Chocolatey changes")]
+        //////////////////////////////////////////////////////////
+        // End - Chocolatey Specific Modification
+        //////////////////////////////////////////////////////////
         public void Dispose_WithIndependentInterval_DoesNotClashWithNonoverlappingInterval()
         {
             const string independentInterval = "independentTestInterval";