Skip to content

Commit

Permalink
test updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@vishweshbankwar
vishweshbankwar committed May 22, 2024
1 parent 59ddca8 commit 524c0dd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 50 deletions.
17 changes: 1 addition & 16 deletions test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/MetricExporterBenchmarks.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,39 +574,32 @@ public void InstrumentWithWithGenevaCounterMetricExporter4Dimensions()
[Benchmark]
public void SerializeCounterMetricItemWith3Dimensions()
{
#if EXPOSE_EXPERIMENTAL_FEATURES
this.counterMetricPointWith3Dimensions.TryGetExemplars(out var exemplars);
#endif

this.tlvMetricsExporter.SerializeMetricWithTLV(
MetricEventType.ULongMetric,
this.counterMetricWith3Dimensions.Name,
this.counterMetricPointWith3Dimensions.EndTime.ToFileTime(),
this.counterMetricPointWith3Dimensions.Tags,
this.counterMetricDataWith3Dimensions,
#if EXPOSE_EXPERIMENTAL_FEATURES
MetricType.LongSum,
exemplars,
#endif
out _,
out _);
}

[Benchmark]
public void SerializeCounterMetricItemWith4Dimensions()
{
#if EXPOSE_EXPERIMENTAL_FEATURES
this.counterMetricPointWith4Dimensions.TryGetExemplars(out var exemplars);
#endif
this.tlvMetricsExporter.SerializeMetricWithTLV(
MetricEventType.ULongMetric,
this.counterMetricWith4Dimensions.Name,
this.counterMetricPointWith4Dimensions.EndTime.ToFileTime(),
this.counterMetricPointWith4Dimensions.Tags,
this.counterMetricDataWith4Dimensions,
#if EXPOSE_EXPERIMENTAL_FEATURES
MetricType.LongSum,
exemplars,
#endif
out _,
out _);
}
Expand All @@ -626,9 +619,7 @@ public void ExportCounterMetricItemWith4Dimensions()
[Benchmark]
public void SerializeHistogramMetricItemWith3Dimensions()
{
#if EXPOSE_EXPERIMENTAL_FEATURES
this.histogramMetricPointWith3Dimensions.TryGetExemplars(out var exemplars);
#endif
this.tlvMetricsExporter.SerializeHistogramMetricWithTLV(
this.histogramMetricWith3Dimensions.Name,
this.histogramMetricPointWith3Dimensions.EndTime.ToFileTime(),
Expand All @@ -638,20 +629,16 @@ public void SerializeHistogramMetricItemWith3Dimensions()
this.histogramCountWith3Dimensions,
this.histogramMinWith3Dimensions,
this.histogramMaxWith3Dimensions,
#if EXPOSE_EXPERIMENTAL_FEATURES
MetricType.Histogram,
exemplars,
#endif
out _,
out _);
}

[Benchmark]
public void SerializeHistogramMetricItemWith4Dimensions()
{
#if EXPOSE_EXPERIMENTAL_FEATURES
this.histogramMetricPointWith4Dimensions.TryGetExemplars(out var exemplars);
#endif
this.tlvMetricsExporter.SerializeHistogramMetricWithTLV(
this.histogramMetricWith4Dimensions.Name,
this.histogramMetricPointWith4Dimensions.EndTime.ToFileTime(),
Expand All @@ -661,10 +648,8 @@ public void SerializeHistogramMetricItemWith4Dimensions()
this.histogramCountWith4Dimensions,
this.histogramMinWith4Dimensions,
this.histogramMaxWith4Dimensions,
#if EXPOSE_EXPERIMENTAL_FEATURES
MetricType.Histogram,
exemplars,
#endif
out _,
out _);
}
Expand Down
34 changes: 0 additions & 34 deletions test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,19 +185,15 @@ public void SuccessfulExportOnLinux()
var metricDataValue = Convert.ToUInt64(metricPoint.GetSumLong());
var metricData = new MetricData { UInt64Value = metricDataValue };

#if EXPOSE_EXPERIMENTAL_FEATURES
metricPoint.TryGetExemplars(out var exemplars);
#endif
var bodyLength = exporter.SerializeMetricWithTLV(
MetricEventType.ULongMetric,
metric.Name,
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
MetricType.LongSum,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -385,9 +381,7 @@ public void SuccessfulSerializationWithTLV(bool testMaxLimits, bool hasExemplars

if (hasExemplars)
{
#if EXPOSE_EXPERIMENTAL_FEATURES
meterProviderBuilder.SetExemplarFilter(ExemplarFilterType.AlwaysOn);
#endif
}

if (hasFilteredTagsForExemplars)
Expand Down Expand Up @@ -983,9 +977,7 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
metricPointsEnumerator.MoveNext();
var metricPoint = metricPointsEnumerator.Current;

#if EXPOSE_EXPERIMENTAL_FEATURES
metricPoint.TryGetExemplars(out var exemplars);
#endif

List<TlvField> fields = null;

Expand All @@ -1000,10 +992,8 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand All @@ -1029,10 +1019,8 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -1060,10 +1048,8 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -1091,10 +1077,8 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -1129,10 +1113,8 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
count,
min,
max,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -1171,7 +1153,6 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
Assert.Equal(bodyLength, data.LenBody);
}

#if EXPOSE_EXPERIMENTAL_FEATURES
List<Exemplar> validExemplars = new List<Exemplar>();

foreach (var exemplar in exemplars)
Expand All @@ -1198,7 +1179,6 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
AssertExemplarFilteredTagSerialization(expectedExemplar, serializedExemplar);
}
}
#endif

// Check metric name, account, and namespace
var connectionStringBuilder = new ConnectionStringBuilder(exporterOptions.ConnectionString);
Expand Down Expand Up @@ -1271,7 +1251,6 @@ private static void CheckSerializationWithTLVForSingleMetricPoint(Metric metric,
Assert.Equal(dimensionsCount, dimensions.NumDimensions);
}

#if EXPOSE_EXPERIMENTAL_FEATURES
private static void AssertExemplarFilteredTagSerialization(Exemplar expectedExemplar, SingleExemplar serializedExemplar)
{
var serializedExemplarBody = serializedExemplar.Body;
Expand Down Expand Up @@ -1328,7 +1307,6 @@ private static void AssertExemplarFilteredTagSerialization(Exemplar expectedExem

Assert.Equal(filteredTagsExpectedCount, filteredTagsActualCount);
}
#endif

private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exporter)
{
Expand All @@ -1337,9 +1315,7 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
metricPointsEnumerator.MoveNext();
var metricPoint = metricPointsEnumerator.Current;

#if EXPOSE_EXPERIMENTAL_FEATURES
metricPoint.TryGetExemplars(out var exemplars);
#endif

UserdataV2 result = null;

Expand All @@ -1353,10 +1329,8 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand All @@ -1375,10 +1349,8 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand All @@ -1399,10 +1371,8 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand All @@ -1423,10 +1393,8 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
metricPoint.EndTime.ToFileTime(),
metricPoint.Tags,
metricData,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down Expand Up @@ -1454,10 +1422,8 @@ private static UserdataV2 GetSerializedData(Metric metric, TlvMetricExporter exp
count,
min,
max,
#if EXPOSE_EXPERIMENTAL_FEATURES
metricType,
exemplars,
#endif
out _,
out _);

Expand Down

0 comments on commit 524c0dd

Please sign in to comment.