[WIP] Ability to use Standard Library as a substitute for nostd:: classes

.github/workflows/build-mac.yml

@@ -0,0 +1,37 @@
+name: C/C++ CI on Mac OS X
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+    - master
+    - build/*
+  pull_request:
+    branches:
+    - master
+    - build/*
+  schedule:
+  - cron: 0 2 * * 1-5
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    name: Build on ${{ matrix.os }} ${{ matrix.config }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        config: [release]
+        os: [macos-latest]
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+
+    - name: Build
+      run: tools/build.sh ${{ matrix.config }}
+
+    - name: Test
+      run: ./tools/run-tests-all.sh

.github/workflows/build-ubuntu.yml

@@ -0,0 +1,37 @@
+name: C/C++ CI on Ubuntu
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+    - master
+    - build/*
+  pull_request:
+    branches:
+    - master
+    - build/*
+  schedule:
+  - cron: 0 2 * * 1-5
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    name: Build on ${{ matrix.os }} ${{ matrix.config }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        config: [release]
+        os: [ubuntu-18.04, ubuntu-20.04]
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+
+    - name: Build
+      run: tools/build.sh ${{ matrix.config }}
+
+    - name: Test
+      run: ./tools/run-tests-all.sh

.github/workflows/build-windows-2016.yml

@@ -0,0 +1,47 @@
+name: C/C++ CI on Windows 2016 (vs2017)
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+    - master
+    - build/*
+  pull_request:
+    branches:
+    - master
+    - build/*
+  schedule:
+  - cron: 0 2 * * 1-5
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    name: Build on Windows ${{ matrix.arch }}-${{ matrix.config }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        arch: [x64]
+        config: [release]
+        os: [windows-2016]
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+
+    - name: Setup build tools
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\setup-buildtools.cmd
+
+    - name: Build
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\build-vs2017-x64.cmd ${{ matrix.config }}
+
+    - name: Test
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\run-tests-all.cmd

.github/workflows/build-windows-2019.yml

@@ -0,0 +1,47 @@
+name: C/C++ CI on Windows 2019 (vs2019)
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+    - master
+    - build/*
+  pull_request:
+    branches:
+    - master
+    - build/*
+  schedule:
+  - cron: 0 2 * * 1-5
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    name: Build on Windows ${{ matrix.arch }}-${{ matrix.config }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        arch: [x64]
+        config: [release]
+        os: [windows-2019]
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+
+    - name: Setup build tools
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\setup-buildtools.cmd
+
+    - name: Build
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\build-vs2019-x64.cmd ${{ matrix.config }}
+
+    - name: Test
+      run: |
+        cd "$Env:GITHUB_WORKSPACE"
+        .\tools\run-tests-all.cmd

.gitignore

@@ -34,3 +34,11 @@
 
 # Bazel files
 /bazel-*
+
+# Output directories
+/out
+/out.*
+# Indicator that the tools were deployed
+.buildtools
+# Tools module
+/tools/vcpkg

.gitmodules

@@ -1,3 +1,22 @@
 [submodule "third_party/prometheus-cpp"]
 	path = third_party/prometheus-cpp
 	url = https://github.com/jupp0r/prometheus-cpp.git
+
+[submodule "tools/vcpkg"]
+	path = tools/vcpkg
+	url = https://github.com/Microsoft/vcpkg
+	branch = master
+
+[submodule "third_party/ms-gsl"]
+	path = "third_party/ms-gsl"
+	url = https://github.com/microsoft/GSL
+	branch = master
+
+[submodule "third_party/googletest"]
+	path = third_party/googletest
+	url = https://github.com/google/googletest
+        branch = master
+
+[submodule "third_party/benchmark"]
+	path = third_party/benchmark
+	url = https://github.com/google/benchmark

CMakeLists.txt

@@ -10,6 +10,36 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 11)
 endif()
 
+option(WITH_STL "Whether to use Standard Library for C++latest features" OFF)
+
+option(WITH_ABSEIL "Whether to use Abseil for C++latest features" OFF)
+
+if(WITH_ABSEIL)
+  add_definitions(-DHAVE_ABSEIL)
+  find_package(absl CONFIG REQUIRED)
+  set(CORE_RUNTIME_LIBS absl::any absl::base absl::bits absl::city)
+  # target_link_libraries(main PRIVATE absl::any absl::base absl::bits
+  # absl::city)
+endif()
+
+if(WITH_STL)
+  # We require at least C++17. C++20 is optimal to avoid gsl::span
+  add_definitions(-DHAVE_CPP_STDLIB -DHAVE_GSL)
+  # We ask for 20, but we may get C++17
+  set(CMAKE_CXX_STANDARD 20)
+  # Guidelines Support Library path
+  set(GSL_DIR third_party/ms-gsl)
+  include_directories(${GSL_DIR}/include)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS_SPEED "/O2")
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} /Zc:__cplusplus ${CMAKE_CXX_FLAGS_SPEED}")
+  endif()
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2a")
+  endif()
+endif()
+
 option(WITH_OTPROTOCOL
        "Whether to include the OpenTelemetry Protocol in the SDK" OFF)
 

api/CMakeLists.txt

@@ -12,3 +12,9 @@ install(
 if(BUILD_TESTING)
   add_subdirectory(test)
 endif()
+
+if(WITH_STL)
+  message("Building with standard library types...")
+else()
+  message("Building with nostd types...")
+endif()

api/include/opentelemetry/common/attribute_value.h

@@ -11,16 +11,20 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 namespace common
 {
 using AttributeValue = nostd::variant<bool,
-                                      int,
+                                      int32_t,
                                       int64_t,
-                                      unsigned int,
+                                      uint32_t,
                                       uint64_t,
                                       double,
                                       nostd::string_view,
+                                      const char *,
+#ifdef HAVE_SPAN_BYTE
+                                      nostd::span<const uint8_t>,  // TODO: not part of OT spec yet
+#endif
                                       nostd::span<const bool>,
-                                      nostd::span<const int>,
+                                      nostd::span<const int32_t>,
                                       nostd::span<const int64_t>,
-                                      nostd::span<const unsigned int>,
+                                      nostd::span<const uint32_t>,
                                       nostd::span<const uint64_t>,
                                       nostd::span<const double>,
                                       nostd::span<const nostd::string_view>>;
@@ -35,7 +39,9 @@ enum AttributeType
   TYPE_DOUBLE,
   TYPE_STRING,
   TYPE_CSTRING,
-  // TYPE_SPAN_BYTE, // TODO: not part of OT spec yet
+#if HAVE_SPAN_BYTE
+  TYPE_SPAN_BYTE,  // TODO: not part of OT spec yet
+#endif
   TYPE_SPAN_BOOL,
   TYPE_SPAN_INT,
   TYPE_SPAN_INT64,

api/include/opentelemetry/context/context.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstring>
 #include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
@@ -65,7 +66,7 @@ class Context
     {
       if (key.size() == data->key_length_)
       {
-        if (memcmp(key.data(), data->key_, data->key_length_) == 0)
+        if (std::memcmp(key.data(), data->key_, data->key_length_) == 0)
         {
           return data->value_;
         }
@@ -81,7 +82,7 @@ class Context
     {
       if (key.size() == data->key_length_)
       {
-        if (memcmp(key.data(), data->key_, data->key_length_) == 0)
+        if (std::memcmp(key.data(), data->key_, data->key_length_) == 0)
         {
           return true;
         }

api/include/opentelemetry/context/iruntime_context.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include "opentelemetry/context/context.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace context
+{
+
+// The Token object provides is returned when attaching objects to the
+// RuntimeContext object and is associated with a context object, and
+// can be provided to the RuntimeContext Detach method to remove the
+// associated context from the RuntimeContext.
+class Token
+{
+public:
+  bool operator==(const Context &other) noexcept { return context_ == other; }
+
+  // The ContextDetacher object automatically attempts to detach
+  // the Token when all copies of the Token are out of scope.
+  class ContextDetacher
+  {
+  public:
+    ContextDetacher(Context context) : context_(context) {}
+
+    ~ContextDetacher();
+
+  private:
+    Context context_;
+  };
+
+  Token() noexcept = default;
+
+  // A constructor that sets the token's Context object to the
+  // one that was passed in.
+  Token(Context context)
+  {
+    context_ = context;
+
+    detacher_ = nostd::shared_ptr<ContextDetacher>(new ContextDetacher(context_));
+  };
+
+  Context context_;
+
+  nostd::shared_ptr<ContextDetacher> detacher_;
+};
+
+class IRuntimeContext
+{
+public:
+  // Provides a token with the passed in context
+  Token CreateToken(Context context) noexcept { return Token(context); };
+
+  virtual Context InternalGetCurrent() noexcept = 0;
+
+  virtual Token InternalAttach(Context context) noexcept = 0;
+
+  virtual bool InternalDetach(Token &token) noexcept = 0;
+};
+
+}  // namespace context
+OPENTELEMETRY_END_NAMESPACE