Merge pull request #217 from open-telemetry/main

merged from upstream

Author: malkia

.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
 

CHANGELOG.md

@@ -15,6 +15,9 @@ Increment the:
 
 ## [Unreleased]
 
+* [BUILD] Fix misssing exported definition for OTLP file exporter and forceflush
+  [#3319](https://github.com/open-telemetry/opentelemetry-cpp/pull/3319)
+
 * [SDK] Add tracer scope configurator
   [#3137](https://github.com/open-telemetry/opentelemetry-cpp/pull/3137)
 

exporters/elasticsearch/src/es_log_recordable.cc

@@ -34,6 +34,16 @@ struct json_assign_visitor
   {
     *j_ = u;
   }
+
+  template <class U>
+  void operator()(const opentelemetry::nostd::span<U> &span)
+  {
+    *j_ = nlohmann::json::array();
+    for (const auto &elem : span)
+    {
+      j_->push_back(elem);
+    }
+  }
 };
 
 template <>

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h

@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
+// IWYU pragma: no_include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
 #include "opentelemetry/version.h"
 
@@ -15,6 +15,9 @@ namespace exporter
 namespace otlp
 {
 
+class OtlpGrpcClient;                // IWYU pragma: keep
+class OtlpGrpcClientReferenceGuard;  // IWYU pragma: keep
+
 /**
  * Factory class for OtlpGrpcClient.
  */

exporters/otlp/test/otlp_grpc_exporter_factory_test.cc

@@ -18,6 +18,15 @@
   Implementation, this requires protobuf.
 */
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
+
+/*
+  Make sure OtlpGrpcClientFactory does not require,
+  even indirectly, gRPC headers.
+*/
+#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
+#  error "gRPC should not be included"
+#endif
+
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc

@@ -18,6 +18,15 @@
   Implementation, this requires protobuf.
 */
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
+
+/*
+  Make sure OtlpGrpcClientFactory does not require,
+  even indirectly, gRPC headers.
+*/
+#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
+#  error "gRPC should not be included"
+#endif
+
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc

@@ -18,6 +18,15 @@
   Implementation, this requires protobuf.
 */
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
+
+/*
+  Make sure OtlpGrpcClientFactory does not require,
+  even indirectly, gRPC headers.
+*/
+#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
+#  error "gRPC should not be included"
+#endif
+
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

ext/src/dll/input.src

@@ -10,7 +10,9 @@ Create@BatchLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
 Create@SimpleLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
 Create@MultiLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
 TracerProvider@trace@sdk@v1@opentelemetry
+ForceFlush@TracerProvider@trace@sdk@v1@opentelemetry
 LoggerProvider@logs@sdk@v1@opentelemetry
+ForceFlush@LoggerProvider@logs@sdk@v1@opentelemetry
 OStreamLogRecordExporter@logs@exporter@v1@opentelemetry
 Create@OStreamMetricExporterFactory@metrics@exporter@v1@opentelemetry
 Create@PeriodicExportingMetricReaderFactory@metrics@sdk@v1@opentelemetry
@@ -68,4 +70,14 @@ GetOtlpDefaultHttpTracesEndpoint@otlp@exporter@v1@opentelemetry
 GetOtlpDefaultHttpMetricsEndpoint@otlp@exporter@v1@opentelemetry
 GetOtlpDefaultHttpLogsEndpoint@otlp@exporter@v1@opentelemetry
 #endif  // defined(WITH_OTLP_HTTP)
+
+#if defined(WITH_OTLP_FILE)
+Create@OtlpFileExporterFactory@otlp@exporter@v1@opentelemetry
+Create@OtlpFileLogRecordExporterFactory@otlp@exporter@v1@opentelemetry
+Create@OtlpFileMetricExporterFactory@otlp@exporter@v1@opentelemetry
+OtlpFileExporterOptions@otlp@exporter@v1@opentelemetry
+OtlpFileLogRecordExporterOptions@otlp@exporter@v1@opentelemetry
+OtlpFileMetricExporterOptions@otlp@exporter@v1@opentelemetry
+#endif  // defined(WITH_OTLP_FILE)
+
 // clang-format on