Skip to content

Commit 5559a6c

Browse files
authored
[geneva] Rename metric transports (open-telemetry#2119)
1 parent 794eb48 commit 5559a6c

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

src/OpenTelemetry.Exporter.Geneva/Metrics/OtlpProtobuf/OtlpProtobufMetricExporter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public OtlpProtobufMetricExporter(Func<Resource> getResource, ConnectionStringBu
2525

2626
this.getResource = getResource;
2727

28-
this.otlpProtobufSerializer = new OtlpProtobufSerializer(MetricEtwDataTransport.Instance, connectionStringBuilder, prepopulatedMetricDimensions);
28+
this.otlpProtobufSerializer = new OtlpProtobufSerializer(MetricWindowsEventTracingDataTransport.Instance, connectionStringBuilder, prepopulatedMetricDimensions);
2929
}
3030

3131
public ExportResult Export(in Batch<Metric> batch)

src/OpenTelemetry.Exporter.Geneva/Metrics/TlvMetricExporter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ internal TlvMetricExporter(ConnectionStringBuilder connectionStringBuilder, IRea
4343
}
4444

4545
var unixDomainSocketPath = connectionStringBuilder.ParseUnixDomainSocketPath();
46-
this.metricDataTransport = new MetricUnixDataTransport(unixDomainSocketPath);
46+
this.metricDataTransport = new MetricUnixDomainSocketDataTransport(unixDomainSocketPath);
4747
break;
4848
case TransportProtocol.Unspecified:
4949
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
5050
{
51-
this.metricDataTransport = MetricEtwDataTransport.Instance;
51+
this.metricDataTransport = MetricWindowsEventTracingDataTransport.Instance;
5252
break;
5353
}
5454
else
@@ -77,7 +77,7 @@ public void Dispose()
7777
{
7878
// The ETW data transport singleton on Windows should NOT be disposed.
7979
// On Linux, Unix Domain Socket is used and should be disposed.
80-
if (this.metricDataTransport != MetricEtwDataTransport.Instance)
80+
if (this.metricDataTransport != MetricWindowsEventTracingDataTransport.Instance)
8181
{
8282
this.metricDataTransport.Dispose();
8383
}

src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricUnixDataTransport.cs renamed to src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricUnixDomainSocketDataTransport.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
namespace OpenTelemetry.Exporter.Geneva;
77

8-
internal sealed class MetricUnixDataTransport : IMetricDataTransport
8+
internal sealed class MetricUnixDomainSocketDataTransport : IMetricDataTransport
99
{
1010
private readonly int fixedPayloadLength;
1111
private readonly UnixDomainSocketDataTransport udsDataTransport;
1212
private bool isDisposed;
1313

14-
public MetricUnixDataTransport(
14+
public MetricUnixDomainSocketDataTransport(
1515
string unixDomainSocketPath,
1616
int timeoutMilliseconds = UnixDomainSocketDataTransport.DefaultTimeoutMilliseconds)
1717
{

src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricEtwDataTransport.cs renamed to src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricWindowsEventTracingDataTransport.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
namespace OpenTelemetry.Exporter.Geneva;
1010

1111
[EventSource(Name = "OpenTelemetryGenevaMetricExporter", Guid = "{edc24920-e004-40f6-a8e1-0e6e48f39d84}")]
12-
internal sealed class MetricEtwDataTransport : EventSource, IMetricDataTransport
12+
internal sealed class MetricWindowsEventTracingDataTransport : EventSource, IMetricDataTransport
1313
{
1414
private const int OtlpProtobufMetricEventId = 81;
1515
private readonly int fixedPayloadEndIndex;
1616
private bool isDisposed;
1717

18-
private MetricEtwDataTransport()
18+
private MetricWindowsEventTracingDataTransport()
1919
{
2020
unsafe
2121
{
2222
this.fixedPayloadEndIndex = sizeof(BinaryHeader);
2323
}
2424
}
2525

26-
public static MetricEtwDataTransport Instance { get; private set; } = new();
26+
public static MetricWindowsEventTracingDataTransport Instance { get; private set; } = new();
2727

2828
[NonEvent]
2929
#if NET

test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ public void MultipleCallsOnWindowsReusesSingletonEtwDataTransport()
249249
{
250250
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
251251
{
252-
var singleton = MetricEtwDataTransport.Instance;
252+
var singleton = MetricWindowsEventTracingDataTransport.Instance;
253253
this.EmitMetrics("one");
254-
Assert.Equal(singleton, MetricEtwDataTransport.Instance);
254+
Assert.Equal(singleton, MetricWindowsEventTracingDataTransport.Instance);
255255
this.EmitMetrics("two");
256-
Assert.Equal(singleton, MetricEtwDataTransport.Instance);
256+
Assert.Equal(singleton, MetricWindowsEventTracingDataTransport.Instance);
257257
}
258258
}
259259

0 commit comments

Comments
 (0)