Merge pull request #270 from bobvanderlinden/pr-fix-raven-context

Fix Raven incorrect contexts for error reports
bobvanderlinden · May 8, 2019 · 5ff529f · 5ff529f
2 parents 88e43d9 + c277ba3
commit 5ff529f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/pull-request-handler.ts b/src/pull-request-handler.ts
@@ -190,7 +190,7 @@ export function getPullRequestPlan (
       }
     default:
       Raven.mergeContext({
-        extras: { pullRequestInfo }
+        extra: { pullRequestInfo }
       })
       throw new Error(`Merge state (${pullRequestInfo.mergeStateStatus}) was not recognized`)
   }

diff --git a/src/pull-request-query.ts b/src/pull-request-query.ts
@@ -64,10 +64,9 @@ export async function queryPullRequest (github: Context['github'], { owner, repo
     'pullRequestNumber': pullRequestNumber
   })
 
-  return Raven.context({
-    extras: { response }
-  }, () => {
-    const checkedResponse = validatePullRequestQuery(response)
-    return checkedResponse.repository.pullRequest
-  })
+  const checkedResponse = Raven.context({
+    extra: { response }
+  }, () => validatePullRequestQuery(response))
+
+  return checkedResponse.repository.pullRequest
 }
diff --git a/src/repository-worker.ts b/src/repository-worker.ts
@@ -1,3 +1,4 @@
+import Raven from 'raven'
 import { WaitQueue } from './WaitQueue'
 import { RepositoryReference, PullRequestReference } from './github-models'
 import { handlePullRequest, PullRequestContext } from './pull-request-handler'
@@ -40,11 +41,15 @@ export class RepositoryWorker {
       },
       startedAt: new Date()
     }
-    try {
-      await handlePullRequest(pullRequestContext, pullRequestReference)
-    } catch (err) {
-      this.onPullRequestError(pullRequestReference, err)
-    }
+    await Raven.context({
+      extra: { pullRequestReference }
+    }, async () => {
+      try {
+        await handlePullRequest(pullRequestContext, pullRequestReference)
+      } catch (err) {
+        this.onPullRequestError(pullRequestReference, err)
+      }
+    })
   }
 
   public queue (pullRequestNumber: number) {