diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04b01a3..c893fb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,12 +34,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 # MinVer needs full git history - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json @@ -73,7 +73,7 @@ jobs: - name: Upload test results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: test-results-${{ matrix.os }} path: artifacts/test-results @@ -81,7 +81,7 @@ jobs: - name: Generate coverage report if: matrix.os == 'ubuntu-latest' - uses: danielpalme/ReportGenerator-GitHub-Action@5.5.0 + uses: danielpalme/ReportGenerator-GitHub-Action@5.5.10 with: reports: artifacts/test-results/**/coverage.cobertura.xml targetdir: artifacts/coverage-report @@ -94,7 +94,7 @@ jobs: - name: Upload coverage report if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: coverage-report path: artifacts/coverage-report @@ -106,7 +106,7 @@ jobs: - name: Upload packages if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: packages path: | diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index bcc6d67..f475a8b 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -97,7 +97,7 @@ jobs: Write-Host "Package version: $version" - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json @@ -137,7 +137,7 @@ jobs: - name: Upload test results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: publish-test-results path: .\artifacts\test-results @@ -175,7 +175,7 @@ jobs: } - name: Upload packages - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: publish-packages-${{ steps.version.outputs.version }} path: | @@ -212,7 +212,7 @@ jobs: git push origin "v$env:PACKAGE_VERSION" - name: Create GitHub Release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: tag_name: v${{ steps.version.outputs.version }} name: v${{ steps.version.outputs.version }} diff --git a/Directory.Packages.props b/Directory.Packages.props index aec4958..f993d05 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,30 +1,30 @@ - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Tracing.Samples.Console/Program.cs b/samples/Tracing.Samples.Console/Program.cs index 7275ff2..5c3c8c7 100644 --- a/samples/Tracing.Samples.Console/Program.cs +++ b/samples/Tracing.Samples.Console/Program.cs @@ -1,7 +1,6 @@ using System.Diagnostics; using Atya.Diagnostics.Tracing.Abstractions; using Atya.Diagnostics.Tracing.Context; -using Atya.Diagnostics.Tracing.DependencyInjection; using Atya.Diagnostics.Tracing.Extensions; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Tracing/Activities/ActivitySourceAccessor.cs b/src/Tracing/Activities/ActivitySourceAccessor.cs index e6234f1..e08b1b5 100644 --- a/src/Tracing/Activities/ActivitySourceAccessor.cs +++ b/src/Tracing/Activities/ActivitySourceAccessor.cs @@ -13,10 +13,10 @@ namespace Atya.Diagnostics.Tracing.Activities; /// public sealed class ActivitySourceAccessor : IActivitySourceAccessor, IDisposable { - private readonly KeyValuePair[] defaultTags; - private readonly string? serviceName; - private readonly string? serviceVersion; - private bool disposed; + private readonly KeyValuePair[] _defaultTags; + private readonly string? _serviceName; + private readonly string? _serviceVersion; + private bool _disposed; /// /// Initializes a new instance of the class. @@ -33,9 +33,9 @@ public ActivitySourceAccessor(IOptions options) ValidateDefaultTagNames(tracingOptions.DefaultTags); this.ActivitySource = new ActivitySource(tracingOptions.ActivitySourceName, tracingOptions.ActivitySourceVersion); - this.serviceName = NormalizeOptionalValue(tracingOptions.ServiceName); - this.serviceVersion = NormalizeOptionalValue(tracingOptions.ServiceVersion); - this.defaultTags = tracingOptions.DefaultTags.ToArray(); + _serviceName = NormalizeOptionalValue(tracingOptions.ServiceName); + _serviceVersion = NormalizeOptionalValue(tracingOptions.ServiceVersion); + _defaultTags = tracingOptions.DefaultTags.ToArray(); } /// @@ -49,7 +49,7 @@ public ActivitySourceAccessor(IOptions options) IEnumerable>? tags = null, IEnumerable? links = null) { - ObjectDisposedException.ThrowIf(this.disposed, this); + ObjectDisposedException.ThrowIf(_disposed, this); _ = Guard.AgainstNullOrWhiteSpace(name); return this.ActivitySource.StartActivity(name, kind, parentContext, this.CreateActivityTags(tags), links); @@ -100,13 +100,13 @@ public ActivitySourceAccessor(IOptions options) /// public void Dispose() { - if (this.disposed) + if (_disposed) { return; } this.ActivitySource.Dispose(); - this.disposed = true; + _disposed = true; } private static string? NormalizeOptionalValue(string? value) @@ -140,17 +140,17 @@ private static void AddIfNotNull(Dictionary tags, string name, private IEnumerable>? CreateActivityTags(IEnumerable>? tags) { - if (this.serviceName is null && this.serviceVersion is null && this.defaultTags.Length == 0) + if (_serviceName is null && _serviceVersion is null && _defaultTags.Length == 0) { return tags; } var activityTags = new Dictionary(StringComparer.Ordinal); - AddIfNotNull(activityTags, Tags.TracingTagNames.ServiceName, this.serviceName); - AddIfNotNull(activityTags, Tags.TracingTagNames.ServiceVersion, this.serviceVersion); + AddIfNotNull(activityTags, Tags.TracingTagNames.ServiceName, _serviceName); + AddIfNotNull(activityTags, Tags.TracingTagNames.ServiceVersion, _serviceVersion); - foreach (var tag in this.defaultTags) + foreach (var tag in _defaultTags) { AddIfNotNull(activityTags, tag.Key, tag.Value); } diff --git a/src/Tracing/DependencyInjection/TracingServiceCollectionExtensions.cs b/src/Tracing/DependencyInjection/TracingServiceCollectionExtensions.cs index 760f09f..e4c6be2 100644 --- a/src/Tracing/DependencyInjection/TracingServiceCollectionExtensions.cs +++ b/src/Tracing/DependencyInjection/TracingServiceCollectionExtensions.cs @@ -6,10 +6,9 @@ using Atya.Diagnostics.Tracing.Internal; using Atya.Diagnostics.Tracing.Options; using Atya.Foundation.Guards; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Atya.Diagnostics.Tracing.DependencyInjection; +namespace Microsoft.Extensions.DependencyInjection; /// /// Service registration extensions for Atya tracing services. diff --git a/src/Tracing/PublicAPI.Unshipped.txt b/src/Tracing/PublicAPI.Unshipped.txt index a5c028e..f49df23 100644 --- a/src/Tracing/PublicAPI.Unshipped.txt +++ b/src/Tracing/PublicAPI.Unshipped.txt @@ -35,8 +35,8 @@ Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.TraceState.get -> string? Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.TraceState.init -> void Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.TryGetActivityContext(out System.Diagnostics.ActivityContext activityContext) -> bool Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.WriteTo(System.Collections.Generic.IDictionary! headers) -> void -Atya.Diagnostics.Tracing.DependencyInjection.TracingServiceCollectionExtensions Atya.Diagnostics.Tracing.Extensions.ActivityExtensions +Microsoft.Extensions.DependencyInjection.TracingServiceCollectionExtensions Atya.Diagnostics.Tracing.Options.TracingOptions Atya.Diagnostics.Tracing.Options.TracingOptions.AddDefaultTag(string! name, object? value) -> Atya.Diagnostics.Tracing.Options.TracingOptions! Atya.Diagnostics.Tracing.Options.TracingOptions.ActivitySourceName.get -> string! @@ -74,7 +74,6 @@ static Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.FromActivity(System static Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.operator !=(Atya.Diagnostics.Tracing.Context.TraceContextSnapshot? left, Atya.Diagnostics.Tracing.Context.TraceContextSnapshot? right) -> bool static Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.operator ==(Atya.Diagnostics.Tracing.Context.TraceContextSnapshot? left, Atya.Diagnostics.Tracing.Context.TraceContextSnapshot? right) -> bool static Atya.Diagnostics.Tracing.Context.TraceContextSnapshot.TryCaptureCurrent(out Atya.Diagnostics.Tracing.Context.TraceContextSnapshot? snapshot) -> bool -static Atya.Diagnostics.Tracing.DependencyInjection.TracingServiceCollectionExtensions.AddAtyaTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action? configure = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.MarkError(this System.Diagnostics.Activity! activity, string! errorType, string? message = null) -> System.Diagnostics.Activity! static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.MarkError(this System.Diagnostics.Activity! activity, System.Exception! exception) -> System.Diagnostics.Activity! static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.MarkSuccess(this System.Diagnostics.Activity! activity) -> System.Diagnostics.Activity! @@ -87,3 +86,4 @@ static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.SetOutcome(this Sy static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.SetTagIfNotNull(this System.Diagnostics.Activity! activity, string! name, object? value) -> System.Diagnostics.Activity! static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.SetTenantId(this System.Diagnostics.Activity! activity, string! tenantId) -> System.Diagnostics.Activity! static Atya.Diagnostics.Tracing.Extensions.ActivityExtensions.SetUserId(this System.Diagnostics.Activity! activity, string! userId) -> System.Diagnostics.Activity! +static Microsoft.Extensions.DependencyInjection.TracingServiceCollectionExtensions.AddAtyaTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action? configure = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! diff --git a/src/Tracing/README.md b/src/Tracing/README.md index 6d288ac..ce0f61b 100644 --- a/src/Tracing/README.md +++ b/src/Tracing/README.md @@ -22,7 +22,6 @@ This package intentionally does not configure OpenTelemetry SDK exporters, loggi ```csharp using Atya.Diagnostics.Tracing.Abstractions; -using Atya.Diagnostics.Tracing.DependencyInjection; using Atya.Diagnostics.Tracing.Extensions; services.AddAtyaTracing(options => diff --git a/tests/Tracing.UnitTests/GlobalUsings.cs b/tests/Tracing.UnitTests/GlobalUsings.cs index d6c5f46..6d8055c 100644 --- a/tests/Tracing.UnitTests/GlobalUsings.cs +++ b/tests/Tracing.UnitTests/GlobalUsings.cs @@ -5,7 +5,6 @@ global using Atya.Diagnostics.Tracing.Abstractions; global using Atya.Diagnostics.Tracing.Activities; global using Atya.Diagnostics.Tracing.Context; -global using Atya.Diagnostics.Tracing.DependencyInjection; global using Atya.Diagnostics.Tracing.Extensions; global using Atya.Diagnostics.Tracing.Options; global using Atya.Diagnostics.Tracing.Tags;