fix: logging adjustments

Author: lukaszczerpak-cloudinary

app.js

@@ -1,37 +1,5 @@
 const logger = require('./logger').logger;
 
-const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
-const { registerInstrumentations } = require('@opentelemetry/instrumentation');
-const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
-const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
-
-const provider = new NodeTracerProvider();
-// const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-// const { ConsoleSpanExporter } = require('@opentelemetry/tracing');
-// provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.register();
-
-let expressInstrumentation = new ExpressInstrumentation();
-expressInstrumentation.setTracerProvider(provider);
-
-registerInstrumentations({
-    instrumentations: [
-        // Express instrumentation expects HTTP layer to be instrumented
-        new HttpInstrumentation({
-            ignoreIncomingRequestHook: (req) => {
-                return req.connection.localPort === 6060;   // ignore incoming requests to prometheus
-            },
-            ignoreOutgoingRequestHook: (req) => {
-                return ![   // we care about performance of outgoing requests to those hosts only
-                    'www.webpagetest.org',
-                    'api.cloudinary.com'
-                ].includes(req.hostname);
-            },
-        }),
-        expressInstrumentation,
-    ],
-});
-
 const express = require('express');
 const app = express();
 
@@ -55,7 +23,7 @@ const wpt = require('./routes/wpt');
 wpt(app);
 
 // catch 404 and forward to error handler
-app.all('*any', function (req, res) {
+app.all('*', function (req, res) {
     res.status(404).send('what???');
 });
 

instrumentation.js

@@ -1,10 +1,15 @@
 const opentelemetry = require('@opentelemetry/sdk-node');
 const {Resource} = require('@opentelemetry/resources');
+const {registerInstrumentations} = require('@opentelemetry/instrumentation');
+const {HttpInstrumentation} = require('@opentelemetry/instrumentation-http');
+const {ExpressInstrumentation} = require('@opentelemetry/instrumentation-express');
+const {PrometheusExporter} = require('@opentelemetry/exporter-prometheus');
+
 const {
     ATTR_SERVICE_NAME,
     ATTR_SERVICE_VERSION
 } = require('@opentelemetry/semantic-conventions');
-const {PrometheusExporter} = require('@opentelemetry/exporter-prometheus');
+
 const sdk = new opentelemetry.NodeSDK({
     resource: new Resource({
         [ATTR_SERVICE_NAME]: 'web-speed-test-server',
@@ -15,3 +20,21 @@ const sdk = new opentelemetry.NodeSDK({
     }),
 });
 sdk.start();
+
+registerInstrumentations({
+    instrumentations: [
+        // Express instrumentation expects HTTP layer to be instrumented
+        new HttpInstrumentation({
+            ignoreIncomingRequestHook: (req) => {
+                return req.connection.localPort === 6060;   // ignore incoming requests to prometheus
+            },
+            ignoreOutgoingRequestHook: (req) => {
+                return ![   // we care about performance of outgoing requests to those hosts only
+                    'www.webpagetest.org',
+                    'api.cloudinary.com'
+                ].includes(req.hostname);
+            },
+        }),
+        new ExpressInstrumentation()
+    ],
+});

package.json

@@ -4,8 +4,7 @@
   "private": true,
   "scripts": {
     "test": "mocha",
-    "start": "node start.js",
-    "start-with-instrumentation": "node --require ./instrumentation.js start.js",
+    "start": "node --require ./instrumentation.js start.js",
     "postinstall": "patch-package"
   },
   "dependencies": {
@@ -25,7 +24,7 @@
     "cookie-parser": "~1.4.7",
     "debug": "~4.4.0",
     "dotenv": "^16.4.7",
-    "express": "^5.0.1",
+    "express": "^4.21.2",
     "got": "^14.4.5",
     "lodash": "^4.17.21",
     "rollbar": "^2.26.4",