From de657a65ce94ddd5050ecdc653f5ea43dc4d2ea3 Mon Sep 17 00:00:00 2001
From: Juliana Fajardini <jufajardini@oisf.net>
Date: Mon, 24 Mar 2025 12:29:40 -0700
Subject: [PATCH] exceptions: move reassembly memcap stats to common counter

Part of making the exception policy stats counters more search
friendly.

Task #7185

(cherry picked from commit 9a3b1553ccd58127bd3e35bd7987fb420909387d)
---
 etc/schema.json  | 10 +++++-----
 src/stream-tcp.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/schema.json b/etc/schema.json
index 36e635c938..e0c5a2ac4e 100644
--- a/etc/schema.json
+++ b/etc/schema.json
@@ -4973,6 +4973,11 @@
                                 "description":
                                         "How many times session memcap exception policy was applied, and which one",
                                 "$ref": "#/$defs/exceptionPolicy"
+                            },
+                            "reassembly": {
+                                "description":
+                                        "How many times reassembly memcap exception policy was applied, and which one",
+                                "$ref": "#/$defs/exceptionPolicy"
                             }
                         }
                     }
@@ -5342,11 +5347,6 @@
                         "pseudo_failed": {
                             "type": "integer"
                         },
-                        "reassembly_exception_policy": {
-                            "description":
-                                    "How many times reassembly memcap exception policy was applied, and which one",
-                            "$ref": "#/$defs/exceptionPolicy"
-                        },
                         "reassembly_gap": {
                             "type": "integer"
                         },
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index dece208605..e3a75b3116 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -5995,7 +5995,7 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
 
     ExceptionPolicySetStatsCounters(tv, &stt->ra_ctx->counter_tcp_reas_eps,
             &stream_reassembly_memcap_eps_stats, stream_config.reassembly_memcap_policy,
-            "tcp.reassembly_exception_policy.", IsReassemblyMemcapExceptionPolicyStatsValid);
+            "exception_policy.tcp.reassembly.", IsReassemblyMemcapExceptionPolicyStatsValid);
 
     stt->ra_ctx->counter_tcp_segment_from_cache =
             StatsRegisterCounter("tcp.segment_from_cache", tv);