Restore merge conflict file

open-telemetry · Dec 14, 2020 · 13bc179 · 13bc179
1 parent f642a60
commit 13bc179
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/sdk/include/opentelemetry/sdk/logs/processor.h b/sdk/include/opentelemetry/sdk/logs/processor.h
@@ -43,15 +43,6 @@ class LogProcessor
    */
   virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
 
-  /**
-   * Create a log recordable. This requests a new log recordable from the
-   * associated exporter.
-   * @return a newly initialized recordable
-   *
-   * Note: This method must be callable from multiple threads.
-   */
-  virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
-
   /**
    * OnReceive is called by the SDK once a log record has been successfully created.
    * @param record the log record

diff --git a/sdk/test/CMakeLists.txt b/sdk/test/CMakeLists.txt
@@ -1 +1,4 @@
+add_subdirectory(common)
+add_subdirectory(trace)
+add_subdirectory(metrics)
 add_subdirectory(logs)