[SPDLOG] Add support for latest opentelemetry version(s) (open-telemetry#593)

Author: Cookies52

.github/workflows/spdlog.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.19.0"
+          ref: "v1.24.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies

instrumentation/spdlog/CMakeLists.txt

@@ -13,7 +13,7 @@ find_package(spdlog REQUIRED)
 add_library(${this_target} src/sink.cc)
 
 target_compile_options(${this_target} PUBLIC
-  -Wall -Wextra -Werror -Wpedantic -fPIC
+  -Wall -Wextra -Wpedantic -fPIC
 )
 
 set_target_properties(${this_target} PROPERTIES EXPORT_NAME ${this_target})

instrumentation/spdlog/README.md

@@ -8,7 +8,7 @@
 ## Requirements
 
 - Current release tested only with Ubuntu 20.04.6 LTS
-- OpenTelemetry >= v1.12.0 
+- OpenTelemetry >= v1.21.0 
 - spdlog >= v1.5.0
 
 ### Usage

instrumentation/spdlog/src/sink.cc

@@ -6,7 +6,8 @@
 #include <opentelemetry/instrumentation/spdlog/sink.h>
 
 #include <opentelemetry/logs/provider.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/code_attributes.h>
+#include <opentelemetry/semconv/incubating/thread_attributes.h>
 #include <opentelemetry/version.h>
 
 namespace spdlog
@@ -25,15 +26,16 @@ void OpenTelemetrySink<Mutex>::sink_it_(const spdlog::details::log_msg &msg)
 
   if (log_record)
   {
-    using namespace opentelemetry::trace::SemanticConventions;
+    using namespace opentelemetry::semconv::code;
+    using namespace opentelemetry::semconv::thread;
 
     log_record->SetSeverity(levelToSeverity(msg.level));
     log_record->SetBody(opentelemetry::nostd::string_view(msg.payload.data(), msg.payload.size()));
     log_record->SetTimestamp(msg.time);
     if (!msg.source.empty())
     {
-      log_record->SetAttribute(kCodeFilepath, msg.source.filename);
-      log_record->SetAttribute(kCodeLineno, msg.source.line);
+      log_record->SetAttribute(kCodeFilePath, msg.source.filename);
+      log_record->SetAttribute(kCodeLineNumber, msg.source.line);
     }
     log_record->SetAttribute(kThreadId, msg.thread_id);
     logger->EmitLogRecord(std::move(log_record));

instrumentation/spdlog/test/sink_test.cc

@@ -143,12 +143,12 @@ TEST_F(OpenTelemetrySinkTest, Log_Success)
         ASSERT_TRUE(timestamp.time_since_epoch() >= pre_log.time_since_epoch());
         ASSERT_TRUE(timestamp.time_since_epoch() <= post_log.time_since_epoch());
       }));
-  EXPECT_CALL(*logrecord_mock, SetAttribute(nostd::string_view("code.lineno"), _))
+  EXPECT_CALL(*logrecord_mock, SetAttribute(nostd::string_view("code.line.number"), _))
       .WillOnce(Invoke([](nostd::string_view, const common::AttributeValue &line_number) {
         ASSERT_TRUE(nostd::holds_alternative<int>(line_number));
         ASSERT_GE(nostd::get<int>(line_number), 0);
       }));
-  EXPECT_CALL(*logrecord_mock, SetAttribute(nostd::string_view("code.filepath"), _))
+  EXPECT_CALL(*logrecord_mock, SetAttribute(nostd::string_view("code.file.path"), _))
       .WillOnce(Invoke([](nostd::string_view, const common::AttributeValue &file_name) {
         ASSERT_TRUE(nostd::holds_alternative<const char *>(file_name));
         ASSERT_TRUE(std::strstr(nostd::get<const char *>(file_name), "sink_test.cc") != nullptr);