From 0146449f5f9c128dab1cb741c98fbcff3fdb2510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=BC=9F?= <305542043@qq.com> Date: Thu, 30 Nov 2023 21:53:33 +0800 Subject: [PATCH] Fix NullReferenceException (#102) --- src/Elastic.Transport/DefaultHttpTransport.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Elastic.Transport/DefaultHttpTransport.cs b/src/Elastic.Transport/DefaultHttpTransport.cs index 440aa52..1ea73c9 100644 --- a/src/Elastic.Transport/DefaultHttpTransport.cs +++ b/src/Elastic.Transport/DefaultHttpTransport.cs @@ -155,7 +155,7 @@ public override Task RequestAsync( in OpenTelemetryData openTelemetryData, CancellationToken cancellationToken = default) => RequestCoreAsync(true, method, path, data, requestParameters, openTelemetryData, cancellationToken).AsTask(); - + private async ValueTask RequestCoreAsync( bool isAsync, HttpMethod method, @@ -185,28 +185,28 @@ private async ValueTask RequestCoreAsync( Settings.OnRequestDataCreated?.Invoke(requestData); TResponse response = null; - if (OpenTelemetry.ElasticTransportActivitySource.HasListeners() && activity.IsAllDataRequested) + if (activity is { IsAllDataRequested: true }) { if (activity.IsAllDataRequested) OpenTelemetry.SetCommonAttributes(activity, openTelemetryData, Settings); if (Settings.Authentication is BasicAuthentication basicAuthentication) - activity?.SetTag(SemanticConventions.DbUser, basicAuthentication.Username); + activity.SetTag(SemanticConventions.DbUser, basicAuthentication.Username); - activity?.SetTag(OpenTelemetryAttributes.ElasticTransportProductName, Settings.ProductRegistration.Name); - activity?.SetTag(OpenTelemetryAttributes.ElasticTransportProductVersion, Settings.ProductRegistration.ProductAssemblyVersion); - activity?.SetTag(OpenTelemetryAttributes.ElasticTransportVersion, TransportVersion); - activity?.SetTag(SemanticConventions.UserAgentOriginal, Settings.UserAgent.ToString()); + activity.SetTag(OpenTelemetryAttributes.ElasticTransportProductName, Settings.ProductRegistration.Name); + activity.SetTag(OpenTelemetryAttributes.ElasticTransportProductVersion, Settings.ProductRegistration.ProductAssemblyVersion); + activity.SetTag(OpenTelemetryAttributes.ElasticTransportVersion, TransportVersion); + activity.SetTag(SemanticConventions.UserAgentOriginal, Settings.UserAgent.ToString()); if (openTelemetryData.SpanAttributes is not null) { - foreach (var attribute in requestData.OpenTelemetryData.SpanAttributes) + foreach (var attribute in openTelemetryData.SpanAttributes) { - activity?.SetTag(attribute.Key, attribute.Value); + activity.SetTag(attribute.Key, attribute.Value); } } - activity?.SetTag(SemanticConventions.HttpRequestMethod, requestData.Method.GetStringValue()); + activity.SetTag(SemanticConventions.HttpRequestMethod, requestData.Method.GetStringValue()); } List? seenExceptions = null;