Update ci and fix bugs

Author: zurex

.github/workflows/statsd.yml

@@ -16,33 +16,31 @@ jobs:
     name: CMake on Linux
     runs-on: ubuntu-latest
     steps:
-      - name: checkout otel contrib statsd
+      - name: checkout opentelemetry-cpp-contrib
         uses: actions/checkout@v3
         with:
-          path: "otel_cpp_contrib"
-      - name: checkout otel cpp
+          path: opentelemetry-cpp-contrib
+          submodules: "recursive"
+      - name: checkout opentelemetry-cpp
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
           ref: "v1.20.0"
-          path: "otel_cpp"
+          path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup
         run: |
           sudo apt update -y 
-          sudo apt install -y --no-install-recommends --no-install-suggests build-essential\
+          sudo apt install -y --no-install-recommends --no-install-suggest \
+            build-essential \
+            cmake \
+            ninja-build \
             ca-certificates wget git valgrind lcov
       - name: run tests
         run: |
-          sudo $GITHUB_WORKSPACE/otel_cpp/ci/setup_googletest.sh
-          mkdir -p "$GITHUB_WORKSPACE/otel_cpp/build"
-          cd "$GITHUB_WORKSPACE/otel_cpp/build"
-          cmake .. -DOPENTELEMETRY_INSTALL=ON
-          cmake --build . -j$(nproc)
-          cmake --install . --prefix "$HOME/prebuilt-otel"
-          mkdir -p "$GITHUB_WORKSPACE/otel_cpp_contrib/exporters/statsd/build"
-          cd "$GITHUB_WORKSPACE/otel_cpp_contrib/exporters/statsd/build"
-          cmake .. "-DCMAKE_PREFIX_PATH=$HOME/prebuilt-otel" \
-            -DBUILD_TESTING=ON -DWITH_EXAMPLES=ON
+          sudo $GITHUB_WORKSPACE/opentelemetry-cpp/ci/setup_googletest.sh
+          mkdir -p "$GITHUB_WORKSPACE/opentelemetry-cpp/build"
+          cd "$GITHUB_WORKSPACE/opentelemetry-cpp/build"
+          cmake .. -G Ninja -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH=$GITHUB_WORKSPACE/opentelemetry-cpp-contrib/exporters/statsd 
           cmake --build . -j$(nproc)
-          ctest
+          ctest -j1 --output-on-failure

exporters/statsd/include/opentelemetry/exporters/statsd/metrics/exporter.h

@@ -5,16 +5,16 @@
 
 #include "opentelemetry/common/spin_lock_mutex.h"
 #include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/geneva/metrics/connection_string_parser.h"
-#include "opentelemetry/exporters/geneva/metrics/data_transport.h"
-#include "opentelemetry/exporters/geneva/metrics/exporter_options.h"
+#include "opentelemetry/exporters/statsd/metrics/connection_string_parser.h"
+#include "opentelemetry/exporters/statsd/metrics/data_transport.h"
+#include "opentelemetry/exporters/statsd/metrics/exporter_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/sdk/metrics/data/metric_data.h"
 
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter {
-namespace geneva {
+namespace statsd {
 namespace metrics {
 
 constexpr size_t kBufferSize = 65360; // the maximum ETW payload (inclusive)
@@ -121,7 +121,7 @@ static std::string AttributeValueToString(
   } else if (nostd::holds_alternative<std::string>(value)) {
     result = nostd::get<std::string>(value);
   } else {
-    LOG_WARN("[Geneva Metrics Exporter] AttributeValueToString - "
+    LOG_WARN("[Statsd Metrics Exporter] AttributeValueToString - "
              " Nested attributes not supported - ignored");
   }
   return result;
@@ -133,6 +133,6 @@ static uint64_t UnixTimeToWindowsTicks(uint64_t unix_epoch_secs) {
 }
 
 } // namespace metrics
-} // namespace geneva
+} // namespace statsd
 } // namespace exporter
 OPENTELEMETRY_END_NAMESPACE

exporters/statsd/include/opentelemetry/exporters/statsd/metrics/macros.h

@@ -0,0 +1,64 @@
+// Copyright 2021, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
+
+#include <mutex>
+
+#ifndef TOKENPASTE
+#define TOKENPASTE(x, y) x##y
+#endif
+
+#ifndef TOKENPASTE2
+#define TOKENPASTE2(x, y) TOKENPASTE(x, y)
+#endif
+
+#ifndef LOCKGUARD
+#define LOCKGUARD(macro_mutex)                                                 \
+  std::lock_guard<decltype(macro_mutex)> TOKENPASTE2(__guard_,                 \
+                                                     __LINE__)(macro_mutex)
+#endif
+
+#if defined(HAVE_CONSOLE_LOG) && !defined(LOG_DEBUG)
+// Log to console if there's no standard log facility defined
+#include <cstdio>
+#ifndef LOG_DEBUG
+#define LOG_DEBUG(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
+#define LOG_TRACE(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
+#define LOG_INFO(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
+#define LOG_WARN(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
+#define LOG_ERROR(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
+#endif
+#endif
+
+#ifndef LOG_DEBUG
+// Don't log anything if there's no standard log facility defined
+#define LOG_DEBUG(fmt_, ...)
+#define LOG_TRACE(fmt_, ...)
+#define LOG_INFO(fmt_, ...)
+#define LOG_WARN(fmt_, ...)
+#define LOG_ERROR(fmt_, ...)
+#endif
+
+// Annex K macros
+#if !defined(_MSC_VER)
+#ifndef strncpy_s
+#define strncpy_s(dest, destsz, src, count)                                    \
+  strncpy(dest, src, (destsz <= count) ? destsz : count)
+#endif
+#endif
+
+// SAL macro
+#ifndef _Out_cap_
+#define _Out_cap_(size)
+#endif

exporters/statsd/include/opentelemetry/exporters/statsd/metrics/socket_tools.h

@@ -109,7 +109,7 @@ typedef u_short sa_family_t;
 #endif
 #endif
 
-#include "opentelemetry/exporters/geneva/metrics/macros.h"
+#include "opentelemetry/exporters/statsd/metrics/macros.h"
 
 namespace net {