Skip to content

[SDM] Changes To MetricType #3615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkeirstead merged 2 commits into from
Jan 25, 2023
Merged

[SDM] Changes To MetricType #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47a957
Tweaks to account for new All flag
kkeirstead Jan 25, 2023
887c6d4
Fixed build/test failures from Wiktor's changes
kkeirstead Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/MetricSourceConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe
public enum MetricType
{
EventCounter = 0x1,
Meter = 0x2
Meter = 0x2,
All = 0xFF
}

public sealed class MetricEventPipeProvider
Expand All @@ -26,7 +27,7 @@ public sealed class MetricEventPipeProvider

public float? IntervalSeconds { get; set; }

public MetricType Type { get; set; } = MetricType.EventCounter | MetricType.Meter;
public MetricType Type { get; set; } = MetricType.All;
}

public sealed class MetricSourceConfiguration : MonitoringSourceConfiguration
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ internal enum CounterGroupType
{
EventCounter = 0x1,
Meter = 0x2,
All = 0xFF
}

internal class EventPipeCounterGroup
Expand All @@ -34,7 +35,7 @@ internal class EventPipeCounterGroup

public string[] CounterNames { get; set; }

public CounterGroupType Type { get; set; } = CounterGroupType.EventCounter | CounterGroupType.Meter;
public CounterGroupType Type { get; set; } = CounterGroupType.All;

public float? IntervalSeconds { get; set; }
}
Expand Down
4 changes: 2 additions & 2 deletions src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public void ValidateMetadataParsing_Success()
const string value1 = "V1";
const string key2 = "K2";
const string value2 = "V:2";
IDictionary<string, string> metadataDict = TraceEventExtensions.GetMetadata($"{key1}:{value1},{key2}:{value2}");
IDictionary<string, string> metadataDict = CounterUtilities.GetMetadata($"{key1}:{value1},{key2}:{value2}");

Assert.Equal(2, metadataDict.Count);
Assert.Equal(value1, metadataDict[key1]);
Expand All @@ -515,7 +515,7 @@ public void ValidateMetadataParsing_Success()
[InlineData("K1")]
public void ValidateMetadataParsing_Failure(string invalidMetadata)
{
IDictionary<string, string> metadataDict = TraceEventExtensions.GetMetadata(invalidMetadata);
IDictionary<string, string> metadataDict = CounterUtilities.GetMetadata(invalidMetadata);

Assert.Empty(metadataDict);
}
Expand Down