Add AppSignal Monitoring (#99)

* Add AppSignal

* Update TS

* Activate AppSignal

* Upgrade to node 14

* Add AppSignal middleware

* Create child span

* Add more logging

* Fix logging data to appsignal

* Fix wildcard paths

* Revert the wildcard change

* Fix appsignal

* Activate it conditionally

* Proper loggin

* Better logging

* Set right NODE_ENV

* Fix cache locations

* Update cache key

* Add extra instrumentatin

* Remove lerna-debug.log

* Track API Calls

* Move to withSpan

Author: CompuIves

.circleci/config.yml

@@ -6,50 +6,53 @@ version: 2
 jobs:
   build-dependencies:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     working_directory: ~/codesandbox
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "yarn.lock" }}
+            - v2-dependencies-{{ checksum "yarn.lock" }}
             # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
+            - v2-dependencies-
 
       - run: yarn install
 
       - save_cache:
           paths:
             - node_modules
             - packages/cli/node_modules
-            - packages/git-extractors/node_modules
+            - packages/git-extractor/node_modules
             - packages/import-utils/node_modules
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
+          key: v2-dependencies-{{ checksum "yarn.lock" }}
 
       # run tests!
       - run: yarn build
       - run: yarn test
 
       - save_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/codesandbox
   create-docker-image:
     machine: true
     working_directory: ~/codesandbox
     steps:
       - restore_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Docker Sign In
           command: "if [ -n $DOCKER_USER ]; then echo $DOCKER_PWD | docker login -u $DOCKER_USER --password-stdin; else exit 0; fi"
       - run:
           name: Create Dockerfile
           command: |
             cat > Dockerfile <<EOF
-            FROM node:9.11.1
+            FROM node:14.13.1
             WORKDIR /app
             COPY . /app
+
+            ENV NODE_ENV=production
+
             CMD ["node", "./packages/git-extractor/dist/index.js"]
             EOF
       - run:

.gitignore

@@ -9,5 +9,4 @@ temp
 jest
 .aws
 dist
-
-
+lerna-debug.log

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:9.8
+FROM node:14.13.1
 MAINTAINER Ives van Hoorne
 
 RUN mkdir /usr/src/app

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:9.8
+FROM node:14.13.1
 MAINTAINER Ives van Hoorne
 
 ADD .git /workspace/.git

lerna-debug.log

@@ -17,7 +17,7 @@
     "lerna": "^2.4.0",
     "rimraf": "^2.6.2",
     "ts-jest": "^23.10.4",
-    "typescript": "^3.5.3"
+    "typescript": "^4.0.3"
   },
   "workspaces": [
     "packages/cli",

package.json

@@ -57,7 +57,7 @@
     "@types/lodash": "^4.14.106",
     "@types/lz-string": "^1.3.32",
     "@types/ms": "^0.7.29",
-    "@types/node": "^8.0.1",
+    "@types/node": "^14",
     "@types/ora": "^0.3.31",
     "@types/shortid": "^0.0.29",
     "@types/update-notifier": "^1.0.1",

packages/cli/package.json

@@ -24,7 +24,7 @@
     // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
     /* Strict Type-Checking Options */
-    "strict": true /* Enable all strict type-checking options. */
+    "strict": true, /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
@@ -50,6 +50,7 @@
     /* Experimental Options */
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "skipLibCheck": true
   },
   "include": ["src/**/*.ts", "node_modules/**/*.ts", "typings/**/*.ts"],
   "exclude": ["__tests__", "build", "**/*.test.ts", "temp"]

packages/cli/tsconfig.json

@@ -25,10 +25,10 @@
     "@types/jszip": "^3.4.1",
     "@types/koa": "^2.0.39",
     "@types/koa-bodyparser": "^3.0.25",
-    "@types/koa-router": "^7.0.22",
+    "@types/koa__router": "^8.0.3",
     "@types/lodash.pickby": "^4.6.2",
     "@types/lru-cache": "^4.1.0",
-    "@types/node": "^8.0.50",
+    "@types/node": "^14",
     "@types/node-fetch": "^1.6.7",
     "@types/redis": "^2.6.0",
     "@types/shortid": "^0.0.29",
@@ -44,6 +44,8 @@
     "ts-node": "^8.10.1"
   },
   "dependencies": {
+    "@appsignal/nodejs": "^1.0.1",
+    "@koa/router": "^9.4.0",
     "@sentry/node": "5.13.2",
     "acorn": "^5.1.2",
     "acorn-dynamic-import": "^2.0.2",
@@ -69,7 +71,6 @@
     "jszip": "^3.5.0",
     "koa": "^2.2.0",
     "koa-bodyparser": "^4.2.0",
-    "koa-router": "^7.2.0",
     "lodash.pickby": "^4.6.0",
     "lru-cache": "^4.1.1",
     "node-fetch": "^1.7.3",

packages/git-extractor/package.json

@@ -1,17 +1,19 @@
 import * as Sentry from "@sentry/node";
 import * as Koa from "koa";
 import * as bodyParser from "koa-bodyparser";
-import * as Router from "koa-router";
+import * as Router from "@koa/router";
 
 import camelize from "./middleware/camelize";
 import decamelize from "./middleware/decamelize";
 import errorHandler from "./middleware/error-handler";
+import appSignalMiddleware from "./middleware/appsignal";
 // MIDDLEWARE
 import logger from "./middleware/logger";
 import notFound from "./middleware/not-found";
 import * as define from "./routes/define";
 // ROUTES
 import * as github from "./routes/github";
+import { appsignal } from "./utils/appsignal";
 import log from "./utils/log";
 
 Sentry.init({
@@ -28,6 +30,7 @@ app.use(bodyParser({ jsonLimit: "50mb" }));
 app.use(camelize);
 app.use(decamelize);
 app.use(notFound);
+app.use(appSignalMiddleware);
 
 router
   .get(
@@ -55,7 +58,18 @@ app.use(router.routes()).use(router.allowedMethods());
 log(`Listening on ${DEFAULT_PORT}`);
 app.listen(DEFAULT_PORT);
 
+console.log(
+  JSON.stringify({
+    message: `AppSignal ${appsignal.VERSION}, active: ${appsignal.isActive}`,
+  })
+);
+
 app.on("error", (err, ctx) => {
+  const span = appsignal.tracer().currentSpan();
+  if (span) {
+    span.addError(err);
+  }
+
   Sentry.withScope(function (scope) {
     scope.addEventProcessor(function (event) {
       return Sentry.Handlers.parseRequest(event, ctx.request);