Skip to content

Commit 206d117

Browse files
KielekCodeBlanch
Kielek
and
CodeBlanch
authored
[Exporter.OTLP] Mark as nullable (#5708)
Co-authored-by: Mikel Blanchard <[email protected]>
1 parent b5cafe0 commit 206d117

Some content is hidden

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

47 files changed

+113
-136
lines changed

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/Stable/PublicAPI.Shipped.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
#nullable enable
2-
~OpenTelemetry.Exporter.OtlpMetricExporter.OtlpMetricExporter(OpenTelemetry.Exporter.OtlpExporterOptions options) -> void
3-
~OpenTelemetry.Exporter.OtlpTraceExporter.OtlpTraceExporter(OpenTelemetry.Exporter.OtlpExporterOptions options) -> void
4-
~override OpenTelemetry.Exporter.OtlpMetricExporter.Export(in OpenTelemetry.Batch<OpenTelemetry.Metrics.Metric> metrics) -> OpenTelemetry.ExportResult
5-
~override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
62
OpenTelemetry.Exporter.OtlpExporterOptions
73
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions<System.Diagnostics.Activity!>!
84
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.set -> void
@@ -25,31 +21,35 @@ OpenTelemetry.Exporter.OtlpExportProtocol.HttpProtobuf = 1 -> OpenTelemetry.Expo
2521
OpenTelemetry.Exporter.OtlpLogExporter
2622
OpenTelemetry.Exporter.OtlpLogExporter.OtlpLogExporter(OpenTelemetry.Exporter.OtlpExporterOptions! options) -> void
2723
OpenTelemetry.Exporter.OtlpMetricExporter
24+
OpenTelemetry.Exporter.OtlpMetricExporter.OtlpMetricExporter(OpenTelemetry.Exporter.OtlpExporterOptions! options) -> void
2825
OpenTelemetry.Exporter.OtlpTraceExporter
26+
OpenTelemetry.Exporter.OtlpTraceExporter.OtlpTraceExporter(OpenTelemetry.Exporter.OtlpExporterOptions! options) -> void
2927
OpenTelemetry.Logs.OtlpLogExporterHelperExtensions
3028
OpenTelemetry.Metrics.OtlpMetricExporterExtensions
3129
OpenTelemetry.OpenTelemetryBuilderOtlpExporterExtensions
3230
OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
3331
override OpenTelemetry.Exporter.OtlpLogExporter.Export(in OpenTelemetry.Batch<OpenTelemetry.Logs.LogRecord!> logRecordBatch) -> OpenTelemetry.ExportResult
32+
override OpenTelemetry.Exporter.OtlpMetricExporter.Export(in OpenTelemetry.Batch<OpenTelemetry.Metrics.Metric!> metrics) -> OpenTelemetry.ExportResult
3433
override OpenTelemetry.Exporter.OtlpMetricExporter.OnShutdown(int timeoutMilliseconds) -> bool
34+
override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity!> activityBatch) -> OpenTelemetry.ExportResult
3535
override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool
36+
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder) -> OpenTelemetry.Logs.LoggerProviderBuilder!
3637
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Logs.LogRecordExportProcessorOptions!>? configureExporterAndProcessor) -> OpenTelemetry.Logs.LoggerProviderBuilder!
3738
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>? configureExporter) -> OpenTelemetry.Logs.LoggerProviderBuilder!
3839
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Logs.LogRecordExportProcessorOptions!>! configureExporterAndProcessor) -> OpenTelemetry.Logs.LoggerProviderBuilder!
3940
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>! configureExporter) -> OpenTelemetry.Logs.LoggerProviderBuilder!
40-
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.LoggerProviderBuilder! builder) -> OpenTelemetry.Logs.LoggerProviderBuilder!
41+
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
4142
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Logs.LogRecordExportProcessorOptions!>? configureExporterAndProcessor) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
4243
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>? configure) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
4344
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Logs.LogRecordExportProcessorOptions!>! configureExporterAndProcessor) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
4445
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>! configure) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
45-
static OpenTelemetry.Logs.OtlpLogExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
46+
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!
4647
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Metrics.MetricReaderOptions!>? configureExporterAndMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
4748
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>? configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
4849
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!, OpenTelemetry.Metrics.MetricReaderOptions!>! configureExporterAndMetricReader) -> OpenTelemetry.Metrics.MeterProviderBuilder!
4950
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
50-
static OpenTelemetry.Metrics.OtlpMetricExporterExtensions.AddOtlpExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!
51-
static OpenTelemetry.OpenTelemetryBuilderOtlpExporterExtensions.UseOtlpExporter(this OpenTelemetry.IOpenTelemetryBuilder! builder, OpenTelemetry.Exporter.OtlpExportProtocol protocol, System.Uri! baseUrl) -> OpenTelemetry.IOpenTelemetryBuilder!
5251
static OpenTelemetry.OpenTelemetryBuilderOtlpExporterExtensions.UseOtlpExporter(this OpenTelemetry.IOpenTelemetryBuilder! builder) -> OpenTelemetry.IOpenTelemetryBuilder!
52+
static OpenTelemetry.OpenTelemetryBuilderOtlpExporterExtensions.UseOtlpExporter(this OpenTelemetry.IOpenTelemetryBuilder! builder, OpenTelemetry.Exporter.OtlpExportProtocol protocol, System.Uri! baseUrl) -> OpenTelemetry.IOpenTelemetryBuilder!
53+
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder!
5354
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, string? name, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>? configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
5455
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions!>! configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
55-
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder!

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Builder/OpenTelemetryBuilderOtlpExporterExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
using Microsoft.Extensions.Configuration;
75
using OpenTelemetry.Exporter;
86
using OpenTelemetry.Internal;

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Builder/OtlpExporterBuilder.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
using System.Diagnostics;
75
using Microsoft.Extensions.Configuration;
86
using Microsoft.Extensions.DependencyInjection;
@@ -40,7 +38,7 @@ internal OtlpExporterBuilder(
4038

4139
name ??= Options.DefaultName;
4240

43-
RegisterOtlpExporterServices(services!, name!);
41+
RegisterOtlpExporterServices(services!, name);
4442

4543
this.name = name;
4644
this.Services = services!;

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Builder/OtlpExporterBuilderOptions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
using System.Diagnostics;
75
using Microsoft.Extensions.Configuration;
86
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Builder/UseOtlpExporterRegistration.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
namespace OpenTelemetry.Exporter;
75

86
// Note: This class is added to the IServiceCollection when UseOtlpExporter is

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/IOtlpExporterOptions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
#if NETFRAMEWORK
75
using System.Net.Http;
86
#endif

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ActivityExtensions.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal static void AddBatch(
3434

3535
foreach (var activity in activityBatch)
3636
{
37-
Span span = activity.ToOtlpSpan(sdkLimitOptions);
37+
Span? span = activity.ToOtlpSpan(sdkLimitOptions);
3838
if (span == null)
3939
{
4040
OpenTelemetryProtocolExporterEventSource.Log.CouldNotTranslateActivity(
@@ -73,7 +73,7 @@ internal static void Return(this ExportTraceServiceRequest request)
7373
}
7474

7575
[MethodImpl(MethodImplOptions.AggressiveInlining)]
76-
internal static ScopeSpans GetSpanListFromPool(string name, string version)
76+
internal static ScopeSpans GetSpanListFromPool(string name, string? version)
7777
{
7878
if (!SpanListPool.TryTake(out var spans))
7979
{
@@ -96,7 +96,7 @@ internal static ScopeSpans GetSpanListFromPool(string name, string version)
9696
}
9797

9898
[MethodImpl(MethodImplOptions.AggressiveInlining)]
99-
internal static Span ToOtlpSpan(this Activity activity, SdkLimitOptions sdkLimitOptions)
99+
internal static Span? ToOtlpSpan(this Activity activity, SdkLimitOptions sdkLimitOptions)
100100
{
101101
if (activity.IdFormat != ActivityIdFormat.W3C)
102102
{
@@ -145,7 +145,7 @@ internal static Span ToOtlpSpan(this Activity activity, SdkLimitOptions sdkLimit
145145

146146
if (activity.Kind == ActivityKind.Client || activity.Kind == ActivityKind.Producer)
147147
{
148-
PeerServiceResolver.Resolve(ref otlpTags, out string peerServiceName, out bool addAsTag);
148+
PeerServiceResolver.Resolve(ref otlpTags, out string? peerServiceName, out bool addAsTag);
149149

150150
if (peerServiceName != null && addAsTag)
151151
{
@@ -180,7 +180,7 @@ internal static Span ToOtlpSpan(this Activity activity, SdkLimitOptions sdkLimit
180180
}
181181

182182
[MethodImpl(MethodImplOptions.AggressiveInlining)]
183-
private static OtlpTrace.Status ToOtlpStatus(this Activity activity, ref TagEnumerationState otlpTags)
183+
private static OtlpTrace.Status? ToOtlpStatus(this Activity activity, ref TagEnumerationState otlpTags)
184184
{
185185
var statusCodeForTagValue = StatusHelper.GetStatusCodeForTagValue(otlpTags.StatusCode);
186186
if (activity.Status == ActivityStatusCode.Unset && statusCodeForTagValue == null)
@@ -189,7 +189,7 @@ private static OtlpTrace.Status ToOtlpStatus(this Activity activity, ref TagEnum
189189
}
190190

191191
OtlpTrace.Status.Types.StatusCode otlpActivityStatusCode = OtlpTrace.Status.Types.StatusCode.Unset;
192-
string otlpStatusDescription = null;
192+
string? otlpStatusDescription = null;
193193
if (activity.Status != ActivityStatusCode.Unset)
194194
{
195195
// The numerical values of the two enumerations match, a simple cast is enough.
@@ -204,7 +204,7 @@ private static OtlpTrace.Status ToOtlpStatus(this Activity activity, ref TagEnum
204204
if (statusCodeForTagValue != StatusCode.Unset)
205205
{
206206
// The numerical values of the two enumerations match, a simple cast is enough.
207-
otlpActivityStatusCode = (OtlpTrace.Status.Types.StatusCode)(int)statusCodeForTagValue;
207+
otlpActivityStatusCode = (OtlpTrace.Status.Types.StatusCode)(int)statusCodeForTagValue!;
208208
if (statusCodeForTagValue == StatusCode.Error && !string.IsNullOrEmpty(otlpTags.StatusDescription))
209209
{
210210
otlpStatusDescription = otlpTags.StatusDescription;
@@ -304,17 +304,17 @@ private struct TagEnumerationState : PeerServiceResolver.IPeerServiceState
304304

305305
public Span Span;
306306

307-
public string StatusCode;
307+
public string? StatusCode;
308308

309-
public string StatusDescription;
309+
public string? StatusDescription;
310310

311-
public string PeerService { get; set; }
311+
public string? PeerService { get; set; }
312312

313313
public int? PeerServicePriority { get; set; }
314314

315-
public string HostName { get; set; }
315+
public string? HostName { get; set; }
316316

317-
public string IpAddress { get; set; }
317+
public string? IpAddress { get; set; }
318318

319319
public long Port { get; set; }
320320

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExperimentalOptions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
using Microsoft.Extensions.Configuration;
75

86
namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/BaseOtlpGrpcExportClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ protected BaseOtlpGrpcExportClient(OtlpExporterOptions options)
2626
}
2727

2828
#if NETSTANDARD2_1 || NET
29-
internal GrpcChannel Channel { get; set; }
29+
internal GrpcChannel? Channel { get; set; }
3030
#else
31-
internal Channel Channel { get; set; }
31+
internal Channel? Channel { get; set; }
3232
#endif
3333

3434
internal Uri Endpoint { get; }

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/ExportClientGrpcResponse.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#nullable enable
5-
64
namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClient;
75

86
internal sealed class ExportClientGrpcResponse : ExportClientResponse

0 commit comments

Comments
 (0)