Revert "feat: Emit breakdowns for all transactions (#25886)" (#26082)

This reverts commit eb22065.

Author: dashed

src/sentry/projectoptions/defaults.py

@@ -70,7 +70,7 @@
     epoch_defaults={
         1: {
             "span_ops": {
-                "type": "spanOperations",
+                "type": "span_operations",
                 "matches": ["http", "db", "browser", "resource"],
             }
         },

src/sentry/relay/config.py

@@ -162,9 +162,10 @@ def get_project_config(project, full_config=True, project_keys=None):
         if dynamic_sampling is not None:
             cfg["config"]["dynamicSampling"] = dynamic_sampling
 
-    breakdowns_config = project.get_option("sentry:breakdowns")
-    if breakdowns_config is not None:
-        cfg["config"]["breakdowns"] = breakdowns_config
+    if features.has("organizations:performance-ops-breakdown", project.organization):
+        breakdowns_config = project.get_option("sentry:breakdowns")
+        if breakdowns_config is not None:
+            cfg["config"]["breakdowns"] = breakdowns_config
 
     if not full_config:
         # This is all we need for external Relay processors

tests/sentry/api/endpoints/test_relay_projectconfigs.py

@@ -16,13 +16,10 @@
 
 
 def _get_all_keys(config):
-    for config_key in config:
-        yield config_key
-        if isinstance(config[config_key], dict):
-            for key in _get_all_keys(config[config_key]):
-                # Bypass operations breakdown key
-                if config_key == "breakdowns" and key == "span_ops":
-                    continue
+    for key in config:
+        yield key
+        if isinstance(config[key], dict):
+            for key in _get_all_keys(config[key]):
                 yield key
 
 

tests/sentry/api/endpoints/test_relay_projectconfigs_v2.py

@@ -16,13 +16,10 @@
 
 
 def _get_all_keys(config):
-    for config_key in config:
-        yield config_key
-        if isinstance(config[config_key], dict):
-            for key in _get_all_keys(config[config_key]):
-                # Bypass operations breakdown key
-                if config_key == "breakdowns" and key == "span_ops":
-                    continue
+    for key in config:
+        yield key
+        if isinstance(config[key], dict):
+            for key in _get_all_keys(config[key]):
                 yield key
 
 

tests/sentry/relay/snapshots/test_config/test_get_project_config/no_ops_breakdown/full_config.pysnap

@@ -1,5 +1,5 @@
 ---
-created: '2021-05-13T22:16:37.531016Z'
+created: '2021-04-26T06:44:48.641788Z'
 creator: sentry
 source: tests/sentry/relay/test_config.py
 ---
@@ -13,7 +13,7 @@ config:
       - db
       - browser
       - resource
-      type: spanOperations
+      type: span_operations
   datascrubbingSettings:
     excludeFields: []
     scrubData: true

tests/sentry/relay/snapshots/test_config/test_get_project_config/no_ops_breakdown/slim_config.pysnap

@@ -1,5 +1,5 @@
 ---
-created: '2021-05-13T22:16:37.389823Z'
+created: '2021-04-26T06:44:48.504933Z'
 creator: sentry
 source: tests/sentry/relay/test_config.py
 ---
@@ -13,7 +13,7 @@ config:
       - db
       - browser
       - resource
-      type: spanOperations
+      type: span_operations
   datascrubbingSettings:
     excludeFields: []
     scrubData: true

tests/sentry/relay/snapshots/test_config/test_get_project_config/ops_breakdown/full_config.pysnap

@@ -1,19 +1,11 @@
 ---
-created: '2021-05-13T22:16:37.268371Z'
+created: '2021-04-26T06:44:48.376070Z'
 creator: sentry
 source: tests/sentry/relay/test_config.py
 ---
 config:
   allowedDomains:
   - '*'
-  breakdowns:
-    span_ops:
-      matches:
-      - http
-      - db
-      - browser
-      - resource
-      type: spanOperations
   datascrubbingSettings:
     excludeFields: []
     scrubData: true

tests/sentry/relay/snapshots/test_config/test_get_project_config/ops_breakdown/slim_config.pysnap

@@ -1,19 +1,11 @@
 ---
-created: '2021-05-13T22:16:37.059214Z'
+created: '2021-04-26T06:44:48.135605Z'
 creator: sentry
 source: tests/sentry/relay/test_config.py
 ---
 config:
   allowedDomains:
   - '*'
-  breakdowns:
-    span_ops:
-      matches:
-      - http
-      - db
-      - browser
-      - resource
-      type: spanOperations
   datascrubbingSettings:
     excludeFields: []
     scrubData: true