Merge branch 'main' into yunl/aotTypeDescriptor

open-telemetry · Jun 22, 2023 · cbdef79 · cbdef79
2 parents aff152f + 5f825cb
commit cbdef79
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageVersion Include="Google.Protobuf" Version="[3.19.4,4.0)" />
     <PackageVersion Include="Grpc" Version="[2.44.0,3.0)" />
-    <PackageVersion Include="Grpc.Net.Client" Version="[2.43.0,3.0)" />
+    <PackageVersion Include="Grpc.Net.Client" Version="[2.45.0,3.0)" />
     <PackageVersion Include="Grpc.Tools" Version="[2.44.0,3.0)" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1,6.0)" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
@@ -14,6 +14,10 @@
   for instructions to enable exemplars.
   ([#4553](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4553))
 
+* Updated Grpc.Net.Client to v2.45 to fix unobserved exception
+  from failed calls.
+  ([#4573](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4573))
+
 * Updated to support `Severity` and `SeverityText` when exporting `LogRecord`s.
   ([#4568](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4568))
 

diff --git a/src/OpenTelemetry/Logs/LogRecordExportProcessorOptions.cs b/src/OpenTelemetry/Logs/LogRecordExportProcessorOptions.cs
@@ -17,6 +17,7 @@
 #nullable enable
 
 using System.Diagnostics;
+using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Logs;
 
@@ -25,6 +26,8 @@ namespace OpenTelemetry.Logs;
 /// </summary>
 public class LogRecordExportProcessorOptions
 {
+    private BatchExportLogRecordProcessorOptions batchExportProcessorOptions;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="LogRecordExportProcessorOptions"/> class.
     /// </summary>
@@ -38,7 +41,7 @@ public LogRecordExportProcessorOptions()
     {
         Debug.Assert(defaultBatchExportLogRecordProcessorOptions != null, "defaultBatchExportLogRecordProcessorOptions was null");
 
-        this.BatchExportProcessorOptions = defaultBatchExportLogRecordProcessorOptions ?? new();
+        this.batchExportProcessorOptions = defaultBatchExportLogRecordProcessorOptions ?? new();
     }
 
     /// <summary>
@@ -49,5 +52,13 @@ public LogRecordExportProcessorOptions()
     /// <summary>
     /// Gets or sets the batch export options. Ignored unless <see cref="ExportProcessorType"/> is <see cref="ExportProcessorType.Batch"/>.
     /// </summary>
-    public BatchExportLogRecordProcessorOptions BatchExportProcessorOptions { get; set; }
+    public BatchExportLogRecordProcessorOptions BatchExportProcessorOptions
+    {
+        get => this.batchExportProcessorOptions;
+        set
+        {
+            Guard.ThrowIfNull(value);
+            this.batchExportProcessorOptions = value;
+        }
+    }
 }