Merge branch 'next' into plat-6094

* next:
  chore(plugin-restify): send body in event.request
  dep: bump bugsnag-android dependency to v5.20.0
  chore(examples): add missing Dockerfile to angular example

Author: Dan Skinner

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+### Changed
+
+- (react-native) Update bugsnag-android to v5.20.0
+  - The number of threads reported can now be limited using `Configuration.setMaxReportedThreads` (defaulting to 200)
+    [bugsnag-android#1607](https://github.com/bugsnag/bugsnag-android/pull/1607)
+  - Improved the performance and stability of the NDK and ANR plugins by caching JNI references on start
+    [bugsnag-android#1596](https://github.com/bugsnag/bugsnag-android/pull/1596)
+    [bugsnag-android#1601](https://github.com/bugsnag/bugsnag-android/pull/1601)
 
 ### Fixed
 

examples/ts/angular/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:8
+
+WORKDIR /usr/src/app
+
+COPY package* /usr/src/app/
+RUN npm install
+
+COPY . /usr/src/app/
+CMD npm run serve -- --host 0.0.0.0

examples/ts/angular/README.md

@@ -27,7 +27,7 @@ docker build -t bugsnag-js-example-angular . && \
 docker run -p 4200:4200 -it bugsnag-js-example-angular
 ```
 
-__Note__: remember to replace `YOUR_API_KEY` in `src/lib/bugsnag.js` with your own!
+__Note__: remember to replace `YOUR_API_KEY` in `src/app/app.module.ts` with your own!
 
 ### Without docker
 Ensure you have a version of Node.js >=4 on your machine.

packages/plugin-restify/src/restify.js

@@ -24,10 +24,10 @@ module.exports = {
       req.bugsnag = requestClient
 
       // extract request info and pass it to the relevant bugsnag properties
-      const { request, metadata } = getRequestAndMetadataFromReq(req)
-      requestClient.addMetadata('request', metadata)
       requestClient.addOnError((event) => {
+        const { request, metadata } = getRequestAndMetadataFromReq(req)
         event.request = { ...event.request, ...request }
+        requestClient.addMetadata('request', metadata)
       }, true)
 
       if (!client._config.autoDetectErrors) return next()
@@ -77,15 +77,16 @@ module.exports = {
 }
 
 const getRequestAndMetadataFromReq = req => {
-  const requestInfo = extractRequestInfo(req)
+  const { body, ...requestInfo } = extractRequestInfo(req)
   return {
     metadata: requestInfo,
     request: {
+      body,
       clientIp: requestInfo.clientIp,
       headers: requestInfo.headers,
       httpMethod: requestInfo.httpMethod,
       url: requestInfo.url,
-      referer: requestInfo.referer
+      referer: requestInfo.referer // Not part of the notifier spec for request but leaving for backwards compatibility
     }
   }
 }

packages/react-native/android/build.gradle

@@ -39,8 +39,8 @@ android {
 }
 
 dependencies {
-    api "com.bugsnag:bugsnag-android:5.19.2"
-    api "com.bugsnag:bugsnag-plugin-react-native:5.19.2"
+    api "com.bugsnag:bugsnag-android:5.20.0"
+    api "com.bugsnag:bugsnag-plugin-react-native:5.20.0"
     implementation 'com.facebook.react:react-native:+'
 
     testImplementation "junit:junit:4.12"

packages/react-native/prepare-android-vendor.config

@@ -1,2 +1,2 @@
 version
-5.19.2
+5.20.0

test/node/features/fixtures/restify/scenarios/app.js

@@ -18,6 +18,8 @@ var server = restify.createServer()
 
 server.pre(middleware.requestHandler)
 
+server.use(restify.plugins.bodyParser());
+
 // If the server hasn't started sending something within 2 seconds
 // it probably won't. So end the request and hurry the failing test
 // along.
@@ -79,6 +81,10 @@ server.get('/handled', function (req, res, next) {
   res.end('OK')
 })
 
+server.post('/bodytest', function (req, res, next) {
+  throw new Error('request body')
+})
+
 server.on('restifyError', middleware.errorHandler)
 
 server.listen(80)

test/node/features/restify.feature

@@ -89,3 +89,16 @@ Scenario: a handled error passed to req.bugsnag.notify()
   And the event "request.url" equals "http://restify/handled"
   And the event "request.httpMethod" equals "GET"
   And the event "request.clientIp" is not null
+
+Scenario: adding body to request metadata
+  When I POST the data "data=in_request_body" to the URL "http://restify/bodytest"
+  And I wait to receive an error
+  Then the error is valid for the error reporting API version "4" for the "Bugsnag Node" notifier
+  And the event "unhandled" is true
+  And the event "severity" equals "error"
+  And the exception "errorClass" equals "Error"
+  And the exception "message" equals "request body"
+  And the exception "type" equals "nodejs"
+  And the "file" of stack frame 0 equals "scenarios/app.js"
+  And the event "request.body.data" equals "in_request_body"
+  And the event "request.httpMethod" equals "POST"