Merge pull request #19 from senecajs/improve-plugin

Improve plugin
senecajs · Jun 30, 2022 · 9306ff7 · 9306ff7
2 parents 8ce25e8 + 3b3b2be
commit 9306ff7
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 407 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,8 +30,11 @@ jobs:
     - run: npm install
     - run: npm run build --if-present
     - run: npm test
+      env:
+        NEW_RELIC_HOME: './test'
 
     - name: Coveralls
+      if: ${{ false }}
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/dist/tracing-collector.js b/dist/tracing-collector.js
diff --git a/dist/tracing-collector.js.map b/dist/tracing-collector.js.map
diff --git a/package.json b/package.json
@@ -16,9 +16,9 @@
     "url": "git://github.com/senecajs/seneca-telemetry-newrelic.git"
   },
   "scripts": {
-    "test": "jest --coverage",
+    "test": "jest",
     "test-some": "jest -t",
-    "test-watch": "jest --coverage --watchAll",
+    "test-watch": "jest --watchAll",
     "watch": "tsc -w -d",
     "build": "tsc -d",
     "doc": "seneca-doc",
@@ -35,25 +35,26 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@seneca/doc": "^4.0.1",
-    "@seneca/provider": "^0.2.0",
-    "@types/jest": "^27.0.3",
+    "@seneca/doc": "4.0.1",
+    "@seneca/provider": "0.2.0",
+    "@types/jest": "27.0.3",
     "@types/newrelic": "7.0.3",
     "@types/node": "16.11.36",
-    "esbuild": "^0.14.3",
-    "esbuild-jest": "^0.5.0",
-    "express": "^4.18.1",
-    "jest": "^27.4.4",
-    "newrelic": "^8.10.0",
-    "seneca": ">=3",
-    "seneca-entity": "^16.0.3",
-    "seneca-msg-test": "^3.2.0",
-    "seneca-promisify": ">=2",
-    "typescript": "^4.5.3"
+    "esbuild": "0.14.3",
+    "esbuild-jest": "0.5.0",
+    "express": "4.18.1",
+    "jest": "27.4.4",
+    "seneca": "3",
+    "seneca-entity": "16.0.3",
+    "seneca-msg-test": "3.2.0",
+    "seneca-promisify": "2",
+    "typescript": "4.5.3"
   },
   "peerDependencies": {
     "seneca": ">=3",
-    "seneca-promisify": ">=2"
+    "seneca-promisify": ">=2",
+    "@newrelic/telemetry-sdk": ">=0.6",
+    "newrelic": ">=8"
   },
   "dependencies": {
     "@newrelic/telemetry-sdk": "0.6.0",

diff --git a/src/newrelic.ts b/src/newrelic.ts
@@ -217,4 +217,4 @@ export default newrelic
 
 if ('undefined' !== typeof (module)) {
     module.exports = newrelic
-}
+}
diff --git a/src/tracing-collector.ts b/src/tracing-collector.ts
@@ -14,6 +14,7 @@ export class TracingCollector {
     this.spanClient = new SpanClient({
       apiKey,
     });
+
     this.seneca = seneca;
   }
 
@@ -63,8 +64,8 @@ export class TracingCollector {
           await this.sendTracing(spec);
           spec.dispatched = true;
           this._clearQueue();
-        } catch (error) {
-          this.seneca.log.error(error);
+        } catch (error: any) {
+          this.seneca.log.error(error.message || error.stack);
         }
       }
     } else {
@@ -87,6 +88,7 @@ export class TracingCollector {
   sendTracing(spec: TelemetrySpecMetadata): Promise<string|void|boolean> {
     return new Promise((resolve, reject) => {
       const spanBatch = new SpanBatch();
+
       const span = new Span(
         spec.mi_id,
         spec.tx_id,
@@ -101,14 +103,25 @@ export class TracingCollector {
           fullMessage: spec.fullMessage!,
         }
       );
+
       spanBatch.addSpan(span);
-      this.spanClient.send(spanBatch, (error: any, res: any, body: any) => {
+
+      this.spanClient.send(spanBatch, (error: any, res: any, _body: any) => {
         if (error) {
           reject(error);
           return;
         }
 
+        if (!res) {
+          const error = new Error('There was no error but response has, nonetheless, come back as null');
+          reject(error);
+          return;
+        }
+
+        // TODO: QUESTION: Consider passing the response and body objects via the `resolve` call?
+        //
         resolve(res.statusCode);
+        return;
       })
     })
   }

diff --git a/test/basic.js b/test/basic.js
diff --git a/test/express-seneca.js b/test/express-seneca.js
diff --git a/test/hello_world.test.ts b/test/hello_world.test.ts
@@ -0,0 +1,5 @@
+
+describe('testing', () => {
+  test('is configured ok', () => {
+  })
+})
diff --git a/test/http-cli.ts b/test/http-cli.ts
-Original file line number
+Diff line change
@@ Expand Up / @@ -217,4 +217,4 @@ export default newrelic @@
     if ('undefined' !== typeof (module)) {
         module.exports = newrelic
-    }
+    }