Skip to content

Commit e0b9819

Browse files
author
Timothy Mothra
authored
remove OTELRESOURCE from Logs and Metrics (Azure#36430)
1 parent e34efb3 commit e0b9819

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorLogExporter.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ public override ExportResult Export(in Batch<LogRecord> batch)
4242
var telemetryItems = LogsHelper.OtelToAzureMonitorLogs(batch, LogResource, _instrumentationKey);
4343
if (telemetryItems.Count > 0)
4444
{
45-
if (LogResource?.MetricTelemetry != null)
46-
{
47-
telemetryItems.Add(LogResource.MetricTelemetry);
48-
}
4945
exportResult = _transmitter.TrackAsync(telemetryItems, false, CancellationToken.None).EnsureCompleted();
5046
}
5147
}

sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorMetricExporter.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ public override ExportResult Export(in Batch<Metric> batch)
4646
var telemetryItems = MetricHelper.OtelToAzureMonitorMetrics(batch, MetricResource, _instrumentationKey);
4747
if (telemetryItems.Count > 0)
4848
{
49-
if (MetricResource?.MetricTelemetry != null)
50-
{
51-
telemetryItems.Add(MetricResource.MetricTelemetry);
52-
}
5349
exportResult = _transmitter.TrackAsync(telemetryItems, false, CancellationToken.None).EnsureCompleted();
5450
}
5551
}

sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/E2ETelemetryItemValidation/MetricsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void VerifyObservableUpDownCounter(bool asView)
259259

260260
// ASSERT
261261
metricReader.Collect();
262-
Assert.True(telemetryItems.Count == 2);
262+
Assert.True(telemetryItems.Count == 1);
263263
var telemetryItem = telemetryItems.Last()!;
264264
this.telemetryOutput.Write(telemetryItem);
265265
TelemetryItemValidationHelper.AssertMetricTelemetry(
@@ -274,7 +274,7 @@ public void VerifyObservableUpDownCounter(bool asView)
274274
{ }
275275

276276
metricReader.Collect();
277-
Assert.True(telemetryItems.Count == 2);
277+
Assert.True(telemetryItems.Count == 1);
278278
telemetryItem = telemetryItems.Last()!;
279279
this.telemetryOutput.Write(telemetryItem!);
280280
TelemetryItemValidationHelper.AssertMetricTelemetry(

sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/StandardMetricTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void ValidateRequestDurationMetric()
5252
meterProvider?.ForceFlush();
5353

5454
// Standard Metrics + Resource Metrics.
55-
Assert.Equal(2, metricTelemetryItems.Count);
55+
Assert.Single(metricTelemetryItems);
5656

5757
var metricTelemetry = metricTelemetryItems.Last()!;
5858
Assert.Equal("MetricData", metricTelemetry.Data.BaseType);
@@ -105,7 +105,7 @@ public void ValidateDependencyDurationMetric()
105105
meterProvider?.ForceFlush();
106106

107107
// Standard Metrics + Resource Metrics.
108-
Assert.Equal(2, metricTelemetryItems.Count);
108+
Assert.Single(metricTelemetryItems);
109109

110110
var metricTelemetry = metricTelemetryItems.Last()!;
111111
Assert.Equal("MetricData", metricTelemetry.Data.BaseType);

0 commit comments

Comments
 (0)