diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d17ae2ca2..99f6ec22c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,23 +41,19 @@ jobs: # ./ci/do_ci.sh cmake.exporter.otprotocol.test cmake_test: - name: CMake test (without otlp-exporter) - runs-on: ubuntu-latest + name: CMake test (prometheus, elasticsearch, zipkin) + runs-on: ubuntu-22.04 + env: + CXX_STANDARD: '17' steps: - uses: actions/checkout@v4 with: submodules: 'recursive' - name: setup - env: - CC: /usr/bin/gcc-12 - CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - - name: run cmake tests (without otlp-exporter) - env: - CC: /usr/bin/gcc-12 - CXX: /usr/bin/g++-12 + - name: run cmake tests run: | ./ci/do_ci.sh cmake.test diff --git a/exporters/elasticsearch/src/es_log_recordable.cc b/exporters/elasticsearch/src/es_log_recordable.cc index 7376a9c78a..1b6fe3f0e3 100644 --- a/exporters/elasticsearch/src/es_log_recordable.cc +++ b/exporters/elasticsearch/src/es_log_recordable.cc @@ -34,6 +34,16 @@ struct json_assign_visitor { *j_ = u; } + + template + void operator()(const opentelemetry::nostd::span &span) + { + *j_ = nlohmann::json::array(); + for (const auto &elem : span) + { + j_->push_back(elem); + } + } }; template <>