Rename TelemetryResilienceStrategyOptions to TelemetryOptions

bench/Polly.Core.Benchmarks/TelemetryBenchmark.cs

@@ -34,7 +34,7 @@ private ResilienceStrategy Build(ResilienceStrategyBuilder builder)
 
         if (Telemetry)
         {
-            TelemetryResilienceStrategyOptions options = new() { LoggerFactory = NullLoggerFactory.Instance };
+            TelemetryOptions options = new() { LoggerFactory = NullLoggerFactory.Instance };
 
             if (Enrichment)
             {

src/Polly.Extensions/DependencyInjection/PollyServiceCollectionExtensions.cs

@@ -209,7 +209,7 @@ private static IServiceCollection AddResilienceStrategyRegistry<TKey>(this IServ
     private static void AddResilienceStrategyBuilder(this IServiceCollection services)
     {
         services
-            .AddOptions<TelemetryResilienceStrategyOptions>()
+            .AddOptions<TelemetryOptions>()
             .Configure<IServiceProvider>((options, serviceProvider) =>
             {
                 options.LoggerFactory = serviceProvider.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
@@ -219,7 +219,7 @@ private static void AddResilienceStrategyBuilder(this IServiceCollection service
         {
             var builder = new ResilienceStrategyBuilder();
             builder.Properties.Set(PollyDependencyInjectionKeys.ServiceProvider, serviceProvider);
-            builder.EnableTelemetry(serviceProvider.GetRequiredService<IOptions<TelemetryResilienceStrategyOptions>>().Value);
+            builder.EnableTelemetry(serviceProvider.GetRequiredService<IOptions<TelemetryOptions>>().Value);
             return builder;
         });
     }

src/Polly.Extensions/Telemetry/EnrichmentContext.cs

@@ -1,7 +1,7 @@
 namespace Polly.Extensions.Telemetry;
 
 /// <summary>
-/// Enrichment context used when reporting resilience telemetry. This context is passed to the registered enrichers in <see cref="TelemetryResilienceStrategyOptions.Enrichers"/>.
+/// Enrichment context used when reporting resilience telemetry. This context is passed to the registered enrichers in <see cref="TelemetryOptions.Enrichers"/>.
 /// </summary>
 public sealed partial class EnrichmentContext
 {

src/Polly.Extensions/Telemetry/ResilienceTelemetryDiagnosticSource.cs

@@ -12,7 +12,7 @@ internal class ResilienceTelemetryDiagnosticSource : DiagnosticSource
     private readonly ILogger _logger;
     private readonly List<Action<EnrichmentContext>> _enrichers;
 
-    public ResilienceTelemetryDiagnosticSource(TelemetryResilienceStrategyOptions options)
+    public ResilienceTelemetryDiagnosticSource(TelemetryOptions options)
     {
         _enrichers = options.Enrichers.ToList();
         _logger = options.LoggerFactory.CreateLogger(TelemetryUtil.PollyDiagnosticSource);

src/Polly.Extensions/Telemetry/TelemetryResilienceStrategyOptions.cs → src/Polly.Extensions/Telemetry/TelemetryOptions.cs

@@ -9,7 +9,7 @@ namespace Polly.Extensions.Telemetry;
 /// <summary>
 /// The options that are used to configure the telemetry that is produced by the resilience strategies.
 /// </summary>
-public class TelemetryResilienceStrategyOptions
+public class TelemetryOptions
 {
     /// <summary>
     /// Gets or sets the logger factory.

src/Polly.Extensions/Telemetry/TelemetryResilienceStrategyBuilderExtensions.cs

@@ -28,7 +28,7 @@ public static TBuilder EnableTelemetry<TBuilder>(this TBuilder builder, ILoggerF
         Guard.NotNull(builder);
         Guard.NotNull(loggerFactory);
 
-        return builder.EnableTelemetry(new TelemetryResilienceStrategyOptions { LoggerFactory = loggerFactory });
+        return builder.EnableTelemetry(new TelemetryOptions { LoggerFactory = loggerFactory });
     }
 
     /// <summary>
@@ -43,7 +43,7 @@ public static TBuilder EnableTelemetry<TBuilder>(this TBuilder builder, ILoggerF
     /// Additionally, the telemetry strategy that logs and meters the executions is added to the beginning of the strategy pipeline.
     /// </remarks>
     /// <exception cref="ArgumentNullException">Thrown when <paramref name="builder"/> or <paramref name="options"/> is <see langword="null"/>.</exception>
-    public static TBuilder EnableTelemetry<TBuilder>(this TBuilder builder, TelemetryResilienceStrategyOptions options)
+    public static TBuilder EnableTelemetry<TBuilder>(this TBuilder builder, TelemetryOptions options)
         where TBuilder : ResilienceStrategyBuilderBase
     {
         Guard.NotNull(builder);

test/Polly.Extensions.Tests/DependencyInjection/PollyServiceCollectionExtensionTests.cs

@@ -147,7 +147,7 @@ public void AddResilienceStrategy_EnsureTelemetryEnabled(bool hasLogging)
         var diagSource = telemetry!.GetType().GetProperty("DiagnosticSource", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(telemetry);
         diagSource.Should().BeOfType<ResilienceTelemetryDiagnosticSource>();
 
-        var factory = _services.BuildServiceProvider().GetRequiredService<IOptions<TelemetryResilienceStrategyOptions>>().Value.LoggerFactory;
+        var factory = _services.BuildServiceProvider().GetRequiredService<IOptions<TelemetryOptions>>().Value.LoggerFactory;
 
         if (hasLogging)
         {

test/Polly.Extensions.Tests/Telemetry/ResilienceTelemetryDiagnosticSourceTests.cs

@@ -30,7 +30,7 @@ public void Meter_Ok()
     {
         ResilienceTelemetryDiagnosticSource.Meter.Name.Should().Be("Polly");
         ResilienceTelemetryDiagnosticSource.Meter.Version.Should().Be("1.0");
-        new ResilienceTelemetryDiagnosticSource(new TelemetryResilienceStrategyOptions())
+        new ResilienceTelemetryDiagnosticSource(new TelemetryOptions())
             .Counter.Description.Should().Be("Tracks the number of resilience events that occurred in resilience strategies.");
     }
 
@@ -207,7 +207,7 @@ public void WriteEvent_MeteringWithoutStrategyKey_Ok()
 
     private ResilienceTelemetryDiagnosticSource Create(Action<ICollection<Action<EnrichmentContext>>>? configureEnrichers = null)
     {
-        var options = new TelemetryResilienceStrategyOptions
+        var options = new TelemetryOptions
         {
             LoggerFactory = _loggerFactory
         };

test/Polly.Extensions.Tests/Telemetry/TelemetryResilienceStrategyOptionsTests.cs → test/Polly.Extensions.Tests/Telemetry/TelemetryOptionsTests.cs

@@ -5,12 +5,12 @@
 
 namespace Polly.Extensions.Tests.Telemetry;
 
-public class TelemetryResilienceStrategyOptionsTests
+public class TelemetryOptionsTests
 {
     [Fact]
     public void Ctor_EnsureDefaults()
     {
-        var options = new TelemetryResilienceStrategyOptions();
+        var options = new TelemetryOptions();
 
         options.Enrichers.Should().BeEmpty();
         options.LoggerFactory.Should().Be(NullLoggerFactory.Instance);

test/Polly.Extensions.Tests/Telemetry/TelemetryResilienceStrategyBuilderExtensionsTests.cs

@@ -53,7 +53,7 @@ public void EnableTelemetry_EnsureLogging(bool generic)
     public void EnableTelemetry_InvalidOptions_Throws()
     {
         _builder
-            .Invoking(b => b.EnableTelemetry(new TelemetryResilienceStrategyOptions
+            .Invoking(b => b.EnableTelemetry(new TelemetryOptions
             {
                 LoggerFactory = null!,
             })).Should()
@@ -66,7 +66,7 @@ The LoggerFactory field is required.
             """);
 
         _genericBuilder
-            .Invoking(b => b.EnableTelemetry(new TelemetryResilienceStrategyOptions
+            .Invoking(b => b.EnableTelemetry(new TelemetryOptions
             {
                 LoggerFactory = null!,
             })).Should()