Skip to content

Commit

Permalink
Updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeBlanch committed Jun 20, 2024
1 parent a52d079 commit 4a58bc4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 26 deletions.
4 changes: 2 additions & 2 deletions src/OpenTelemetry/.publicApi/Stable/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
OpenTelemetry.OpenTelemetrySdk
OpenTelemetry.OpenTelemetrySdk.Dispose() -> void
OpenTelemetry.OpenTelemetrySdk.LoggerProvider.get -> OpenTelemetry.Logs.LoggerProvider!
OpenTelemetry.OpenTelemetrySdk.MeterProvider.get -> OpenTelemetry.Metrics.MeterProvider!
OpenTelemetry.OpenTelemetrySdk.Services.get -> System.IServiceProvider!
OpenTelemetry.OpenTelemetrySdk.TracerProvider.get -> OpenTelemetry.Trace.TracerProvider!
OpenTelemetry.OpenTelemetrySdkExtensions
static OpenTelemetry.OpenTelemetrySdk.Create(System.Action<OpenTelemetry.IOpenTelemetryBuilder!>! configure) -> OpenTelemetry.OpenTelemetrySdk!
static OpenTelemetry.OpenTelemetrySdkExtensions.GetLoggerFactory(this OpenTelemetry.OpenTelemetrySdk! sdk) -> Microsoft.Extensions.Logging.ILoggerFactory!
static OpenTelemetry.OpenTelemetrySdkExtensions.GetLoggerFactory(this OpenTelemetry.OpenTelemetrySdk! sdk) -> Microsoft.Extensions.Logging.ILoggerFactory!
6 changes: 6 additions & 0 deletions src/OpenTelemetry/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

* Added `OpenTelemetrySdk.Create` API for configuring OpenTelemetry .NET signals
(logging, tracing, and metrics) via a single builder. This new API simplifies
bootstrap and teardown, and supports cross-cutting extensions targeting
`IOpenTelemetryBuilder`.
([#5325](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5325))

## 1.9.0

Released 2024-Jun-14
Expand Down
27 changes: 3 additions & 24 deletions src/OpenTelemetry/OpenTelemetrySdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
// SPDX-License-Identifier: Apache-2.0

using System.Diagnostics;
#if EXPOSE_EXPERIMENTAL_FEATURES && NET8_0_OR_GREATER
using System.Diagnostics.CodeAnalysis;
#endif
using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Internal;
using OpenTelemetry.Logs;
Expand Down Expand Up @@ -42,11 +39,6 @@ private OpenTelemetrySdk(
?? new NoopTracerProvider();
}

/// <summary>
/// Gets the <see cref="IServiceProvider"/> containing SDK services.
/// </summary>
public IServiceProvider Services => this.serviceProvider;

/// <summary>
/// Gets the <see cref="Metrics.MeterProvider"/>.
/// </summary>
Expand All @@ -69,34 +61,21 @@ private OpenTelemetrySdk(
/// </remarks>
public TracerProvider TracerProvider { get; }

#if EXPOSE_EXPERIMENTAL_FEATURES
/// <summary>
/// Gets the <see cref="Logs.LoggerProvider"/>.
/// </summary>
/// <remarks>
/// <para><b>WARNING</b>: This is an experimental API which might change or
/// be removed in the future. Use at your own risk.</para>
/// Note: The default <see cref="LoggerProvider"/> will be a no-op instance.
/// Call <see
/// cref="OpenTelemetryBuilderSdkExtensions.WithLogging(IOpenTelemetryBuilder)"/> to
/// enable logging.
/// </remarks>
#if NET8_0_OR_GREATER
[Experimental(DiagnosticDefinitions.LoggerProviderExperimentalApi, UrlFormat = DiagnosticDefinitions.ExperimentalApiUrlFormat)]
#endif
public LoggerProvider LoggerProvider { get; }
#else

/// <summary>
/// Gets the <see cref="Logs.LoggerProvider"/>.
/// Gets the <see cref="IServiceProvider"/> containing SDK services.
/// </summary>
/// <remarks>
/// Note: The default <see cref="LoggerProvider"/> will be a no-op instance.
/// Call <see
/// cref="OpenTelemetryBuilderSdkExtensions.WithLogging(IOpenTelemetryBuilder)"/> to
/// enable logging.
/// </remarks>
internal LoggerProvider LoggerProvider { get; }
#endif
internal IServiceProvider Services => this.serviceProvider;

/// <summary>
/// Create an <see cref="OpenTelemetrySdk"/> instance.
Expand Down

0 comments on commit 4a58bc4

Please sign in to comment.