Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reference to error code in Jaeger logging #930

Merged
merged 5 commits into from
Aug 2, 2021
Merged

Fix reference to error code in Jaeger logging #930

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a38a0ea
Fix reference to error code in Jaeger logging
ThomsonTan Jul 30, 2021
8fda75b
Format comment
ThomsonTan Jul 30, 2021
01517a3
Add error log for unsupported winsock
ThomsonTan Jul 30, 2021
2cad1c0
Merge branch 'main' into FixLogging
lalitb Jul 31, 2021
bdf90a6
Merge branch 'main' into FixLogging
lalitb Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions exporters/jaeger/src/udp_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@ 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 */
/* requested. */

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;
Expand Down