Misc fixes

Constantine0808 · May 29, 2024 · ae2e4a1 · ae2e4a1
1 parent 649b38c
commit ae2e4a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Logger.php b/src/Logger.php
@@ -276,11 +276,11 @@ public function __construct(SettingsLogger $settings, string $prefix = '')
         $this->colors[self::WARNING] = implode(';', [self::FOREGROUND['white'], self::SET['dim'], self::BACKGROUND['red']]);
         $this->colors[self::ERROR] = implode(';', [self::FOREGROUND['white'], self::SET['bold'], self::BACKGROUND['red']]);
         $this->colors[self::FATAL_ERROR] = implode(';', [self::FOREGROUND['red'], self::SET['bold'], self::BACKGROUND['light_gray']]);
-        $this->newline = PHP_EOL;
+        $newline = PHP_EOL;
         if ($this->mode === self::ECHO_LOGGER) {
             $stdout = getStdout();
             if (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
-                $this->newline = '<br>'.$this->newline;
+                $newline = '<br>'.$newline;
             }
         } elseif ($this->mode === self::FILE_LOGGER) {
             $stdout = new WritableResourceStream(fopen($this->optional, 'a'));
@@ -309,6 +309,7 @@ static function () use ($maxSize, $optional, $stdout): void {
                 $stdout = getStderr();
             }
         }
+        $this->newline = $newline;
 
         if (isset($stdout)) {
             $pipe = new Pipe(PHP_INT_MAX);

diff --git a/src/MTProto/MTProtoOutgoingMessage.php b/src/MTProto/MTProtoOutgoingMessage.php
@@ -189,10 +189,12 @@ public function reply($result): void
             $this->connection->inFlightGauge?->dec([
                 'method' => $this->constructor,
             ]);
-            $this->connection->requestLatencies?->observe(
-                hrtime(true) - $this->sent,
-                ['method' => $this->constructor]
-            );
+            if (!\is_callable($result)) {
+                $this->connection->requestLatencies?->observe(
+                    hrtime(true) - $this->sent,
+                    ['method' => $this->constructor]
+                );
+            }
         }
 
         $this->serializedBody = null;

diff --git a/src/MTProtoSession/Session.php b/src/MTProtoSession/Session.php
@@ -195,7 +195,7 @@ public function createSession(): void
         $this->requestLatencies = $this->API->getPromHistogram(
             "MadelineProto",
             "request_latencies",
-            "Request latency in nanoseconds by method",
+            "Successful request latency in nanoseconds by method",
             $labels,
             [
                 5_000_000,