chore: revert Couchbase upgrade (#2210)

rogeralsing · web-flow · commit 1a605960f0a7 · 2025-08-03T21:06:08.000+02:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -62,12 +62,12 @@
     <PackageVersion Include="MudBlazor" Version="6.21.0" />
     <PackageVersion Include="Neovolve.Logging.Xunit" Version="6.1.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="OpenTelemetry" Version="1.10.0" />
-    <PackageVersion Include="OpenTelemetry.Api" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Api" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
     <PackageVersion Include="Proto.Cluster.CodeGen" Version="1.7.0" />
diff --git a/src/Proto.OpenTelemetry/OpenTelemetryMethodsDecorators.cs b/src/Proto.OpenTelemetry/OpenTelemetryMethodsDecorators.cs
@@ -26,8 +26,8 @@ public static void Send(string source, PID target, object message, ActivitySetup
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -56,8 +56,8 @@ public static PID SpawnNamed(string source, ActivitySetup spawnActivitySetup, Fu
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -79,8 +79,8 @@ internal static void Request(string source, PID target, object message, Activity
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -108,8 +108,8 @@ internal static void Request(string source, PID target, object message, PID? sen
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -135,16 +135,16 @@ internal static async Task<T> RequestAsync<T>(string source, PID target, object
         catch (TimeoutException ex)
         {
             activity?.SetTag(ProtoTags.ActionType, nameof(RequestAsync));
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
             activity?.AddEvent(new ActivityEvent("Request Timeout"));
 
             throw;
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -166,8 +166,8 @@ internal static void Forward(string source, PID target, object message, Activity
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -187,8 +187,8 @@ internal static void Respond(object message,
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }
@@ -236,8 +236,8 @@ internal static async Task Receive(string source, MessageEnvelope envelope, Acti
         }
         catch (Exception ex)
         {
-            activity?.RecordException(ex);
-            activity?.SetStatus(Status.Error);
+            activity?.AddException(ex);
+            activity?.SetStatus(ActivityStatusCode.Error);
 
             throw;
         }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public static void Send(string source, PID target, object message, ActivitySetup`
`26`	`26`	`}`
`27`	`27`	`catch (Exception ex)`
`28`	`28`	`{`
`29`		`- activity?.RecordException(ex);`
`30`		`- activity?.SetStatus(Status.Error);`
	`29`	`+ activity?.AddException(ex);`
	`30`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`31`	`31`
`32`	`32`	`throw;`
`33`	`33`	`}`
`@@ -56,8 +56,8 @@ public static PID SpawnNamed(string source, ActivitySetup spawnActivitySetup, Fu`
`56`	`56`	`}`
`57`	`57`	`catch (Exception ex)`
`58`	`58`	`{`
`59`		`- activity?.RecordException(ex);`
`60`		`- activity?.SetStatus(Status.Error);`
	`59`	`+ activity?.AddException(ex);`
	`60`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`61`	`61`
`62`	`62`	`throw;`
`63`	`63`	`}`
`@@ -79,8 +79,8 @@ internal static void Request(string source, PID target, object message, Activity`
`79`	`79`	`}`
`80`	`80`	`catch (Exception ex)`
`81`	`81`	`{`
`82`		`- activity?.RecordException(ex);`
`83`		`- activity?.SetStatus(Status.Error);`
	`82`	`+ activity?.AddException(ex);`
	`83`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`84`	`84`
`85`	`85`	`throw;`
`86`	`86`	`}`
`@@ -108,8 +108,8 @@ internal static void Request(string source, PID target, object message, PID? sen`
`108`	`108`	`}`
`109`	`109`	`catch (Exception ex)`
`110`	`110`	`{`
`111`		`- activity?.RecordException(ex);`
`112`		`- activity?.SetStatus(Status.Error);`
	`111`	`+ activity?.AddException(ex);`
	`112`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`113`	`113`
`114`	`114`	`throw;`
`115`	`115`	`}`
`@@ -135,16 +135,16 @@ internal static async Task<T> RequestAsync<T>(string source, PID target, object`
`135`	`135`	`catch (TimeoutException ex)`
`136`	`136`	`{`
`137`	`137`	`activity?.SetTag(ProtoTags.ActionType, nameof(RequestAsync));`
`138`		`- activity?.RecordException(ex);`
`139`		`- activity?.SetStatus(Status.Error);`
	`138`	`+ activity?.AddException(ex);`
	`139`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`140`	`140`	`activity?.AddEvent(new ActivityEvent("Request Timeout"));`
`141`	`141`
`142`	`142`	`throw;`
`143`	`143`	`}`
`144`	`144`	`catch (Exception ex)`
`145`	`145`	`{`
`146`		`- activity?.RecordException(ex);`
`147`		`- activity?.SetStatus(Status.Error);`
	`146`	`+ activity?.AddException(ex);`
	`147`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`148`	`148`
`149`	`149`	`throw;`
`150`	`150`	`}`
`@@ -166,8 +166,8 @@ internal static void Forward(string source, PID target, object message, Activity`
`166`	`166`	`}`
`167`	`167`	`catch (Exception ex)`
`168`	`168`	`{`
`169`		`- activity?.RecordException(ex);`
`170`		`- activity?.SetStatus(Status.Error);`
	`169`	`+ activity?.AddException(ex);`
	`170`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`171`	`171`
`172`	`172`	`throw;`
`173`	`173`	`}`
`@@ -187,8 +187,8 @@ internal static void Respond(object message,`
`187`	`187`	`}`
`188`	`188`	`catch (Exception ex)`
`189`	`189`	`{`
`190`		`- activity?.RecordException(ex);`
`191`		`- activity?.SetStatus(Status.Error);`
	`190`	`+ activity?.AddException(ex);`
	`191`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`192`	`192`
`193`	`193`	`throw;`
`194`	`194`	`}`
`@@ -236,8 +236,8 @@ internal static async Task Receive(string source, MessageEnvelope envelope, Acti`
`236`	`236`	`}`
`237`	`237`	`catch (Exception ex)`
`238`	`238`	`{`
`239`		`- activity?.RecordException(ex);`
`240`		`- activity?.SetStatus(Status.Error);`
	`239`	`+ activity?.AddException(ex);`
	`240`	`+ activity?.SetStatus(ActivityStatusCode.Error);`
`241`	`241`
`242`	`242`	`throw;`
`243`	`243`	`}`