added to link_identity

Author: MeredithAnya

src/sentry/integrations/slack/link_identity.py

@@ -1,19 +1,23 @@
 from __future__ import absolute_import, print_function
 
+import six
+
 from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.http import Http404
 from django.utils import timezone
 from django.views.decorators.cache import never_cache
 
-from sentry import http
 from sentry.models import Integration, Identity, IdentityProvider, IdentityStatus, Organization
 from sentry.utils.http import absolute_uri
 from sentry.utils.signing import sign, unsign
+from sentry.web.decorators import transaction_start
 from sentry.web.frontend.base import BaseView
 from sentry.web.helpers import render_to_response
+from sentry.shared_integrations.exceptions import ApiError
 
-from .utils import logger, track_response_code
+from .client import SlackClient
+from .utils import logger
 
 
 def build_linking_url(integration, organization, slack_id, channel_id, response_url):
@@ -31,6 +35,7 @@ def build_linking_url(integration, organization, slack_id, channel_id, response_
 
 
 class SlackLinkIdentityView(BaseView):
+    @transaction_start("SlackLinkIdentityView")
     @never_cache
     def handle(self, request, signed_params):
         params = unsign(signed_params.encode("ascii", errors="ignore"))
@@ -82,19 +87,18 @@ def handle(self, request, signed_params):
             "text": "Your Slack identity has been linked to your Sentry account. You're good to go!",
         }
 
-        session = http.build_session()
-        req = session.post(params["response_url"], json=payload)
-        status_code = req.status_code
-        resp = req.json()
-
-        # If the user took their time to link their slack account, we may no
-        # longer be able to respond, and we're not guaranteed able to post into
-        # the channel. Ignore Expired url errors.
-        #
-        # XXX(epurkhiser): Yes the error string has a space in it.
-        if not resp.get("ok") and resp.get("error") != "Expired url":
-            logger.error("slack.link-notify.response-error", extra={"response": resp})
-        track_response_code(status_code, resp.get("ok"))
+        client = SlackClient()
+        try:
+            client.post(params["response_url"], data=payload, json=True)
+        except ApiError as e:
+            message = six.text_type(e)
+            # If the user took their time to link their slack account, we may no
+            # longer be able to respond, and we're not guaranteed able to post into
+            # the channel. Ignore Expired url errors.
+            #
+            # XXX(epurkhiser): Yes the error string has a space in it.
+            if message != "Expired url":
+                logger.error("slack.link-notify.response-error", extra={"error": message})
 
         return render_to_response(
             "sentry/slack-linked.html",

src/sentry/web/frontend/pipeline_advancer.py

@@ -7,6 +7,7 @@
 from sentry.identity.pipeline import IdentityProviderPipeline
 from sentry.integrations.pipeline import IntegrationPipeline
 from sentry.web.frontend.base import BaseView
+from sentry.web.decorators import transaction_start
 
 
 # The request doesn't contain the pipeline type (pipeline information is stored
@@ -28,6 +29,7 @@ class PipelineAdvancerView(BaseView):
 
     csrf_protect = False
 
+    @transaction_start("PipelineAdvancerView")
     def handle(self, request, provider_id):
         pipeline = None