misc: optimize APM storage

Author: MartinKolarik

elastic-apm-node.cjs

@@ -19,4 +19,6 @@ module.exports = {
 	captureErrorLogStackTraces: 'always',
 	ignoreUrls: [ '/favicon.ico', '/health', '/amp_preconnect_polyfill_404_or_other_error_expected._Do_not_worry_about_it' ],
 	transactionSampleRate: 1,
+	exitSpanMinDuration: '2ms',
+	spanCompressionSameKindMaxDuration: '10ms',
 };

package-lock.json

@@ -20,7 +20,7 @@
 		"crypto-random-string": "^5.0.0",
 		"csv-parser": "^3.0.0",
 		"elastic-apm-node": "^4.8.1",
-		"elastic-apm-utils": "^4.1.0",
+		"elastic-apm-utils": "^4.1.1",
 		"got": "^14.2.1",
 		"gunzip-maybe": "^1.4.2",
 		"h-logger2": "^1.2.6",

package.json

@@ -2,7 +2,7 @@ import { createServer } from 'node:http';
 import * as zlib from 'node:zlib';
 import * as url from 'node:url';
 import apmAgent from 'elastic-apm-node';
-import { koa as koaElasticUtils } from 'elastic-apm-utils';
+import { apm as apmUtils, koa as koaElasticUtils } from 'elastic-apm-utils';
 import json from 'koa-json';
 import Router from '@koa/router';
 import conditionalGet from 'koa-conditional-get';
@@ -31,6 +31,10 @@ import type { CustomContext } from '../../types.js';
 import { registerAlternativeIpRoute } from '../../alternative-ip/route/alternative-ip.js';
 import { registerLimitsRoute } from '../../limits/route/get-limits.js';
 
+apmAgent.addTransactionFilter(apmUtils.transactionFilter({
+	keepResponse: [ 'location' ],
+}));
+
 const app = new Koa();
 const publicPath = url.fileURLToPath(new URL('.', import.meta.url)) + '/../../../public';
 const docsHost = config.get<string>('server.docsHost');

src/lib/http/server.ts

@@ -18,8 +18,8 @@ export const probeMetadata = errorHandler(async (socket: ServerSocket, next: (er
 		let message = 'failed to collect probe metadata';
 
 		if (error instanceof ProbeError) {
-			message = error.message;
 			logger.warn(message, error);
+			message = error.message;
 		} else {
 			logger.error(message, error);
 		}

src/lib/ws/middleware/probe-metadata.ts

@@ -77,8 +77,8 @@ export class MeasurementStore {
 			this.redis.hSet('gp:in-progress', id, startTime.getTime()),
 			this.redis.set(getMeasurementKey(id, 'probes_awaiting'), onlineProbesMap.size, { EX: probesAwaitingTtl }),
 			this.redis.json.set(key, '$', measurementWithoutDefaults),
-			this.redis.expire(key, config.get<number>('measurement.resultTTL')),
 			this.redis.json.set(getMeasurementKey(id, 'ips'), '$', allProbes.map(probe => probe.ipAddress)),
+			this.redis.expire(key, config.get<number>('measurement.resultTTL')),
 			this.redis.expire(getMeasurementKey(id, 'ips'), config.get<number>('measurement.resultTTL')),
 		]);