Skip to content

Feature/PreAggMetrics.Master #735

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
merged 144 commits into from
Apr 2, 2018
Merged

Feature/PreAggMetrics.Master #735

Show file tree
Hide file tree
Changes from 121 commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
65cc22e
Metrics: Initial commit includes the Microsoft.ApplicationInsights.Me…
May 23, 2017
47719be
Metrics: MultidimensionalCube returns GetPointResult type instances.
Jun 20, 2017
98080eb
Metrics: Refactor Multidimensional Cube related names.
macrogreg Jun 20, 2017
b5c86ac
Metrics: Building MetricAggregationManager infrastructure. Work in Pr…
macrogreg Jun 28, 2017
4f0eb88
Metrics: Building MetricAggregationManager infrastructure. Work in Pr…
macrogreg Jun 28, 2017
9ec0331
Metrics: Building MetricAggregationManager infrastructure. Work in Pr…
macrogreg Jul 12, 2017
b3ee2a7
Metrics: Scaffolding of MetricAggregationManager infrastructure is la…
macrogreg Jul 14, 2017
98c8b99
Metrics: Starting scaffolding for TelemetryClient extensions. Work in…
macrogreg Jul 14, 2017
087c0fa
Metrics: Object pooling for Aggregators.
macrogreg Jul 14, 2017
82efe9f
Metrics: Make MultidimensionalCube.TotalPointsCountLimit non-readonly.
macrogreg Jul 14, 2017
79d0eab
Metrics: UNDO: Make MultidimensionalCube.TotalPointsCountLimit non-re…
macrogreg Jul 14, 2017
9ffa720
Metrics: Retarget from .Net Core to .Net Standard 1.5.
macrogreg Jul 14, 2017
e605611
Metrics: Refactor solution directory.
macrogreg Jul 14, 2017
c80d45a
Metrics: Convenience APIs layered in a separate DLL.
macrogreg Jul 14, 2017
f95755d
Metrics: Some namng refactorings.
macrogreg Jul 14, 2017
79bead2
Metrics: Completed scaffolding for convenience APIs.
macrogreg Jul 18, 2017
25e6af3
Metrics: Added Code Analysis (but not passing yet).
macrogreg Jul 18, 2017
6bef84e
Metrics: Moved Build output folders to outside of code enlistment.
macrogreg Jul 18, 2017
ae17d1c
Metrics: Added dummy XML comments for publics.
macrogreg Jul 18, 2017
5f88ba2
Metrics: Exposed Time Series of a Metric.
macrogreg Jul 18, 2017
43081ce
Metrics: Remove some FxCop errors.
macrogreg Jul 18, 2017
c9faf63
Metrics: Factored out common build properties.
macrogreg Jul 18, 2017
4ddd3d6
Metrics: Addd more dummy XML comments. Debug build works now with com…
macrogreg Jul 18, 2017
a785c07
Metrics: Adressed some Code Analysis errors.
macrogreg Jul 18, 2017
9d88261
Metrics: Fix Build break in QP adapter
macrogreg Sep 2, 2017
604af43
Metrics: Dummy Test project builds and runs.
macrogreg Sep 2, 2017
75327e3
Metrics: Added StyleCop, resolved errors, then commented from build t…
macrogreg Sep 2, 2017
ee45e84
Metrics: Added Unit Tests for MultidimensionalCube.
macrogreg Sep 13, 2017
980e352
Metrics: Remove Track APIs that take ints; only take doubles. Some ad…
macrogreg Sep 15, 2017
632f55f
Metrics: Metric Configuration defaults to Double instead of Int.
macrogreg Sep 16, 2017
6990559
Metrics: Simplified some public surface.
macrogreg Sep 16, 2017
dabb969
Metrics: A few additional tests and fixes.
macrogreg Sep 16, 2017
a8b6e57
Metrics: GrowingCollectionTests
macrogreg Sep 23, 2017
b2b9eff
Metrics: Unit tests for SimpleDoubleDataSeriesAggregator.
macrogreg Sep 28, 2017
559ea96
Metrics: Unit tests for SimpleUInt32DataSeriesAggregator.
macrogreg Sep 28, 2017
9027032
Metrics: Refactored Aggregators in a dedicated subdirectory.
macrogreg Sep 28, 2017
24f8708
Metrics: Refactored Aggregators in a dedicated subdirectory.
macrogreg Sep 28, 2017
1500cc4
Metrics: Unit tests for DefaultAggregationPeriodCycle.
macrogreg Sep 28, 2017
6dd429c
Metrics: Uncomment ReadOptimizedList.
macrogreg Sep 28, 2017
5abc1f4
Metrics: Remove ReadOptimizedList since it is not used.
macrogreg Sep 28, 2017
61687d7
Metrics: Unit tests for NaiveDistinctCountMetricSeriesAggregator.
macrogreg Sep 28, 2017
c07caf7
Metrics: Unit tests for NaiveDistinctCountMetricSeriesAggregator.
macrogreg Sep 28, 2017
101c6e6
Metrics: Concurrent tests for Agregators.
macrogreg Sep 28, 2017
8d21a57
Metrics: Refactor MetricConsumerKind to MetricAggregationCycleKind.
macrogreg Sep 29, 2017
12026e4
Metrics: Some renamings previously forgotten during the CycleKind ref…
macrogreg Sep 29, 2017
c801714
Metrics: Simplity Aggregation Manager to only have 2 instead of 3 Sto…
macrogreg Oct 3, 2017
8795e56
Metrics: MetricAggregationManager tests.
macrogreg Oct 3, 2017
413d0a0
Metrics: Core Util unit tests.
macrogreg Oct 3, 2017
f4b0240
Metrics: MetricManager unit tests.
macrogreg Oct 5, 2017
eac0d4b
Metrics: Telemetry Pipeline Unite Tests
macrogreg Oct 5, 2017
c54d585
Metrics: Series Tests and small refactorings
macrogreg Oct 7, 2017
1230dc2
Metrics: Fix issues with MetricManager finalizer. Allow tests to pass…
macrogreg Oct 7, 2017
f9e9e36
Metrics: Added TelemetryConfigurationExtensionsTests. This completes …
macrogreg Oct 7, 2017
d3221d9
Metrics: Started Convenience API validation.
macrogreg Oct 9, 2017
0def7b3
Metrics: Metric tests and bug fixes.
macrogreg Oct 11, 2017
93c59ed
Metrics: Grouped Tests under a common folder.
macrogreg Oct 11, 2017
6bd3ea8
Metrics: Consistency in Test Assembly Names.
macrogreg Oct 11, 2017
cb6644d
Metrics: Moved generic data structures in separate assembly.
macrogreg Oct 11, 2017
d88d5c3
Metrics: Name length issue with data structures test assembly.
macrogreg Oct 11, 2017
16798d2
Metrics: Move over to MultidimensionalCube2
macrogreg Oct 15, 2017
6861496
Metrics: Refactored datastructures ammably name.
macrogreg Oct 15, 2017
17fa3b5
metrics: Added MetricAggregationScope.
macrogreg Oct 16, 2017
0977cc1
Metrics: MultidimensionalCube2 tests.
macrogreg Oct 16, 2017
a2db654
Metrics: MetricTests complete.
macrogreg Oct 20, 2017
f2a4b38
Metrics: More convenience Unit Tests
macrogreg Oct 20, 2017
95b51f3
Metrics: Fix some typos.
macrogreg Oct 20, 2017
796aabb
Metrics: TelemetryClientExtensionsTests
macrogreg Oct 23, 2017
bb4de11
Metrics: TelemetryClientExtensionsAdvancedTests
macrogreg Oct 23, 2017
5f4ac30
Metrics: Stamp Sdk Version into telemetry.
macrogreg Oct 23, 2017
1383ecf
Metrics: Fix StdDev test tool.
macrogreg Oct 23, 2017
a148a9c
Metrics: Added some examples.
macrogreg Oct 28, 2017
4459bc8
Metrics: Refactor to add an abstraction to MetricAggregate.
macrogreg Oct 30, 2017
ef05ac8
Metrics: More examples.
macrogreg Oct 31, 2017
97d0c87
Metrics: Add mode examples.
macrogreg Oct 31, 2017
c3f33b5
Metrics: Spellcheck in Examples.
macrogreg Oct 31, 2017
2f4bd2c
Metrics: Remove Additional Data Context
macrogreg Nov 4, 2017
7086cf2
Metrics: Added some doc comments.
macrogreg Nov 7, 2017
c393e51
Metrics: Rename Counters to Accumulators
macrogreg Nov 7, 2017
89f3665
Metrics: Add more doc comments.
macrogreg Nov 7, 2017
fa4bf96
Metrics: Doc comments for MetricDimensionNames.
macrogreg Nov 11, 2017
0952cf9
Metrics: Even faster aggregators (work in progress).
macrogreg Nov 12, 2017
a229dea
Metrics: Even faster aggregators (work in progress, almost done, need…
macrogreg Nov 14, 2017
cf6e34e
Metrics: Even faster aggregators (work in progress, ongoing cleanup).
macrogreg Nov 20, 2017
a921a83
Metrics: Even faster aggregators (complted; old aggregators removed).
macrogreg Nov 20, 2017
7789eb5
Metrics: Convenience and ConcurrentDatastructures into Core (prod cod…
macrogreg Nov 20, 2017
2534887
Metrics: Convenience and ConcurrentDatastructures into Core (tests).
macrogreg Nov 20, 2017
b03ce6d
Metrics: Splitting out Extensions assembly (initial split, work in pr…
macrogreg Nov 20, 2017
d7d1f97
Metrics: Splitting out Extensions assembly (done).
macrogreg Nov 20, 2017
68eab5b
Metrics: Rename .Metrics() to .GetMetricManager().
macrogreg Nov 20, 2017
109cd39
Metrics: Refactor datastructures folder name.
macrogreg Nov 20, 2017
a3591cf
Metrics: Move Internals and Publics into separate directories.
macrogreg Nov 20, 2017
17ac72b
Metrics: Fixed a bunch of Cop errors.
macrogreg Nov 20, 2017
2d4da73
Metrics: Fixed a few more Cop errors.
macrogreg Nov 20, 2017
f36ce30
Metrics: Protect user code calls to filters.
macrogreg Nov 21, 2017
0260f81
Metrics: Simplify Metrics collection retrieval and expose it as a pub…
macrogreg Nov 21, 2017
61c8adf
Metrics: Add the AutoCleanupUnusedSeries to IMetricSeriesConfiguratio…
macrogreg Nov 21, 2017
3a24c9a
Metrics: Minor text fixes.
macrogreg Dec 27, 2017
4a768ba
Revert "Metrics: Add the AutoCleanupUnusedSeries to IMetricSeriesConf…
macrogreg Dec 27, 2017
44b7bde
Metrics: Remove IMetricConfiguration iface as unnecesary abstraction.
macrogreg Mar 14, 2018
4af3b8d
Metrics: Add MetricIdentifier class not do not use it yet.
macrogreg Mar 15, 2018
2cd32b9
Metrics: Support for Namespace and up to 10 dimensions by using Metri…
macrogreg Mar 16, 2018
2dacff7
Metrics: Refactor Hash Code computation into Utils.
macrogreg Mar 16, 2018
8484f59
Metrics: Refactor aggregate constants.
macrogreg Mar 16, 2018
07503e8
Metrics: Moving folders to prepare to merge into Core SDK repo.
Mar 17, 2018
4ad8dfd
Merge branch 'metrics/master' of c:\T\Labs\ApplicationInsights-SDK-La…
Mar 17, 2018
7610b97
Metrics: Metric Pre-Aggregation was just importend from the Labs repo…
Mar 18, 2018
13200b8
Metrics: Move public classes in plain Application Insights namespace …
Mar 18, 2018
da59332
Metrics: Rename the old internal Metric class into MetricV1 to avoid …
Mar 18, 2018
ac3d847
Metrics: Rename the old internal Metric class into MetricV1 to avoid …
Mar 18, 2018
11e76fb
Metrics: Rename the old internal MetricManager class into MetricManag…
Mar 18, 2018
54fbcdc
Metrics: Move other files of the Metrics Core package into the Core S…
Mar 18, 2018
fe163a3
Metrics: Get Core SDK to build by fixing a few errors and disabling C…
Mar 18, 2018
12da57a
Metrics: Metrics.Extension assembly now builds separately in the corr…
Mar 19, 2018
580fbaf
Metrics: Resolve most of the Style build issues, except a few purpose…
macrogreg Mar 21, 2018
c8b8531
Metrics: Rename legacy IMetricProcessor to IMetricProcessorV1
macrogreg Mar 21, 2018
8a068b7
Metrics: Resolv "SA1101: Prefix local calls with 'this'"
macrogreg Mar 21, 2018
f88adf7
Metrics: Resolve "SA1308: Variable Names Must Not Be Prefixed"
macrogreg Mar 21, 2018
7a665c8
Metrics: Fixed a few warnings intorduced nd overlooked in this week's…
macrogreg Mar 21, 2018
b09d6a4
Metrics: Resolve "SA1309: Field names must not begin with underscore"
macrogreg Mar 21, 2018
3fffbef
Metrics: Fix small, previously overlooked build break cause by style …
macrogreg Mar 21, 2018
1f151e2
Metrics: Move all global style rule suppressions into the same centra…
macrogreg Mar 21, 2018
1752f58
Metrics: Addressing various small PR comments.
macrogreg Mar 27, 2018
9a2de02
Metrics: Remove suppressions for additional styling rules.
macrogreg Mar 27, 2018
4384d37
Metrics: Re-enable PublicApiAnalyzer.
macrogreg Mar 27, 2018
881e218
Merge branch 'develop' into feature/PreAggMetrics.Master
macrogreg Mar 27, 2018
ea156ab
Metrics: Move all tests into he right folders.
macrogreg Mar 28, 2018
7ee39f6
Metrics: Move the Metrics.Extensions project out of the repo.
macrogreg Mar 28, 2018
c6e1bb5
Merge branch 'develop' into feature/PreAggMetrics.Master
macrogreg Mar 28, 2018
c45f657
Metrics: Merge V1-MetricManager renamings.
macrogreg Mar 29, 2018
5772b0c
Merge branch 'develop' into feature/PreAggMetrics.Master
macrogreg Mar 29, 2018
f05316e
Metrics: Brings Examples back into the test project.
macrogreg Mar 29, 2018
dec02a2
Metrics: Reduce public API surface and mark the hidden APIs as @Publi…
macrogreg Mar 29, 2018
459b490
Metrics: Disable style rule "SA1623: Property summary documentation m…
macrogreg Mar 29, 2018
638115b
Metrics: Fix-up @ToDo tags.
macrogreg Mar 29, 2018
08dc69e
Metrics: Re-enable tyle rule "SA1625: Element documentation must not …
macrogreg Mar 29, 2018
1a3f4db
Metrics: Fix a typo.
macrogreg Mar 30, 2018
cda6d4d
Merge branch 'develop' into feature/PreAggMetrics.Master
macrogreg Mar 30, 2018
28b8222
Metrics: Address some FxCop errors.
macrogreg Mar 30, 2018
68870f1
Metrics: Address FxCop warning "CA1305: Specify IFormatProvider".
macrogreg Mar 30, 2018
0556564
Metrics: Temporarily disable tests that fail due to https://github.co…
macrogreg Mar 30, 2018
af0a785
Metrics: Make MetricManager an internal property on TelemetryConfigur…
macrogreg Mar 30, 2018
99f3be6
Metrics: Test tweaks.
macrogreg Mar 30, 2018
3bff8e3
Merge "develop" to "feature/PreAggMetrics.Master"
macrogreg Mar 30, 2018
6092810
Metrics: Remove Obsolete attribute on TrackMetric(..)
macrogreg Mar 31, 2018
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
38 changes: 19 additions & 19 deletions Test/Microsoft.ApplicationInsights.Test/Shared/Extensibility/MetricManagerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public void CanCreateMetricHavingNoDimensions()
var sentTelemetry = new List<ITelemetry>();

var client = this.InitializeTelemetryClient(sentTelemetry);
using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
Copy link
Contributor

@SergeyKanzhelev SergeyKanzhelev Mar 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you send this change separately? Mixing too much in a single PR makes reviewers life harder.

Copy link
Contributor Author

@macrogreg macrogreg Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, it would have been better to do this as separate PRs.Unfortunately I discovered the need for this renaming in the process of integrating and they ended up embedded. I can redo those changes in a separate branch for a separate PR, but it will take a little time. Given that they concern a separate set of files I hope that it does not affect the PR logic too much. Can we please skip this improvement?

Copy link
Contributor

@SergeyKanzhelev SergeyKanzhelev Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried opening and reviewing this PR? It hangs chrome on my machine =)

It literally takes a few minutes to merge as there will be only handful conflicts. I just tried. And will save a lot of time and nerves to reviewers. So please consider doing it

{
// Act
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");
metric.Track(42);
}

Expand All @@ -47,10 +47,10 @@ public void CanCreateMetricExplicitlySettingDimensionsToNull()

var client = this.InitializeTelemetryClient(sentTelemetry);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
// Act
Metric metric = manager.CreateMetric("Test Metric", null);
MetricV1 metric = manager.CreateMetric("Test Metric", null);
metric.Track(42);
}

Expand Down Expand Up @@ -79,10 +79,10 @@ public void CanCreateMetricWithASetOfDimensions()
{ "Dim2", "Value2"}
};

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
// Act
Metric metric = manager.CreateMetric("Test Metric", dimensions);
MetricV1 metric = manager.CreateMetric("Test Metric", dimensions);
metric.Track(42);
}

Expand All @@ -108,9 +108,9 @@ public void AggregatedMetricTelemetryHasIntervalDurationProperty()
var sentTelemetry = new List<ITelemetry>();

var client = this.InitializeTelemetryClient(sentTelemetry);
using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
metric.Track(42);
Expand All @@ -134,9 +134,9 @@ public void AggregatedMetricTelemetryIntervalDurationPropertyIsPositiveInteger()
var sentTelemetry = new List<ITelemetry>();

var client = this.InitializeTelemetryClient(sentTelemetry);
using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
metric.Track(42);
Expand All @@ -162,10 +162,10 @@ public void EqualMetricsAreCombinedIntoSignleAggregatedStatsStructure()

var client = this.InitializeTelemetryClient(sentTelemetry);

Metric metric1 = null;
Metric metric2 = null;
MetricV1 metric1 = null;
MetricV1 metric2 = null;

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
// note: on first go aggregators may be different because manager may
// snapshot after first got created but before the second
Expand Down Expand Up @@ -203,9 +203,9 @@ public void EqualMetricsAreCombinedIntoSignleAggregatedStatsStructure()
[TestMethod]
public void CanDisposeMetricManagerMultipleTimes()
{
MetricManager manager = null;
MetricManagerV1 manager = null;

using (manager = new MetricManager()) { }
using (manager = new MetricManagerV1()) { }

//Assert.DoesNotThrow
manager.Dispose();
Expand All @@ -218,9 +218,9 @@ public void FlushCreatesAggregatedMetricTelemetry()
var sentTelemetry = new List<ITelemetry>();

var client = this.InitializeTelemetryClient(sentTelemetry);
using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

metric.Track(42);

Expand All @@ -242,9 +242,9 @@ public void DisposingManagerCreatesAggregatedMetricTelemetry()
var sentTelemetry = new List<ITelemetry>();

var client = this.InitializeTelemetryClient(sentTelemetry);
using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

metric.Track(42);

Expand Down
96 changes: 48 additions & 48 deletions Test/Microsoft.ApplicationInsights.Test/Shared/Extensibility/MetricTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public void MetricInvokesMetricProcessorsForEachValueTracked()
{ "Dim2", "Value2"}
};

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric", dimensions);
MetricV1 metric = manager.CreateMetric("Test Metric", dimensions);

// Act
metric.Track(42);
Expand Down Expand Up @@ -57,9 +57,9 @@ public void MetricAggregatorCalculatesSampleCountCorrectly()

var client = this.InitializeTelemetryClient(sentTelemetry, sentSamples);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
for (int i = 0; i < testValues.Length; i++)
Expand Down Expand Up @@ -89,9 +89,9 @@ public void MetricAggregatorCalculatesSumCorrectly()

var client = this.InitializeTelemetryClient(sentTelemetry, sentSamples);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
for (int i = 0; i < testValues.Length; i++)
Expand Down Expand Up @@ -121,9 +121,9 @@ public void MetricAggregatorCalculatesMinCorrectly()

var client = this.InitializeTelemetryClient(sentTelemetry, sentSamples);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
for (int i = 0; i < testValues.Length; i++)
Expand Down Expand Up @@ -153,9 +153,9 @@ public void MetricAggregatorCalculatesMaxCorrectly()

var client = this.InitializeTelemetryClient(sentTelemetry, sentSamples);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
for (int i = 0; i < testValues.Length; i++)
Expand Down Expand Up @@ -185,9 +185,9 @@ public void MetricAggregatorCalculatesStandardDeviationCorrectly()

var client = this.InitializeTelemetryClient(sentTelemetry, sentSamples);

using (MetricManager manager = new MetricManager(client))
using (MetricManagerV1 manager = new MetricManagerV1(client))
{
Metric metric = manager.CreateMetric("Test Metric");
MetricV1 metric = manager.CreateMetric("Test Metric");

// Act
for (int i = 0; i < testValues.Length; i++)
Expand Down Expand Up @@ -228,9 +228,9 @@ public void MetricAggregatorCalculatesStandardDeviationCorrectly()
[TestMethod]
public void MetricNeverEqualsNull()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric");
object other = null;

Assert.IsFalse(metric.Equals(other));
Expand All @@ -240,9 +240,9 @@ public void MetricNeverEqualsNull()
[TestMethod]
public void MetricEqualsItself()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric");

Assert.IsTrue(metric.Equals(metric));
}
Expand All @@ -251,9 +251,9 @@ public void MetricEqualsItself()
[TestMethod]
public void MetricNotEqualsOtherObject()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric");
var other = new object();

Assert.IsFalse(metric.Equals(other));
Expand All @@ -263,10 +263,10 @@ public void MetricNotEqualsOtherObject()
[TestMethod]
public void MetricsAreEqualForTheSameMetricNameWithoutDimensions()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
Metric other = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric");
MetricV1 other = manager.CreateMetric("My metric");

Assert.IsTrue(metric.Equals(other));
}
Expand All @@ -275,10 +275,10 @@ public void MetricsAreEqualForTheSameMetricNameWithoutDimensions()
[TestMethod]
public void MetricNameIsCaseSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
Metric other = manager.CreateMetric("My Metric");
MetricV1 metric = manager.CreateMetric("My metric");
MetricV1 other = manager.CreateMetric("My Metric");

Assert.IsFalse(metric.Equals(other));
}
Expand All @@ -287,10 +287,10 @@ public void MetricNameIsCaseSensitive()
[TestMethod]
public void MetricNameIsAccentSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric");
Metric other = manager.CreateMetric("My métric");
MetricV1 metric = manager.CreateMetric("My metric");
MetricV1 other = manager.CreateMetric("My métric");

Assert.IsFalse(metric.Equals(other));
}
Expand All @@ -299,10 +299,10 @@ public void MetricNameIsAccentSensitive()
[TestMethod]
public void MetricsAreEqualIfDimensionsSetToNothingImplicitlyAndExplicitly()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric", null);
Metric other = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric", null);
MetricV1 other = manager.CreateMetric("My metric");

Assert.IsTrue(metric.Equals(other));
}
Expand All @@ -311,10 +311,10 @@ public void MetricsAreEqualIfDimensionsSetToNothingImplicitlyAndExplicitly()
[TestMethod]
public void MetricsAreEqualIfDimensionsSetToNothingImplicitlyAndExplicitlyAsEmptySet()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
Metric metric = manager.CreateMetric("My metric", new Dictionary<string, string>());
Metric other = manager.CreateMetric("My metric");
MetricV1 metric = manager.CreateMetric("My metric", new Dictionary<string, string>());
MetricV1 other = manager.CreateMetric("My metric");

Assert.IsTrue(metric.Equals(other));
}
Expand All @@ -323,7 +323,7 @@ public void MetricsAreEqualIfDimensionsSetToNothingImplicitlyAndExplicitlyAsEmpt
[TestMethod]
public void DimensionsAreOrderInsensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
var dimensionSet1 = new Dictionary<string, string>() {
{ "Dim1", "Value1"},
Expand All @@ -335,8 +335,8 @@ public void DimensionsAreOrderInsensitive()
{ "Dim1", "Value1"},
};

Metric metric = manager.CreateMetric("My metric", dimensionSet1);
Metric other = manager.CreateMetric("My metric", dimensionSet2);
MetricV1 metric = manager.CreateMetric("My metric", dimensionSet1);
MetricV1 other = manager.CreateMetric("My metric", dimensionSet2);

Assert.IsTrue(metric.Equals(other));
}
Expand All @@ -345,13 +345,13 @@ public void DimensionsAreOrderInsensitive()
[TestMethod]
public void DimensionNamesAreCaseSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
var dimensionSet1 = new Dictionary<string, string>() { { "Dim1", "Value1" } };
var dimensionSet2 = new Dictionary<string, string>() { { "dim1", "Value1" } };

Metric metric = manager.CreateMetric("My metric", dimensionSet1);
Metric other = manager.CreateMetric("My metric", dimensionSet2);
MetricV1 metric = manager.CreateMetric("My metric", dimensionSet1);
MetricV1 other = manager.CreateMetric("My metric", dimensionSet2);

Assert.IsFalse(metric.Equals(other));
}
Expand All @@ -360,13 +360,13 @@ public void DimensionNamesAreCaseSensitive()
[TestMethod]
public void DimensionNamesAreAccentSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
var dimensionSet1 = new Dictionary<string, string>() { { "Dim1", "Value1" } };
var dimensionSet2 = new Dictionary<string, string>() { { "Dím1", "Value1" } };

Metric metric = manager.CreateMetric("My metric", dimensionSet1);
Metric other = manager.CreateMetric("My metric", dimensionSet2);
MetricV1 metric = manager.CreateMetric("My metric", dimensionSet1);
MetricV1 other = manager.CreateMetric("My metric", dimensionSet2);

Assert.IsFalse(metric.Equals(other));
}
Expand All @@ -375,13 +375,13 @@ public void DimensionNamesAreAccentSensitive()
[TestMethod]
public void DimensionValuesAreCaseSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
var dimensionSet1 = new Dictionary<string, string>() { { "Dim1", "Value1" } };
var dimensionSet2 = new Dictionary<string, string>() { { "Dim1", "value1" } };

Metric metric = manager.CreateMetric("My metric", dimensionSet1);
Metric other = manager.CreateMetric("My metric", dimensionSet2);
MetricV1 metric = manager.CreateMetric("My metric", dimensionSet1);
MetricV1 other = manager.CreateMetric("My metric", dimensionSet2);

Assert.IsFalse(metric.Equals(other));
}
Expand All @@ -390,13 +390,13 @@ public void DimensionValuesAreCaseSensitive()
[TestMethod]
public void DimensionValuesAreAccentSensitive()
{
using (var manager = new MetricManager())
using (var manager = new MetricManagerV1())
{
var dimensionSet1 = new Dictionary<string, string>() { { "Dim1", "Value1" } };
var dimensionSet2 = new Dictionary<string, string>() { { "Dim1", "Válue1" } };

Metric metric = manager.CreateMetric("My metric", dimensionSet1);
Metric other = manager.CreateMetric("My metric", dimensionSet2);
MetricV1 metric = manager.CreateMetric("My metric", dimensionSet1);
MetricV1 other = manager.CreateMetric("My metric", dimensionSet2);

Assert.IsFalse(metric.Equals(other));
}
Expand Down
4 changes: 2 additions & 2 deletions Test/Microsoft.ApplicationInsights.Test/Shared/Extensibility/StubMetricProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;

internal class StubMetricProcessor : IMetricProcessor
internal class StubMetricProcessor : IMetricProcessorV1
{
private IList<MetricSample> sampleList;

Expand All @@ -17,7 +17,7 @@ public StubMetricProcessor(IList<MetricSample> sampleList)
this.sampleList = sampleList;
}

public void Track(Metric metric, double value)
public void Track(MetricV1 metric, double value)
{
this.sampleList.Add(
new MetricSample()
Expand Down
Loading