Changing the type of callback function in Export function to std::function (open-telemetry#1278)

DebajitDas · web-flow · commit 729c2f8e60ef · 2022-03-22T11:17:14.000-07:00
diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h
@@ -97,7 +97,7 @@ class ElasticsearchLogExporter final : public opentelemetry::sdk::logs::LogExpor
   void Export(
       const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
           &records,
-      nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
       override;
 
   /**
diff --git a/exporters/elasticsearch/src/es_log_exporter.cc b/exporters/elasticsearch/src/es_log_exporter.cc
@@ -121,11 +121,11 @@ class AsyncResponseHandler : public http_client::EventHandler
    */
   AsyncResponseHandler(
       std::shared_ptr<ext::http::client::Session> session,
-      nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback,
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback,
       bool console_debug = false)
       : console_debug_{console_debug},
         session_{std::move(session)},
-        result_callback_{result_callback}
+        result_callback_{std::move(result_callback)}
   {}
 
   /**
@@ -184,7 +184,7 @@ class AsyncResponseHandler : public http_client::EventHandler
   // Stores the session object for the request
   std::shared_ptr<ext::http::client::Session> session_;
   // Callback to call to on receiving events
-  nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback_;
+  std::function<bool(opentelemetry::sdk::common::ExportResult)> result_callback_;
 
   // A string to store the response body
   std::string body_ = "";
@@ -284,7 +284,7 @@ sdk::common::ExportResult ElasticsearchLogExporter::Export(
 void ElasticsearchLogExporter::Export(
     const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
         &records,
-    nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   // Return failure if this exporter has been shutdown
   if (isShutdown())
@@ -321,8 +321,8 @@ void ElasticsearchLogExporter::Export(
   request->SetBody(body_vec);
 
   // Send the request
-  auto handler =
-      std::make_shared<AsyncResponseHandler>(session, result_callback, options_.console_debug_);
+  auto handler = std::make_shared<AsyncResponseHandler>(session, std::move(result_callback),
+                                                        options_.console_debug_);
   session->SendRequest(handler);
 }
 
diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h
@@ -67,8 +67,8 @@ class JaegerExporter final : public opentelemetry::sdk::trace::SpanExporter
    * @param result_callback callback function accepting ExportResult as argument
    */
   void Export(const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-              nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-                  result_callback) noexcept override;
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override;
 
   /**
    * Shutdown the exporter.
diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc
@@ -72,7 +72,7 @@ sdk_common::ExportResult JaegerExporter::Export(
 
 void JaegerExporter::Export(
     const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-    nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN(" async not supported. Making sync interface call");
   auto status = Export(spans);
diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
@@ -69,9 +69,9 @@ class InMemorySpanExporter final : public opentelemetry::sdk::trace::SpanExporte
    * @param spans a span of unique pointers to span recordables
    * @param result_callback callback function accepting ExportResult as argument
    */
-  void Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-      nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept override
+  void Export(const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     OTEL_INTERNAL_LOG_WARN(" async not supported. Making sync interface call");
     auto status = Export(spans);
diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h
@@ -42,9 +42,9 @@ class OStreamLogExporter final : public opentelemetry::sdk::logs::LogExporter
   /**
    * Exports a span of logs sent from the processor asynchronously.
    */
-  void Export(const opentelemetry::nostd::span<std::unique_ptr<sdk::logs::Recordable>> &records,
-              opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-                  result_callback) noexcept;
+  void Export(
+      const opentelemetry::nostd::span<std::unique_ptr<sdk::logs::Recordable>> &records,
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept;
 
   /**
    * Marks the OStream Log Exporter as shut down.
diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
@@ -41,8 +41,8 @@ class OStreamSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
   void Export(
       const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>>
           &spans,
-      opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-          result_callback) noexcept override;
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
+      override;
 
   bool Shutdown(
       std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
diff --git a/exporters/ostream/src/log_exporter.cc b/exporters/ostream/src/log_exporter.cc
@@ -182,8 +182,7 @@ sdk::common::ExportResult OStreamLogExporter::Export(
 
 void OStreamLogExporter::Export(
     const opentelemetry::nostd::span<std::unique_ptr<sdk::logs::Recordable>> &records,
-    opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-        result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   // Do not have async support
   auto result = Export(records);
diff --git a/exporters/ostream/src/span_exporter.cc b/exporters/ostream/src/span_exporter.cc
@@ -98,8 +98,7 @@ sdk::common::ExportResult OStreamSpanExporter::Export(
 
 void OStreamSpanExporter::Export(
     const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-    opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-        result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   auto result = Export(spans);
   result_callback(result);
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
@@ -57,9 +57,9 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter
    * @param spans a span of unique pointers to span recordables
    * @param result_callback callback function accepting ExportResult as argument
    */
-  virtual void Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-      nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept override;
+  virtual void Export(const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
+                      std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                          &&result_callback) noexcept override;
 
   /**
    * Shut down the exporter.
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_exporter.h
@@ -62,7 +62,7 @@ class OtlpGrpcLogExporter : public opentelemetry::sdk::logs::LogExporter
    */
   virtual void Export(
       const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &records,
-      nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
       override;
 
   /**
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
@@ -93,7 +93,7 @@ class OtlpHttpExporter final : public opentelemetry::sdk::trace::SpanExporter
    */
   virtual void Export(
       const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-      nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
       override;
 
   /**
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_exporter.h
@@ -94,7 +94,7 @@ class OtlpHttpLogExporter final : public opentelemetry::sdk::logs::LogExporter
    */
   virtual void Export(
       const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &records,
-      nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
       override;
 
   /**
diff --git a/exporters/otlp/src/otlp_grpc_exporter.cc b/exporters/otlp/src/otlp_grpc_exporter.cc
@@ -145,7 +145,7 @@ sdk::common::ExportResult OtlpGrpcExporter::Export(
 
 void OtlpGrpcExporter::Export(
     const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-    nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN(
       "[OTLP TRACE GRPC Exporter] async not supported. Making sync interface call");
diff --git a/exporters/otlp/src/otlp_grpc_log_exporter.cc b/exporters/otlp/src/otlp_grpc_log_exporter.cc
@@ -163,7 +163,7 @@ opentelemetry::sdk::common::ExportResult OtlpGrpcLogExporter::Export(
 
 void OtlpGrpcLogExporter::Export(
     const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
-    nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN(
       "[OTLP LOG GRPC Exporter] async not supported. Making sync interface call");
diff --git a/exporters/otlp/src/otlp_http_exporter.cc b/exporters/otlp/src/otlp_http_exporter.cc
@@ -61,7 +61,7 @@ opentelemetry::sdk::common::ExportResult OtlpHttpExporter::Export(
 
 void OtlpHttpExporter::Export(
     const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-    nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN(" async not supported. Making sync interface call");
   auto status = Export(spans);
diff --git a/exporters/otlp/src/otlp_http_log_exporter.cc b/exporters/otlp/src/otlp_http_log_exporter.cc
@@ -62,7 +62,7 @@ opentelemetry::sdk::common::ExportResult OtlpHttpLogExporter::Export(
 
 void OtlpHttpLogExporter::Export(
     const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
-    nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN(" async not supported. Making sync interface call");
   auto status = Export(logs);
diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
@@ -84,8 +84,8 @@ class ZipkinExporter final : public opentelemetry::sdk::trace::SpanExporter
    * @param result_callback callback function accepting ExportResult as argument
    */
   void Export(const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-              nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-                  result_callback) noexcept override;
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override;
 
   /**
    * Shut down the exporter.
diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc
@@ -95,7 +95,7 @@ sdk::common::ExportResult ZipkinExporter::Export(
 
 void ZipkinExporter::Export(
     const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-    nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept
+    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
 {
   OTEL_INTERNAL_LOG_WARN("[ZIPKIN EXPORTER] async not supported. Making sync interface call");
   auto status = Export(spans);
diff --git a/sdk/include/opentelemetry/sdk/logs/exporter.h b/sdk/include/opentelemetry/sdk/logs/exporter.h
@@ -53,7 +53,7 @@ class LogExporter
    */
   virtual void Export(
       const nostd::span<std::unique_ptr<Recordable>> &records,
-      nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept = 0;
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept = 0;
 
   /**
    * Marks the exporter as ShutDown and cleans up any resources as required.
diff --git a/sdk/include/opentelemetry/sdk/trace/exporter.h b/sdk/include/opentelemetry/sdk/trace/exporter.h
@@ -49,7 +49,7 @@ class SpanExporter
    */
   virtual void Export(
       const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-      nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept = 0;
+      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept = 0;
 
   /**
    * Shut down the exporter.
diff --git a/sdk/test/logs/batch_log_processor_test.cc b/sdk/test/logs/batch_log_processor_test.cc
@@ -55,9 +55,9 @@ class MockLogExporter final : public LogExporter
     return ExportResult::kSuccess;
   }
 
-  void Export(
-      const opentelemetry::nostd::span<std::unique_ptr<Recordable>> &records,
-      opentelemetry::nostd::function_ref<bool(ExportResult)> result_callback) noexcept override
+  void Export(const opentelemetry::nostd::span<std::unique_ptr<Recordable>> &records,
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     auto th = std::thread([this, records, result_callback]() {
       auto result = Export(records);
diff --git a/sdk/test/logs/simple_log_processor_test.cc b/sdk/test/logs/simple_log_processor_test.cc
@@ -55,7 +55,8 @@ class TestExporter final : public LogExporter
 
   // Dummy Async Export implementation
   void Export(const nostd::span<std::unique_ptr<Recordable>> &records,
-              nostd::function_ref<bool(ExportResult)> result_callback) noexcept override
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     auto result = Export(records);
     result_callback(result);
@@ -146,7 +147,8 @@ class FailShutDownExporter final : public LogExporter
   }
 
   void Export(const nostd::span<std::unique_ptr<Recordable>> &records,
-              nostd::function_ref<bool(ExportResult)> result_callback) noexcept override
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     result_callback(ExportResult::kSuccess);
   }
diff --git a/sdk/test/trace/batch_span_processor_test.cc b/sdk/test/trace/batch_span_processor_test.cc
@@ -56,9 +56,9 @@ class MockSpanExporter final : public sdk::trace::SpanExporter
     return sdk::common::ExportResult::kSuccess;
   }
 
-  void Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
-      nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept override
+  void Export(const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     auto th = std::thread([this, spans, result_callback]() {
       auto result = Export(spans);
diff --git a/sdk/test/trace/simple_processor_test.cc b/sdk/test/trace/simple_processor_test.cc
@@ -52,8 +52,8 @@ class RecordShutdownExporter final : public SpanExporter
   }
 
   void Export(const opentelemetry::nostd::span<std::unique_ptr<Recordable>> &spans,
-              opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>
-                  result_callback) noexcept override
+              std::function<bool(opentelemetry::sdk::common::ExportResult)>
+                  &&result_callback) noexcept override
   {
     result_callback(ExportResult::kSuccess);
   }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ sdk_common::ExportResult JaegerExporter::Export(`
`72`	`72`
`73`	`73`	`void JaegerExporter::Export(`
`74`	`74`	`const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans,`
`75`		`- nostd::function_ref<bool(sdk::common::ExportResult)> result_callback) noexcept`
	`75`	`+ std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept`
`76`	`76`	`{`
`77`	`77`	`OTEL_INTERNAL_LOG_WARN(" async not supported. Making sync interface call");`
`78`	`78`	`auto status = Export(spans);`
Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,7 @@ sdk::common::ExportResult OStreamLogExporter::Export(`
`182`	`182`
`183`	`183`	`void OStreamLogExporter::Export(`
`184`	`184`	`const opentelemetry::nostd::span<std::unique_ptr<sdk::logs::Recordable>> &records,`
`185`		`- opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>`
`186`		`- result_callback) noexcept`
	`185`	`+ std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept`
`187`	`186`	`{`
`188`	`187`	`// Do not have async support`
`189`	`188`	`auto result = Export(records);`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ sdk::common::ExportResult OStreamSpanExporter::Export(`
`98`	`98`
`99`	`99`	`void OStreamSpanExporter::Export(`
`100`	`100`	`const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,`
`101`		`- opentelemetry::nostd::function_ref<bool(opentelemetry::sdk::common::ExportResult)>`
`102`		`- result_callback) noexcept`
	`101`	`+ std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept`
`103`	`102`	`{`
`104`	`103`	`auto result = Export(spans);`
`105`	`104`	`result_callback(result);`