Skip to content

Commit 5b1889d

Browse files
CodeBlanchcijothomasalanwest
authored
[Hosting] Remove obsolete methods ahead of 1.4.0 release (#4071)
* Remove obsolete methods from hosting library ahead of 1.4.0 release. * Warning cleanup. * CHANGELOG patch. * Merge fixes. * MD lint fix. * Slim down the changes shown on the diff. * More diff slimming. * CHANGELOG fix. --------- Co-authored-by: Cijo Thomas <[email protected]> Co-authored-by: Alan West <[email protected]>
1 parent bdf1e08 commit 5b1889d

File tree

5 files changed

+5
-248
lines changed

5 files changed

+5
-248
lines changed
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions
2-
OpenTelemetry.Metrics.MeterProviderBuilderExtensions
32
OpenTelemetry.OpenTelemetryBuilder
43
OpenTelemetry.OpenTelemetryBuilder.ConfigureResource(System.Action<OpenTelemetry.Resources.ResourceBuilder!>! configure) -> OpenTelemetry.OpenTelemetryBuilder!
54
OpenTelemetry.OpenTelemetryBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
65
OpenTelemetry.OpenTelemetryBuilder.WithMetrics() -> OpenTelemetry.OpenTelemetryBuilder!
76
OpenTelemetry.OpenTelemetryBuilder.WithMetrics(System.Action<OpenTelemetry.Metrics.MeterProviderBuilder!>! configure) -> OpenTelemetry.OpenTelemetryBuilder!
87
OpenTelemetry.OpenTelemetryBuilder.WithTracing() -> OpenTelemetry.OpenTelemetryBuilder!
98
OpenTelemetry.OpenTelemetryBuilder.WithTracing(System.Action<OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> OpenTelemetry.OpenTelemetryBuilder!
10-
OpenTelemetry.Trace.TracerProviderBuilderExtensions
119
static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> OpenTelemetry.OpenTelemetryBuilder!
12-
static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
13-
static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<OpenTelemetry.Metrics.MeterProviderBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
14-
static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
15-
static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
16-
static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.Configure(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Action<System.IServiceProvider!, OpenTelemetry.Metrics.MeterProviderBuilder!>! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
17-
static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.GetServices(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
18-
static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Configure(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, System.Action<System.IServiceProvider!, OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
19-
static OpenTelemetry.Trace.TracerProviderBuilderExtensions.GetServices(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
10+

src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
* Removed deprecated extensions: `AddOpenTelemetryTracing`,
6+
`AddOpenTelemetryMetrics`, `Configure`, & `GetServices`.
7+
([#4071](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4071))
8+
59
## 1.4.0-rc.4
610

711
Released 2023-Feb-10

src/OpenTelemetry.Extensions.Hosting/Metrics/MeterProviderBuilderExtensions.cs

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -52,102 +52,4 @@ public static OpenTelemetryBuilder AddOpenTelemetry(this IServiceCollection serv
5252

5353
return new(services);
5454
}
55-
56-
/// <summary>
57-
/// Configure OpenTelemetry and register a <see cref="IHostedService"/>
58-
/// to automatically start tracing services in the supplied <see
59-
/// cref="IServiceCollection" />.
60-
/// </summary>
61-
/// <remarks>
62-
/// Notes:
63-
/// <list type="bullet">
64-
/// <item>
65-
/// This is safe to be called multiple times. Only a single <see
66-
/// cref="TracerProvider"/> will be created for a given <see
67-
/// cref="IServiceCollection"/>.
68-
/// </item>
69-
/// <item>
70-
/// This method should be called by application host code. Library
71-
/// authors should call <see
72-
/// cref="OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.ConfigureOpenTelemetryTracerProvider(IServiceCollection, Action{IServiceProvider, TracerProviderBuilder})"/>
73-
/// instead.
74-
/// </item>
75-
/// </list>
76-
/// </remarks>
77-
/// <param name="services"><see cref="IServiceCollection"/>.</param>
78-
/// <returns>Supplied <see cref="IServiceCollection"/> for chaining
79-
/// calls.</returns>
80-
[Obsolete("Use the AddOpenTelemetry().WithTracing(configure) pattern instead. This method will be removed in a future version.")]
81-
public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services)
82-
=> AddOpenTelemetryTracing(services, b => { });
83-
84-
/// <summary>
85-
/// Configure OpenTelemetry and register a <see cref="IHostedService"/>
86-
/// to automatically start tracing services in the supplied <see
87-
/// cref="IServiceCollection" />.
88-
/// </summary>
89-
/// <remarks><inheritdoc
90-
/// cref="AddOpenTelemetryTracing(IServiceCollection)"
91-
/// path="/remarks"/></remarks>
92-
/// <param name="services"><see cref="IServiceCollection"/>.</param>
93-
/// <param name="configure">Callback action to configure the <see
94-
/// cref="TracerProviderBuilder"/>.</param>
95-
/// <returns>Supplied <see cref="IServiceCollection"/> for chaining
96-
/// calls.</returns>
97-
[Obsolete("Use the AddOpenTelemetry().WithTracing(configure) pattern instead. This method will be removed in a future version.")]
98-
public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services, Action<TracerProviderBuilder> configure)
99-
{
100-
services.AddOpenTelemetry().WithTracing(configure);
101-
102-
return services;
103-
}
104-
105-
/// <summary>
106-
/// Configure OpenTelemetry and register a <see cref="IHostedService"/>
107-
/// to automatically start metric services in the supplied <see
108-
/// cref="IServiceCollection" />.
109-
/// </summary>
110-
/// <remarks>
111-
/// Notes:
112-
/// <list type="bullet">
113-
/// <item>
114-
/// This is safe to be called multiple times. Only a single <see
115-
/// cref="MeterProvider"/> will be created for a given <see
116-
/// cref="IServiceCollection"/>.
117-
/// </item>
118-
/// <item>
119-
/// This method should be called by application host code. Library
120-
/// authors should call <see
121-
/// cref="OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.ConfigureOpenTelemetryMeterProvider(IServiceCollection, Action{IServiceProvider, MeterProviderBuilder})"/>
122-
/// instead.
123-
/// </item>
124-
/// </list>
125-
/// </remarks>
126-
/// <param name="services"><see cref="IServiceCollection"/>.</param>
127-
/// <returns>Supplied <see cref="IServiceCollection"/> for chaining
128-
/// calls.</returns>
129-
[Obsolete("Use the AddOpenTelemetry().WithMetrics(configure) pattern instead. This method will be removed in a future version.")]
130-
public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services)
131-
=> AddOpenTelemetryMetrics(services, b => { });
132-
133-
/// <summary>
134-
/// Configure OpenTelemetry and register a <see cref="IHostedService"/>
135-
/// to automatically start metric services in the supplied <see
136-
/// cref="IServiceCollection" />.
137-
/// </summary>
138-
/// <remarks><inheritdoc
139-
/// cref="AddOpenTelemetryMetrics(IServiceCollection)"
140-
/// path="/remarks"/></remarks>
141-
/// <param name="services"><see cref="IServiceCollection"/>.</param>
142-
/// <param name="configure">Callback action to configure the <see
143-
/// cref="TracerProviderBuilder"/>.</param>
144-
/// <returns>Supplied <see cref="IServiceCollection"/> for chaining
145-
/// calls.</returns>
146-
[Obsolete("Use the AddOpenTelemetry().WithMetrics(configure) pattern instead. This method will be removed in a future version.")]
147-
public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services, Action<MeterProviderBuilder> configure)
148-
{
149-
services.AddOpenTelemetry().WithMetrics(configure);
150-
151-
return services;
152-
}
15355
}

src/OpenTelemetry.Extensions.Hosting/Trace/TracerProviderBuilderExtensions.cs

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)