From b60615302c61c0e4331ed874951a62fd238b417e Mon Sep 17 00:00:00 2001
From: zino <marlon.maschkiwitz@4players.io>
Date: Thu, 14 Aug 2025 19:30:50 +0200
Subject: [PATCH] m

---
 progs/registry.mtail | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/progs/registry.mtail b/progs/registry.mtail
index c2309cf..343e659 100644
--- a/progs/registry.mtail
+++ b/progs/registry.mtail
@@ -13,39 +13,33 @@ gauge push_session_start by repo, user, node
   registry_requests_total["pull_blob"][$repo][$node]++
 }
 
-/"remote_address":"(?P<node>[^"]*)".*"remote_user":"(?P<user>[^"]*)".*"method":"POST".*"path":"\/v2\/(?P<repo>.+?)\/blobs\/uploads\/".*"status":202/
-{
-  if push_session_start[$repo][$user][$node] == 0 {
-    push_session_start[$repo][$user][$node] = time()
-  }
-  registry_requests_total["push_upload"][$repo][$node]++
-}
-
 /"remote_address":"(?P<node>[^"]*)".*"remote_user":"(?P<user>[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P<repo>.+?)\/blobs\/uploads\/[a-f0-9-]+".*"upstream_range":"(?P<start>\d+)-(?P<end>\d+)".*"request_time":(?P<rt>[0-9.]+)"/
 {
   registry_push_upload_bytes_total[$repo][$user][$node] += int($end) - int($start) + 1
   push_session_bytes[$repo][$user][$node] += int($end) - int($start) + 1
+  registry_requests_total["push_upload"][$repo][$node]++
   if push_session_start[$repo][$user][$node] == 0 {
     push_session_start[$repo][$user][$node] = time()
   }
-  registry_requests_total["push_upload"][$repo][$node]++
 }
 
-/"remote_address":"(?P<node>[^"]*)".*"remote_user":"(?P<user>[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P<repo>.+?)\/blobs\/uploads\/[a-f0-9-]+".*"upstream_range":"".*"request_length":(?P<req>\d+)/
+/"remote_address":"(?P<node>[^"]*)".*"remote_user":"(?P<user>[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P<repo>.+?)\/blobs\/uploads\/[a-f0-9-]+".*"request_length":(?P<req>\d+)/
 {
   registry_push_upload_bytes_total[$repo][$user][$node] += $req
   push_session_bytes[$repo][$user][$node] += $req
+  registry_requests_total["push_upload"][$repo][$node]++
   if push_session_start[$repo][$user][$node] == 0 {
     push_session_start[$repo][$user][$node] = time()
   }
-  registry_requests_total["push_upload"][$repo][$node]++
 }
 
 /"remote_address":"(?P<node>[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P<repo>.+?)\/manifests\/[^"]+"/
 {
   registry_requests_total["push_manifest"][$repo][$node]++
-  if push_session_start[$repo][$user][$node] > 0 && push_session_bytes[$repo][$user][$node] > 0 && time() - push_session_start[$repo][$user][$node] > 0 {
-    registry_push_session_speed_mbps[$repo][$user][$node] = (push_session_bytes[$repo][$user][$node] * 8) / (time() - push_session_start[$repo][$user][$node]) / 1000000
+  if push_session_start[$repo][$user][$node] > 0 {
+    if time() - push_session_start[$repo][$user][$node] > 0 {
+      registry_push_session_speed_mbps[$repo][$user][$node] = (push_session_bytes[$repo][$user][$node] * 8) / (time() - push_session_start[$repo][$user][$node]) / 1000000
+    }
   }
   push_session_bytes[$repo][$user][$node] = 0
   push_session_start[$repo][$user][$node] = 0