From 716c046fa7c3595dc5d5f7f5d523c42684b8e0f3 Mon Sep 17 00:00:00 2001
From: Elio Di Nino <52972357+ElioDiNino@users.noreply.github.com>
Date: Mon, 19 Oct 2026 10:58:14 -0700
Subject: [PATCH] fix(metrics): drop duplicate snuba prefix from remaining
 metrics

The global metrics backend already prefixes everything with `snuba.`, so
wrappers named `snuba.delete`, `snuba.state` and `snuba.validation`
emitted `snuba.snuba.*`, and the read-through cache fail-open counter
repeated its wrapper prefix. Also removes the unused attribution wrapper.

Refs EAP-851
---
 snuba/attribution/__init__.py      | 4 ----
 snuba/request/validation.py        | 2 +-
 snuba/state/__init__.py            | 2 +-
 snuba/state/cache/redis/backend.py | 2 +-
 snuba/web/bulk_delete_query.py     | 2 +-
 snuba/web/delete_query.py          | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/snuba/attribution/__init__.py b/snuba/attribution/__init__.py
index 7250029245b..43f6318f7e2 100644
--- a/snuba/attribution/__init__.py
+++ b/snuba/attribution/__init__.py
@@ -3,12 +3,8 @@
 import logging
 from datetime import datetime
 
-from snuba import environment
-from snuba.utils.metrics.wrapper import MetricsWrapper
-
 from .appid import AppID
 
-metrics = MetricsWrapper(environment.metrics, "snuba.attribution")
 logger = logging.getLogger("snuba.attribution")
 
 INVALID_APPID = AppID("invalid", "sns", datetime(2022, 3, 25))
diff --git a/snuba/request/validation.py b/snuba/request/validation.py
index 8f39d1cdd8f..1860c918671 100644
--- a/snuba/request/validation.py
+++ b/snuba/request/validation.py
@@ -37,7 +37,7 @@
 from snuba.utils.metrics.wrapper import MetricsWrapper
 from snuba.utils.sentry import SENTRY_OP, set_tag_and_attribute
 
-metrics = MetricsWrapper(environment.metrics, "snuba.validation")
+metrics = MetricsWrapper(environment.metrics, "validation")
 
 
 class Parser(Protocol):
diff --git a/snuba/state/__init__.py b/snuba/state/__init__.py
index cfc16908902..953eff7007e 100644
--- a/snuba/state/__init__.py
+++ b/snuba/state/__init__.py
@@ -17,7 +17,7 @@
 from snuba.utils.streams.configuration_builder import build_kafka_producer_configuration
 from snuba.utils.streams.topics import Topic
 
-metrics = MetricsWrapper(environment.metrics, "snuba.state")
+metrics = MetricsWrapper(environment.metrics, "state")
 logger = logging.getLogger("snuba.state")
 
 kfk: Producer | None = None
diff --git a/snuba/state/cache/redis/backend.py b/snuba/state/cache/redis/backend.py
index 207db742c95..c9ed98a3ba8 100644
--- a/snuba/state/cache/redis/backend.py
+++ b/snuba/state/cache/redis/backend.py
@@ -144,5 +144,5 @@ def get_readthrough(
         except (ConnectionError, ReadOnlyError, RedisTimeoutError, ValueError):
             if settings.RAISE_ON_READTHROUGH_CACHE_REDIS_FAILURES:
                 raise
-            metrics.increment("snuba.read_through_cache.fail_open")
+            metrics.increment("fail_open")
             return function()
diff --git a/snuba/web/bulk_delete_query.py b/snuba/web/bulk_delete_query.py
index d2dbbb3330c..17d4b656dd6 100644
--- a/snuba/web/bulk_delete_query.py
+++ b/snuba/web/bulk_delete_query.py
@@ -42,7 +42,7 @@
     deletes_are_enabled,
 )
 
-metrics = MetricsWrapper(environment.metrics, "snuba.delete")
+metrics = MetricsWrapper(environment.metrics, "delete")
 logger = logging.getLogger(__name__)
 
 
diff --git a/snuba/web/delete_query.py b/snuba/web/delete_query.py
index a22c2839b73..d6eccf085a9 100644
--- a/snuba/web/delete_query.py
+++ b/snuba/web/delete_query.py
@@ -44,7 +44,7 @@
 from snuba.web import QueryException, QueryExtraData, QueryResult
 from snuba.web.db_query import _apply_allocation_policies_quota
 
-metrics = MetricsWrapper(environment.metrics, "snuba.delete")
+metrics = MetricsWrapper(environment.metrics, "delete")
 
 
 class DeletesNotEnabledError(Exception):