Merge branch 'master' into scttcper/typescript-4-fixes

Author: scttcper

src/sentry/api/serializers/models/integration.py

@@ -69,12 +69,16 @@ def serialize(self, obj, attrs, user):
         except NotImplementedError:
             # slack doesn't have an installation implementation
             config_data = obj.config
+            dynamic_display_information = None
         else:
             # just doing this to avoid querying for an object we already have
             installation._org_integration = obj
             config_data = installation.get_config_data()
+            dynamic_display_information = installation.get_dynamic_display_information()
 
         integration.update({"configData": config_data})
+        if dynamic_display_information:
+            integration.update({"dynamicDisplayInformation": dynamic_display_information})
 
         return integration
 

src/sentry/api/serializers/models/release.py

@@ -263,12 +263,14 @@ def get_attrs(self, item_list, user, **kwargs):
             first_seen, last_seen, issue_counts_by_release = self.__get_release_data_no_environment(
                 project, item_list
             )
+            environments = None
         else:
             (
                 first_seen,
                 last_seen,
                 issue_counts_by_release,
             ) = self.__get_release_data_with_environment(project, item_list, environment)
+            environments = [environment]
 
         owners = {
             d["id"]: d for d in serialize(set(i.owner for i in item_list if i.owner_id), user)
@@ -300,6 +302,7 @@ def get_attrs(self, item_list, user, **kwargs):
                 [(pr["project__id"], pr["release__version"]) for pr in project_releases],
                 health_stats_period=health_stats_period,
                 summary_stats_period=summary_stats_period,
+                environments=environments,
                 stat=health_stat,
             )
         else:

src/sentry/eventstream/base.py

@@ -1,9 +1,12 @@
 from __future__ import absolute_import
 
+import random
 import logging
 
-from sentry.utils.services import Service
+from sentry import options
 from sentry.tasks.post_process import post_process_group
+from sentry.utils.services import Service
+from sentry.utils.cache import cache_key_for_event
 
 
 logger = logging.getLogger(__name__)
@@ -43,13 +46,30 @@ def _dispatch_post_process_group_task(
         if skip_consume:
             logger.info("post_process.skip.raw_event", extra={"event_id": event.event_id})
         else:
-            post_process_group.delay(
-                event=event,
-                is_new=is_new,
-                is_regression=is_regression,
-                is_new_group_environment=is_new_group_environment,
-                primary_hash=primary_hash,
+            random_val = random.random()
+            cache_key = cache_key_for_event(
+                {"project": event.project_id, "event_id": event.event_id}
             )
+            if options.get("postprocess.use-cache-key") > random_val:
+                post_process_group.delay(
+                    event=None,
+                    is_new=is_new,
+                    is_regression=is_regression,
+                    is_new_group_environment=is_new_group_environment,
+                    primary_hash=primary_hash,
+                    cache_key=cache_key,
+                    group_id=event.group_id,
+                )
+            else:
+                # Pass the cache key here to ensure that the processing cache is removed.
+                post_process_group.delay(
+                    event=event,
+                    is_new=is_new,
+                    is_regression=is_regression,
+                    is_new_group_environment=is_new_group_environment,
+                    primary_hash=primary_hash,
+                    cache_key=cache_key,
+                )
 
     def insert(
         self,

src/sentry/integrations/base.py

@@ -289,6 +289,9 @@ def update_organization_config(self, data):
     def get_config_data(self):
         return self.org_integration.config
 
+    def get_dynamic_display_information(self):
+        return None
+
     def get_client(self):
         # Return the api client for a given provider
         raise NotImplementedError

src/sentry/integrations/slack/tasks.py

@@ -58,18 +58,7 @@ def _format_value(self, status, rule_id):
 
 
 @instrumented_task(name="sentry.integrations.slack.search_channel_id", queue="integrations")
-def find_channel_id_for_rule(
-    name,
-    environment,
-    project,
-    action_match,
-    filter_match,
-    conditions,
-    actions,
-    frequency,
-    uuid,
-    rule_id=None,
-):
+def find_channel_id_for_rule(project, actions, uuid, rule_id=None, **kwargs):
     redis_rule_status = RedisRuleStatus(uuid)
 
     try:
@@ -118,16 +107,8 @@ def find_channel_id_for_rule(
                 action["channel_id"] = item_id
                 break
 
-        kwargs = {
-            "name": name,
-            "environment": environment,
-            "project": project,
-            "action_match": action_match,
-            "filter_match": filter_match,
-            "conditions": conditions,
-            "actions": actions,
-            "frequency": frequency,
-        }
+        kwargs["actions"] = actions
+        kwargs["project"] = project
 
         if rule_id:
             rule = Rule.objects.get(id=rule_id)

src/sentry/integrations/vercel/integration.py

@@ -6,6 +6,7 @@
 
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.serializers import ValidationError
+from six.moves.urllib.parse import urlencode
 
 
 from sentry.integrations import (
@@ -21,6 +22,7 @@
 from sentry.identity.pipeline import IdentityProviderPipeline
 from sentry.utils.http import absolute_uri
 from sentry.models import (
+    Organization,
     Integration,
     Project,
     ProjectKey,
@@ -36,9 +38,11 @@
 
 logger = logging.getLogger("sentry.integrations.vercel")
 
-DESCRIPTION = """
+DESCRIPTION = _(
+    """
 Vercel is an all-in-one platform with Global CDN supporting static & JAMstack deployment and Serverless Functions.
 """
+)
 
 FEATURES = [
     FeatureDescription(
@@ -49,7 +53,7 @@
     ),
 ]
 
-INSTALL_NOTICE_TEXT = (
+INSTALL_NOTICE_TEXT = _(
     "Visit the Vercel Marketplace to install this integration. After installing the"
     " Sentry integration, you'll be redirected back to Sentry to finish syncing Vercel and Sentry projects."
 )
@@ -63,11 +67,19 @@
 
 
 configure_integration = {"title": _("Connect Your Projects")}
+connect_project_instruction = _(
+    "To complete installation, please connect your Sentry and Vercel projects."
+)
+install_source_code_integration = _(
+    "Install a [source code integration]({}) and configure your repositories."
+)
 
 disable_dialog = {
-    "actionText": "Visit Vercel",
-    "body": "In order to uninstall this integration, you must go"
-    " to Vercel and uninstall there by clicking 'Remove Configuration'.",
+    "actionText": _("Visit Vercel"),
+    "body": _(
+        "In order to uninstall this integration, you must go"
+        " to Vercel and uninstall there by clicking 'Remove Configuration'."
+    ),
 }
 
 
@@ -97,6 +109,21 @@ class VercelIntegration(IntegrationInstallation):
     def metadata(self):
         return self.model.metadata
 
+    def get_dynamic_display_information(self):
+        organization = Organization.objects.get_from_cache(id=self.organization_id)
+        source_code_link = absolute_uri(
+            u"/settings/%s/integrations/?%s"
+            % (organization.slug, urlencode({"category": "source code management"}))
+        )
+        return {
+            "configure_integration": {
+                "instructions": [
+                    connect_project_instruction,
+                    install_source_code_integration.format(source_code_link),
+                ]
+            }
+        }
+
     def get_client(self):
         access_token = self.metadata["access_token"]
         if self.metadata["installation_type"] == "team":

src/sentry/static/sentry/app/components/events/interfaces/spans/spanDetail.tsx

@@ -108,10 +108,6 @@ class SpanDetail extends React.Component<Props, State> {
       end,
     };
 
-    if (query.project.length === 0) {
-      delete query.project;
-    }
-
     return api.requestPromise(url, {
       method: 'GET',
       query,

src/sentry/static/sentry/app/types/index.tsx

@@ -858,6 +858,11 @@ export type Integration = {
       | 'born_as_bot'
       | 'migrated_to_bot';
   };
+  dynamicDisplayInformation?: {
+    configure_integration?: {
+      instructions: string[];
+    };
+  };
 };
 
 export type IntegrationExternalIssue = {

src/sentry/static/sentry/app/views/projectInstall/overview.jsx

@@ -57,7 +57,7 @@ class ProjectInstallOverview extends AsyncComponent {
 
     return (
       <div>
-        <SentryDocumentTitle title={t('Error Tracking')} objSlug={projectId} />
+        <SentryDocumentTitle title={t('Instrumentation')} objSlug={projectId} />
         <SettingsPageHeader title={t('Configure your application')} />
         <TextBlock>
           {t(

src/sentry/static/sentry/app/views/releasesV2/detail/releaseHeader.tsx

@@ -92,7 +92,10 @@ const ReleaseHeader = ({location, orgId, release, project, releaseMeta}: Props)
             </DeploysWrapper>
           </ReleaseStat>
           {hasHealthData && (
-            <ReleaseStat label={t('Crashes')}>
+            <ReleaseStat
+              label={t('Crashes')}
+              help={t('Crash means that user experienced an unhandled error')}
+            >
               <Count value={sessionsCrashed} />
             </ReleaseStat>
           )}

src/sentry/static/sentry/app/views/releasesV2/detail/releaseStat.tsx

@@ -2,15 +2,20 @@ import React from 'react';
 import styled from '@emotion/styled';
 
 import space from 'app/styles/space';
+import QuestionTooltip from 'app/components/questionTooltip';
 
 type Props = {
   label: string;
   children: React.ReactNode;
+  help?: React.ReactNode;
 };
 
-const ReleaseStat = ({label, children}: Props) => (
+const ReleaseStat = ({label, children, help}: Props) => (
   <Wrapper>
-    <Label>{label}</Label>
+    <Label hasHelp={!!help}>
+      {label}
+      {help && <StyledQuestionTooltip title={help} size="xs" position="top" />}
+    </Label>
     <Value>{children}</Value>
   </Wrapper>
 );
@@ -21,15 +26,24 @@ const Wrapper = styled('div')`
   }
 `;
 
-const Label = styled('div')`
+const Label = styled('div')<{hasHelp: boolean}>`
   font-weight: 600;
   font-size: ${p => p.theme.fontSizeSmall};
   text-transform: uppercase;
   color: ${p => p.theme.gray500};
   line-height: 1.3;
   margin-bottom: ${space(0.25)};
   white-space: nowrap;
+  display: flex;
+  @media (min-width: ${p => p.theme.breakpoints[1]}) {
+    justify-content: flex-end;
+  }
+`;
+
+const StyledQuestionTooltip = styled(QuestionTooltip)`
+  margin-left: ${space(0.5)};
 `;
+
 const Value = styled('div')`
   font-size: ${p => p.theme.fontSizeExtraLarge};
   color: ${p => p.theme.gray700};

src/sentry/static/sentry/app/views/settings/incidentRules/triggers/chart/index.tsx

@@ -201,16 +201,13 @@ const ChartPlaceholder = styled(Placeholder)`
 
 const StickyWrapper = styled('div')`
   position: sticky;
-  top: 69px; /* Height of settings breadcrumb 69px */
+  top: ${space(1)};
   z-index: ${p => p.theme.zIndex.dropdown - 1};
-  background: rgba(255, 255, 255, 0.9);
 `;
 
 const StyledPanel = styled(Panel)`
   /* Remove margin for the sticky window */
   margin-bottom: 0;
-  /* Keep semi transparent background */
-  background: none;
 `;
 
 const StyledSelectControl = styled(SelectControl)`

src/sentry/static/sentry/app/views/settings/organizationIntegrations/configureIntegration.tsx

@@ -16,6 +16,8 @@ import SettingsPageHeader from 'app/views/settings/components/settingsPageHeader
 import withOrganization from 'app/utils/withOrganization';
 import {Organization, Integration, IntegrationProvider} from 'app/types';
 import {trackIntegrationEvent} from 'app/utils/integrationUtil';
+import {singleLineRenderer} from 'app/utils/marked';
+import Alert from 'app/components/alert';
 
 type RouteParams = {
   orgId: string;
@@ -125,6 +127,14 @@ class ConfigureIntegration extends AsyncView<Props, State> {
           </Form>
         )}
 
+        {integration.dynamicDisplayInformation?.configure_integration?.instructions.map(
+          instruction => (
+            <Alert type="info">
+              <span dangerouslySetInnerHTML={{__html: singleLineRenderer(instruction)}} />
+            </Alert>
+          )
+        )}
+
         {provider && provider.features.includes('alert-rule') && (
           <IntegrationAlertRules integration={integration} />
         )}

src/sentry/static/sentry/app/views/settings/project/navigationConfiguration.tsx

@@ -108,7 +108,7 @@ export default function getConfiguration({
       items: [
         {
           path: `${pathPrefix}/install/`,
-          title: t('Error Tracking'),
+          title: t('Instrumentation'),
         },
         {
           path: `${pathPrefix}/keys/`,