Merge pull request #3 from voiceip/windows_support

New Features: Windows support + Tags + TCP Support

.gitignore

@@ -8,3 +8,7 @@ build
 .vagrant
 Vagrantfile
 include/version.hpp
+Debug/
+Release/
+.vscode/
+build*

.travis.yml

@@ -1,25 +1,50 @@
 language: cpp
-compiler:
-    - clang
-    - gcc
-before_install:
-    - sudo apt-get -qq install python-software-properties
-    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    - sudo apt-get -qq update
-    - sudo apt-get -qq install gcc-4.8 g++-4.8
-    - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
-    - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
-    - sudo apt-get -qq install valgrind
-    - sudo apt-get -qq install cppcheck
-    - $CXX --version
 env:
     - STATSD_COMPILE_MODE=Debug
-    - STATSD_COMPILE_MODE=Release
-script: make test STATSD_COMPILE_MODE=$STATSD_COMPILE_MODE
-after_script: make lint
-os:
-    - linux
-    - osx
+    # - STATSD_COMPILE_MODE=Release
+branches:
+  only: 
+    - master
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-6
+      - g++-6
+      - cmake
+#      - valgrind
+      - cppcheck
+      - build-essential
+before_install:
+- |-
+    case $TRAVIS_OS_NAME in
+      windows)
+        choco install visualstudio2019buildtools --package-parameters "--includeRecommended --includeOptional"
+        choco install make cmake cppcheck tree visualstudio2017-workload-vctools mingw
+        ;;
+      linux)
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 50
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 50
+        ;;
+    esac
 matrix:
-    allow_failures:
-        - os: osx
+  include:
+    - os: linux
+      dist: trusty
+      script: make test STATSD_COMPILE_MODE=$STATSD_COMPILE_MODE
+      after_script: make lint
+    - os: osx
+      osx_image: xcode10
+      script: make test STATSD_COMPILE_MODE=$STATSD_COMPILE_MODE
+      after_script: make lint
+    - os: windows
+      compiler: msvc19
+      script: 
+        - mkdir build && cd build
+        - cmake -DCMAKE_BUILD_TYPE=$STATSD_COMPILE_MODE  ..
+        - cmake --build .
+        - tree
+        - ./bin/$STATSD_COMPILE_MODE/statsd-test.exe
+  allow_failures:
+        - os: windows

CMakeLists.txt

@@ -43,7 +43,12 @@ add_executable(
     test/statsd.cpp
 )
 
-target_link_libraries(statsd-test statsd pthread)
+IF (WIN32)
+  target_link_libraries(statsd-test statsd_static Ws2_32)
+ELSE()
+  target_link_libraries(statsd-test statsd pthread)
+ENDIF()
+
 
 enable_testing()
 

README.md

@@ -1,7 +1,9 @@
 StatsD client cpp [![Build Status](https://travis-ci.org/euskadi31/statsd-cpp.png)](https://travis-ci.org/euskadi31/statsd-cpp)
 =================
 
-A cpp client for the Etsy StatsD server.
+A cpp client for the StatsD server.
+
+Supported on MacOS, Unix, Windows
 
 Install
 -------

include/statsd.hpp

@@ -9,27 +9,31 @@
 #pragma once
 
 #include <string>
-#include <netinet/in.h>
-
-#ifdef DEBUG
+#include <random>
 # include <iostream>
-# define statsd_error(message) \
-    std::cerr << "StatsD: " << message << std::endl;
+
+#ifdef _WIN32
+#include <Winsock2.h>
 #else
-# define statsd_error(message)
+#include <netinet/in.h>
 #endif
 
+# define statsd_error(message) \
+	std::cerr << "StatsD: " << message << std::endl;
+
 class statsd
 {
 public:
 
     /**
-     * Open udp socket
+     * Open udp/tcp socket
      *
      * @param host The host of StatsD server
-     * @param port The port of StatsD server
-     */
-    static void open(const std::string& host, int16_t port = 8125);
+	 * @param port The port of StatsD server
+	 * @param mode SOCK_DGRAM/SOCK_STREAM for UDP/TCP
+	 * return int  0 for success.
+	 */
+    static int open(const std::string& host, int16_t port = 8125, int mode = SOCK_DGRAM);
 
     /**
      * Log timing information
@@ -83,6 +87,21 @@ class statsd
      */
     static void set(const std::string& key, const int64_t value, const float sample_rate = 1.0);
 
+
+    /**
+    * setPrefix
+    * 
+    * @param prefix         The prefix to prepend
+    */
+    static void setPrefix(const std::string& _prefix);
+
+    /**
+     * setGlobalTags
+     * 
+     * @param global_tags   The global tags
+     */
+    static void setGlobalTags(std::vector<std::string> global_tags);
+
     /**
      * Close socket
      */
@@ -108,6 +127,7 @@ class statsd
     static std::string prepare(
         const std::string& key,
         const int64_t value,
+        const std::vector<std::string> tags,
         const float sample_rate,
         const std::string& unit
     );
@@ -125,9 +145,12 @@ class statsd
     {
         struct sockaddr_in server = {};
         int sock = -1;
+	    int type = SOCK_DGRAM;
     };
 
     static statsd_t info;
+    static std::string prefix;
+    static std::string global_tags_str;
 
     /**
      * Send