From 755d149fbd34cd08e582a6c922de9bb2d54a236f Mon Sep 17 00:00:00 2001 From: Sung Yoon Whang Date: Mon, 29 Apr 2019 18:28:06 -0700 Subject: [PATCH] Fix issue with dotnet-counters not being able to target user-defined EventSource (#222) --- src/Tools/dotnet-counters/ConsoleWriter.cs | 6 +++++- src/Tools/dotnet-counters/CounterProvider.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Tools/dotnet-counters/ConsoleWriter.cs b/src/Tools/dotnet-counters/ConsoleWriter.cs index 2963d2f84..1886dfd08 100644 --- a/src/Tools/dotnet-counters/ConsoleWriter.cs +++ b/src/Tools/dotnet-counters/ConsoleWriter.cs @@ -83,8 +83,12 @@ namespace Microsoft.Diagnostics.Tools.Counters } else { - // If it's from an provider, just append it at the end. + // If it's from an unknown provider, just append it at the end. string displayName = payload.GetDisplay(); + if (string.IsNullOrEmpty(displayName)) + { + displayName = payload.GetName(); + } int left = displayName.Length + 7; // displayName + " : " int row = maxRow; displayPosition[name] = (left, row); diff --git a/src/Tools/dotnet-counters/CounterProvider.cs b/src/Tools/dotnet-counters/CounterProvider.cs index 03c8b68c3..07400071b 100644 --- a/src/Tools/dotnet-counters/CounterProvider.cs +++ b/src/Tools/dotnet-counters/CounterProvider.cs @@ -43,7 +43,7 @@ namespace Microsoft.Diagnostics.Tools.Counters public static string SerializeUnknownProviderName(string unknownCounterProviderName, int interval) { - return $"{unknownCounterProviderName}:0xffffffff:0x4:EventCounterIntervalSec={interval}"; + return $"{unknownCounterProviderName}:ffffffff:4:EventCounterIntervalSec={interval}"; } public IReadOnlyList GetAllCounters() => Counters.Values.ToList(); -- 2.34.1