remove getName(), add back const, and format

open-o11y · Dec 4, 2020 · 1d00776 · 1d00776
1 parent bba7316
commit 1d00776
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 34 deletions.
diff --git a/sdk/include/opentelemetry/sdk/logs/logger.h b/sdk/include/opentelemetry/sdk/logs/logger.h
@@ -42,13 +42,7 @@ class Logger final : public opentelemetry::logs::Logger
    * @param name The name of this logger instance
    * @param logger_provider The logger provider that owns this logger.
    */
-  explicit Logger(opentelemetry::nostd::string_view name,
-                  std::shared_ptr<LoggerProvider> logger_provider) noexcept;
-
-  /**
-   * Returns the name of this logger.
-   */
-  const opentelemetry::nostd::string_view GetName() noexcept override;
+  explicit Logger(std::shared_ptr<LoggerProvider> logger_provider) noexcept;
 
   /**
    * Writes a log record into the processor.
@@ -60,9 +54,6 @@ class Logger final : public opentelemetry::logs::Logger
   // The logger provider of this Logger. Uses a weak_ptr to avoid cyclic dependancy issues the with
   // logger provider
   std::weak_ptr<LoggerProvider> logger_provider_;
-
-  // The name of this logger
-  opentelemetry::nostd::string_view logger_name_;
 };
 
 }  // namespace logs

diff --git a/sdk/src/logs/logger.cc b/sdk/src/logs/logger.cc
@@ -15,8 +15,8 @@
  */
 
 #include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/trace/provider.h"
 #include "opentelemetry/sdk/trace/span_data.h"
+#include "opentelemetry/trace/provider.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
@@ -55,20 +55,20 @@ void Logger::Log(const opentelemetry::logs::LogRecord &record) noexcept
     record_pointer->timestamp = core::SystemTimestamp(std::chrono::system_clock::now());
   }
 
-  auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-  auto tracer = provider->GetTracer("foo_library");
+  auto provider     = opentelemetry::trace::Provider::GetTracerProvider();
+  auto tracer       = provider->GetTracer("foo_library");
   auto span_context = tracer->GetCurrentSpan()->GetContext();
-  
+
   // Traceid
   if (!record_pointer->trace_id.IsValid())
   {
-     record_pointer->trace_id = span_context.trace_id();
+    record_pointer->trace_id = span_context.trace_id();
   }
 
   // Spanid
   if (!record_pointer->span_id.IsValid())
   {
-    record_pointer->span_id = span_context.span_id(); 
+    record_pointer->span_id = span_context.span_id();
   }
 
   // Traceflag

diff --git a/sdk/src/logs/simple_log_processor.cc b/sdk/src/logs/simple_log_processor.cc
@@ -38,13 +38,13 @@ SimpleLogProcessor::SimpleLogProcessor(std::unique_ptr<LogExporter> &&exporter)
  */
 void SimpleLogProcessor::OnReceive(std::shared_ptr<opentelemetry::logs::LogRecord> record) noexcept
 {
-  std::vector<std::shared_ptr<opentelemetry::logs::LogRecord>> batch; 
-  batch.emplace_back(record); 
-  // nostd::span<std::shared_ptr<opentelemetry::logs::LogRecord>> batch(&record, 1);
+  std::vector<std::shared_ptr<opentelemetry::logs::LogRecord>> batch;
+  batch.emplace_back(record);
   // Get lock to ensure Export() is never called concurrently
-  std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
+  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
 
-  if (exporter_->Export(opentelemetry::nostd::span<std::shared_ptr<opentelemetry::logs::LogRecord>>(batch.data(), batch.size())) != ExportResult::kSuccess)
+  if (exporter_->Export(opentelemetry::nostd::span<std::shared_ptr<opentelemetry::logs::LogRecord>>(
+          batch.data(), batch.size())) != ExportResult::kSuccess)
   {
     /* Alert user of the failed export */
   }

diff --git a/sdk/test/logs/CMakeLists.txt b/sdk/test/logs/CMakeLists.txt
@@ -1,7 +1,4 @@
-foreach(
-  testname 
-  logger_provider_test 
-  logger_test)
+foreach(testname logger_provider_test logger_test)
   add_executable(${testname} "${testname}.cc")
   target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
                         ${CMAKE_THREAD_LIBS_INIT} opentelemetry_logs)

diff --git a/sdk/test/logs/logger_provider_test.cc b/sdk/test/logs/logger_provider_test.cc
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "opentelemetry/sdk/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
 
 #include <gtest/gtest.h>
 
@@ -69,8 +69,7 @@ TEST(LoggerProvider, LoggerProviderLoggerArguments)
 
 class DummyProcessor : public LogProcessor
 {
-  void OnReceive(std::unique_ptr<opentelemetry::logs::LogRecord> &&record) noexcept
-  {}
+  void OnReceive(std::unique_ptr<opentelemetry::logs::LogRecord> &&record) noexcept {}
   bool ForceFlush(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept {}
   bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept {}
 };

diff --git a/sdk/test/logs/logger_test.cc b/sdk/test/logs/logger_test.cc
@@ -15,14 +15,14 @@
  */
 
 #include "opentelemetry/sdk/logs/logger.h"
+#include "opentelemetry/sdk/trace/simple_processor.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
 
 #include <gtest/gtest.h>
 
 using namespace opentelemetry::sdk::logs;
-namespace sdktrace  = opentelemetry::sdk::trace;
+namespace sdktrace = opentelemetry::sdk::trace;
 
 TEST(Logger, LoggerName)
 {
@@ -57,11 +57,9 @@ class DummyProcessor : public LogProcessor
   bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept {}
 };
 
-
 TEST(Logger, DefaultValueInjection)
 {
-  // TODO: once a Log Exporter is implemented, check that 
-  // timestamp, traceid, spanid, and traceflags were 
+  // TODO: once a Log Exporter is implemented, check that
+  // timestamp, traceid, spanid, and traceflags were
   // injected from the span context properly
 }
-