tests

open-telemetry · Dec 9, 2021 · 73d026b · 73d026b
1 parent 3349d14
commit 73d026b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 12 deletions.
diff --git a/api/include/opentelemetry/logs/logger_provider.h b/api/include/opentelemetry/logs/logger_provider.h
@@ -36,7 +36,7 @@ class LoggerProvider
 
   virtual nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
                                               nostd::span<nostd::string_view> args,
-                                              nostd::string_view schema_url) = 0;
+                                              nostd::string_view schema_url = "") = 0;
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE

diff --git a/api/include/opentelemetry/logs/noop.h b/api/include/opentelemetry/logs/noop.h
@@ -66,14 +66,14 @@ class NoopLoggerProvider final : public opentelemetry::logs::LoggerProvider
 
   nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
                                       nostd::string_view options,
-                                      nostd::string_view schema_url) override
+                                      nostd::string_view schema_url = "") override
   {
     return logger_;
   }
 
   nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
                                       nostd::span<nostd::string_view> args,
-                                      nostd::string_view schema_url) override
+                                      nostd::string_view schema_url = "") override
   {
     return logger_;
   }

diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc
@@ -92,12 +92,16 @@ class TestLogger : public Logger
 // Define a basic LoggerProvider class that returns an instance of the logger class defined above
 class TestProvider : public LoggerProvider
 {
-  shared_ptr<Logger> GetLogger(string_view library_name, string_view options = "") override
+  shared_ptr<Logger> GetLogger(string_view library_name,
+                               string_view options           = "",
+                               nostd::string_view schema_url = "") override
   {
     return shared_ptr<Logger>(new TestLogger());
   }
 
-  shared_ptr<Logger> GetLogger(string_view library_name, span<string_view> args) override
+  shared_ptr<Logger> GetLogger(string_view library_name,
+                               span<string_view> args,
+                               nostd::string_view schema_url = "") override
   {
     return shared_ptr<Logger>(new TestLogger());
   }

diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc
@@ -20,12 +20,16 @@ using opentelemetry::nostd::string_view;
 
 class TestProvider : public LoggerProvider
 {
-  shared_ptr<Logger> GetLogger(string_view library_name, string_view options) override
+  shared_ptr<Logger> GetLogger(string_view library_name,
+                               string_view options,
+                               string_view schema_url = "") override
   {
     return shared_ptr<Logger>(nullptr);
   }
 
-  shared_ptr<Logger> GetLogger(string_view library_name, span<string_view> args) override
+  shared_ptr<Logger> GetLogger(string_view library_name,
+                               span<string_view> args,
+                               string_view schema_url = "") override
   {
     return shared_ptr<Logger>(nullptr);
   }

diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
@@ -158,6 +158,11 @@ class ElasticSearchRecordable final : public sdk::logs::Recordable
    * Returns a JSON object contain the log information
    */
   nlohmann::json GetJSON() noexcept { return json_; };
+
+  void SetInstrumentationLibrary(
+      std::unique_ptr<sdk::instrumentationlibrary::InstrumentationLibrary>
+          instrumentation_library) noexcept override
+  {}
 };
 }  // namespace logs
 }  // namespace exporter

diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
@@ -222,8 +222,10 @@ class LoggerProvider : public opentelemetry::logs::LoggerProvider
    * - "XML"            - XML events (reserved for future use)
    * @return
    */
-  nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(nostd::string_view name,
-                                                           nostd::string_view args = "") override
+  nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
+      nostd::string_view name,
+      nostd::string_view args       = "",
+      nostd::string_view schema_url = "") override
   {
     UNREFERENCED_PARAMETER(args);
     ETWProvider::EventFormat evtFmt = config_.encoding;
@@ -233,9 +235,10 @@ class LoggerProvider : public opentelemetry::logs::LoggerProvider
 
   nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
       nostd::string_view name,
-      nostd::span<nostd::string_view> args) override
+      nostd::span<nostd::string_view> args,
+      nostd::string_view schema_url = "") override
   {
-    return GetLogger(name, args[0]);
+    return GetLogger(name, args[0], schema_url);
   }
 };
 

diff --git a/sdk/include/opentelemetry/sdk/logs/log_record.h b/sdk/include/opentelemetry/sdk/logs/log_record.h
@@ -181,6 +181,11 @@ class LogRecord final : public Recordable
    * @return the timestamp for this log
    */
   opentelemetry::common::SystemTimestamp GetTimestamp() const noexcept { return timestamp_; }
+
+  void SetInstrumentationLibrary(
+      std::unique_ptr<sdk::instrumentationlibrary::InstrumentationLibrary>
+          instrumentation_library) noexcept override
+  {}
 };
 }  // namespace logs
 }  // namespace sdk

diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
@@ -60,7 +60,7 @@ class LoggerProvider final : public opentelemetry::logs::LoggerProvider,
   opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
       opentelemetry::nostd::string_view name,
       nostd::span<nostd::string_view> args,
-      nostd::string_view schema_url) noexcept override;
+      nostd::string_view schema_url = "") noexcept override;
 
   /**
    * Returns a shared pointer to the processor currently stored in the