From dfa0102e59f7d4a7ff8204f441afcc678799b5cc Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Jul 2022 15:18:06 -0700 Subject: [PATCH 1/5] add recordable span_data getter --- sdk/include/opentelemetry/sdk/trace/recordable.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index b92a3ff063..aa355af6e2 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -10,6 +10,7 @@ #include "opentelemetry/sdk/common/empty_attributes.h" #include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h" #include "opentelemetry/sdk/resource/resource.h" +#include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/trace/canonical_code.h" #include "opentelemetry/trace/span.h" #include "opentelemetry/trace/span_context.h" @@ -146,6 +147,14 @@ class Recordable */ virtual void SetInstrumentationLibrary( const InstrumentationLibrary &instrumentation_library) noexcept = 0; + + /** + * Get the SpanData object for this Recordable. + * + * @return SpanData* + */ + + virtual explicit operator SpanData *() const { return nullptr; } }; } // namespace trace } // namespace sdk From eac517b5dbdba5496714e03b64a1804834d1548d Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Jul 2022 15:25:15 -0700 Subject: [PATCH 2/5] fix --- 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 aa355af6e2..a46f596255 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -10,7 +10,6 @@ #include "opentelemetry/sdk/common/empty_attributes.h" #include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h" #include "opentelemetry/sdk/resource/resource.h" -#include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/trace/canonical_code.h" #include "opentelemetry/trace/span.h" #include "opentelemetry/trace/span_context.h" @@ -29,6 +28,7 @@ namespace trace { using namespace opentelemetry::sdk::instrumentationlibrary; +class SpanData; /** * Maintains a representation of a span in a format that can be processed by a recorder. From 67ad7c706ff8d5511ceb2a9b61a74feee0b223d9 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Jul 2022 15:30:34 -0700 Subject: [PATCH 3/5] fix --- 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 a46f596255..aa355af6e2 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -10,6 +10,7 @@ #include "opentelemetry/sdk/common/empty_attributes.h" #include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h" #include "opentelemetry/sdk/resource/resource.h" +#include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/trace/canonical_code.h" #include "opentelemetry/trace/span.h" #include "opentelemetry/trace/span_context.h" @@ -28,7 +29,6 @@ namespace trace { using namespace opentelemetry::sdk::instrumentationlibrary; -class SpanData; /** * Maintains a representation of a span in a format that can be processed by a recorder. From f7dc7bc37330809c6c7d015e1d9aeec2eb4783a9 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Jul 2022 16:32:02 -0700 Subject: [PATCH 4/5] remove circular dependency --- sdk/include/opentelemetry/sdk/trace/recordable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index aa355af6e2..1cfbb00ae5 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -10,7 +10,6 @@ #include "opentelemetry/sdk/common/empty_attributes.h" #include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h" #include "opentelemetry/sdk/resource/resource.h" -#include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/trace/canonical_code.h" #include "opentelemetry/trace/span.h" #include "opentelemetry/trace/span_context.h" @@ -29,7 +28,7 @@ namespace trace { using namespace opentelemetry::sdk::instrumentationlibrary; - +class SpanData; /** * Maintains a representation of a span in a format that can be processed by a recorder. * From dbfd7eb06e42b0f9992dd7352f618ee873f6bcd6 Mon Sep 17 00:00:00 2001 From: Lalit Date: Mon, 1 Aug 2022 14:55:24 -0700 Subject: [PATCH 5/5] formatting.. --- sdk/include/opentelemetry/sdk/trace/recordable.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index 8ef7bfb3f6..04248944e9 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -141,8 +141,6 @@ class Recordable */ virtual void SetDuration(std::chrono::nanoseconds duration) noexcept = 0; - - /** * Get the SpanData object for this Recordable. *