tests

open-telemetry · Aug 16, 2022 · 34c7f9d · 34c7f9d
1 parent be21431
commit 34c7f9d
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 100 deletions.
diff --git a/GrpcGreeter/GrpcGreeter.csproj b/GrpcGreeter/GrpcGreeter.csproj
diff --git a/GrpcGreeter/Program.cs b/GrpcGreeter/Program.cs
diff --git a/GrpcGreeter/Protos/greet.proto b/GrpcGreeter/Protos/greet.proto
diff --git a/GrpcGreeter/Services/GreeterService.cs b/GrpcGreeter/Services/GreeterService.cs
diff --git a/GrpcGreeter/appsettings.Development.json b/GrpcGreeter/appsettings.Development.json
diff --git a/GrpcGreeter/appsettings.json b/GrpcGreeter/appsettings.json
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs
@@ -39,9 +39,9 @@ public static GrpcChannel CreateChannel(this OtlpExporterOptions options)
                 options.Endpoint,
                 new GrpcChannelOptions
                 {
-                    // https://docs.microsoft.com/en-us/aspnet/core/grpc/netstandard?view=aspnetcore-6.0
-                    //https://docs.microsoft.com/en-us/aspnet/core/grpc/netstandard?view=aspnetcore-6.0#net-framework
-                    HttpHandler = new WinHttpHandler(),
+#if NET462_OR_GREATER
+                    HttpHandler = new WinHttpHandler(),
+#endif
                     HttpClient = options.HttpClientFactory?.Invoke() ?? throw new InvalidOperationException("OtlpExporterOptions was missing HttpClientFactory or it returned null."),
                     DisposeHttpClient = true,
                 });

diff --git a/.../OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterOptionsExtensionsTests.cs b/.../OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterOptionsExtensionsTests.cs
@@ -87,7 +87,7 @@ public void GetHeaders_NoOptionHeaders_ReturnsEmptyHeaders(string optionHeaders)
 
         [Theory]
         [InlineData(OtlpExportProtocol.Grpc, typeof(OtlpGrpcTraceExportClient))]
-        //[InlineData(OtlpExportProtocol.HttpProtobuf, typeof(OtlpHttpTraceExportClient))]
+        [InlineData(OtlpExportProtocol.HttpProtobuf, typeof(OtlpHttpTraceExportClient))]
         public void GetTraceExportClient_SupportedProtocol_ReturnsCorrectExportClient(OtlpExportProtocol protocol, Type expectedExportClientType)
         {
             if (protocol == OtlpExportProtocol.Grpc && Environment.Version.Major == 3)