From e1c66bc702acfbc7bb2b7cf7ef665f9ceb9f12ab Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sun, 27 Jul 2025 14:27:37 +0200 Subject: [PATCH] [CONFIGURATION] File configuration - sdk resource --- .../logs/batch_log_record_processor_options.h | 2 +- .../opentelemetry/sdk/resource/resource.h | 21 +++++++------------ sdk/src/resource/resource.cc | 6 ++++++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h index b130f947af..84e03bcf37 100644 --- a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h +++ b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h @@ -16,7 +16,7 @@ namespace logs { /** - * Struct to hold batch SpanProcessor options. + * Struct to hold batch LogRecordProcessor options. */ struct BatchLogRecordProcessorOptions { diff --git a/sdk/include/opentelemetry/sdk/resource/resource.h b/sdk/include/opentelemetry/sdk/resource/resource.h index 5260b7c3f5..b89e84649e 100644 --- a/sdk/include/opentelemetry/sdk/resource/resource.h +++ b/sdk/include/opentelemetry/sdk/resource/resource.h @@ -19,7 +19,14 @@ using ResourceAttributes = opentelemetry::sdk::common::AttributeMap; class Resource { public: - Resource(const Resource &) = default; + Resource() noexcept; + + Resource(const ResourceAttributes &attributes) noexcept; + + Resource(const ResourceAttributes &attributes, const std::string &schema_url) noexcept; + + Resource(const Resource &) = default; + Resource &operator=(const Resource &) = default; const ResourceAttributes &GetAttributes() const noexcept; const std::string &GetSchemaURL() const noexcept; @@ -61,21 +68,9 @@ class Resource static Resource &GetDefault(); -protected: - /** - * The constructor is protected and only for use internally by the class and - * inside ResourceDetector class. - * Users should use the Create factory method to obtain a Resource - * instance. - */ - Resource(const ResourceAttributes &attributes = ResourceAttributes(), - const std::string &schema_url = std::string{}) noexcept; - private: ResourceAttributes attributes_; std::string schema_url_; - - friend class ResourceDetector; }; } // namespace resource diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc index 5ae5446e80..95b41498f8 100644 --- a/sdk/src/resource/resource.cc +++ b/sdk/src/resource/resource.cc @@ -20,6 +20,12 @@ namespace sdk namespace resource { +Resource::Resource() noexcept : attributes_(), schema_url_() {} + +Resource::Resource(const ResourceAttributes &attributes) noexcept + : attributes_(attributes), schema_url_() +{} + Resource::Resource(const ResourceAttributes &attributes, const std::string &schema_url) noexcept : attributes_(attributes), schema_url_(schema_url) {}