From 9a3daabeb4cda213ba7807eebf201ae3a4ca8ade Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Mon, 24 Jun 2019 16:16:38 -0700 Subject: [PATCH] add db name to xevent session and view (#6135) --- .../profiler/browser/profiler.contribution.ts | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts index 5825829f0b..b141265b6e 100644 --- a/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts +++ b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts @@ -86,6 +86,14 @@ const profilerViewTemplateSchema: IJSONSchema = { { name: 'Duration', eventsMapped: ['duration'] + }, + { + name: 'DatabaseID', + eventsMapped: ['database_id'] + }, + { + name: 'DatabaseName', + eventsMapped: ['database_name'] } ] }, @@ -107,6 +115,14 @@ const profilerViewTemplateSchema: IJSONSchema = { { name: 'StartTime', eventsMapped: ['timestamp'] + }, + { + name: 'DatabaseID', + eventsMapped: ['database_id'] + }, + { + name: 'DatabaseName', + eventsMapped: ['database_name'] } ] }, @@ -197,6 +213,14 @@ const profilerViewTemplateSchema: IJSONSchema = { { name: 'Duration', eventsMapped: ['duration'] + }, + { + name: 'DatabaseID', + eventsMapped: ['database_id'] + }, + { + name: 'DatabaseName', + eventsMapped: ['database_name'] } ] }, @@ -218,6 +242,14 @@ const profilerViewTemplateSchema: IJSONSchema = { { name: 'SPID', eventsMapped: ['session_id'] + }, + { + name: 'DatabaseID', + eventsMapped: ['database_id'] + }, + { + name: 'DatabaseName', + eventsMapped: ['database_name'] } ] } @@ -251,13 +283,13 @@ const profilerSessionTemplateSchema: IJSONSchema = { ADD EVENT sqlserver.logout( ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id)), ADD EVENT sqlserver.rpc_completed( - ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) + ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))), ADD EVENT sqlserver.sql_batch_completed( - ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) + ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))), ADD EVENT sqlserver.sql_batch_starting( - ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) + ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id) WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))) ADD TARGET package0.ring_buffer(SET max_events_limit=(1000),max_memory=(51200)) WITH (MAX_MEMORY=8192 KB,EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS,MAX_DISPATCH_LATENCY=5 SECONDS,MAX_EVENT_SIZE=0 KB,MEMORY_PARTITION_MODE=PER_CPU,TRACK_CAUSALITY=ON,STARTUP_STATE=OFF)` @@ -300,10 +332,10 @@ const profilerSessionTemplateSchema: IJSONSchema = { ADD EVENT sqlserver.logout( ACTION(package0.event_sequence,sqlserver.session_id)), ADD EVENT sqlserver.rpc_starting( - ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_name) + ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name) WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))), ADD EVENT sqlserver.sql_batch_starting( - ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_name) + ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name) WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))) ADD TARGET package0.ring_buffer(SET max_events_limit=(1000),max_memory=(51200)) WITH (MAX_MEMORY=8192 KB,EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS,MAX_DISPATCH_LATENCY=5 SECONDS,MAX_EVENT_SIZE=0 KB,MEMORY_PARTITION_MODE=PER_CPU,TRACK_CAUSALITY=ON,STARTUP_STATE=OFF)`