From 9a0e14fcd6a37cf59b2da4fd2542ab2d06c36af0 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 21 Feb 2024 11:24:03 -0800 Subject: [PATCH] eventsource --- ...OpenTelemetryProtocolExporterEventSource.cs | 18 ++++++++++++++++++ .../OtlpExporterTransmissionHandler.cs | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs index 31ed2a749f4..249b423ce38 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs @@ -33,6 +33,15 @@ public void ExportMethodException(Exception ex, bool isRetry = false) } } + [NonEvent] + public void SubmitRequestException(Exception ex) + { + if (Log.IsEnabled(EventLevel.Error, EventKeywords.All)) + { + this.SubmitRequestException(ex.ToInvariantString()); + } + } + [Event(2, Message = "Exporter failed send data to collector to {0} endpoint. Data will not be sent. Exception: {1}", Level = EventLevel.Error)] public void FailedToReachCollector(string rawCollectorUri, string ex) { @@ -83,4 +92,13 @@ public void InvalidEnvironmentVariable(string key, string value) { this.WriteEvent(11, key, value); } + +#if NET6_0_OR_GREATER + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Parameters to this method are primitive and are trimmer safe.")] +#endif + [Event(12, Message = "Unknown error in TrySubmitRequest method. Message: '{0}'. IsRetry: {1}", Level = EventLevel.Error)] + public void SubmitRequestException(string ex) + { + this.WriteEvent(12, ex); + } } diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Transmission/OtlpExporterTransmissionHandler.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Transmission/OtlpExporterTransmissionHandler.cs index 1d56b22dbfb..7a885142628 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Transmission/OtlpExporterTransmissionHandler.cs +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Transmission/OtlpExporterTransmissionHandler.cs @@ -38,7 +38,7 @@ public bool TrySubmitRequest(TRequest request) } catch (Exception ex) { - OpenTelemetryProtocolExporterEventSource.Log.ExportMethodException(ex); + OpenTelemetryProtocolExporterEventSource.Log.SubmitRequestException(ex); this.OnRequestDropped(request); return false; }