From a38a0eaebdb1db540d4137b7c8194c06b41df20e Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 30 Jul 2021 13:38:50 -0700 Subject: [PATCH 1/3] Fix reference to error code in Jaeger logging --- exporters/jaeger/src/udp_transport.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/jaeger/src/udp_transport.cc b/exporters/jaeger/src/udp_transport.cc index 6ae41e7b9a..9cde937733 100644 --- a/exporters/jaeger/src/udp_transport.cc +++ b/exporters/jaeger/src/udp_transport.cc @@ -39,11 +39,11 @@ void UDPTransport::InitSocket() int err = WSAStartup(wVersionRequested, &wsaData); if (err != 0) { - OTEL_INTERNAL_LOG_ERROR("Jaeger Exporter: WSAStartup failed with error: " << error); + OTEL_INTERNAL_LOG_ERROR("Jaeger Exporter: WSAStartup failed with error: " << err); return; } - /* Confirm that the WinSock DLL supports 2.2.*/ + /* Confirm that the WinSock DLL supports 2.2. */ /* Note that if the DLL supports versions greater */ /* than 2.2 in addition to 2.2, it will still return */ /* 2.2 in wVersion since that is the version we */ From 8fda75bbc7bdf565025858dee0c6d78b0c5902a6 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 30 Jul 2021 13:52:22 -0700 Subject: [PATCH 2/3] Format comment --- exporters/jaeger/src/udp_transport.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/jaeger/src/udp_transport.cc b/exporters/jaeger/src/udp_transport.cc index 9cde937733..242f23c003 100644 --- a/exporters/jaeger/src/udp_transport.cc +++ b/exporters/jaeger/src/udp_transport.cc @@ -43,7 +43,7 @@ void UDPTransport::InitSocket() return; } - /* Confirm that the WinSock DLL supports 2.2. */ + /* Confirm that the WinSock DLL supports 2.2. */ /* Note that if the DLL supports versions greater */ /* than 2.2 in addition to 2.2, it will still return */ /* 2.2 in wVersion since that is the version we */ From 01517a3d3cc25811fb06abfda7383e1d985e7401 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 30 Jul 2021 14:01:41 -0700 Subject: [PATCH 3/3] Add error log for unsupported winsock --- exporters/jaeger/src/udp_transport.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/exporters/jaeger/src/udp_transport.cc b/exporters/jaeger/src/udp_transport.cc index 242f23c003..306a0e97fc 100644 --- a/exporters/jaeger/src/udp_transport.cc +++ b/exporters/jaeger/src/udp_transport.cc @@ -51,7 +51,9 @@ void UDPTransport::InitSocket() if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { - // TODO: handle error that WinSock 2.2 is not supported. + OTEL_INTERNAL_LOG_ERROR("Jaeger Exporter: winsock " << LOBYTE(wsaData.wVersion) << "." + << HIBYTE(wsaData.wVersion) + << " is not supported."); WSACleanup(); return;