resolved post-merge conflicts

Signed-off-by: Alex Kehayov <aleks.kehayov@limechain.tech>

Author: AlexKehayov

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/streaming/BlockNodeConnection.java

@@ -688,7 +688,9 @@ public void sendRequest(@NonNull final PublishStreamRequest request) {
                         () -> {
                             if (getConnectionState() == ConnectionState.ACTIVE) {
                                 logWithContext(
+                                        logger,
                                         DEBUG,
+                                        this,
                                         "Pipeline onNext() timed out after {}ms",
                                         pipelineOperationTimeout.toMillis());
                                 blockStreamMetrics.recordPipelineOperationTimeout();
@@ -803,7 +805,9 @@ private void closePipeline(final boolean callOnComplete) {
                     final ScheduledFuture<?> timeoutTask = executorService.schedule(
                             () -> {
                                 logWithContext(
-                                        logger, DEBUG, this,
+                                        logger,
+                                        DEBUG,
+                                        this,
                                         "Pipeline onComplete() timed out after {}ms",
                                         pipelineOperationTimeout.toMillis());
                                 blockStreamMetrics.recordPipelineOperationTimeout();
@@ -822,7 +826,7 @@ private void closePipeline(final boolean callOnComplete) {
                         }
                     }
 
-                    logWithContext(DEBUG, "Request pipeline successfully closed.");
+                    logWithContext(logger, DEBUG, this, "Request pipeline successfully closed.");
                 }
             } catch (final Exception e) {
                 logger.warn(formatLogMessage("Error while completing request pipeline.", this), e);