improvements after some discussion with Ben

giograno · giograno · commit cd06d1a10698 · 2024-11-18T18:54:59.000-05:00
diff --git a/localstack-core/localstack/aws/handlers/validation.py b/localstack-core/localstack/aws/handlers/validation.py
@@ -53,7 +53,16 @@ def _record_usage(self, context: RequestContext) -> None:
         user_agent = context.request.headers.get("User-Agent")
         if not request_path or not user_agent:
             return
-        collector = UsageCollectorFactory.get_collector(context.request.path)
+        # Skip the endpoints for the new API Gateway implementation
+        if "execute-api" in request_path:
+            return
+        # We only record the first segment in the path after the _internal/ or _aws/ prefix, as a path can have
+        # potentially an infinite number of parameters.
+        recorded_path = request_path.split("/")[":2"]
+        if len(recorded_path) < 2:
+            return
+        recorded_path = "/".join(recorded_path)
+        collector = UsageCollectorFactory.get_collector(recorded_path)
         collector.record(user_agent)
 
     def _load_specs(self) -> None:
