Fix flush in RemoteReporter

Signed-off-by: Isaac Hier <ihier@uber.com>

Author: Isaac Hier

examples/hotrod/HTTPServer.cpp

@@ -73,22 +73,28 @@ void HTTPServer::start()
         }
 
         std::istringstream iss(requestStr);
-        const auto request = net::http::Request::parse(iss);
-        auto itr =
-            std::find_if(std::begin(_handlers),
-                         std::end(_handlers),
-                         [&request](const HandlerVec::value_type& pair) {
-                             return std::regex_search(request.target(),
-                                                      pair.first);
-                         });
-
-        Handler handler = ((itr == std::end(_handlers)) ? defaultHandler
-                                                        : itr->second);
-
-        std::packaged_task<void(net::Socket&&, const net::http::Request&)> task(
-            handler);
-        _tasks.push_back(task.get_future());
-        task(std::move(clientSocket), request);
+        try {
+            const auto request = net::http::Request::parse(iss);
+            auto itr =
+                std::find_if(std::begin(_handlers),
+                             std::end(_handlers),
+                             [&request](const HandlerVec::value_type& pair) {
+                                 return std::regex_search(request.target(),
+                                                          pair.first);
+                             });
+
+            Handler handler = ((itr == std::end(_handlers)) ? defaultHandler
+                                                            : itr->second);
+
+            std::packaged_task<void(net::Socket&&,
+                                    const net::http::Request&)> task(
+                handler);
+            _tasks.push_back(task.get_future());
+            task(std::move(clientSocket), request);
+        } catch (...) {
+            auto logger = logging::consoleLogger();
+            utils::ErrorUtil::logError(*logger, "Error parsing request");
+        }
 
         _tasks.erase(
             std::remove_if(std::begin(_tasks),

src/jaegertracing/baggage/RemoteRestrictionManager.cpp

@@ -106,7 +106,7 @@ void RemoteRestrictionManager::poll() noexcept
             }
         }
 
-        if ((Clock::now() - lastUpdateTime) > _refreshInterval) {
+        if ((Clock::now() - lastUpdateTime) >= _refreshInterval) {
             updateRestrictions(remoteURI);
             lastUpdateTime = Clock::now();
         }

src/jaegertracing/reporters/RemoteReporter.cpp

@@ -76,8 +76,8 @@ void RemoteReporter::sweepQueue()
 {
     while (true) {
         std::unique_lock<std::mutex> lock(_mutex);
-        _cv.wait(lock, [this]() {
-            return !_running || !_queue.empty() || bufferFlushIntervalExpired();
+        _cv.wait_until(lock, _lastFlush + _bufferFlushInterval, [this]() {
+            return !_running || !_queue.empty();
         });
 
         if (!_running && _queue.empty()) {