From 5546e37dbe1011ae5ec9d926b9fe53ca1e9a4aa8 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <xakep139@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:55:54 +0200
Subject: [PATCH] Remove EventListenerRecyclingInterval from
 EventCountersCollectorOptions (#4178)

* Update EventCountersCollectorOptions.cs

* Update Microsoft.Extensions.Telemetry.json

* Update appsettings.json
---
 .../EventCountersCollectorOptions.cs          | 26 -------------------
 .../Microsoft.Extensions.Telemetry.json       |  6 +----
 .../appsettings.json                          |  3 +--
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
index ab6504d4738..cfc1c2e6cbb 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
@@ -16,15 +16,6 @@ public class EventCountersCollectorOptions
 {
     private static readonly TimeSpan _defaultSamplingInterval = TimeSpan.FromSeconds(1);
 
-#if NET5_0_OR_GREATER
-    /// <remarks>
-    /// This is a work-around for this <see href="/dotnet/runtime/issues/43985">issue</see>.
-    /// The field is intended to be used on .NET 5 only, we ship it for newer TFMs to resolve package compositional issues.
-    /// See discussion in <see href="https://domoreexp.visualstudio.com/R9/_git/SDK/pullrequest/552703"/> for additional context.
-    /// </remarks>
-    private static readonly TimeSpan _defaultEventListenerRecyclingInterval = TimeSpan.FromHours(1);
-#endif
-
     /// <summary>
     /// Gets or sets a list of EventSources and CounterNames to listen for.
     /// </summary>
@@ -71,21 +62,4 @@ public class EventCountersCollectorOptions
     /// </remarks>
     [Experimental(diagnosticId: "TBD", UrlFormat = WarningDefinitions.SharedUrlFormat)]
     public bool IncludeRecommendedDefault { get; set; }
-
-#if NET5_0_OR_GREATER
-    /// <summary>
-    /// Gets or sets the interval at which to recycle the <see cref="EventCountersListener"/>.
-    /// </summary>
-    /// <value>
-    /// The default value is 1 hour.
-    /// </value>
-    /// <remarks>
-    /// This property is a work-around for <see href="/dotnet/runtime/issues/43985">dotnet/runtime issue 43985</see>.
-    /// It only has an effect on .NET 5, and is ignored for .NET 6 and later versions.
-    /// </remarks>
-    // The property is intended to be used on .NET 5 only, we ship it for newer TFMs to resolve package compositional issues. Refer to discussion for details:
-    // https://domoreexp.visualstudio.com/R9/_git/SDK/pullrequest/552703?_a=files&path=/src/Extensions/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs&discussionId=9983912
-    [TimeSpan("00:10:00", "06:00:00")]
-    public TimeSpan EventListenerRecyclingInterval { get; set; } = _defaultEventListenerRecyclingInterval;
-#endif
 }
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json
index 364c822941a..e0f476ddfb9 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json
@@ -15,10 +15,6 @@
           "Member": "System.Collections.Generic.IDictionary<string, System.Collections.Generic.ISet<string>> Microsoft.Extensions.Telemetry.Metering.EventCountersCollectorOptions.Counters { get; set; }",
           "Stage": "Stable"
         },
-        {
-          "Member": "System.TimeSpan Microsoft.Extensions.Telemetry.Metering.EventCountersCollectorOptions.EventListenerRecyclingInterval { get; set; }",
-          "Stage": "Stable"
-        },
         {
           "Member": "bool Microsoft.Extensions.Telemetry.Metering.EventCountersCollectorOptions.IncludeRecommendedDefault { get; set; }",
           "Stage": "Experimental"
@@ -640,4 +636,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/appsettings.json b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/appsettings.json
index c1078224b63..eb8605bee70 100644
--- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/appsettings.json
+++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/appsettings.json
@@ -31,8 +31,7 @@
     "Counters": {
       "Key1": [ "one", "two", "three", "four" ],
       "Key2": [ "ABC" ]
-    },
-    "EventListenerRecyclingInterval": "00:20:00"
+    }
   },
   "InvalidConfig": {
     "SamplingInterval": "00:00:00"