From b8bdc4a69fa24ad9c8e3d162aa8b53801a03084d Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 19 Feb 2026 18:08:03 -0500
Subject: [PATCH] Move Default Trace tabs from Resource Metrics to Overview
 section (#169)

Default Trace Events and Trace Analysis tabs belong under Overview, not
Resource Metrics. Extracted into new DefaultTraceContent UserControl
following the same pattern as DailySummaryContent and CriticalIssuesContent.
Removed dead column filter popup infrastructure from ResourceMetricsContent.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/Controls/DefaultTraceContent.xaml   | 187 ++++++++++++
 .../Controls/DefaultTraceContent.xaml.cs      | 155 ++++++++++
 .../Controls/ResourceMetricsContent.xaml      | 177 ------------
 .../Controls/ResourceMetricsContent.xaml.cs   | 266 +-----------------
 Dashboard/ServerTab.xaml                      |   5 +
 Dashboard/ServerTab.xaml.cs                   |  10 +-
 6 files changed, 356 insertions(+), 444 deletions(-)
 create mode 100644 Dashboard/Controls/DefaultTraceContent.xaml
 create mode 100644 Dashboard/Controls/DefaultTraceContent.xaml.cs

diff --git a/Dashboard/Controls/DefaultTraceContent.xaml b/Dashboard/Controls/DefaultTraceContent.xaml
new file mode 100644
index 00000000..6552c711
--- /dev/null
+++ b/Dashboard/Controls/DefaultTraceContent.xaml
@@ -0,0 +1,187 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.DefaultTraceContent"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800"
+             Loaded="OnLoaded">
+    <TabControl>
+        <!-- Default Trace Events Sub-Tab -->
+        <TabItem Header="Default Trace Events">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10" Background="{DynamicResource BackgroundLightBrush}">
+                    <TextBlock Text="Event Filter:" VerticalAlignment="Center" Margin="5,0" FontWeight="Bold"/>
+                    <ComboBox x:Name="DefaultTraceEventsFilterCombo" Width="200" Margin="2,0" SelectionChanged="DefaultTraceEventsFilter_Changed">
+                        <ComboBoxItem Content="All Events" Tag="" IsSelected="True"/>
+                        <ComboBoxItem Content="Object:Altered" Tag="%Object:Altered%"/>
+                        <ComboBoxItem Content="Object:Created" Tag="%Object:Created%"/>
+                        <ComboBoxItem Content="Object:Deleted" Tag="%Object:Deleted%"/>
+                        <ComboBoxItem Content="Audit%" Tag="Audit%"/>
+                        <ComboBoxItem Content="Database%" Tag="Database%"/>
+                        <ComboBoxItem Content="ErrorLog" Tag="%ErrorLog%"/>
+                        <ComboBoxItem Content="Security%" Tag="Security%"/>
+                    </ComboBox>
+                    <Separator Margin="10,0" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+                    <Button Content="Refresh" Click="DefaultTraceEvents_Refresh_Click" Margin="5,0" Padding="10,4" Style="{StaticResource SuccessButton}"/>
+                </StackPanel>
+
+                <Grid Grid.Row="1">
+                <DataGrid x:Name="DefaultTraceEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                          RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource DataGridContextMenu}"
+                          ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Event Time" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventTime"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding EventName}" Width="150">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventName"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="110" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="DatabaseName"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ObjectName}" Width="150">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Object Name" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="ObjectName"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding LoginName}" Width="120">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="110" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="LoginName"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding TextData}" Width="300">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Text Data" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="290" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="TextData"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Severity}" Width="60">
+                            <DataGridTextColumn.Header>
+                                <StackPanel>
+                                    <TextBlock Text="Severity" FontWeight="Bold" Margin="0,0,0,2"/>
+                                    <TextBox Width="50" Height="22" FontSize="11" TextChanged="DefaultTraceEventsNumericFilterTextBox_TextChanged" Tag="Severity"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+                <TextBlock x:Name="DefaultTraceEventsNoDataMessage" Style="{StaticResource NoDataMessage}"/>
+                </Grid>
+            </Grid>
+        </TabItem>
+
+        <!-- Trace Analysis Sub-Tab -->
+        <TabItem Header="Trace Analysis">
+            <Grid>
+            <DataGrid x:Name="TraceAnalysisDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource DataGridContextMenu}"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Collected" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="CollectionTime"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding EventName}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="EventName"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="110" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="DatabaseName"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding LoginName}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="LoginName"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Duration (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="DurationMs"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="CPU (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="70" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="CpuMs"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Reads"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Writes (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Writes"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SqlText}" Width="400">
+                        <DataGridTextColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="SQL Text" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <TextBox Width="390" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="SqlText"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="TraceAnalysisNoDataMessage" Style="{StaticResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/Dashboard/Controls/DefaultTraceContent.xaml.cs b/Dashboard/Controls/DefaultTraceContent.xaml.cs
new file mode 100644
index 00000000..ed7aea1f
--- /dev/null
+++ b/Dashboard/Controls/DefaultTraceContent.xaml.cs
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Services;
+
+namespace PerformanceMonitorDashboard.Controls
+{
+    public partial class DefaultTraceContent : UserControl
+    {
+        private DatabaseService? _databaseService;
+
+        private int _defaultTraceEventsHoursBack = 24;
+        private DateTime? _defaultTraceEventsFromDate;
+        private DateTime? _defaultTraceEventsToDate;
+        private string? _defaultTraceEventsFilter;
+
+        private int _traceAnalysisHoursBack = 24;
+        private DateTime? _traceAnalysisFromDate;
+        private DateTime? _traceAnalysisToDate;
+
+        public DefaultTraceContent()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(DatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        public void SetTimeRange(int hoursBack, DateTime? fromDate = null, DateTime? toDate = null)
+        {
+            _defaultTraceEventsHoursBack = hoursBack;
+            _defaultTraceEventsFromDate = fromDate;
+            _defaultTraceEventsToDate = toDate;
+
+            _traceAnalysisHoursBack = hoursBack;
+            _traceAnalysisFromDate = fromDate;
+            _traceAnalysisToDate = toDate;
+        }
+
+        public async Task RefreshAllDataAsync()
+        {
+            if (_databaseService == null) return;
+
+            await Task.WhenAll(
+                RefreshDefaultTraceEventsAsync(),
+                RefreshTraceAnalysisAsync()
+            );
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            TabHelpers.AutoSizeColumnMinWidths(DefaultTraceEventsDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(TraceAnalysisDataGrid);
+            TabHelpers.FreezeColumns(DefaultTraceEventsDataGrid, 1);
+            TabHelpers.FreezeColumns(TraceAnalysisDataGrid, 1);
+        }
+
+        #region Default Trace Events
+
+        private void DefaultTraceEventsFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            if (DefaultTraceEventsFilterCombo.SelectedItem is ComboBoxItem selected)
+            {
+                _defaultTraceEventsFilter = selected.Tag?.ToString();
+                if (string.IsNullOrEmpty(_defaultTraceEventsFilter))
+                {
+                    _defaultTraceEventsFilter = null;
+                }
+                DefaultTraceEvents_Refresh_Click(sender, new RoutedEventArgs());
+            }
+        }
+
+        private async void DefaultTraceEvents_Refresh_Click(object? sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await RefreshDefaultTraceEventsAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error refreshing Default Trace Events data: {ex.Message}", ex);
+            }
+        }
+
+        private async Task RefreshDefaultTraceEventsAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetDefaultTraceEventsAsync(_defaultTraceEventsHoursBack, _defaultTraceEventsFromDate, _defaultTraceEventsToDate, _defaultTraceEventsFilter);
+                DefaultTraceEventsDataGrid.ItemsSource = data;
+                DefaultTraceEventsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading default trace events: {ex.Message}");
+            }
+        }
+
+        private void DefaultTraceEventsFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
+        }
+
+        private void DefaultTraceEventsNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
+        }
+
+        #endregion
+
+        #region Trace Analysis
+
+        private async Task RefreshTraceAnalysisAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetTraceAnalysisAsync(_traceAnalysisHoursBack, _traceAnalysisFromDate, _traceAnalysisToDate);
+                TraceAnalysisDataGrid.ItemsSource = data;
+                TraceAnalysisNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading trace analysis: {ex.Message}");
+            }
+        }
+
+        private void TraceAnalysisFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
+        }
+
+        private void TraceAnalysisNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
+        }
+
+        #endregion
+    }
+}
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index d30c14cb..4eeb5f6c 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -295,183 +295,6 @@
             </Grid>
         </TabItem>
 
-        <!-- Default Trace Events Sub-Tab -->
-        <TabItem Header="Default Trace Events">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10" Background="{DynamicResource BackgroundLightBrush}">
-                    <TextBlock Text="Event Filter:" VerticalAlignment="Center" Margin="5,0" FontWeight="Bold"/>
-                    <ComboBox x:Name="DefaultTraceEventsFilterCombo" Width="200" Margin="2,0" SelectionChanged="DefaultTraceEventsFilter_Changed">
-                        <ComboBoxItem Content="All Events" Tag="" IsSelected="True"/>
-                        <ComboBoxItem Content="Object:Altered" Tag="%Object:Altered%"/>
-                        <ComboBoxItem Content="Object:Created" Tag="%Object:Created%"/>
-                        <ComboBoxItem Content="Object:Deleted" Tag="%Object:Deleted%"/>
-                        <ComboBoxItem Content="Audit%" Tag="Audit%"/>
-                        <ComboBoxItem Content="Database%" Tag="Database%"/>
-                        <ComboBoxItem Content="ErrorLog" Tag="%ErrorLog%"/>
-                        <ComboBoxItem Content="Security%" Tag="Security%"/>
-                    </ComboBox>
-                    <Separator Margin="10,0" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
-                    <Button Content="Refresh" Click="DefaultTraceEvents_Refresh_Click" Margin="5,0" Padding="10,4" Style="{StaticResource SuccessButton}"/>
-                </StackPanel>
-
-                <Grid Grid.Row="1">
-                <DataGrid x:Name="DefaultTraceEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                          RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource DataGridContextMenu}"
-                          ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Event Time" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventTime"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding EventName}" Width="150">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="110" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="DatabaseName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding ObjectName}" Width="150">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Object Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="ObjectName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding LoginName}" Width="120">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="110" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="LoginName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding TextData}" Width="300">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Text Data" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="290" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="TextData"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding Severity}" Width="60">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Severity" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="50" Height="22" FontSize="11" TextChanged="DefaultTraceEventsNumericFilterTextBox_TextChanged" Tag="Severity"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-                <TextBlock x:Name="DefaultTraceEventsNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                </Grid>
-            </Grid>
-        </TabItem>
-
-        <!-- Trace Analysis Sub-Tab -->
-        <TabItem Header="Trace Analysis">
-            <Grid>
-            <DataGrid x:Name="TraceAnalysisDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource DataGridContextMenu}"
-                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Collected" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="CollectionTime"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding EventName}" Width="150">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="EventName"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="110" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="DatabaseName"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LoginName}" Width="100">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="LoginName"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Duration (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="DurationMs"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" Width="80">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="CPU (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="70" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="CpuMs"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Reads"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Writes (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Writes"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding SqlText}" Width="400">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="SQL Text" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="390" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="SqlText"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-            <TextBlock x:Name="TraceAnalysisNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-            </Grid>
-        </TabItem>
-
         <!-- Session Stats Sub-Tab -->
         <TabItem Header="Session Stats">
             <!-- Session Stats Chart -->
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 125dfc7b..276f8390 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -16,7 +16,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 using Microsoft.Win32;
 using PerformanceMonitorDashboard.Models;
@@ -29,7 +28,7 @@ namespace PerformanceMonitorDashboard.Controls
     /// <summary>
     /// UserControl for the Resource Metrics tab content.
     /// Displays Latch Stats, Spinlock Stats, TempDB Stats, CPU Spikes, Session Stats,
-    /// File I/O Latency, Server Trends, Perfmon Counters, Default Trace Events, and Trace Analysis.
+    /// File I/O Latency, Server Trends, and Perfmon Counters.
     /// </summary>
     public partial class ResourceMetricsContent : UserControl
     {
@@ -75,16 +74,6 @@ public partial class ResourceMetricsContent : UserControl
         private List<PerfmonStatsItem>? _allPerfmonCountersData;
         private List<PerfmonCounterSelectionItem>? _perfmonCounterItems;
 
-        // Default Trace Events state
-        private int _defaultTraceEventsHoursBack = 24;
-        private DateTime? _defaultTraceEventsFromDate;
-        private DateTime? _defaultTraceEventsToDate;
-
-        // Trace Analysis state
-        private int _traceAnalysisHoursBack = 24;
-        private DateTime? _traceAnalysisFromDate;
-        private DateTime? _traceAnalysisToDate;
-
         // Wait Stats Detail state
         private int _waitStatsDetailHoursBack = 24;
         private DateTime? _waitStatsDetailFromDate;
@@ -105,19 +94,7 @@ public partial class ResourceMetricsContent : UserControl
         private Helpers.ChartHoverHelper? _serverTrendsTempdbHover;
         private Helpers.ChartHoverHelper? _serverTrendsMemoryHover;
         private Helpers.ChartHoverHelper? _serverTrendsPerfmonHover;
-        // Column filter popup and state
-        private Popup? _filterPopup;
-        private ColumnFilterPopup? _filterPopupContent;
-        private string? _currentFilterDataGridName;
-
         // Filter state dictionaries for each DataGrid
-        private Dictionary<string, ColumnFilterState> _defaultTraceEventsFilters = new();
-        private Dictionary<string, ColumnFilterState> _traceAnalysisFilters = new();
-
-        // Unfiltered data for each DataGrid
-        private List<DefaultTraceEventItem>? _defaultTraceEventsUnfilteredData;
-        private List<TraceAnalysisItem>? _traceAnalysisUnfilteredData;
-
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         // Must store and remove these by reference before creating new ones
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
@@ -147,12 +124,8 @@ public ResourceMetricsContent()
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
             // Apply minimum column widths based on header text
-            TabHelpers.AutoSizeColumnMinWidths(DefaultTraceEventsDataGrid);
-            TabHelpers.AutoSizeColumnMinWidths(TraceAnalysisDataGrid);
 
             // Freeze identifier columns
-            TabHelpers.FreezeColumns(DefaultTraceEventsDataGrid, 1);
-            TabHelpers.FreezeColumns(TraceAnalysisDataGrid, 1);
         }
 
         private void SetupChartContextMenus()
@@ -230,14 +203,6 @@ public void SetTimeRange(int hoursBack, DateTime? fromDate = null, DateTime? toD
             _perfmonCountersFromDate = fromDate;
             _perfmonCountersToDate = toDate;
 
-            _defaultTraceEventsHoursBack = hoursBack;
-            _defaultTraceEventsFromDate = fromDate;
-            _defaultTraceEventsToDate = toDate;
-
-            _traceAnalysisHoursBack = hoursBack;
-            _traceAnalysisFromDate = fromDate;
-            _traceAnalysisToDate = toDate;
-
             _waitStatsDetailHoursBack = hoursBack;
             _waitStatsDetailFromDate = fromDate;
             _waitStatsDetailToDate = toDate;
@@ -262,8 +227,6 @@ await Task.WhenAll(
                     LoadFileIoLatencyChartsAsync(),
                     RefreshServerTrendsAsync(),
                     RefreshPerfmonCountersTabAsync(),
-                    RefreshDefaultTraceEventsAsync(),
-                    RefreshTraceAnalysisAsync(),
                     RefreshWaitStatsDetailTabAsync()
                 );
             }
@@ -1284,134 +1247,6 @@ private void LoadServerTrendsPerfmonChart(IEnumerable<PerfmonStatsItem> perfmonD
 
         #endregion
 
-        // Filtering logic moved to DataGridFilterService.ApplyFilter()
-
-
-        #region Shared Filter Popup Methods
-
-        private void ShowFilterPopup(Button button, string columnName, string dataGridName, Dictionary<string, ColumnFilterState> filters)
-        {
-            if (_filterPopup == null)
-            {
-                _filterPopupContent = new ColumnFilterPopup();
-                _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
-                _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
-
-                _filterPopup = new Popup
-                {
-                    Child = _filterPopupContent,
-                    StaysOpen = false,
-                    Placement = PlacementMode.Bottom,
-                    AllowsTransparency = true
-                };
-            }
-
-            _currentFilterDataGridName = dataGridName;
-            filters.TryGetValue(columnName, out var existingFilter);
-            _filterPopupContent!.Initialize(columnName, existingFilter);
-            _filterPopup.PlacementTarget = button;
-            _filterPopup.IsOpen = true;
-        }
-
-        private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
-        {
-            if (_filterPopup != null) _filterPopup.IsOpen = false;
-
-            switch (_currentFilterDataGridName)
-            {
-                case "DefaultTraceEvents":
-                    UpdateFilterState(_defaultTraceEventsFilters, e.FilterState);
-                    ApplyDefaultTraceEventsFilters();
-                    UpdateDataGridFilterButtonStyles(DefaultTraceEventsDataGrid, _defaultTraceEventsFilters);
-                    break;
-                case "TraceAnalysis":
-                    UpdateFilterState(_traceAnalysisFilters, e.FilterState);
-                    ApplyTraceAnalysisFilters();
-                    UpdateDataGridFilterButtonStyles(TraceAnalysisDataGrid, _traceAnalysisFilters);
-                    break;
-            }
-        }
-
-        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
-        {
-            if (_filterPopup != null) _filterPopup.IsOpen = false;
-        }
-
-        private void UpdateFilterState(Dictionary<string, ColumnFilterState> filters, ColumnFilterState filterState)
-        {
-            if (filterState.IsActive)
-                filters[filterState.ColumnName] = filterState;
-            else
-                filters.Remove(filterState.ColumnName);
-        }
-
-        private void UpdateDataGridFilterButtonStyles(DataGrid dataGrid, Dictionary<string, ColumnFilterState> filters)
-        {
-            foreach (var column in dataGrid.Columns)
-            {
-                if (column.Header is StackPanel headerPanel)
-                {
-                    var filterButton = headerPanel.Children.OfType<Button>().FirstOrDefault();
-                    if (filterButton != null && filterButton.Tag is string columnName)
-                    {
-                        bool hasActiveFilter = filters.TryGetValue(columnName, out var filter) && filter.IsActive;
-
-                        var textBlock = new System.Windows.Controls.TextBlock
-                        {
-                            Text = "\uE71C",
-                            FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
-                            Foreground = hasActiveFilter
-                                ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xD7, 0x00))
-                                : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF))
-                        };
-                        filterButton.Content = textBlock;
-
-                        filterButton.ToolTip = hasActiveFilter && filter != null
-                            ? $"Filter: {filter.DisplayText}\n(Click to modify)"
-                            : "Click to filter";
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region Filter Click Handlers
-
-        private void DefaultTraceEventsFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button && button.Tag is string columnName)
-                ShowFilterPopup(button, columnName, "DefaultTraceEvents", _defaultTraceEventsFilters);
-        }
-
-        private void TraceAnalysisFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button && button.Tag is string columnName)
-                ShowFilterPopup(button, columnName, "TraceAnalysis", _traceAnalysisFilters);
-        }
-
-        #endregion
-
-        #region Apply Filter Methods
-
-        private void ApplyDefaultTraceEventsFilters()
-        {
-            if (_defaultTraceEventsUnfilteredData == null) { _defaultTraceEventsUnfilteredData = DefaultTraceEventsDataGrid.ItemsSource as List<DefaultTraceEventItem> ?? (DefaultTraceEventsDataGrid.ItemsSource as IEnumerable<DefaultTraceEventItem>)?.ToList(); }
-            if (_defaultTraceEventsUnfilteredData == null) return;
-            if (_defaultTraceEventsFilters.Count == 0) { DefaultTraceEventsDataGrid.ItemsSource = _defaultTraceEventsUnfilteredData; return; }
-            DefaultTraceEventsDataGrid.ItemsSource = _defaultTraceEventsUnfilteredData.Where(item => _defaultTraceEventsFilters.Values.All(f => !f.IsActive || DataGridFilterService.MatchesFilter(item, f))).ToList();
-        }
-
-        private void ApplyTraceAnalysisFilters()
-        {
-            if (_traceAnalysisUnfilteredData == null) { _traceAnalysisUnfilteredData = TraceAnalysisDataGrid.ItemsSource as List<TraceAnalysisItem> ?? (TraceAnalysisDataGrid.ItemsSource as IEnumerable<TraceAnalysisItem>)?.ToList(); }
-            if (_traceAnalysisUnfilteredData == null) return;
-            if (_traceAnalysisFilters.Count == 0) { TraceAnalysisDataGrid.ItemsSource = _traceAnalysisUnfilteredData; return; }
-            TraceAnalysisDataGrid.ItemsSource = _traceAnalysisUnfilteredData.Where(item => _traceAnalysisFilters.Values.All(f => !f.IsActive || DataGridFilterService.MatchesFilter(item, f))).ToList();
-        }
-
-        #endregion
-
         #region Context Menu Handlers
 
         private void CopyCell_Click(object sender, RoutedEventArgs e)
@@ -1787,105 +1622,6 @@ private void LoadPerfmonCountersChart(List<PerfmonStatsItem>? data, int hoursBac
 
         #endregion
 
-        #region Default Trace Events Tab
-
-        private string? _defaultTraceEventsFilter;
-
-        private void DefaultTraceEventsFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            if (DefaultTraceEventsFilterCombo.SelectedItem is ComboBoxItem selected)
-            {
-                _defaultTraceEventsFilter = selected.Tag?.ToString();
-                if (string.IsNullOrEmpty(_defaultTraceEventsFilter))
-                {
-                    _defaultTraceEventsFilter = null;
-                }
-                DefaultTraceEvents_Refresh_Click(sender, new RoutedEventArgs());
-            }
-        }
-
-        private async void DefaultTraceEvents_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                await RefreshDefaultTraceEventsAsync();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error refreshing Default Trace Events data: {ex.Message}", ex);
-            }
-        }
-
-        private async Task RefreshDefaultTraceEventsAsync()
-        {
-            if (_databaseService == null) return;
-
-            try
-            {
-                var data = await _databaseService.GetDefaultTraceEventsAsync(_defaultTraceEventsHoursBack, _defaultTraceEventsFromDate, _defaultTraceEventsToDate, _defaultTraceEventsFilter);
-                DefaultTraceEventsDataGrid.ItemsSource = data;
-                DefaultTraceEventsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading default trace events: {ex.Message}");
-            }
-        }
-
-        private void DefaultTraceEventsFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
-        }
-
-        private void DefaultTraceEventsNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
-        }
-
-        #endregion
-
-        #region Trace Analysis Tab
-
-        private async void TraceAnalysis_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                await RefreshTraceAnalysisAsync();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error refreshing Trace Analysis data: {ex.Message}", ex);
-            }
-        }
-
-        private async Task RefreshTraceAnalysisAsync()
-        {
-            if (_databaseService == null) return;
-
-            try
-            {
-                var data = await _databaseService.GetTraceAnalysisAsync(_traceAnalysisHoursBack, _traceAnalysisFromDate, _traceAnalysisToDate);
-                TraceAnalysisDataGrid.ItemsSource = data;
-                TraceAnalysisNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading trace analysis: {ex.Message}");
-            }
-        }
-
-        private void TraceAnalysisFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
-        }
-
-        private void TraceAnalysisNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
-        }
-
-        #endregion
-
         #region Wait Stats Detail Tab
 
         private void WaitTypesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index d539516c..fa7f83b4 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -224,6 +224,11 @@
                         <controls:CriticalIssuesContent x:Name="CriticalIssuesTab" />
                     </TabItem>
 
+                    <!-- Default Trace Sub-Tab -->
+                    <TabItem Header="Default Trace">
+                        <controls:DefaultTraceContent x:Name="DefaultTraceTab" />
+                    </TabItem>
+
                     <!-- Server Configuration Changes Sub-Tab -->
                     <TabItem Header="Server Config Changes">
                         <Grid>
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 4259f3d1..58acbcf6 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -114,6 +114,7 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             // Initialize Overview sub-tab UserControls
             DailySummaryTab.Initialize(_databaseService);
             CriticalIssuesTab.Initialize(_databaseService);
+            DefaultTraceTab.Initialize(_databaseService);
             MemoryTab.Initialize(_databaseService);
             PerformanceTab.Initialize(_databaseService, s => StatusText.Text = s);
             SystemEventsContent.Initialize(_databaseService);
@@ -699,7 +700,8 @@ private async void ServerTab_Loaded(object sender, RoutedEventArgs e)
                 ResourceMetricsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
-                
+                DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+
                 await LoadDataAsync();
             }
             catch (Exception ex)
@@ -862,6 +864,7 @@ private async void ApplyToAllTabs_Click(object sender, RoutedEventArgs e)
                 ResourceMetricsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
 
                 // Refresh all data
                 StatusText.Text = GetLoadingMessage();
@@ -1162,8 +1165,10 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         _resourceOverviewFromDate = _globalFromDate;
                         _resourceOverviewToDate = _globalToDate;
                         CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                        DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         CollectionHealth_Refresh_Click(null, new RoutedEventArgs());
                         await CriticalIssuesTab.RefreshDataAsync();
+                        await DefaultTraceTab.RefreshAllDataAsync();
                         await RefreshResourceOverviewAsync();
                         break;
 
@@ -1272,13 +1277,14 @@ private async Task LoadDataAsync()
                 var resourceMetricsTask = ResourceMetricsContent.RefreshAllDataAsync();
                 var dailySummaryTask = DailySummaryTab.RefreshDataAsync();
                 var criticalIssuesTask = CriticalIssuesTab.RefreshDataAsync();
+                var defaultTraceTask = DefaultTraceTab.RefreshAllDataAsync();
                 var systemEventsTask = SystemEventsContent.RefreshAllDataAsync();
 
                 // Wait for everything to complete before _isRefreshing resets
                 await Task.WhenAll(
                     healthTask, blockingEventsTask, deadlocksTask, blockingStatsTask, lockWaitStatsTask,
                     performanceTask, memoryTask, resourceOverviewTask, runningJobsTask,
-                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, systemEventsTask);
+                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, systemEventsTask);
 
                 // Populate grids with fetched data
                 var healthData = await healthTask;