Skip to content

Commit

Permalink
Revert "Add more information to DevDiagnostics resource usage page (#…
Browse files Browse the repository at this point in the history 
…3755)" (#3797)

This reverts commit e260332.

Co-authored-by: Jason Holmes <27746781+jaholme@users.noreply.github.com>
  • Loading branch information
@jaholme
jaholme and jaholme committed Sep 6, 2024
1 parent 0f712ec commit 23d5a14
Show file tree
Hide file tree
Showing 18 changed files with 1,678 additions and 2,710 deletions.
232 changes: 113 additions & 119 deletions tools/DevDiagnostics/DevHome.DevDiagnostics/DDApp.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,113 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using DevHome.Common.Extensions;
using DevHome.Common.Services;
using DevHome.DevDiagnostics.Helpers;

using DevHome.DevDiagnostics.Models;
using DevHome.DevDiagnostics.Pages;
using DevHome.DevDiagnostics.Services;
using DevHome.DevDiagnostics.Telemetry;
using DevHome.DevDiagnostics.TelemetryEvents;
using DevHome.DevDiagnostics.ViewModels;
using DevHome.Telemetry;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Xaml;
using Windows.Storage;

namespace DevHome.DevDiagnostics;

public partial class App : Application, IApp
{
// The .NET Generic Host provides dependency injection, configuration, logging, and other services.
// https://docs.microsoft.com/dotnet/core/extensions/generic-host
// https://docs.microsoft.com/dotnet/core/extensions/dependency-injection
// https://docs.microsoft.com/dotnet/core/extensions/configuration
// https://docs.microsoft.com/dotnet/core/extensions/logging
public IHost Host { get; }

public T GetService<T>()
where T : class => Host.GetService<T>();

public Microsoft.UI.Dispatching.DispatcherQueue? UIDispatcher { get; }

public App()
{
InitializeComponent();

UIDispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();

Host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder()
.ConfigureServices((context, services) =>
{
// Services
services.AddSingleton<IPageService, DDPageService>();
services.AddSingleton<INavigationService, DDNavigationService>();
services.AddSingleton<TelemetryReporter>();
services.AddSingleton<DDAppInfoService>();
services.AddSingleton<DDInsightsService>();
services.AddSingleton<WERHelper>();
services.AddSingleton<WERAnalyzer>();
services.AddSingleton<ExternalToolsHelper>();
services.AddSingleton<InternalToolsHelper>();
services.AddSingleton<PerfCounters>();
services.AddSingleton<HardwareMonitor>();
// Window
services.AddSingleton<PrimaryWindow>();
// Views and ViewModels
services.AddSingleton<AppDetailsPage>();
services.AddSingleton<AppDetailsPageViewModel>();
services.AddSingleton<InsightsPage>();
services.AddSingleton<InsightsPageViewModel>();
services.AddSingleton<ModulesPage>();
services.AddSingleton<ModulesPageViewModel>();
services.AddSingleton<ProcessListPage>();
services.AddSingleton<ProcessListPageViewModel>();
services.AddSingleton<ProcessResourceUsagePage>();
services.AddSingleton<ProcessResourceUsagePageViewModel>();
services.AddSingleton<ResourceUsagePage>();
services.AddSingleton<ResourceUsagePageViewModel>();
services.AddSingleton<WERPage>();
services.AddSingleton<WERPageViewModel>();
services.AddSingleton<WinLogsPage>();
services.AddSingleton<WinLogsPageViewModel>();
services.AddSingleton<SettingsPage>();
services.AddSingleton<SettingsPageViewModel>();
services.AddSingleton<SystemResourceUsagePage>();
services.AddSingleton<SystemResourceUsagePageViewModel>();
// Settings sub-pages and viewmodels.
services.AddTransient<PreferencesViewModel>();
services.AddTransient<PreferencesPage>();
services.AddTransient<AdditionalToolsViewModel>();
services.AddTransient<AdditionalToolsPage>();
services.AddTransient<AdvancedSettingsViewModel>();
services.AddTransient<AdvancedSettingsPage>();
services.AddTransient<AboutViewModel>();
services.AddTransient<AboutPage>();
}).Build();

// Provide an explicit implementationInstance otherwise AddSingleton does not create a new instance immediately.
// It will lazily init when the first component requires it but the hotkey helper needs to be registered immediately.
Application.Current.GetService<PrimaryWindow>();
}

internal static ITelemetry Logger => TelemetryFactory.Get<ITelemetry>();

internal static void LogTimeTaken(string eventName, uint timeTakenMilliseconds, Guid? relatedActivityId = null) => Logger.LogTimeTaken(eventName, timeTakenMilliseconds, relatedActivityId);

internal static void LogCritical(string eventName, bool isError = false, Guid? relatedActivityId = null) => Logger.LogCritical(eventName, isError, relatedActivityId);

internal static void Log<T>(string eventName, LogLevel level, T data, Guid? relatedActivityId = null)
where T : EventBase
{
Logger.Log<T>(eventName, level, data, relatedActivityId ?? null);
}

internal static void LogError<T>(string eventName, LogLevel level, T data, Guid? relatedActivityId = null)
where T : EventBase
{
Logger.LogError<T>(eventName, level, data, relatedActivityId);
}

internal static void Log(string eventName, LogLevel level, Guid? relatedActivityId = null) => Logger.Log(eventName, level, new UsageEventData(), relatedActivityId);
}
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using DevHome.Common.Extensions;
using DevHome.Common.Services;
using DevHome.DevDiagnostics.Helpers;

using DevHome.DevDiagnostics.Models;
using DevHome.DevDiagnostics.Pages;
using DevHome.DevDiagnostics.Services;
using DevHome.DevDiagnostics.Telemetry;
using DevHome.DevDiagnostics.TelemetryEvents;
using DevHome.DevDiagnostics.ViewModels;
using DevHome.Telemetry;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Xaml;
using Windows.Storage;

namespace DevHome.DevDiagnostics;

public partial class App : Application, IApp
{
// The .NET Generic Host provides dependency injection, configuration, logging, and other services.
// https://docs.microsoft.com/dotnet/core/extensions/generic-host
// https://docs.microsoft.com/dotnet/core/extensions/dependency-injection
// https://docs.microsoft.com/dotnet/core/extensions/configuration
// https://docs.microsoft.com/dotnet/core/extensions/logging
public IHost Host { get; }

public T GetService<T>()
where T : class => Host.GetService<T>();

public Microsoft.UI.Dispatching.DispatcherQueue? UIDispatcher { get; }

public App()
{
InitializeComponent();

UIDispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();

Host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder()
.ConfigureServices((context, services) =>
{
// Services
services.AddSingleton<IPageService, DDPageService>();
services.AddSingleton<INavigationService, DDNavigationService>();
services.AddSingleton<TelemetryReporter>();
services.AddSingleton<DDAppInfoService>();
services.AddSingleton<DDInsightsService>();
services.AddSingleton<WERHelper>();
services.AddSingleton<WERAnalyzer>();
services.AddSingleton<ExternalToolsHelper>();
services.AddSingleton<InternalToolsHelper>();
// Window
services.AddSingleton<PrimaryWindow>();
// Views and ViewModels
services.AddSingleton<AppDetailsPage>();
services.AddSingleton<AppDetailsPageViewModel>();
services.AddSingleton<InsightsPage>();
services.AddSingleton<InsightsPageViewModel>();
services.AddSingleton<ModulesPage>();
services.AddSingleton<ModulesPageViewModel>();
services.AddSingleton<ProcessListPage>();
services.AddSingleton<ProcessListPageViewModel>();
services.AddSingleton<ResourceUsagePage>();
services.AddSingleton<ResourceUsagePageViewModel>();
services.AddSingleton<WERPage>();
services.AddSingleton<WERPageViewModel>();
services.AddSingleton<WinLogsPage>();
services.AddSingleton<WinLogsPageViewModel>();
services.AddSingleton<SettingsPage>();
services.AddSingleton<SettingsPageViewModel>();
// Settings sub-pages and viewmodels.
services.AddTransient<PreferencesViewModel>();
services.AddTransient<PreferencesPage>();
services.AddTransient<AdditionalToolsViewModel>();
services.AddTransient<AdditionalToolsPage>();
services.AddTransient<AdvancedSettingsViewModel>();
services.AddTransient<AdvancedSettingsPage>();
services.AddTransient<AboutViewModel>();
services.AddTransient<AboutPage>();
}).Build();

// Provide an explicit implementationInstance otherwise AddSingleton does not create a new instance immediately.
// It will lazily init when the first component requires it but the hotkey helper needs to be registered immediately.
Application.Current.GetService<PrimaryWindow>();
}

internal static ITelemetry Logger => TelemetryFactory.Get<ITelemetry>();

internal static void LogTimeTaken(string eventName, uint timeTakenMilliseconds, Guid? relatedActivityId = null) => Logger.LogTimeTaken(eventName, timeTakenMilliseconds, relatedActivityId);

internal static void LogCritical(string eventName, bool isError = false, Guid? relatedActivityId = null) => Logger.LogCritical(eventName, isError, relatedActivityId);

internal static void Log<T>(string eventName, LogLevel level, T data, Guid? relatedActivityId = null)
where T : EventBase
{
Logger.Log<T>(eventName, level, data, relatedActivityId ?? null);
}

internal static void LogError<T>(string eventName, LogLevel level, T data, Guid? relatedActivityId = null)
where T : EventBase
{
Logger.LogError<T>(eventName, level, data, relatedActivityId);
}

internal static void Log(string eventName, LogLevel level, Guid? relatedActivityId = null) => Logger.Log(eventName, level, new UsageEventData(), relatedActivityId);
}
Loading

0 comments on commit 23d5a14

Please sign in to comment.