Skip to content

Commit 9b83188

Browse files
authored
[console, in-memory] Tweak nullable annotations in registration extensions (open-telemetry#5833)
1 parent 82b1fbd commit 9b83188

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

src/OpenTelemetry.Exporter.Console/.publicApi/Stable/PublicAPI.Shipped.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ override OpenTelemetry.Exporter.ConsoleLogRecordExporter.Export(in OpenTelemetry
2424
override OpenTelemetry.Exporter.ConsoleMetricExporter.Export(in OpenTelemetry.Batch<OpenTelemetry.Metrics.Metric!> batch) -> OpenTelemetry.ExportResult
2525
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! loggerProviderBuilder) -> OpenTelemetry.Logs.LoggerProviderBuilder!
2626
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! loggerProviderBuilder, string? name, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configure) -> OpenTelemetry.Logs.LoggerProviderBuilder!
27-
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! loggerProviderBuilder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configure) -> OpenTelemetry.Logs.LoggerProviderBuilder!
27+
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! loggerProviderBuilder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>! configure) -> OpenTelemetry.Logs.LoggerProviderBuilder!
2828
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
2929
static OpenTelemetry.Logs.ConsoleExporterLoggingExtensions.AddConsoleExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configure) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
3030
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!
3131
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!, OpenTelemetry.Metrics.MetricReaderOptions!>? configureExporterAndMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
3232
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configureExporter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
3333
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!, OpenTelemetry.Metrics.MetricReaderOptions!>? configureExporterAndMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
34-
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configureExporter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
34+
static OpenTelemetry.Metrics.ConsoleExporterMetricsExtensions.AddConsoleExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>! configureExporter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
3535
static OpenTelemetry.Trace.ConsoleExporterHelperExtensions.AddConsoleExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder!
3636
static OpenTelemetry.Trace.ConsoleExporterHelperExtensions.AddConsoleExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
37-
static OpenTelemetry.Trace.ConsoleExporterHelperExtensions.AddConsoleExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>? configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
37+
static OpenTelemetry.Trace.ConsoleExporterHelperExtensions.AddConsoleExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.ConsoleExporterOptions!>! configure) -> OpenTelemetry.Trace.TracerProviderBuilder!

src/OpenTelemetry.Exporter.Console/ConsoleExporterHelperExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public static TracerProviderBuilder AddConsoleExporter(this TracerProviderBuilde
2424
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
2525
/// <param name="configure">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
2626
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
27-
public static TracerProviderBuilder AddConsoleExporter(this TracerProviderBuilder builder, Action<ConsoleExporterOptions>? configure)
27+
public static TracerProviderBuilder AddConsoleExporter(this TracerProviderBuilder builder, Action<ConsoleExporterOptions> configure)
2828
=> AddConsoleExporter(builder, name: null, configure);
2929

3030
/// <summary>
3131
/// Adds Console exporter to the TracerProvider.
3232
/// </summary>
3333
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
34-
/// <param name="name">Name which is used when retrieving options.</param>
35-
/// <param name="configure">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
34+
/// <param name="name">Optional name which is used when retrieving options.</param>
35+
/// <param name="configure">Optional callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
3636
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
3737
public static TracerProviderBuilder AddConsoleExporter(
3838
this TracerProviderBuilder builder,

src/OpenTelemetry.Exporter.Console/ConsoleExporterLoggingExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static OpenTelemetryLoggerOptions AddConsoleExporter(this OpenTelemetryLo
2323
/// Adds Console exporter with OpenTelemetryLoggerOptions.
2424
/// </summary>
2525
/// <param name="loggerOptions"><see cref="OpenTelemetryLoggerOptions"/> options to use.</param>
26-
/// <param name="configure">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
26+
/// <param name="configure">Optional callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
2727
/// <returns>The instance of <see cref="OpenTelemetryLoggerOptions"/> to chain the calls.</returns>
2828
// TODO: [Obsolete("Call LoggerProviderBuilder.AddConsoleExporter instead this method will be removed in a future version.")]
2929
public static OpenTelemetryLoggerOptions AddConsoleExporter(this OpenTelemetryLoggerOptions loggerOptions, Action<ConsoleExporterOptions>? configure)
@@ -52,15 +52,15 @@ public static LoggerProviderBuilder AddConsoleExporter(
5252
/// <returns>The supplied instance of <see cref="LoggerProviderBuilder"/> to chain the calls.</returns>
5353
public static LoggerProviderBuilder AddConsoleExporter(
5454
this LoggerProviderBuilder loggerProviderBuilder,
55-
Action<ConsoleExporterOptions>? configure)
55+
Action<ConsoleExporterOptions> configure)
5656
=> AddConsoleExporter(loggerProviderBuilder, name: null, configure);
5757

5858
/// <summary>
5959
/// Adds Console exporter with LoggerProviderBuilder.
6060
/// </summary>
6161
/// <param name="loggerProviderBuilder"><see cref="LoggerProviderBuilder"/>.</param>
62-
/// <param name="name">Name which is used when retrieving options.</param>
63-
/// <param name="configure">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
62+
/// <param name="name">Optional name which is used when retrieving options.</param>
63+
/// <param name="configure">Optional callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
6464
/// <returns>The supplied instance of <see cref="LoggerProviderBuilder"/> to chain the calls.</returns>
6565
public static LoggerProviderBuilder AddConsoleExporter(
6666
this LoggerProviderBuilder loggerProviderBuilder,

src/OpenTelemetry.Exporter.Console/ConsoleExporterMetricsExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public static MeterProviderBuilder AddConsoleExporter(this MeterProviderBuilder
3030
/// <param name="builder"><see cref="MeterProviderBuilder"/> builder to use.</param>
3131
/// <param name="configureExporter">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
3232
/// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
33-
public static MeterProviderBuilder AddConsoleExporter(this MeterProviderBuilder builder, Action<ConsoleExporterOptions>? configureExporter)
33+
public static MeterProviderBuilder AddConsoleExporter(this MeterProviderBuilder builder, Action<ConsoleExporterOptions> configureExporter)
3434
=> AddConsoleExporter(builder, name: null, configureExporter);
3535

3636
/// <summary>
3737
/// Adds <see cref="ConsoleMetricExporter"/> to the <see cref="MeterProviderBuilder"/>.
3838
/// </summary>
3939
/// <param name="builder"><see cref="MeterProviderBuilder"/> builder to use.</param>
40-
/// <param name="name">Name which is used when retrieving options.</param>
41-
/// <param name="configureExporter">Callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
40+
/// <param name="name">Optional name which is used when retrieving options.</param>
41+
/// <param name="configureExporter">Optional callback action for configuring <see cref="ConsoleExporterOptions"/>.</param>
4242
/// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
4343
public static MeterProviderBuilder AddConsoleExporter(
4444
this MeterProviderBuilder builder,

src/OpenTelemetry.Exporter.InMemory/.publicApi/Stable/PublicAPI.Shipped.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static OpenTelemetry.Logs.InMemoryExporterLoggingExtensions.AddInMemoryExporter(
2020
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.Metric!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>? configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
2121
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.MetricSnapshot!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>? configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
2222
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.Metric!>! exportedItems) -> OpenTelemetry.Metrics.MeterProviderBuilder!
23-
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.Metric!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>? configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
23+
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.Metric!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>! configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
2424
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.MetricSnapshot!>! exportedItems) -> OpenTelemetry.Metrics.MeterProviderBuilder!
25-
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.MetricSnapshot!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>? configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
25+
static OpenTelemetry.Metrics.InMemoryExporterMetricsExtensions.AddInMemoryExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Collections.Generic.ICollection<OpenTelemetry.Metrics.MetricSnapshot!>! exportedItems, System.Action<OpenTelemetry.Metrics.MetricReaderOptions!>! configureMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
2626
static OpenTelemetry.Trace.InMemoryExporterHelperExtensions.AddInMemoryExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Collections.Generic.ICollection<System.Diagnostics.Activity!>! exportedItems) -> OpenTelemetry.Trace.TracerProviderBuilder!

src/OpenTelemetry.Exporter.InMemory/InMemoryExporterMetricsExtensions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static MeterProviderBuilder AddInMemoryExporter(this MeterProviderBuilder
4141
public static MeterProviderBuilder AddInMemoryExporter(
4242
this MeterProviderBuilder builder,
4343
ICollection<Metric> exportedItems,
44-
Action<MetricReaderOptions>? configureMetricReader)
44+
Action<MetricReaderOptions> configureMetricReader)
4545
=> AddInMemoryExporter(builder, name: null, exportedItems, configureMetricReader);
4646

4747
/// <summary>
@@ -51,9 +51,9 @@ public static MeterProviderBuilder AddInMemoryExporter(
5151
/// Be aware that <see cref="Metric"/> may continue to be updated after export.
5252
/// </remarks>
5353
/// <param name="builder"><see cref="MeterProviderBuilder"/> builder to use.</param>
54-
/// <param name="name">Name which is used when retrieving options.</param>
54+
/// <param name="name">Optional name which is used when retrieving options.</param>
5555
/// <param name="exportedItems">Collection which will be populated with the exported <see cref="Metric"/>.</param>
56-
/// <param name="configureMetricReader">Callback action for configuring <see cref="MetricReaderOptions"/>.</param>
56+
/// <param name="configureMetricReader">Optional callback action for configuring <see cref="MetricReaderOptions"/>.</param>
5757
/// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
5858
public static MeterProviderBuilder AddInMemoryExporter(
5959
this MeterProviderBuilder builder,
@@ -108,7 +108,7 @@ public static MeterProviderBuilder AddInMemoryExporter(
108108
public static MeterProviderBuilder AddInMemoryExporter(
109109
this MeterProviderBuilder builder,
110110
ICollection<MetricSnapshot> exportedItems,
111-
Action<MetricReaderOptions>? configureMetricReader)
111+
Action<MetricReaderOptions> configureMetricReader)
112112
=> AddInMemoryExporter(builder, name: null, exportedItems, configureMetricReader);
113113

114114
/// <summary>
@@ -119,9 +119,9 @@ public static MeterProviderBuilder AddInMemoryExporter(
119119
/// Use this if you need a copy of <see cref="Metric"/> that will not be updated after export.
120120
/// </remarks>
121121
/// <param name="builder"><see cref="MeterProviderBuilder"/> builder to use.</param>
122-
/// <param name="name">Name which is used when retrieving options.</param>
122+
/// <param name="name">Optional name which is used when retrieving options.</param>
123123
/// <param name="exportedItems">Collection which will be populated with the exported <see cref="Metric"/> represented as <see cref="MetricSnapshot"/>.</param>
124-
/// <param name="configureMetricReader">Callback action for configuring <see cref="MetricReaderOptions"/>.</param>
124+
/// <param name="configureMetricReader">Optional callback action for configuring <see cref="MetricReaderOptions"/>.</param>
125125
/// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
126126
public static MeterProviderBuilder AddInMemoryExporter(
127127
this MeterProviderBuilder builder,

0 commit comments

Comments
 (0)