From e29dc2acdba5aa5385702f3177222124068d8312 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Wed, 3 May 2017 11:06:21 -0700 Subject: [PATCH] minor review comments and func tests fix --- .../Shared/DependencyTrackingTelemetryModule.cs | 8 ++++---- .../FunctionalTests/FuncTest/AspNetCoreHttpTests.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/DependencyCollector/Shared/DependencyTrackingTelemetryModule.cs b/Src/DependencyCollector/Shared/DependencyTrackingTelemetryModule.cs index 9312c49ee..3d468faee 100644 --- a/Src/DependencyCollector/Shared/DependencyTrackingTelemetryModule.cs +++ b/Src/DependencyCollector/Shared/DependencyTrackingTelemetryModule.cs @@ -219,7 +219,7 @@ protected virtual void Dispose(bool disposing) /// /// Initialize for framework event source (not supported for Net40). /// - private void InitializeForFrameworkEventSource() + private void InitializeForDiagnosticAndFrameworkEventSource() { #if NET45 DesktopDiagnosticSourceHttpProcessing desktopHttpProcessing = new DesktopDiagnosticSourceHttpProcessing( @@ -267,21 +267,21 @@ private void InitializeForRuntimeInstrumentationOrFramework() } catch (Exception exp) { - this.InitializeForFrameworkEventSource(); + this.InitializeForDiagnosticAndFrameworkEventSource(); DependencyCollectorEventSource.Log.ProfilerFailedToAttachError(exp.ToInvariantString()); } } else { // if config is set to disable runtime instrumentation then default to framework event source - this.InitializeForFrameworkEventSource(); + this.InitializeForDiagnosticAndFrameworkEventSource(); DependencyCollectorEventSource.Log.RemoteDependencyModuleVerbose("Runtime instrumentation is set to disabled. Initialize with framework event source instead."); } } else { // if profiler is not attached then default to framework event source - this.InitializeForFrameworkEventSource(); + this.InitializeForDiagnosticAndFrameworkEventSource(); // Log a message to indicate the profiler is not attached DependencyCollectorEventSource.Log.RemoteDependencyModuleProfilerNotAttached(); diff --git a/Test/DependencyCollector/FunctionalTests/FuncTest/AspNetCoreHttpTests.cs b/Test/DependencyCollector/FunctionalTests/FuncTest/AspNetCoreHttpTests.cs index 1823afdab..7088708e4 100644 --- a/Test/DependencyCollector/FunctionalTests/FuncTest/AspNetCoreHttpTests.cs +++ b/Test/DependencyCollector/FunctionalTests/FuncTest/AspNetCoreHttpTests.cs @@ -99,7 +99,7 @@ private static IDisposable DotNetCoreTestSetup() { EnsureDotNetCoreInstalled(); - return new ExpectedSDKPrefixChanger("rddd"); + return new ExpectedSDKPrefixChanger("rdddsc"); } private const string AspxCoreTestAppFolder = "..\\TestApps\\AspxCore\\";