feat: metric controller

revamps metrics
metric collection can now be enabled/disabled by controller

Author: Kl0ven

controller/sentry/admin.py

@@ -12,8 +12,7 @@
 from django_object_actions import DjangoObjectActions, takes_instance_or_queryset
 
 from controller.sentry.forms import BumpForm
-from controller.sentry.inlines import MetricsInline
-from controller.sentry.models import App, Metric
+from controller.sentry.models import App
 
 
 @admin.register(App)
@@ -39,6 +38,10 @@ class AppAdmin(
     ]
     ordering = search_fields
 
+    formfield_overrides = {
+        models.JSONField: {"widget": JSONEditorWidget},
+    }
+
     fieldsets = [
         [
             None,
@@ -52,19 +55,27 @@ class AppAdmin(
         ],
         [
             "WSGI",
-            {"fields": ("wsgi_ignore_path",)},
+            {
+                "classes": ("collapse", "open"),
+                "fields": ("wsgi_ignore_path", "wsgi_collect_metrics", "wsgi_metrics"),
+            },
         ],
         [
             "Celery",
-            {"fields": ("celery_ignore_task",)},
+            {
+                "classes": ("collapse", "open"),
+                "fields": (
+                    "celery_ignore_task",
+                    "celery_collect_metrics",
+                    "celery_metrics",
+                ),
+            },
         ],
     ]
 
     changelist_actions = ["bump"]
     change_actions = ["bump"]
 
-    inlines = [MetricsInline]
-
     @takes_instance_or_queryset
     @add_form_to_action(BumpForm)
     @confirm_action()
@@ -75,31 +86,3 @@ def bump(self, request, queryset, form: BumpForm = None):
             active_sample_rate=form.cleaned_data["new_sample_rate"],
             active_window_end=new_date,
         )
-
-
-@admin.register(Metric)
-class MetricAdmin(admin.ModelAdmin):
-    formfield_overrides = {
-        models.JSONField: {"widget": JSONEditorWidget},
-    }
-
-    list_display = [
-        "type",
-        "last_updated",
-        "app",
-    ]
-
-    search_fields = ["type", "last_updated", "app__reference"]
-    ordering = search_fields
-
-    fieldsets = [
-        [
-            None,
-            {
-                "fields": (
-                    ("type", "last_updated", "app"),
-                    "data",
-                )
-            },
-        ]
-    ]

controller/sentry/inlines.py

@@ -1,5 +1,5 @@
 from collections import Counter
 
 
-def celery_merger(old, new):
-    return dict(Counter(old) + Counter(new))
+def celery_merger(app, new):
+    app.celery_metrics = dict(Counter(app.celery_metrics) + Counter(new))

controller/sentry/metrics/celery.py

@@ -1,5 +1,5 @@
 from collections import Counter
 
 
-def wsgi_merger(old, new):
-    return dict(Counter(old) + Counter(new))
+def wsgi_merger(app, new):
+    app.wsgi_metrics = dict(Counter(app.wsgi_metrics) + Counter(new))

controller/sentry/metrics/wsgi.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.1.5 on 2023-01-09 08:13
+# Generated by Django 4.1.5 on 2023-01-11 08:08
 
 import django_better_admin_arrayfield.models.fields
 from django.db import migrations, models
@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("sentry", "0006_alter_metric_last_updated"),
+        ("sentry", "0002_app_wsgi_ignore_path_alter_app_reference"),
     ]
 
     operations = [
@@ -23,11 +23,14 @@ class Migration(migrations.Migration):
                 size=None,
             ),
         ),
-        migrations.AlterField(
-            model_name="metric",
-            name="type",
-            field=models.CharField(
-                choices=[("WSGI", "WSGI"), ("CELERY", "CELERY")], max_length=10
-            ),
+        migrations.AddField(
+            model_name="app",
+            name="celery_metrics",
+            field=models.JSONField(null=True),
+        ),
+        migrations.AddField(
+            model_name="app",
+            name="wsgi_metrics",
+            field=models.JSONField(null=True),
         ),
     ]

controller/sentry/migrations/0007_app_celery_ignore_task_alter_metric_type.py renamed to controller/sentry/migrations/0003_app_celery_ignore_task_app_celery_metrics_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2023-01-11 08:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sentry", "0003_app_celery_ignore_task_app_celery_metrics_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="app",
+            name="celery_collect_metrics",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="app",
+            name="wsgi_collect_metrics",
+            field=models.BooleanField(default=False),
+        ),
+    ]