From 5d475ee536791da886b3336695617d4df731b312 Mon Sep 17 00:00:00 2001 From: "mark.yang" Date: Tue, 8 Apr 2025 19:42:09 +0900 Subject: [PATCH] opentelemetry-cpp: upgrade 1.17.0 -> 1.19.0 Changelog: https://github.com/open-telemetry/opentelemetry-cpp/releases/tag/v1.19.0 Signed-off-by: mark.yang Signed-off-by: Khem Raj --- .../0001-Fix-build-with-clang-19.patch | 56 ------------------- ..._1.17.0.bb => opentelemetry-cpp_1.19.0.bb} | 6 +- 2 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch rename meta-oe/recipes-support/opentelemetry/{opentelemetry-cpp_1.17.0.bb => opentelemetry-cpp_1.19.0.bb} (91%) diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch deleted file mode 100644 index 2651eb6a72..0000000000 --- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1a5b4035e4cb75b87c716b4ebd5ffe32cd604c6e Mon Sep 17 00:00:00 2001 -From: "Sergey A. Osokin" -Date: Sun, 8 Sep 2024 17:14:25 -0400 -Subject: [PATCH] Fix build with clang 19 - -Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281359 -for details. - -Upstream-Status: Submitted [https://github.com/open-telemetry/opentelemetry-cpp/pull/3055] -Credit: Dimitry Andric -Signed-off-by: Khem Raj ---- - api/include/opentelemetry/logs/event_logger.h | 2 +- - api/include/opentelemetry/logs/logger.h | 2 +- - api/include/opentelemetry/logs/logger_type_traits.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h -index b5c94a70..5892e041 100644 ---- a/api/include/opentelemetry/logs/event_logger.h -+++ b/api/include/opentelemetry/logs/event_logger.h -@@ -66,7 +66,7 @@ class EventLogger - nostd::unique_ptr log_record = delegate_logger->CreateLogRecord(); - - IgnoreTraitResult( -- detail::LogRecordSetterTrait::type>::template Set( -+ detail::LogRecordSetterTrait::type>::template Set<>( - log_record.get(), std::forward(args))...); - - EmitEvent(event_name, std::move(log_record)); -diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h -index dc09a0c2..19da3942 100644 ---- a/api/include/opentelemetry/logs/logger.h -+++ b/api/include/opentelemetry/logs/logger.h -@@ -73,7 +73,7 @@ class Logger - } - - IgnoreTraitResult( -- detail::LogRecordSetterTrait::type>::template Set( -+ detail::LogRecordSetterTrait::type>::template Set<>( - log_record.get(), std::forward(args))...); - - EmitLogRecord(std::move(log_record)); -diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h -index 48613513..f140a545 100644 ---- a/api/include/opentelemetry/logs/logger_type_traits.h -+++ b/api/include/opentelemetry/logs/logger_type_traits.h -@@ -166,7 +166,7 @@ struct LogRecordSetterTrait - * = nullptr> - inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept - { -- return LogRecordSetterTrait::template Set( -+ return LogRecordSetterTrait::template Set<>( - log_record, std::forward(arg)); - } - diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.17.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.19.0.bb similarity index 91% rename from meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.17.0.bb rename to meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.19.0.bb index 3df48fa019..c98bc826ad 100644 --- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.17.0.bb +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.19.0.bb @@ -7,10 +7,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS = "nlohmann-json" - -SRC_URI = "gitsm://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \ - file://0001-Fix-build-with-clang-19.patch" -SRCREV = "fa0a5200ddbe9ae6f487a228e658aedc102dab56" +SRC_URI = "gitsm://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main" +SRCREV = "ced79860f8c8a091a2eabfee6d47783f828a9b59" S = "${WORKDIR}/git" inherit cmake pkgconfig lib_package