hawkly-grpc - npm Package Compare versions

Comparing version 0.5.6 to 0.5.8

CHANGELOG.md

@@ -5,2 +5,12 @@ # Change Log
 
+<a name="0.5.8"></a>
+## [0.5.8](https://github.com/hawkly/hawkly-grpc-javascript/compare/v0.5.7...v0.5.8) (2017-03-12)
+
+
+
+<a name="0.5.7"></a>
+## [0.5.7](https://github.com/hawkly/hawkly-grpc-javascript/compare/v0.5.6...v0.5.7) (2017-03-12)
+
+
+
 <a name="0.5.6"></a>
@@ -7,0 +17,0 @@ ## [0.5.6](https://github.com/hawkly/hawkly-grpc-javascript/compare/v0.5.5...v0.5.6) (2017-03-11)

lib/client.js

@@ -8,2 +8,3 @@ "use strict";
 const hawkly_1 = require("hawkly");
+const index_1 = require("./index");
 let tracer;
@@ -105,2 +106,6 @@ // const lastSpan: Span | undefined;
                         if (err) {
+                            const errMetadata = err.metadata.getMap();
+                            if (errMetadata.type === 'HawklyError') {
+                                reject(new index_1.HawklyError(errMetadata.message, errMetadata.event, JSON.parse(errMetadata.payload)));
+                            }
                             reject(err);
@@ -166,2 +171,6 @@ span.setTag({ error: true });
                         if (err) {
+                            const errMetadata = err.metadata.getMap();
+                            if (errMetadata.type === 'HawklyError') {
+                                reject(new index_1.HawklyError(errMetadata.message, errMetadata.event, JSON.parse(errMetadata.payload)));
+                            }
                             reject(err);
@@ -264,2 +273,2 @@ span.setTag({ error: true });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

lib/index.js

@@ -9,2 +9,31 @@ "use strict";
 exports.hawklyMiddleware = middleware_1.hawklyMiddleware;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5QkFBeUI7QUFDekIscUNBTWtCO0FBT2hCLDZDQUFZO0FBTGQsaUVBQWlFO0FBQ2pFLDZDQUFnRDtBQUc5Qyx5REFBZ0IifQ==
+class HawklyError extends Error {
+    /**
+     *
+     * @param message   A short message that is returned to the caller      (not logged on span)
+     * @param eventName A very short eventName that is saved onto the span  (logged on span)
+     * @param payload (optional) object that is returned to the caller      (logged on span)
+     */
+    constructor(message, eventName, payload) {
+        super(message);
+        if (typeof eventName !== 'string') {
+            throw new Error(`eventName must be a string, got ${typeof eventName}`);
+        }
+        this.eventName = eventName;
+        this.payload = payload;
+    }
+    getMessage() {
+        return this.message;
+    }
+    getEventName() {
+        return this.eventName;
+    }
+    getPayload() {
+        return this.payload;
+    }
+    getPayloadJSON() {
+        return JSON.stringify(this.payload);
+    }
+}
+exports.HawklyError = HawklyError;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5QkFBeUI7QUFDekIscUNBTWtCO0FBdUNoQiw2Q0FBWTtBQXJDZCxpRUFBaUU7QUFDakUsNkNBQWdEO0FBbUM5Qyx5REFBZ0I7QUFqQ2xCLGlCQUFrQixTQUFRLEtBQUs7SUFHN0I7Ozs7O09BS0c7SUFDSCxZQUFZLE9BQWUsRUFBRSxTQUFpQixFQUFFLE9BQVk7UUFDMUQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsRUFBRSxDQUFDLENBQUMsT0FBTyxTQUFTLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLG1DQUFtQyxPQUFPLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDekUsQ0FBQztRQUNELElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO1FBQzNCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFDTSxVQUFVO1FBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUNNLFlBQVk7UUFDakIsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUNNLFVBQVU7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBQ00sY0FBYztRQUNuQixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztDQUNGO0FBVUMsa0NBQVcifQ==

lib/index.spec.js

@@ -127,2 +127,67 @@ "use strict";
 }));
+ava_1.test('unary request should return error in server handler back to client', (t) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    t.plan(5);
+    const PROTO_PATH = __dirname + '/../proto/helloworld.proto';
+    const grpcHost = getHost();
+    const app = new Mali(PROTO_PATH);
+    const errMessage = 'test error';
+    const errEventName = 'testError';
+    const errPayload = { foo: 'bar' };
+    const hawklyTracerOptions = {
+        accessToken: 'test',
+        componentName: 'testServerComponent',
+        // recordCallback: serverRecordCallback,
+        recordCallback: () => { }
+    };
+    // Add the hawkly middleware for tracing server calls
+    app.use(index_1.hawklyMiddleware(hawklyTracerOptions));
+    // add our server handler for the sayHello call
+    app.use({
+        sayHello: () => {
+            throw new index_1.HawklyError(errMessage, errEventName, errPayload);
+        }
+    });
+    app.start(grpcHost);
+    const error = yield t.throws(new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // Create the client
+        const { tracer, client } = index_1.createClient({
+            // hawkly
+            accessToken: 'test',
+            componentName: 'testComponent',
+            recordCallback: () => { },
+            // grpc
+            host: grpcHost,
+            proto: PROTO_PATH,
+            name: 'Greeter',
+        });
+        app.silent = true;
+        // Create a span to encapsulate our work
+        const span = tracer.startSpan('/client/sayHello');
+        // create the gRPC request and wait for it to resolve
+        try {
+            const result = yield client.sayHello({
+                arg: { name: grpcHost },
+                // pass in our span
+                span,
+            });
+            console.warn('result', result);
+            span.finish();
+            resolve(result);
+        }
+        catch (error) {
+            span.finish();
+            reject(error);
+        }
+    })));
+    if (error) {
+        t.true(error instanceof index_1.HawklyError);
+        if (error instanceof index_1.HawklyError) {
+            t.is(error.getMessage(), errMessage);
+            t.is(error.getEventName(), errEventName);
+            t.deepEqual(error.getPayload(), errPayload);
+        }
+    }
+    // And close
+    yield app.close();
+}));
 // tslint:disable-next-line:max-func-body-length
@@ -449,2 +514,2 @@ ava_1.test('request streaming should work', (t) => tslib_1.__awaiter(this, void 0, void 0, function* () {
 }));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":"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"}

lib/middleware.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const createError = require("create-grpc-error");
 const hawkly_1 = require("hawkly");
+const index_1 = require("./index");
 function hawklyMiddleware(options) {
@@ -23,3 +25,2 @@ let tracer;
             catch (err) {
-                console.warn(err);
                 span = tracer.startSpan(ctx.name);
@@ -36,3 +37,21 @@ }
             ctx.span = span;
-            yield next();
+            try {
+                yield next();
+            }
+            catch (error) {
+                if (error instanceof index_1.HawklyError) {
+                    ctx.span.log({
+                        event: error.getEventName(),
+                        payload: error.getPayload(),
+                    });
+                    throw createError('HawklyError', {
+                        type: 'HawklyError',
+                        message: error.getMessage(),
+                        event: error.getEventName(),
+                        payload: error.getPayloadJSON(),
+                    });
+                }
+                ctx.span.finish();
+                throw createError(error);
+            }
             if (ctx.type !== 'duplex') {
@@ -45,2 +64,2 @@ ctx.span.finish();
 exports.hawklyMiddleware = hawklyMiddleware;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUFzQztBQUV0QywwQkFBMEIsT0FBWTtJQUNwQyxJQUFJLE1BQWMsQ0FBQztJQUNuQixFQUFFLENBQUMsQ0FBQyxPQUFPLE9BQU8sQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN2QyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQztJQUMxQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixNQUFNLEdBQUcsSUFBSSxlQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELHVFQUF1RTtJQUN2RSxNQUFNLENBQUMsMEJBQWdDLEdBQVEsRUFBRSxJQUFTOztZQUN4RCw2Q0FBNkM7WUFDN0MsSUFBSSxJQUFVLENBQUM7WUFDZixJQUFJLENBQUM7Z0JBQ0gsTUFBTSxPQUFPLEdBQVEsTUFBTSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUM5RCxJQUFJLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDMUQsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDbEIsSUFBSSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BDLENBQUM7WUFDRCxpRUFBaUU7WUFFakUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFFeEMsb0VBQW9FO1lBQ3BFLHVCQUF1QjtZQUN2QixHQUFHLENBQUMsUUFBUSxxQkFDUCxHQUFHLENBQUMsUUFBUSxFQUNaLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FDbEIsQ0FBQztZQUVGLHdDQUF3QztZQUN4QyxHQUFHLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztZQUNwQixzQ0FBc0M7WUFDdEMsR0FBRyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7WUFFaEIsTUFBTSxJQUFJLEVBQUUsQ0FBQztZQUViLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDMUIsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQixDQUFDO1FBQ0gsQ0FBQztLQUFBLENBQUM7QUFDSixDQUFDO0FBRUMsNENBQWdCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlEQUFpRDtBQUVqRCxtQ0FBc0M7QUFFdEMsbUNBQXNDO0FBRXRDLDBCQUEwQixPQUFZO0lBQ3BDLElBQUksTUFBYyxDQUFDO0lBQ25CLEVBQUUsQ0FBQyxDQUFDLE9BQU8sT0FBTyxDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQzFCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE1BQU0sR0FBRyxJQUFJLGVBQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQsdUVBQXVFO0lBQ3ZFLE1BQU0sQ0FBQywwQkFBZ0MsR0FBUSxFQUFFLElBQVM7O1lBQ3hELDZDQUE2QztZQUM3QyxJQUFJLElBQVUsQ0FBQztZQUNmLElBQUksQ0FBQztnQkFDSCxNQUFNLE9BQU8sR0FBUSxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQzlELElBQUksR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUMxRCxDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDYixJQUFJLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEMsQ0FBQztZQUNELGlFQUFpRTtZQUVqRSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUV4QyxvRUFBb0U7WUFDcEUsdUJBQXVCO1lBQ3ZCLEdBQUcsQ0FBQyxRQUFRLHFCQUNQLEdBQUcsQ0FBQyxRQUFRLEVBQ1osSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUNsQixDQUFDO1lBRUYsd0NBQXdDO1lBQ3hDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1lBQ3BCLHNDQUFzQztZQUN0QyxHQUFHLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztZQUNoQixJQUFJLENBQUM7Z0JBQ0gsTUFBTSxJQUFJLEVBQUUsQ0FBQztZQUNmLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUNmLEVBQUUsQ0FBQyxDQUFDLEtBQUssWUFBWSxtQkFBVyxDQUFDLENBQUMsQ0FBQztvQkFDakMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUM7d0JBQ1gsS0FBSyxFQUFFLEtBQUssQ0FBQyxZQUFZLEVBQUU7d0JBQzNCLE9BQU8sRUFBRSxLQUFLLENBQUMsVUFBVSxFQUFFO3FCQUM1QixDQUFDLENBQUM7b0JBQ0gsTUFBTSxXQUFXLENBQUMsYUFBYSxFQUFFO3dCQUMvQixJQUFJLEVBQUUsYUFBYTt3QkFDbkIsT0FBTyxFQUFFLEtBQUssQ0FBQyxVQUFVLEVBQUU7d0JBQzNCLEtBQUssRUFBRSxLQUFLLENBQUMsWUFBWSxFQUFFO3dCQUMzQixPQUFPLEVBQUUsS0FBSyxDQUFDLGNBQWMsRUFBRTtxQkFDaEMsQ0FBQyxDQUFDO2dCQUNMLENBQUM7Z0JBQ0QsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFFbEIsTUFBTSxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDM0IsQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDMUIsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQixDQUFDO1FBQ0gsQ0FBQztLQUFBLENBQUM7QUFDSixDQUFDO0FBRUMsNENBQWdCIn0=

package.json

 {
   "name": "hawkly-grpc",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "An gRPC wrapper with an OpenTracing compatible tracer for hawkly.io",
@@ -89,2 +89,3 @@ "main": "lib/index.js",
   "dependencies": {
+    "create-grpc-error": "^0.1.0",
     "google-protobuf": "^3.2.0",
@@ -91,0 +92,0 @@ "grpc": "^1.1.2",

README.md

@@ -17,3 +17,26 @@ # hawkly gRPC wrapper for javascript
 
+To run the server, add the `hawklyMiddleware` with configuration as a middleware to `Mali`.
 
+```javascript
+  const PROTO_PATH: string = __dirname + '/../proto/helloworld.proto';
+
+  const grpcHost = '0.0.0.0:1000";
+  const app: Mali = new Mali(PROTO_PATH);
+
+  const hawklyTracerOptions: any = {
+    accessToken: 'test',
+    componentName: 'testServerComponent',
+  };
+
+
+  app.use(hawklyMiddleware(hawklyTracerOptions));
+
+  app.use({
+    sayHello: () => {
+      // handler code
+    }
+  });
+  app.start(grpcHost);
+  ```
+
 ### Client
@@ -93,2 +116,32 @@
 
+### Errors
+
+To simplify error handling for errors raised specifically in the server handler code we export an error type `HawklyError`.
+
+When you throw it in your rpc handler it will be returned to the caller and instatiated as a `HawklyError` on the caller side.
+
+```javascript
+   function sayHello() {
+      throw new HawklyError('This is a test error', 'testError', { foo: 'bar' });
+    }
+
+      try {
+        const result: any = await client.sayHello({
+          arg: { name: grpcHost },
+          // pass in our span
+          span,
+        });
+        // do something with result
+      } catch (error) {
+        if(error instanceof HawklyError){
+          // error throw by server rpc
+          console.log(error.getMessage());   // 'This is a test error'
+          console.log(error.getEventName()); //'testError'
+          console.log(error.getPayload());   //{ foo: 'bar' }
+        } else {
+          // any other grpc error
+        }
+      }
+```
+
 ### More information
@@ -95,0 +148,0 @@

src/client.ts

@@ -7,2 +7,4 @@ import * as createMetadata from 'grpc-create-metadata';
 
+import { HawklyError } from './index';
+
 let tracer: Tracer | undefined;
@@ -125,2 +127,6 @@ // const lastSpan: Span | undefined;
             if (err) {
+              const errMetadata: any = err.metadata.getMap();
+              if (errMetadata.type === 'HawklyError') {
+                reject(new HawklyError(errMetadata.message, errMetadata.event, JSON.parse(errMetadata.payload)));
+              }
               reject(err);
@@ -196,2 +202,6 @@
             if (err) {
+              const errMetadata: any = err.metadata.getMap();
+              if (errMetadata.type === 'HawklyError') {
+                reject(new HawklyError(errMetadata.message, errMetadata.event, JSON.parse(errMetadata.payload)));
+              }
               reject(err);
@@ -198,0 +208,0 @@ span.setTag({ error: true });

src/index.spec.ts

@@ -8,2 +8,3 @@ //tslint:disable
 import {
+  HawklyError,
   TracedRequestStream,
@@ -158,2 +159,74 @@ createClient,
 
+test('unary request should return error in server handler back to client', async (t: any): Promise<void> => {
+  t.plan(5);
+  const PROTO_PATH: string = __dirname + '/../proto/helloworld.proto';
+
+  const grpcHost: string = getHost();
+  const app: Mali = new Mali(PROTO_PATH);
+  const errMessage: string = 'test error';
+  const errEventName: string = 'testError';
+  const errPayload: any = { foo: 'bar' };
+
+  const hawklyTracerOptions: any = {
+    accessToken: 'test',
+    componentName: 'testServerComponent',
+    // recordCallback: serverRecordCallback,
+    recordCallback: () => { }
+  };
+
+  // Add the hawkly middleware for tracing server calls
+  app.use(hawklyMiddleware(hawklyTracerOptions));
+  // add our server handler for the sayHello call
+  app.use({
+    sayHello: () => {
+      throw new HawklyError(errMessage, errEventName, errPayload);
+    }
+  });
+  app.start(grpcHost);
+
+  const error: Error | HawklyError = await t.throws(new Promise(
+    async (resolve: Function, reject: Function) => {
+      // Create the client
+      const { tracer, client } = createClient({
+        // hawkly
+        accessToken: 'test',
+        componentName: 'testComponent',
+        recordCallback: () => { },
+        // grpc
+        host: grpcHost,
+        proto: PROTO_PATH,
+        name: 'Greeter',
+      });
+
+      app.silent = true;
+      // Create a span to encapsulate our work
+      const span: any = tracer.startSpan('/client/sayHello');
+      // create the gRPC request and wait for it to resolve
+      try {
+        const result: any = await client.sayHello({
+          arg: { name: grpcHost },
+          // pass in our span
+          span,
+        });
+        console.warn('result', result)
+        span.finish();
+        resolve(result);
+      } catch (error) {
+        span.finish();
+        reject(error);
+      }
+    }));
+  if (error) {
+    t.true(error instanceof HawklyError);
+    if (error instanceof HawklyError) {
+      t.is(error.getMessage(), errMessage);
+      t.is(error.getEventName(), errEventName);
+      t.deepEqual(error.getPayload(), errPayload);
+    }
+  }
+  // And close
+  await app.close();
+});
+
+
 // tslint:disable-next-line:max-func-body-length
@@ -160,0 +233,0 @@ test('request streaming should work', async (t: any) => {

src/index.ts

@@ -13,2 +13,34 @@ // Import our gRPC client
 
+class HawklyError extends Error {
+  private eventName: string;
+  private payload: {} | undefined;
+  /**
+   *
+   * @param message   A short message that is returned to the caller      (not logged on span)
+   * @param eventName A very short eventName that is saved onto the span  (logged on span)
+   * @param payload (optional) object that is returned to the caller      (logged on span)
+   */
+  constructor(message: string, eventName: string, payload?: {}) {
+    super(message);
+    if (typeof eventName !== 'string') {
+      throw new Error(`eventName must be a string, got ${typeof eventName}`);
+    }
+    this.eventName = eventName;
+    this.payload = payload;
+  }
+  public getMessage(): string {
+    return this.message;
+  }
+  public getEventName(): string {
+    return this.eventName;
+  }
+  public getPayload(): {} | undefined {
+    return this.payload;
+  }
+  public getPayloadJSON(): string | undefined {
+    return JSON.stringify(this.payload);
+  }
+}
+
+
 export {
@@ -20,3 +52,4 @@ hawklyMiddleware,
   TracedResponseStream,
-  TracedDuplexStream
+  TracedDuplexStream,
+  HawklyError
 };

src/middleware.ts

@@ -0,3 +1,7 @@
+import * as createError from 'create-grpc-error';
+
 import { Span, Tracer } from 'hawkly';
 
+import { HawklyError } from './index';
+
 function hawklyMiddleware(options: any): any {
@@ -19,3 +23,2 @@ let tracer: Tracer;
     } catch (err) {
-      console.warn(err);
       span = tracer.startSpan(ctx.name);
@@ -38,5 +41,21 @@ }
     ctx.span = span;
+    try {
+      await next();
+    } catch (error) {
+      if (error instanceof HawklyError) {
+        ctx.span.log({
+          event: error.getEventName(),
+          payload: error.getPayload(),
+        });
+        throw createError('HawklyError', {
+          type: 'HawklyError',
+          message: error.getMessage(),
+          event: error.getEventName(),
+          payload: error.getPayloadJSON(),
+        });
+      }
+      ctx.span.finish();
 
-    await next();
-
+      throw createError(error);
+    }
     if (ctx.type !== 'duplex') {
@@ -43,0 +62,0 @@ ctx.span.finish();

No alert changes

Improved metrics

Total package byte prevSize

268004

increased by5.45%

Lines of code

1882

increased by15.04%

Number of lines in readme file

152

increased by53.54%

Worsened metrics

Dependency count

9

increased by12.5%

Number of package files

24

decreased by-7.69%

Dependency changes

• + Addedcreate-grpc-error@^0.1.0

• + Addedcreate-grpc-error@0.1.0(transitive)