mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	chore: remove connection id from tracking (#9072)
This commit is contained in:
		
							parent
							
								
									135c1bd917
								
							
						
					
					
						commit
						161fa131c7
					
				@ -130,7 +130,7 @@ test('should collect metrics for requests', async () => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    const metrics = await prometheusRegister.metrics();
 | 
					    const metrics = await prometheusRegister.metrics();
 | 
				
			||||||
    expect(metrics).toMatch(
 | 
					    expect(metrics).toMatch(
 | 
				
			||||||
        /http_request_duration_milliseconds\{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined",connectionId="undefined"\}.*1337/,
 | 
					        /http_request_duration_milliseconds\{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined"\}.*1337/,
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -124,7 +124,7 @@ export function registerPrometheusMetrics(
 | 
				
			|||||||
    const requestDuration = createSummary({
 | 
					    const requestDuration = createSummary({
 | 
				
			||||||
        name: 'http_request_duration_milliseconds',
 | 
					        name: 'http_request_duration_milliseconds',
 | 
				
			||||||
        help: 'App response time',
 | 
					        help: 'App response time',
 | 
				
			||||||
        labelNames: ['path', 'method', 'status', 'appName', 'connectionId'],
 | 
					        labelNames: ['path', 'method', 'status', 'appName'],
 | 
				
			||||||
        percentiles: [0.1, 0.5, 0.9, 0.95, 0.99],
 | 
					        percentiles: [0.1, 0.5, 0.9, 0.95, 0.99],
 | 
				
			||||||
        maxAgeSeconds: 600,
 | 
					        maxAgeSeconds: 600,
 | 
				
			||||||
        ageBuckets: 5,
 | 
					        ageBuckets: 5,
 | 
				
			||||||
@ -700,14 +700,13 @@ export function registerPrometheusMetrics(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    eventBus.on(
 | 
					    eventBus.on(
 | 
				
			||||||
        events.REQUEST_TIME,
 | 
					        events.REQUEST_TIME,
 | 
				
			||||||
        ({ path, method, time, statusCode, appName, connectionId }) => {
 | 
					        ({ path, method, time, statusCode, appName }) => {
 | 
				
			||||||
            requestDuration
 | 
					            requestDuration
 | 
				
			||||||
                .labels({
 | 
					                .labels({
 | 
				
			||||||
                    path,
 | 
					                    path,
 | 
				
			||||||
                    method,
 | 
					                    method,
 | 
				
			||||||
                    status: statusCode,
 | 
					                    status: statusCode,
 | 
				
			||||||
                    appName,
 | 
					                    appName,
 | 
				
			||||||
                    connectionId,
 | 
					 | 
				
			||||||
                })
 | 
					                })
 | 
				
			||||||
                .observe(time);
 | 
					                .observe(time);
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
				
			|||||||
@ -55,7 +55,6 @@ export function responseTimeMetrics(
 | 
				
			|||||||
        // when pathname is undefined use a fallback
 | 
					        // when pathname is undefined use a fallback
 | 
				
			||||||
        pathname = pathname ?? collapse(req.path);
 | 
					        pathname = pathname ?? collapse(req.path);
 | 
				
			||||||
        let appName: string | undefined;
 | 
					        let appName: string | undefined;
 | 
				
			||||||
        let connectionId: string | undefined;
 | 
					 | 
				
			||||||
        if (
 | 
					        if (
 | 
				
			||||||
            !flagResolver.isEnabled('responseTimeWithAppNameKillSwitch') &&
 | 
					            !flagResolver.isEnabled('responseTimeWithAppNameKillSwitch') &&
 | 
				
			||||||
            (instanceStatsService.getAppCountSnapshot('7d') ??
 | 
					            (instanceStatsService.getAppCountSnapshot('7d') ??
 | 
				
			||||||
@ -65,9 +64,6 @@ export function responseTimeMetrics(
 | 
				
			|||||||
                req.headers['x-unleash-appname'] ??
 | 
					                req.headers['x-unleash-appname'] ??
 | 
				
			||||||
                req.headers['unleash-appname'] ??
 | 
					                req.headers['unleash-appname'] ??
 | 
				
			||||||
                req.query.appName;
 | 
					                req.query.appName;
 | 
				
			||||||
            if (flagResolver.isEnabled('uniqueSdkTracking')) {
 | 
					 | 
				
			||||||
                connectionId = req.headers['x-unleash-connection-id'];
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        const timingInfo = {
 | 
					        const timingInfo = {
 | 
				
			||||||
@ -76,7 +72,6 @@ export function responseTimeMetrics(
 | 
				
			|||||||
            statusCode,
 | 
					            statusCode,
 | 
				
			||||||
            time,
 | 
					            time,
 | 
				
			||||||
            appName,
 | 
					            appName,
 | 
				
			||||||
            connectionId,
 | 
					 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
        if (!res.locals.responseTimeEmitted) {
 | 
					        if (!res.locals.responseTimeEmitted) {
 | 
				
			||||||
            res.locals.responseTimeEmitted = true;
 | 
					            res.locals.responseTimeEmitted = true;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user