Use Hunter cache repo

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

Author: Isaac Hier

.travis.yml

@@ -1,34 +1,38 @@
 language: cpp
 sudo: true
 dist: trusty
-
 matrix:
   include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-            - lcov
-      env:
-        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
-
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-6
+        - lcov
+    env:
+    - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
 branches:
   only:
-    - master
-
+  - master
 before_install:
-  - eval "${MATRIX_EVAL}"
-
+- eval "${MATRIX_EVAL}"
 script:
-  - ./scripts/build.sh
-
+- ./scripts/build.sh
 after_success:
-  - for f in $(find build -name '*.gcno'); do gcov-6 $f; done
-  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
-
+- for f in $(find build -name '*.gcno'); do gcov-6 $f; done
+- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage
+  reports"
+after_script: |
+  # Hunter: upload cache to the cache server.
+  # Copied from [cpp-ethereum](https://github.com/ethereum/cpp-ethereum/blob/develop/.travis.yml).
+  if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" ]]; then
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo pip install --upgrade requests pyopenssl; fi
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install requests; fi
+    make -C $TRAVIS_BUILD_DIR/build hunter_upload_cache
+  fi
 env:
   global:
-    - LANG="en_US.UTF-8"
+  - LANG="en_US.UTF-8"
+  - secure: 1Pz1mI4PZdzFf2M33snYoaYu/gWxRGK22rw5h9DYtAMFyrqcTKJOI0WnXsIHxjZ5obqVLL/MaNTnO6PbO+sKGEueqNibZhYfjUbZtAV94/uXNkc6Qn6lNALJykqAueGXIkf04CLGpQaJoS8OebFdZODZMJzad58BpckJlF9O/v2OXNx244/bl4Eu61qvbLa/IgRUnLRwGUiHY4CN7Q8+6kNn2cu0nNb2bc+S01jB9PjC+lrkP39ant9f1fY3qWkN3blhLH7OsMaQ9tgs0c/fwCRpyNl95LYodL3Zzi/F61G0PPJL/B2jCGYwFPMsjIj+O6PwF+8k9iAnmA/hUdIQ7+a2l+/Pe9HrPstJD4V99Q922INBYLvgIkvCh7HIV9NDfJ3Ok8tA9PvvGXJ4y12aWvP6QYEfdDFcX6Yrc3NraVMMsz+UhkznHiLdTrj5UwFlmro4a0iRzKeEAOfBmb/pgeD8eESR2IGaZiFsGcLQ0RHFb477fiMJzCstLm/gfhlO6pOvbTMKItEswqePoJI9g0AxQT2Ib8F58Hp91G3U7kbtubZGIT4OZAv6ePj0WnL4FojFWM8TirmPkbVeKwBggxuI85BQO2XE8HhdJPZSz+vzUPPHZbspPdqMaEbk5WgnHv10TmL83VKof48sA4GxfDuXm+NlTan4sWgdPNKpSow=

CMakeLists.txt

@@ -2,17 +2,44 @@ cmake_minimum_required(VERSION 3.1)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/cmake/toolchain.cmake")
+
+set(HUNTER_CACHE_SERVERS "https://github.com/isaachier/cpp-client-hunter-cache")
+
 include(HunterGate)
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.19.129.tar.gz"
-    SHA1 "3e190ff47df41cc16d32c479b9617309e01405bf"
+    URL "https://github.com/ruslo/hunter/archive/v0.19.136.tar.gz"
+    SHA1 "00e8ee66494a66cc2d4df0410ab3dd3948892a7a"
     LOCAL
 )
 
-project(jaegertracing VERSION 0.0.1)
+# Copied from [cpp-ethereum](https://github.com/ethereum/cpp-ethereum/blob/develop/CMakeLists.txt)
+# to upload packages to Hunter cache
+if(HUNTER_ENABLED)
+    find_package(PythonInterp QUIET)
+    if(PYTHONINTERP_FOUND)
+        hunter_gate_self(
+            "${HUNTER_CACHED_ROOT}"
+            "${HUNTER_VERSION}"
+            "${HUNTER_SHA1}"
+            hunter_dir
+        )
+        set(hunter_upload_script "${hunter_dir}/maintenance/upload-cache-to-github.py")
+        set(hunter_cache_dir "${HUNTER_GATE_ROOT}/_Base/Cache")
+        set(hunter_tmp_dir "${HUNTER_GATE_ROOT}/tmp")
+        add_custom_target(
+            hunter_upload_cache
+            ${PYTHON_EXECUTABLE} ${hunter_upload_script}
+            --username isaachier
+            --repo-owner isaachier
+            --repo cpp-client-hunter-cache
+            --cache-dir ${hunter_cache_dir}
+            --temp-dir ${hunter_tmp_dir}
+        )
+    endif()
+endif()
 
-set(CMAKE_CXX_STANDARD_REQUIRED true)
-set(CMAKE_CXX_STANDARD 11)
+project(jaegertracing VERSION 0.0.1)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
    CMAKE_CXX_COMPILER_ID MATCHES "Clang")

cmake/toolchain.cmake

@@ -0,0 +1,4 @@
+set(CMAKE_CXX_STANDARD_REQUIRED true)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)

src/jaegertracing/samplers/SamplerTest.cpp

@@ -28,6 +28,7 @@
 #include "jaegertracing/samplers/RemotelyControlledSampler.h"
 #include "jaegertracing/samplers/Sampler.h"
 #include "jaegertracing/samplers/SamplingStatus.h"
+#include "jaegertracing/testutils/MockAgent.h"
 #include "jaegertracing/testutils/TUDPTransport.h"
 
 namespace jaegertracing {
@@ -285,5 +286,33 @@ TEST(Sampler, testAdaptiveSamplerUpdate)
     sampler.update(newStrategies);
 }
 
+TEST(Sampler, testRemotelyControlledSampler)
+{
+    const auto mockAgent = testutils::MockAgent::make();
+    mockAgent->start();
+    const auto logger = logging::nullLogger();
+    const auto metrics = metrics::Metrics::makeNullMetrics();
+    RemotelyControlledSampler sampler(
+        "test-service",
+        "http://" + mockAgent->samplingServerAddr().authority(),
+        std::make_shared<ProbabilisticSampler>(
+            kTestDefaultSamplingProbability),
+        kTestDefaultMaxOperations,
+        std::chrono::milliseconds(100),
+        *logger,
+        *metrics);
+    std::random_device device;
+    std::mt19937_64 rng;
+    rng.seed(device());
+    for (auto startTime = RemotelyControlledSampler::Clock::now();
+         std::chrono::duration_cast<std::chrono::seconds>(
+            RemotelyControlledSampler::Clock::now() - startTime).count() < 1;) {
+        TraceID traceID(rng(), rng());
+        sampler.isSampled(traceID, kTestOperationName);
+        std::this_thread::sleep_for(std::chrono::milliseconds(20));
+    }
+    sampler.close();
+}
+
 }  // namespace samplers
 }  // namespace jaegertracing