Plugin and sample app are both working

express/src/index.js

@@ -1,8 +1,4 @@
-import { mergeConfig } from 'judoscale-node-core'
-import { MetricsStore } from 'judoscale-node-core'
-import { Reporter } from 'judoscale-node-core'
-import requestMetrics from './lib/request-metrics'
-import WebMetricsCollector from './lib/web-metrics-collector'
+import { mergeConfig, Reporter, MetricsStore, requestMetrics, WebMetricsCollector } from 'judoscale-node-core'
 import Adapter from './lib/adapter'
 
 export default (config) => {

fastify/package.json

@@ -2,7 +2,7 @@
   "name": "judoscale-fastify",
   "version": "1.0.0",
   "description": "Fastify plugin for the Judoscale autoscaler",
-  "main": "plugin.js",
+  "main": "src/plugin.js",
   "scripts": {
     "test": "jest",
     "lint": "npx standard"

fastify/src/adapter.js

@@ -0,0 +1,22 @@
+const { defaultConfig } = require('judoscale-node-core')
+
+class Adapter {
+  constructor(collectors) {
+    this.collectors = collectors
+    this.identifier = 'judoscale-fastify'
+    this.adapter_version = defaultConfig.version
+    this.language_version = process.version
+  }
+
+  asJson() {
+    const data = {}
+    data[this.identifier] = {
+      adapter_version: this.adapter_version,
+      language_version: this.language_version,
+    }
+
+    return data
+  }
+}
+
+module.exports = Adapter

fastify/src/plugin.js

@@ -1,15 +1,19 @@
 const fp = require('fastify-plugin')
-const { MetricsStore } = require('judoscale-node-core')
+const { mergeConfig, Reporter, MetricsStore, requestMetrics, WebMetricsCollector } = require('judoscale-node-core')
+const Adapter = require('./adapter')
 
 async function judoscaleFastify(fastify, options) {
   // Allow injection for testing
   const metricsStore = options.metricsStore || new MetricsStore()
+  const finalConfig = mergeConfig(options)
+  const collectors = [new WebMetricsCollector(metricsStore)]
+  const reporter = new Reporter()
+
+  reporter.start(finalConfig, metricsStore, collectors, Adapter)
 
   fastify.addHook('onRequest', async (request, _reply) => {
     try {
-      const startTime = Date.now()
-      const requestStart = parseInt(request.headers['x-request-start']) || startTime
-      const queueTime = startTime - requestStart
+      const queueTime = requestMetrics.queueTimeFromHeaders(request.headers, Date.now())
 
       metricsStore.push('qt', queueTime)
 

node-core/src/index.js

@@ -2,11 +2,24 @@ import Api from './lib/api'
 import defaultConfigFunction from './lib/default-config'
 import mergeConfig from './lib/merge-config'
 import logger from './lib/logger'
+import requestMetrics from './lib/request-metrics'
 import Metric from './lib/metric'
 import MetricsStore from './lib/metrics-store'
 import Report from './lib/report'
 import Reporter from './lib/reporter'
+import WebMetricsCollector from './lib/web-metrics-collector'
 
 const defaultConfig = defaultConfigFunction()
 
-export { Api, mergeConfig, logger, Metric, MetricsStore, Report, Reporter, defaultConfig }
+export {
+  Api,
+  mergeConfig,
+  logger,
+  requestMetrics,
+  Metric,
+  MetricsStore,
+  Report,
+  Reporter,
+  WebMetricsCollector,
+  defaultConfig,
+}

sample_apps/express_web/README.md

@@ -29,6 +29,8 @@ bin/dev
 
 This will run not only the app but also Judoscale proxy so you can check the metrics being collected by it.
 
+http://localhost:5004
+
 Note that the sample app uses the NPM registry version of judoscale-express, but the local version of judoscale-node-core. If you want to use the local version of judoscale-express, change the `resolutions` in `package.json`.
 
 There doesn't seem to be a way to use _both_ local versions of judoscale-express and judoscale-node-core at the same time. When you use the local version of judoscale-express, the transitive dependency judoscale-node-core dependency will always be the register version, even if you include the local override in `resolutions`.

sample_apps/fastify_web/README.md

@@ -0,0 +1,37 @@
+# Judoscale Demo (Fastify)
+
+A tiny Fastify app for testing Judoscale.
+
+## Local Run
+
+Ensure the Heroku CLI is installed.
+
+```shell
+heroku -v
+```
+
+Install dependencies. Note that we're using `yarn` instead of `npm` so we can use "resolutions". More on this below.
+
+```shell
+npm install
+```
+
+Run the app:
+
+```shell
+bin/dev
+```
+
+This will run both the app and a proxy server that adds the X-Request-Start header for simulating request queue time.
+
+http://localhost:5004
+
+## Local development
+
+To reference the local version of `judoscale-fastify` instead of the NPM version:
+
+```
+npm link judoscale-fastify
+```
+
+This will create a symlink for `node_modules/judoscale-fastify` pointing to the local file system.

sample_apps/fastify_web/app.js

@@ -1,7 +1,15 @@
 import Fastify from 'fastify'
+import judoscale from 'judoscale-fastify'
 
 const fastify = Fastify({
-  logger: true,
+  logger: {
+    level: process.env.LOG_LEVEL || 'debug',
+  },
+})
+
+fastify.register(judoscale, {
+  log_level: process.env.LOG_LEVEL || 'debug',
+  api_base_url: process.env.JUDOSCALE_URL || 'https://judoscale-node-sample.requestcatcher.com',
 })
 
 fastify.get('/', function (request, reply) {