refactor: keep version label on new rest api metric

Author: d-gubert

apps/meteor/app/api/server/middlewares/metrics.ts

@@ -41,14 +41,15 @@ export const metricsMiddleware =
 		const histogramLabels = {
 			status: c.res.status,
 			method: method.toLowerCase(),
+			version: api.version,
 			entrypoint: basePathRegex && entrypoint.startsWith('method.call') ? decodeURIComponent(path.replace(basePathRegex, '')) : entrypoint,
 		};
 
 		rocketchatRestApiEnd({
 			...histogramLabels,
-			version: api.version,
 			...(settings.get('Prometheus_API_User_Agent') && { user_agent: c.req.header('user-agent') }),
 		});
+
 		rocketchatRestApiHistEnd(histogramLabels);
 
 		const contentLength = parseInt(c.res.headers.get('content-length') || '0', 10);

apps/meteor/app/metrics/server/lib/metrics.ts

@@ -82,7 +82,7 @@ export const metrics = {
 	rocketchatRestApiSeconds: new client.Histogram({
 		name: 'rocketchat_rest_api_seconds',
 		help: 'histogram of rocketchat rest api count and time in seconds',
-		labelNames: ['method', 'entrypoint', 'status'],
+		labelNames: ['method', 'entrypoint', 'status', 'version'],
 		buckets: latencyBuckets,
 	}),
 	rocketchatRestApiResponseSizeBytes: new client.Histogram({