Skip to content

Commit 9674b6b

Browse files
martintmkmartintmk
authored
Drop the Extensions from Polly.Extensions namespace (#1469)
1 parent 872154f commit 9674b6b

File tree

46 files changed

+68
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+68
-101
lines changed

‎bench/Polly.Core.Benchmarks/TelemetryBenchmark.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Diagnostics.Metrics;
22
using Microsoft.Extensions.Logging.Abstractions;
3-
using Polly.Extensions.Telemetry;
43
using Polly.Telemetry;
54

65
namespace Polly.Core.Benchmarks;

‎src/Polly.Core/CircuitBreaker/CircuitBreakerManualControl.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using System.Collections.Generic;
2-
31
namespace Polly.CircuitBreaker;
42

53
/// <summary>

‎src/Polly.Core/CircuitBreaker/CircuitBreakerResilienceStrategy.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Polly.Utils;
2-
31
namespace Polly.CircuitBreaker;
42

53
internal sealed class CircuitBreakerResilienceStrategy<T> : ReactiveResilienceStrategy<T>

‎src/Polly.Core/Utils/LegacySupport.cs ‎src/Polly.Core/LegacySupport.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.ComponentModel;
22

3-
namespace Polly.Utils;
3+
namespace Polly;
44

55
/// <summary>
66
/// Legacy support for older versions of Polly.

‎src/Polly.Core/PublicAPI.Unshipped.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Polly.Hedging.OnHedgingArguments.ExecutionTime.get -> System.TimeSpan
146146
Polly.Hedging.OnHedgingArguments.HasOutcome.get -> bool
147147
Polly.Hedging.OnHedgingArguments.OnHedgingArguments(int attemptNumber, bool hasOutcome, System.TimeSpan executionTime) -> void
148148
Polly.HedgingCompositeStrategyBuilderExtensions
149+
Polly.LegacySupport
149150
Polly.NullResilienceStrategy
150151
Polly.NullResilienceStrategy<TResult>
151152
Polly.Outcome
@@ -384,7 +385,6 @@ Polly.Timeout.TimeoutStrategyOptions.TimeoutGenerator.get -> System.Func<Polly.T
384385
Polly.Timeout.TimeoutStrategyOptions.TimeoutGenerator.set -> void
385386
Polly.Timeout.TimeoutStrategyOptions.TimeoutStrategyOptions() -> void
386387
Polly.TimeoutCompositeStrategyBuilderExtensions
387-
Polly.Utils.LegacySupport
388388
static Polly.CircuitBreakerCompositeStrategyBuilderExtensions.AddCircuitBreaker(this Polly.CompositeStrategyBuilder! builder, Polly.CircuitBreaker.CircuitBreakerStrategyOptions! options) -> Polly.CompositeStrategyBuilder!
389389
static Polly.CircuitBreakerCompositeStrategyBuilderExtensions.AddCircuitBreaker<TResult>(this Polly.CompositeStrategyBuilder<TResult>! builder, Polly.CircuitBreaker.CircuitBreakerStrategyOptions<TResult>! options) -> Polly.CompositeStrategyBuilder<TResult>!
390390
static Polly.CompositeStrategyBuilderExtensions.AddStrategy(this Polly.CompositeStrategyBuilder! builder, System.Func<Polly.StrategyBuilderContext!, Polly.ReactiveResilienceStrategy<object!>!>! factory, Polly.ResilienceStrategyOptions! options) -> Polly.CompositeStrategyBuilder!
@@ -394,6 +394,7 @@ static Polly.CompositeStrategyBuilderExtensions.AddStrategy<TResult>(this Polly.
394394
static Polly.CompositeStrategyBuilderExtensions.AddStrategy<TResult>(this Polly.CompositeStrategyBuilder<TResult>! builder, System.Func<Polly.StrategyBuilderContext!, Polly.ReactiveResilienceStrategy<TResult>!>! factory, Polly.ResilienceStrategyOptions! options) -> Polly.CompositeStrategyBuilder<TResult>!
395395
static Polly.FallbackCompositeStrategyBuilderExtensions.AddFallback<TResult>(this Polly.CompositeStrategyBuilder<TResult>! builder, Polly.Fallback.FallbackStrategyOptions<TResult>! options) -> Polly.CompositeStrategyBuilder<TResult>!
396396
static Polly.HedgingCompositeStrategyBuilderExtensions.AddHedging<TResult>(this Polly.CompositeStrategyBuilder<TResult>! builder, Polly.Hedging.HedgingStrategyOptions<TResult>! options) -> Polly.CompositeStrategyBuilder<TResult>!
397+
static Polly.LegacySupport.SetProperties(this Polly.ResilienceProperties! resilienceProperties, System.Collections.Generic.IDictionary<string!, object?>! properties, out System.Collections.Generic.IDictionary<string!, object?>! oldProperties) -> void
397398
static Polly.Outcome.FromException<TResult>(System.Exception! exception) -> Polly.Outcome<TResult>
398399
static Polly.Outcome.FromExceptionAsTask<TResult>(System.Exception! exception) -> System.Threading.Tasks.ValueTask<Polly.Outcome<TResult>>
399400
static Polly.Outcome.FromResult<TResult>(TResult? value) -> Polly.Outcome<TResult>
@@ -411,7 +412,6 @@ static Polly.RetryCompositeStrategyBuilderExtensions.AddRetry(this Polly.Composi
411412
static Polly.RetryCompositeStrategyBuilderExtensions.AddRetry<TResult>(this Polly.CompositeStrategyBuilder<TResult>! builder, Polly.Retry.RetryStrategyOptions<TResult>! options) -> Polly.CompositeStrategyBuilder<TResult>!
412413
static Polly.TimeoutCompositeStrategyBuilderExtensions.AddTimeout<TBuilder>(this TBuilder! builder, Polly.Timeout.TimeoutStrategyOptions! options) -> TBuilder!
413414
static Polly.TimeoutCompositeStrategyBuilderExtensions.AddTimeout<TBuilder>(this TBuilder! builder, System.TimeSpan timeout) -> TBuilder!
414-
static Polly.Utils.LegacySupport.SetProperties(this Polly.ResilienceProperties! resilienceProperties, System.Collections.Generic.IDictionary<string!, object?>! properties, out System.Collections.Generic.IDictionary<string!, object?>! oldProperties) -> void
415415
static readonly Polly.NullResilienceStrategy.Instance -> Polly.NullResilienceStrategy!
416416
static readonly Polly.NullResilienceStrategy<TResult>.Instance -> Polly.NullResilienceStrategy<TResult>!
417417
virtual Polly.Registry.ResilienceStrategyProvider<TKey>.GetStrategy(TKey key) -> Polly.ResilienceStrategy!

‎src/Polly.Core/ResilienceStrategyT.Async.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Polly.Utils;
2-
31
namespace Polly;
42

53
#pragma warning disable RS0027 // API with optional parameter(s) should have the most parameters amongst its public overloads

‎src/Polly.Core/Retry/RetryResilienceStrategy.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using Polly.Telemetry;
32

43
namespace Polly.Retry;

‎src/Polly.Core/Utils/CompositeResilienceStrategy.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using System.Diagnostics;
2-
31
namespace Polly.Utils;
42

53
#pragma warning disable S2302 // "nameof" should be used

‎src/Polly.Core/Utils/TaskHelper.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Threading.Tasks;
2-
3-
namespace Polly.Utils;
1+
namespace Polly.Utils;
42

53
internal static class TaskHelper
64
{

‎src/Polly.Extensions/DependencyInjection/AddResilienceStrategyContext.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using System;
21
using System.Diagnostics.CodeAnalysis;
32
using Microsoft.Extensions.DependencyInjection;
43
using Microsoft.Extensions.Options;
5-
using Polly.Extensions.Registry;
64
using Polly.Registry;
75

8-
namespace Polly.Extensions.DependencyInjection;
6+
namespace Polly.DependencyInjection;
97

108
/// <summary>
119
/// Represents the context for adding a resilience strategy with the specified key.

‎src/Polly.Extensions/DependencyInjection/ConfigureResilienceStrategyRegistryOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Polly.Registry;
22

3-
namespace Polly.Extensions.DependencyInjection;
3+
namespace Polly.DependencyInjection;
44

55
internal sealed class ConfigureResilienceStrategyRegistryOptions<TKey>
66
where TKey : notnull

‎src/Polly.Extensions/DependencyInjection/PollyDependencyInjectionKeys.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Polly.Extensions.DependencyInjection;
1+
namespace Polly.DependencyInjection;
22

33
/// <summary>
44
/// The resilience keys used in the dependency injection scenarios.

‎src/Polly.Extensions/DependencyInjection/PollyServiceCollectionExtensions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using Microsoft.Extensions.Logging;
44
using Microsoft.Extensions.Logging.Abstractions;
55
using Microsoft.Extensions.Options;
6-
using Polly.Extensions.DependencyInjection;
7-
using Polly.Extensions.Telemetry;
6+
using Polly.DependencyInjection;
87
using Polly.Registry;
8+
using Polly.Telemetry;
99
using Polly.Utils;
1010

1111
namespace Polly;
@@ -85,7 +85,7 @@ public static IServiceCollection AddResilienceStrategy<TKey, TResult>(
8585
});
8686
});
8787

88-
return AddResilienceStrategyRegistry<TKey>(services);
88+
return services.AddResilienceStrategyRegistry<TKey>();
8989
}
9090

9191
/// <summary>
@@ -156,7 +156,7 @@ public static IServiceCollection AddResilienceStrategy<TKey>(
156156
});
157157
});
158158

159-
return AddResilienceStrategyRegistry<TKey>(services);
159+
return services.AddResilienceStrategyRegistry<TKey>();
160160
}
161161

162162
/// <summary>

‎src/Polly.Extensions/Polly.Extensions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>net7.0;net6.0;netstandard2.0;net472;net462</TargetFrameworks>
44
<AssemblyTitle>Polly.Extensions</AssemblyTitle>
5-
<RootNamespace>Polly.Extensions</RootNamespace>
5+
<RootNamespace>Polly</RootNamespace>
66
<Nullable>enable</Nullable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<ProjectType>Library</ProjectType>

‎src/Polly.Extensions/PublicAPI.Unshipped.txt

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
#nullable enable
2-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>
3-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>.BuilderName.get -> string!
4-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>.EnableReloads<TOptions>(string? name = null) -> void
5-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>.GetOptions<TOptions>(string? name = null) -> TOptions
6-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>.ServiceProvider.get -> System.IServiceProvider!
7-
Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>.StrategyKey.get -> TKey
8-
Polly.Extensions.Registry.ConfigureBuilderContextExtensions
9-
Polly.Extensions.Telemetry.EnrichmentContext
10-
Polly.Extensions.Telemetry.EnrichmentContext.Arguments.get -> object?
11-
Polly.Extensions.Telemetry.EnrichmentContext.Context.get -> Polly.ResilienceContext!
12-
Polly.Extensions.Telemetry.EnrichmentContext.Outcome.get -> Polly.Outcome<object!>?
13-
Polly.Extensions.Telemetry.EnrichmentContext.Tags.get -> System.Collections.Generic.IList<System.Collections.Generic.KeyValuePair<string!, object?>>!
14-
Polly.Extensions.Telemetry.TelemetryOptions
15-
Polly.Extensions.Telemetry.TelemetryOptions.Enrichers.get -> System.Collections.Generic.ICollection<System.Action<Polly.Extensions.Telemetry.EnrichmentContext!>!>!
16-
Polly.Extensions.Telemetry.TelemetryOptions.LoggerFactory.get -> Microsoft.Extensions.Logging.ILoggerFactory!
17-
Polly.Extensions.Telemetry.TelemetryOptions.LoggerFactory.set -> void
18-
Polly.Extensions.Telemetry.TelemetryOptions.OnTelemetryEvent.get -> System.Action<Polly.Telemetry.TelemetryEventArguments!>?
19-
Polly.Extensions.Telemetry.TelemetryOptions.OnTelemetryEvent.set -> void
20-
Polly.Extensions.Telemetry.TelemetryOptions.ResultFormatter.get -> System.Func<Polly.ResilienceContext!, object?, object?>!
21-
Polly.Extensions.Telemetry.TelemetryOptions.ResultFormatter.set -> void
22-
Polly.Extensions.Telemetry.TelemetryOptions.TelemetryOptions() -> void
2+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>
3+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>.BuilderName.get -> string!
4+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>.EnableReloads<TOptions>(string? name = null) -> void
5+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>.GetOptions<TOptions>(string? name = null) -> TOptions
6+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>.ServiceProvider.get -> System.IServiceProvider!
7+
Polly.DependencyInjection.AddResilienceStrategyContext<TKey>.StrategyKey.get -> TKey
238
Polly.PollyServiceCollectionExtensions
9+
Polly.Registry.ConfigureBuilderContextExtensions
10+
Polly.Telemetry.EnrichmentContext
11+
Polly.Telemetry.EnrichmentContext.Arguments.get -> object?
12+
Polly.Telemetry.EnrichmentContext.Context.get -> Polly.ResilienceContext!
13+
Polly.Telemetry.EnrichmentContext.Outcome.get -> Polly.Outcome<object!>?
14+
Polly.Telemetry.EnrichmentContext.Tags.get -> System.Collections.Generic.IList<System.Collections.Generic.KeyValuePair<string!, object?>>!
15+
Polly.Telemetry.TelemetryOptions
16+
Polly.Telemetry.TelemetryOptions.Enrichers.get -> System.Collections.Generic.ICollection<System.Action<Polly.Telemetry.EnrichmentContext!>!>!
17+
Polly.Telemetry.TelemetryOptions.LoggerFactory.get -> Microsoft.Extensions.Logging.ILoggerFactory!
18+
Polly.Telemetry.TelemetryOptions.LoggerFactory.set -> void
19+
Polly.Telemetry.TelemetryOptions.OnTelemetryEvent.get -> System.Action<Polly.Telemetry.TelemetryEventArguments!>?
20+
Polly.Telemetry.TelemetryOptions.OnTelemetryEvent.set -> void
21+
Polly.Telemetry.TelemetryOptions.ResultFormatter.get -> System.Func<Polly.ResilienceContext!, object?, object?>!
22+
Polly.Telemetry.TelemetryOptions.ResultFormatter.set -> void
23+
Polly.Telemetry.TelemetryOptions.TelemetryOptions() -> void
2424
Polly.TelemetryCompositeStrategyBuilderExtensions
25-
static Polly.Extensions.Registry.ConfigureBuilderContextExtensions.EnableReloads<TKey, TOptions>(this Polly.Registry.ConfigureBuilderContext<TKey>! context, Microsoft.Extensions.Options.IOptionsMonitor<TOptions>! optionsMonitor, string? name = null) -> void
26-
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey, TResult>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder<TResult>!, Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
25+
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey, TResult>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder<TResult>!, Polly.DependencyInjection.AddResilienceStrategyContext<TKey>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
2726
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey, TResult>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder<TResult>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
28-
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder!, Polly.Extensions.DependencyInjection.AddResilienceStrategyContext<TKey>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
27+
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder!, Polly.DependencyInjection.AddResilienceStrategyContext<TKey>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
2928
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategy<TKey>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, TKey key, System.Action<Polly.CompositeStrategyBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
3029
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategyRegistry<TKey>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
3130
static Polly.PollyServiceCollectionExtensions.AddResilienceStrategyRegistry<TKey>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Polly.Registry.ResilienceStrategyRegistryOptions<TKey>!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
31+
static Polly.Registry.ConfigureBuilderContextExtensions.EnableReloads<TKey, TOptions>(this Polly.Registry.ConfigureBuilderContext<TKey>! context, Microsoft.Extensions.Options.IOptionsMonitor<TOptions>! optionsMonitor, string? name = null) -> void
3232
static Polly.TelemetryCompositeStrategyBuilderExtensions.ConfigureTelemetry<TBuilder>(this TBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> TBuilder!
33-
static Polly.TelemetryCompositeStrategyBuilderExtensions.ConfigureTelemetry<TBuilder>(this TBuilder! builder, Polly.Extensions.Telemetry.TelemetryOptions! options) -> TBuilder!
33+
static Polly.TelemetryCompositeStrategyBuilderExtensions.ConfigureTelemetry<TBuilder>(this TBuilder! builder, Polly.Telemetry.TelemetryOptions! options) -> TBuilder!

‎src/Polly.Extensions/Registry/ConfigureBuilderContextExtensions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System.Diagnostics.CodeAnalysis;
22
using Microsoft.Extensions.Options;
3-
using Polly.Extensions.Utils;
4-
using Polly.Registry;
53
using Polly.Utils;
64

7-
namespace Polly.Extensions.Registry;
5+
namespace Polly.Registry;
86

97
/// <summary>
108
/// Extensions for <see cref="ConfigureBuilderContext{TKey}"/>.

‎src/Polly.Extensions/Telemetry/EnrichmentContext.Pool.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Polly.Utils;
22

3-
namespace Polly.Extensions.Telemetry;
3+
namespace Polly.Telemetry;
44

55
public partial class EnrichmentContext
66
{

‎src/Polly.Extensions/Telemetry/EnrichmentContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Polly.Extensions.Telemetry;
1+
namespace Polly.Telemetry;
22

33
/// <summary>
44
/// Enrichment context used when reporting resilience telemetry. This context is passed to the registered enrichers in <see cref="TelemetryOptions.Enrichers"/>.

‎src/Polly.Extensions/Telemetry/EnrichmentUtil.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Polly.Extensions.Telemetry;
1+
namespace Polly.Telemetry;
22

33
internal static class EnrichmentUtil
44
{

‎src/Polly.Extensions/Telemetry/Log.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Diagnostics.CodeAnalysis;
22
using Microsoft.Extensions.Logging;
33

4-
namespace Polly.Extensions.Telemetry;
4+
namespace Polly.Telemetry;
55

66
#pragma warning disable S107 // Methods should not have too many parameters
77

‎src/Polly.Extensions/Telemetry/ResilienceContextExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Globalization;
22

3-
namespace Polly.Extensions.Telemetry;
3+
namespace Polly.Telemetry;
44

55
internal static class ResilienceContextExtensions
66
{
@@ -12,7 +12,7 @@ public static bool IsExecutionHealthy(this ResilienceContext context)
1212
{
1313
for (int i = 0; i < context.ResilienceEvents.Count; i++)
1414
{
15-
if (context.ResilienceEvents[i].Severity > Polly.Telemetry.ResilienceEventSeverity.Information)
15+
if (context.ResilienceEvents[i].Severity > ResilienceEventSeverity.Information)
1616
{
1717
return false;
1818
}

‎src/Polly.Extensions/Telemetry/ResilienceTelemetryDiagnosticSource.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.Diagnostics.Metrics;
22
using Microsoft.Extensions.Logging;
3-
using Polly.Telemetry;
43

5-
namespace Polly.Extensions.Telemetry;
4+
namespace Polly.Telemetry;
65

76
internal sealed class ResilienceTelemetryDiagnosticSource : DiagnosticSource
87
{
@@ -133,8 +132,7 @@ private void LogEvent(TelemetryEventArguments args)
133132
{
134133
if (_logger.IsEnabled(level))
135134
{
136-
Log.ExecutionAttempt(
137-
_logger,
135+
_logger.ExecutionAttempt(
138136
level,
139137
args.Source.BuilderName.GetValueOrPlaceholder(),
140138
args.Source.BuilderInstanceName.GetValueOrPlaceholder(),
@@ -149,8 +147,7 @@ private void LogEvent(TelemetryEventArguments args)
149147
}
150148
else
151149
{
152-
Log.ResilienceEvent(
153-
_logger,
150+
_logger.ResilienceEvent(
154151
level,
155152
args.Event.EventName,
156153
args.Source.BuilderName.GetValueOrPlaceholder(),

‎src/Polly.Extensions/Telemetry/ResilienceTelemetryTags.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Polly.Extensions.Telemetry;
1+
namespace Polly.Telemetry;
22

33
internal class ResilienceTelemetryTags
44
{

‎src/Polly.Extensions/Telemetry/TelemetryCompositeStrategyBuilderExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Diagnostics.CodeAnalysis;
22
using Microsoft.Extensions.Logging;
3-
using Polly.Extensions.Telemetry;
3+
using Polly.Telemetry;
44
using Polly.Utils;
55

66
namespace Polly;

‎src/Polly.Extensions/Telemetry/TelemetryOptions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using System.Net.Http;
33
using Microsoft.Extensions.Logging;
44
using Microsoft.Extensions.Logging.Abstractions;
5-
using Polly.Telemetry;
65

7-
namespace Polly.Extensions.Telemetry;
6+
namespace Polly.Telemetry;
87

98
/// <summary>
109
/// The options that are used to configure the telemetry that is produced by the resilience strategies.

‎src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Diagnostics.Metrics;
22
using Microsoft.Extensions.Logging;
33

4-
namespace Polly.Extensions.Telemetry;
4+
namespace Polly.Telemetry;
55

66
internal sealed class TelemetryResilienceStrategy : ResilienceStrategy
77
{
@@ -51,15 +51,14 @@ protected override async ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState
5151
TState state)
5252
{
5353
var stamp = _timeProvider.GetTimestamp();
54-
Log.ExecutingStrategy(_logger, _builderName.GetValueOrPlaceholder(), _builderInstance.GetValueOrPlaceholder(), context.OperationKey, context.GetResultType());
54+
_logger.ExecutingStrategy(_builderName.GetValueOrPlaceholder(), _builderInstance.GetValueOrPlaceholder(), context.OperationKey, context.GetResultType());
5555

5656
var outcome = await callback(context, state).ConfigureAwait(context.ContinueOnCapturedContext);
5757

5858
var duration = _timeProvider.GetElapsedTime(stamp);
5959
var logLevel = context.IsExecutionHealthy() ? LogLevel.Debug : LogLevel.Warning;
6060

61-
Log.StrategyExecuted(
62-
_logger,
61+
_logger.StrategyExecuted(
6362
logLevel,
6463
_builderName.GetValueOrPlaceholder(),
6564
_builderInstance.GetValueOrPlaceholder(),

‎src/Polly.Extensions/Telemetry/TelemetryUtil.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Microsoft.Extensions.Logging;
2-
using Polly.Telemetry;
32

4-
namespace Polly.Extensions.Telemetry;
3+
namespace Polly.Telemetry;
54

65
internal static class TelemetryUtil
76
{

‎src/Polly.Extensions/Utils/OptionsReloadHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Diagnostics.CodeAnalysis;
22
using Microsoft.Extensions.Options;
33

4-
namespace Polly.Extensions.Utils;
4+
namespace Polly.Utils;
55

66
#pragma warning disable CA1001 // we can get away of not disposing this class because it's active for a lifetime of app
77
#pragma warning disable S2931

‎src/Polly.Testing/ResilienceStrategyExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Polly.Testing;
77
/// </summary>
88
public static class ResilienceStrategyExtensions
99
{
10-
private const string TelemetryResilienceStrategy = "Polly.Extensions.Telemetry.TelemetryResilienceStrategy";
10+
private const string TelemetryResilienceStrategy = "Polly.Telemetry.TelemetryResilienceStrategy";
1111

1212
/// <summary>
1313
/// Gets the inner strategies the <paramref name="strategy"/> is composed of.

0 commit comments

Comments
 (0)