Fix host IP formatting and improve local IP API (#4)

jaegertracing · Nov 14, 2017 · f325ae1 · f325ae1
1 parent dd369e2
commit f325ae1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ if(HUNTER_ENABLED)
   endif()
 endif()
 
-project(jaegertracing VERSION 0.0.5)
+project(jaegertracing VERSION 0.0.7)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
     CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/src/jaegertracing/Tracer.h b/src/jaegertracing/Tracer.h
@@ -194,7 +194,7 @@ class Tracer : public opentracing::Tracer,
            const std::shared_ptr<logging::Logger>& logger,
            const std::shared_ptr<metrics::Metrics>& metrics)
         : _serviceName(serviceName)
-        , _hostIPv4(net::IPAddress::host(AF_INET))
+        , _hostIPv4(net::IPAddress::localIP(AF_INET))
         , _sampler(sampler)
         , _reporter(reporter)
         , _metrics(metrics)
@@ -219,9 +219,7 @@ class Tracer : public opentracing::Tracer,
             _logger->error("Unable to determine this host's IP address");
         }
         else {
-            std::ostringstream oss;
-            oss << _hostIPv4;
-            _tags.push_back(Tag(kTracerIPTagKey, oss.str()));
+            _tags.push_back(Tag(kTracerIPTagKey, _hostIPv4.host()));
         }
 
         std::random_device device;

diff --git a/src/jaegertracing/TracerTest.cpp b/src/jaegertracing/TracerTest.cpp
@@ -115,6 +115,16 @@ TEST(Tracer, testTracer)
     options.references.emplace_back(opentracing::SpanReferenceType::ChildOfRef,
                                     &debugCtx);
 
+    const auto& tags = tracer->tags();
+    auto itr = std::find_if(
+        std::begin(tags),
+        std::end(tags),
+        [](const Tag& tag) { return tag.key() == kTracerIPTagKey; });
+    ASSERT_NE(std::end(tags), itr);
+    ASSERT_TRUE(itr->value().is<std::string>());
+    ASSERT_EQ(net::IPAddress::v4(itr->value().get<std::string>()).host(),
+              net::IPAddress::localIP(AF_INET).host());
+
     std::unique_ptr<Span> span(static_cast<Span*>(
         tracer->StartSpanWithOptions("test-operation", options).release()));
     ASSERT_TRUE(static_cast<bool>(span));

diff --git a/src/jaegertracing/net/IPAddress.cpp b/src/jaegertracing/net/IPAddress.cpp
@@ -34,14 +34,14 @@ struct IfAddrDeleter : public std::function<void(ifaddrs*)> {
 
 }  // anonymous namespace
 
-IPAddress IPAddress::host(int family)
+IPAddress IPAddress::localIP(int family)
 {
-    return host([family](const ifaddrs* ifAddr) {
+    return localIP([family](const ifaddrs* ifAddr) {
         return ifAddr->ifa_addr->sa_family == family;
     });
 }
 
-IPAddress IPAddress::host(std::function<bool(const ifaddrs*)> filter)
+IPAddress IPAddress::localIP(std::function<bool(const ifaddrs*)> filter)
 {
     auto* ifAddrRawPtr = static_cast<ifaddrs*>(nullptr);
     getifaddrs(&ifAddrRawPtr);

diff --git a/src/jaegertracing/net/IPAddress.h b/src/jaegertracing/net/IPAddress.h
@@ -64,9 +64,9 @@ class IPAddress {
         return versionFromString(ip, port, AF_INET6);
     }
 
-    static IPAddress host(int family);
+    static IPAddress localIP(int family);
 
-    static IPAddress host(std::function<bool(const ifaddrs*)> filter);
+    static IPAddress localIP(std::function<bool(const ifaddrs*)> filter);
 
     IPAddress()
         : _addr()