Merge branch 'master' into feat/bitbucket-signed-webhooks-1

Author: oioki

babel.config.ts

@@ -22,13 +22,10 @@ const config: TransformOptions = {
   overrides: [],
   plugins: ['@emotion/babel-plugin', '@babel/plugin-transform-runtime'],
   env: {
-    production: {
-      plugins: [['babel-plugin-add-react-displayname']],
-    },
+    production: {},
     development: {
       plugins: [
         '@emotion/babel-plugin',
-        '@babel/plugin-transform-react-jsx-source',
         ...(process.env.SENTRY_UI_HOT_RELOAD ? ['react-refresh/babel'] : []),
       ],
     },

package.json

@@ -10,8 +10,6 @@
   "dependencies": {
     "@acemarke/react-prod-sourcemaps": "^0.2.1",
     "@babel/core": "~7.25.9",
-    "@babel/plugin-transform-react-jsx": "^7.25.9",
-    "@babel/plugin-transform-react-jsx-source": "^7.25.9",
     "@babel/plugin-transform-runtime": "~7.25.9",
     "@babel/preset-env": "~7.25.9",
     "@babel/preset-react": "^7.25.9",
@@ -94,7 +92,6 @@
     "@types/webpack-env": "^1.18.5",
     "ansi-to-react": "^6.1.6",
     "babel-loader": "^9.2.1",
-    "babel-plugin-add-react-displayname": "^0.0.5",
     "browserslist": "^4.22.2",
     "buffer": "^6.0.3",
     "cbor-web": "^8.1.0",

src/sentry/snuba/metrics/datasource.py

@@ -50,14 +50,12 @@
 )
 from sentry.snuba.metrics.utils import (
     AVAILABLE_GENERIC_OPERATIONS,
-    AVAILABLE_OPERATIONS,
     CUSTOM_MEASUREMENT_DATASETS,
     METRIC_TYPE_TO_ENTITY,
     UNALLOWED_TAGS,
     DerivedMetricParseException,
     MetricDoesNotExistInIndexer,
     MetricMeta,
-    MetricMetaWithTagKeys,
     MetricType,
     NotSupportedOverCompositeEntityException,
     Tag,
@@ -73,7 +71,6 @@
     "get_all_tags",
     "get_tag_values",
     "get_series",
-    "get_single_metric_info",
 )
 
 
@@ -428,42 +425,6 @@ def _fetch_tags_or_values_for_mri(
     return tags_or_values, None
 
 
-def get_single_metric_info(
-    projects: Sequence[Project],
-    metric_name: str,
-    use_case_id: UseCaseID,
-) -> MetricMetaWithTagKeys:
-    tags, metric_type = _fetch_tags_or_values_for_metrics(
-        projects=projects,
-        metric_names=[metric_name],
-        column="tags.key",
-        referrer="snuba.metrics.meta.get_single_metric",
-        use_case_id=use_case_id,
-    )
-    entity_key = METRIC_TYPE_TO_ENTITY[metric_type]
-
-    response_dict = {
-        "name": metric_name,
-        "type": metric_type,
-        "operations": AVAILABLE_OPERATIONS[entity_key.value],
-        "unit": None,
-        "tags": tags,
-    }
-
-    metric_mri = get_mri(metric_name)
-    all_derived_metrics = get_derived_metrics()
-    if metric_mri in all_derived_metrics:
-        derived_metric = all_derived_metrics[metric_mri]
-        response_dict.update(
-            {
-                "operations": [],
-                "unit": derived_metric.unit,
-                "type": derived_metric.result_type,
-            }
-        )
-    return response_dict
-
-
 def get_all_tags(
     projects: Sequence[Project],
     metric_names: Sequence[str] | None,

src/sentry/snuba/metrics/utils.py

@@ -27,7 +27,6 @@
     "Tag",
     "TagValue",
     "MetricMeta",
-    "MetricMetaWithTagKeys",
     "OPERATIONS",
     "OPERATIONS_PERCENTILES",
     "DEFAULT_AGGREGATES",
@@ -358,10 +357,6 @@ class MetricMeta(TypedDict):
     blockingStatus: Sequence[BlockedMetric] | None
 
 
-class MetricMetaWithTagKeys(MetricMeta):
-    tags: Sequence[Tag]
-
-
 OPERATIONS_PERCENTILES = (
     "p50",
     "p75",

src/sentry/taskworker/worker.py

@@ -336,11 +336,19 @@ def _drain_result(self, fetch: bool = True) -> bool:
             if not self._child_tasks.full():
                 fetch_next = FetchNextTask(namespace=self._namespace)
 
-            next_task = self.client.update_task(
-                task_id=result.task_id,
-                status=result.status,
-                fetch_next_task=fetch_next,
-            )
+            try:
+                next_task = self.client.update_task(
+                    task_id=result.task_id,
+                    status=result.status,
+                    fetch_next_task=fetch_next,
+                )
+            except grpc.RpcError as e:
+                logger.exception(
+                    "taskworker.drain_result.update_task_failed",
+                    extra={"task_id": result.task_id, "error": e},
+                )
+                return False
+
             if next_task:
                 try:
                     self._child_tasks.put(next_task, block=False)

src/sentry/templates/sentry/twofactor.html

@@ -1,6 +1,5 @@
 {% extends "sentry/bases/auth.html" %}
 
-{% load sentry_assets %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 
@@ -55,22 +54,3 @@ <h3>Two-Factor Authentication</h3>
     </div>
   </div>
 {% endblock %}
-
-{% block scripts_bottom %}
-    {{ block.super }}
-    {% script %}
-    <script>
-    document.addEventListener('DOMContentLoaded', function() {
-        const input = document.querySelector('input[name="otp"]');
-        if (!input) {
-            return;
-        }
-        input.addEventListener('change', function() {
-            if (input.value.length >= 6) {
-                input.form.submit();
-            }
-        });
-    });
-    </script>
-    {% endscript %}
-{% endblock %}

src/sentry/workflow_engine/endpoints/project_detector_index.py

@@ -114,7 +114,7 @@ def post(self, request, project):
         :param object data_source: Configuration for the data source
         :param array data_conditions: List of conditions to trigger the detector
         """
-        group_type = request.data.get("group_type")
+        group_type = request.data.get("groupType")
         if not group_type:
             raise ValidationError({"groupType": ["This field is required."]})
 

static/app/components/events/eventTagsAndScreenshot/tags.tsx

@@ -2,7 +2,6 @@ import {forwardRef, useCallback, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 
 import GuideAnchor from 'sentry/components/assistant/guideAnchor';
-import {LinkButton} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import {
   getSentryDefaultTags,
@@ -16,24 +15,23 @@ import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Project} from 'sentry/types/project';
-import {useLocation} from 'sentry/utils/useLocation';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
-import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
-import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 import {EventTags} from '../eventTags';
 
 type Props = {
   event: Event;
   projectSlug: Project['slug'];
+  /**
+   * Additional buttons to render in the header of the section
+   */
+  additionalActions?: React.ReactNode;
 };
 
 export const EventTagsDataSection = forwardRef<HTMLElement, Props>(
-  function EventTagsDataSection({event, projectSlug}: Props, ref) {
+  function EventTagsDataSection({event, projectSlug, additionalActions}: Props, ref) {
     const sentryTags = getSentryDefaultTags();
-    const hasStreamlinedUI = useHasStreamlinedUI();
-    const location = useLocation();
 
     const [tagFilter, setTagFilter] = useState<TagFilter>(TagFilter.ALL);
     const handleTagFilterChange = useCallback((value: TagFilter) => {
@@ -57,23 +55,9 @@ export const EventTagsDataSection = forwardRef<HTMLElement, Props>(
       });
     }, [event.tags]);
 
-    // Prevent drawer button from appearing on performance pages
-    const isOnIssueDetails = location.pathname.includes('/issues/');
-
     const actions = (
       <ButtonBar gap={1}>
-        {hasStreamlinedUI && event.groupID && isOnIssueDetails && (
-          <LinkButton
-            to={{
-              pathname: `${location.pathname}${TabPaths[Tab.TAGS]}`,
-              query: location.query,
-              replace: true,
-            }}
-            size="xs"
-          >
-            {t('View All Issue Tags')}
-          </LinkButton>
-        )}
+        {additionalActions}
         <SegmentedControl
           size="xs"
           aria-label={t('Filter tags')}

static/app/components/sidebar/sidebarAccordion.tsx

@@ -62,7 +62,7 @@ function SidebarAccordion({
   const isActive = isItemActive(itemProps);
   const hasMainLink = Boolean(itemProps.to);
 
-  const childSidebarItems = findChildElementsInTree(children, 'SidebarItem');
+  const childSidebarItems = findChildElementsInTree(children, SidebarItem.displayName);
 
   const hasActiveChildren = Children.toArray(childSidebarItems).some(child => {
     if (isValidElement(child)) {
@@ -205,7 +205,7 @@ function findChildElementsInTree(
       typeof child.type === 'string'
         ? child.type
         : 'displayName' in child.type
-          ? (child.type.displayName as string) // `.displayName` is added by `babel-plugin-add-react-displayname` in production builds
+          ? (child.type.displayName as string) // `.displayName` is added manually
           : child.type.name; // `.name` is available in development builds
 
     if (currentComponentName === componentName) {

static/app/components/sidebar/sidebarItem.tsx

@@ -312,6 +312,7 @@ function SidebarItem({
     </Tooltip>
   );
 }
+SidebarItem.displayName = 'SidebarItem';
 
 export function isItemActive(
   item: Pick<SidebarItemProps, 'to' | 'label'>,