From e525abfec96a0900b50c6c6c82c70a76f71a2c43 Mon Sep 17 00:00:00 2001
From: Evgeniy Cheban <mister.cheban@gmail.com>
Date: Sat, 22 Aug 2026 17:21:17 +0300
Subject: [PATCH] Polish gh-132

---
 .../binding/cproto/CommandObservationContext.java     |  2 +-
 .../binding/cproto/ObservationDataSource.java         | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/rt/restream/reindexer/binding/cproto/CommandObservationContext.java b/src/main/java/ru/rt/restream/reindexer/binding/cproto/CommandObservationContext.java
index 1fd7e9d..cd0bb48 100644
--- a/src/main/java/ru/rt/restream/reindexer/binding/cproto/CommandObservationContext.java
+++ b/src/main/java/ru/rt/restream/reindexer/binding/cproto/CommandObservationContext.java
@@ -47,7 +47,7 @@ final class CommandObservationContext extends RequestReplySenderContext<Object,
 
     private RemoteServerAddress remoteServerAddress;
 
-    CommandObservationContext(int command, Object[] arguments) {
+    CommandObservationContext(int command, Object... arguments) {
         super((carrier, key, value) -> {}, Kind.CLIENT);
         this.command = command;
         this.arguments = arguments;
diff --git a/src/main/java/ru/rt/restream/reindexer/binding/cproto/ObservationDataSource.java b/src/main/java/ru/rt/restream/reindexer/binding/cproto/ObservationDataSource.java
index 6e4f22e..55c5a3f 100644
--- a/src/main/java/ru/rt/restream/reindexer/binding/cproto/ObservationDataSource.java
+++ b/src/main/java/ru/rt/restream/reindexer/binding/cproto/ObservationDataSource.java
@@ -54,20 +54,15 @@ private final class ObservationConnection implements Connection {
         public ReindexerResponse rpcCall(int command, Object... args) {
             CommandObservationContext context = new CommandObservationContext(command, args);
             context.setRemoteServiceAddress(url);
-            Observation observation = Observation.createNotStarted(CONVENTION, () -> context, registry).start();
-            try (Observation.Scope scope = observation.openScope()) {
+            Observation observation = Observation.createNotStarted(CONVENTION, () -> context, registry);
+            return observation.observe(() -> {
                 ReindexerResponse response = delegate.rpcCall(command, args);
                 context.setResponse(response);
                 if (response.hasError()) {
                     observation.error(ReindexerExceptionFactory.fromResponse(response));
                 }
                 return response;
-            } catch (Throwable t) {
-                observation.error(t);
-                throw t;
-            } finally {
-                observation.stop();
-            }
+            });
         }
 
         @Override