From cee8ec4a6171956166b2601606f72761b333bcc2 Mon Sep 17 00:00:00 2001 From: dbolduc Date: Thu, 22 Feb 2024 11:34:57 -0500 Subject: [PATCH 1/4] fix: Recordable backwards compat for versions < 1.14.0 --- sdk/include/opentelemetry/sdk/trace/recordable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index f4ac53fe2e..f0802b7303 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -139,7 +139,7 @@ class Recordable * Set the trace flags of the span. * @param flags the flags to set */ - virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept = 0; + virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept {}; /** * Set the spankind of the span. From da5fbd87cbd582225360032295e34518acb611eb Mon Sep 17 00:00:00 2001 From: dbolduc Date: Thu, 22 Feb 2024 13:55:39 -0500 Subject: [PATCH 2/4] suppress compiler warnings --- sdk/include/opentelemetry/sdk/trace/recordable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index f0802b7303..dbb7c27b9e 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -139,7 +139,7 @@ class Recordable * Set the trace flags of the span. * @param flags the flags to set */ - virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept {}; + virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept { (void)flags; }; /** * Set the spankind of the span. From 5df527a535a2de593f984e91ec256f67f53f8b79 Mon Sep 17 00:00:00 2001 From: dbolduc Date: Thu, 22 Feb 2024 14:32:34 -0500 Subject: [PATCH 3/4] d'oh --- sdk/include/opentelemetry/sdk/trace/recordable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index dbb7c27b9e..78200468bb 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -139,7 +139,7 @@ class Recordable * Set the trace flags of the span. * @param flags the flags to set */ - virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept { (void)flags; }; + virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept { (void)flags; } /** * Set the spankind of the span. From d52765092e45cded58e4d6b679098309f49f7c32 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 23 Feb 2024 20:56:02 +0100 Subject: [PATCH 4/4] Update sdk/include/opentelemetry/sdk/trace/recordable.h --- sdk/include/opentelemetry/sdk/trace/recordable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index 78200468bb..5918b80133 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -139,7 +139,7 @@ class Recordable * Set the trace flags of the span. * @param flags the flags to set */ - virtual void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept { (void)flags; } + virtual void SetTraceFlags(opentelemetry::trace::TraceFlags /* flags */) noexcept {} /** * Set the spankind of the span.