Merge branch 'main' into add-scope-config

Author: psx95

.github/workflows/cppcheck.yml

@@ -56,7 +56,14 @@ jobs:
       - name: Count warnings
         run: |
           set +e
-          COUNT=`grep -c -E "\[.+\]" cppcheck.log`
-          echo "cppcheck reported ${COUNT} warning(s)"
-          # TODO: uncomment to enforce failing the build
-          # if [ $COUNT -ne 0 ] ; then exit 1 ; fi
+          readonly WARNING_COUNT=`grep -c -E "\[.+\]" cppcheck.log`
+          echo "cppcheck reported ${WARNING_COUNT} warning(s)"
+          # Acceptable limit, to decrease over time down to 0
+          readonly WARNING_LIMIT=10
+          # FAIL the build if WARNING_COUNT > WARNING_LIMIT
+          if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
+            exit 1
+          # WARN in annotations if WARNING_COUNT > 0
+          elif [ $WARNING_COUNT -gt 0 ] ; then
+            echo "::warning::cppcheck reported ${WARNING_COUNT} warning(s)"
+          fi

CHANGELOG.md

@@ -149,6 +149,9 @@ Increment the:
 * [bazel] Update opentelemetry-proto in MODULE.bazel
   [#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)
 
+* [EXPORTER] Fix scope attributes missing from otlp traces metrics
+  [#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)
+
 * [SDK] Add tracer scope configurator
   [#3137](https://github.com/open-telemetry/opentelemetry-cpp/pull/3137)
 

CMakeLists.txt

@@ -428,12 +428,16 @@ if(WITH_OTLP_GRPC
   endif()
   # Latest Protobuf imported targets and without legacy module support
   if(TARGET protobuf::protoc)
-    project_build_tools_get_imported_location(PROTOBUF_PROTOC_EXECUTABLE
-                                              protobuf::protoc)
-    # If protobuf::protoc is not a imported target, then we use the target
-    # directly for fallback
-    if(NOT PROTOBUF_PROTOC_EXECUTABLE)
-      set(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc)
+    if(CMAKE_CROSSCOMPILING AND Protobuf_PROTOC_EXECUTABLE)
+      set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
+    else()
+      project_build_tools_get_imported_location(PROTOBUF_PROTOC_EXECUTABLE
+                                                protobuf::protoc)
+      # If protobuf::protoc is not a imported target, then we use the target
+      # directly for fallback
+      if(NOT PROTOBUF_PROTOC_EXECUTABLE)
+        set(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc)
+      endif()
     endif()
   elseif(Protobuf_PROTOC_EXECUTABLE)
     # Some versions of FindProtobuf.cmake uses mixed case instead of uppercase

api/include/opentelemetry/baggage/baggage_context.h

@@ -27,7 +27,7 @@ inline nostd::shared_ptr<Baggage> GetBaggage(const context::Context &context) no
 }
 
 inline context::Context SetBaggage(context::Context &context,
-                                   nostd::shared_ptr<Baggage> baggage) noexcept
+                                   const nostd::shared_ptr<Baggage> &baggage) noexcept
 {
   return context.SetValue(kBaggageHeader, baggage);
 }

api/include/opentelemetry/context/context.h

@@ -29,16 +29,14 @@ class Context
   // hold a shared_ptr to the head of the DataList linked list
   template <class T>
   Context(const T &keys_and_values) noexcept
-  {
-    head_ = nostd::shared_ptr<DataList>{new DataList(keys_and_values)};
-  }
+      : head_{nostd::shared_ptr<DataList>{new DataList(keys_and_values)}}
+  {}
 
   // Creates a context object from a key and value, this will
   // hold a shared_ptr to the head of the DataList linked list
   Context(nostd::string_view key, ContextValue value) noexcept
-  {
-    head_ = nostd::shared_ptr<DataList>{new DataList(key, value)};
-  }
+      : head_{nostd::shared_ptr<DataList>{new DataList(key, value)}}
+  {}
 
   // Accepts a new iterable and then returns a new context that
   // contains the new key and value data. It attaches the
@@ -92,22 +90,21 @@ class Context
 
 private:
   // A linked list to contain the keys and values of this context node
-  class DataList
+  struct DataList
   {
-  public:
-    char *key_;
+    char *key_ = nullptr;
 
-    nostd::shared_ptr<DataList> next_;
+    nostd::shared_ptr<DataList> next_{nullptr};
 
-    size_t key_length_;
+    size_t key_length_ = 0UL;
 
     ContextValue value_;
 
-    DataList() { next_ = nullptr; }
+    DataList() = default;
 
     // Builds a data list off of a key and value iterable and returns the head
     template <class T>
-    DataList(const T &keys_and_vals) : key_{nullptr}, next_(nostd::shared_ptr<DataList>{nullptr})
+    DataList(const T &keys_and_vals)
     {
       bool first = true;
       auto *node = this;
@@ -132,9 +129,18 @@ class Context
     {
       key_        = new char[key.size()];
       key_length_ = key.size();
-      memcpy(key_, key.data(), key.size() * sizeof(char));
-      value_ = value;
+      std::memcpy(key_, key.data(), key.size() * sizeof(char));
       next_  = nostd::shared_ptr<DataList>{nullptr};
+      value_ = value;
+    }
+
+    DataList(const DataList &other)
+        : key_(new char[other.key_length_]),
+          next_(other.next_),
+          key_length_(other.key_length_),
+          value_(other.value_)
+    {
+      std::memcpy(key_, other.key_, other.key_length_ * sizeof(char));
     }
 
     DataList &operator=(DataList &&other) noexcept

api/include/opentelemetry/context/propagation/global_propagator.h

@@ -32,7 +32,7 @@ class OPENTELEMETRY_EXPORT GlobalTextMapPropagator
     return nostd::shared_ptr<TextMapPropagator>(GetPropagator());
   }
 
-  static void SetGlobalPropagator(nostd::shared_ptr<TextMapPropagator> prop) noexcept
+  static void SetGlobalPropagator(const nostd::shared_ptr<TextMapPropagator> &prop) noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetPropagator() = prop;

api/include/opentelemetry/context/runtime_context.h

@@ -152,7 +152,8 @@ class OPENTELEMETRY_EXPORT RuntimeContext
    *
    * @param storage a custom runtime context storage
    */
-  static void SetRuntimeContextStorage(nostd::shared_ptr<RuntimeContextStorage> storage) noexcept
+  static void SetRuntimeContextStorage(
+      const nostd::shared_ptr<RuntimeContextStorage> &storage) noexcept
   {
     GetStorage() = storage;
   }

api/include/opentelemetry/logs/event_id.h

@@ -19,9 +19,9 @@ namespace logs
 class EventId
 {
 public:
-  EventId(int64_t id, nostd::string_view name) noexcept : id_{id}
+  EventId(int64_t id, nostd::string_view name) noexcept
+      : id_{id}, name_{nostd::unique_ptr<char[]>{new char[name.length() + 1]}}
   {
-    name_ = nostd::unique_ptr<char[]>{new char[name.length() + 1]};
     std::copy(name.begin(), name.end(), name_.get());
     name_.get()[name.length()] = 0;
   }

api/include/opentelemetry/logs/provider.h

@@ -39,7 +39,7 @@ class OPENTELEMETRY_EXPORT Provider
   /**
    * Changes the singleton LoggerProvider.
    */
-  static void SetLoggerProvider(nostd::shared_ptr<LoggerProvider> tp) noexcept
+  static void SetLoggerProvider(const nostd::shared_ptr<LoggerProvider> &tp) noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetProvider() = tp;
@@ -60,7 +60,7 @@ class OPENTELEMETRY_EXPORT Provider
   /**
    * Changes the singleton EventLoggerProvider.
    */
-  static void SetEventLoggerProvider(nostd::shared_ptr<EventLoggerProvider> tp) noexcept
+  static void SetEventLoggerProvider(const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetEventProvider() = tp;

api/include/opentelemetry/metrics/provider.h

@@ -38,7 +38,7 @@ class Provider
   /**
    * Changes the singleton MeterProvider.
    */
-  static void SetMeterProvider(nostd::shared_ptr<MeterProvider> tp) noexcept
+  static void SetMeterProvider(const nostd::shared_ptr<MeterProvider> &tp) noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetProvider() = tp;

api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h

@@ -221,6 +221,7 @@ template <class ReturnType, class FunctionObject, std::size_t... BoundIndices>
 struct MakeVisitationMatrix<ReturnType, FunctionObject, index_sequence<>,
                             index_sequence<BoundIndices...>> {
   using ResultType = ReturnType (*)(FunctionObject&&);
+  // cppcheck-suppress [duplInheritedMember]
   static constexpr ResultType Run() {
     return &call_with_indices<ReturnType, FunctionObject,
                               (BoundIndices - 1)...>;
@@ -722,6 +723,7 @@ struct VariantCoreAccess {
       Self* self, Args&&... args) {
     Destroy(*self);
     using New = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, Self>::type;
+    // cppcheck-suppress [legacyUninitvar]
     New* const result = ::new (static_cast<void*>(&self->state_))
         New(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
     self->index_ = NewIndex;
@@ -1310,6 +1312,7 @@ class VariantStateBaseDestructorNontrivial : protected VariantStateBase<T...> {
     VariantStateBaseDestructorNontrivial* self;
   };
 
+  // cppcheck-suppress [duplInheritedMember]
   void destroy() { VisitIndices<sizeof...(T)>::Run(Destroyer{this}, index_); }
 
   ~VariantStateBaseDestructorNontrivial() { destroy(); }

api/include/opentelemetry/nostd/shared_ptr.h

@@ -37,7 +37,7 @@ class shared_ptr
 
   struct alignas(kAlignment) PlacementBuffer
   {
-    char data[kMaxSize];
+    char data[kMaxSize]{};
   };
 
   class shared_ptr_wrapper

api/include/opentelemetry/plugin/tracer.h

@@ -20,7 +20,7 @@ class DynamicLibraryHandle;
 class Span final : public trace::Span
 {
 public:
-  Span(std::shared_ptr<trace::Tracer> &&tracer, nostd::shared_ptr<trace::Span> span) noexcept
+  Span(std::shared_ptr<trace::Tracer> &&tracer, const nostd::shared_ptr<trace::Span> &span) noexcept
       : tracer_{std::move(tracer)}, span_{span}
   {}
 

api/include/opentelemetry/semconv/error_attributes.h

@@ -36,9 +36,9 @@ namespace error
  * <p>
  * If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
  * @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
- * status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
- * @code error.type @endcode to capture all errors, regardless of whether they are defined within
- * the domain-specific set or not.</li>
+ * status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
+ * error.type @endcode to capture all errors, regardless of whether they are defined within the
+ * domain-specific set or not.</li>
  * </ul>
  */
 static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/aws_attributes.h

@@ -247,7 +247,7 @@ static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
  * The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
  * @code --copy-source @endcode parameter of the <a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
- * operation within the S3 API</a>. This applies in particular to the following operations: <p> <ul>
+ * operation within the S3 API</a>. This applies in particular to the following operations: <ul>
  *   <li><a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
  *   <li><a
@@ -273,7 +273,7 @@ static constexpr const char *kAwsS3Delete = "aws.s3.delete";
  * <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
  * operations. <p> The @code key @endcode attribute is applicable to all object-related S3
  * operations, i.e. that require the object key as a mandatory parameter. This applies in particular
- * to the following operations: <p> <ul> <li><a
+ * to the following operations: <ul> <li><a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
  *   <li><a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
@@ -323,7 +323,7 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
  * The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
  * to the @code --upload-id @endcode parameter of the <a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
- * operations. This applies in particular to the following operations: <p> <ul> <li><a
+ * operations. This applies in particular to the following operations: <ul> <li><a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
  *   <li><a
  * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>

api/include/opentelemetry/semconv/incubating/cloud_attributes.h

@@ -65,7 +65,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
  * startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
  * instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
  * provider. The following well-known definitions MUST be used if you set this attribute and they
- * apply: <p> <ul> <li><strong>AWS Lambda:</strong> The function <a
+ * apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
  * href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
  * care not to use the "invoked ARN" directly but replace any <a
  * href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>

api/include/opentelemetry/semconv/incubating/deployment_attributes.h

@@ -34,7 +34,7 @@ static constexpr const char *kDeploymentEnvironment = "deployment.environment";
  * @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
  * through the @code service.namespace @endcode, @code service.name @endcode and @code
  * service.instance.id @endcode resource attributes. This implies that resources carrying the
- * following attribute combinations MUST be considered to be identifying the same service: <p> <ul>
+ * following attribute combinations MUST be considered to be identifying the same service: <ul>
  *   <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
  * @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
  * @endcode.</li>

api/include/opentelemetry/semconv/incubating/error_attributes.h

@@ -36,9 +36,9 @@ namespace error
  * <p>
  * If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
  * @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
- * status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
- * @code error.type @endcode to capture all errors, regardless of whether they are defined within
- * the domain-specific set or not.</li>
+ * status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
+ * error.type @endcode to capture all errors, regardless of whether they are defined within the
+ * domain-specific set or not.</li>
  * </ul>
  */
 static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/faas_attributes.h

@@ -58,8 +58,8 @@ static constexpr const char *kFaasDocumentTime = "faas.document.time";
 
 /**
  * The execution environment ID as a string, that will be potentially reused for other invocations
- * to the same function/function version. <p> <ul> <li><strong>AWS Lambda:</strong> Use the (full)
- * log stream name.</li>
+ * to the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
+ * stream name.</li>
  * </ul>
  */
 static constexpr const char *kFaasInstance = "faas.instance";
@@ -109,7 +109,7 @@ static constexpr const char *kFaasMaxMemory = "faas.max_memory";
  * <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
  * code.function @endcode</a> span attributes). <p> For some cloud providers, the above definition
  * is ambiguous. The following definition of function name MUST be used for this attribute (and
- * consequently the span name) for the listed cloud providers/products: <p> <ul>
+ * consequently the span name) for the listed cloud providers/products: <ul>
  *   <li><strong>Azure:</strong>  The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
  * name followed by a forward slash followed by the function name (this form can also be seen in the
  * resource JSON for the function). This means that a span attribute MUST be used, as an Azure
@@ -135,7 +135,6 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
  * The immutable version of the function being executed.
  * <p>
  * Depending on the cloud provider and platform, use:
- * <p>
  * <ul>
  *   <li><strong>AWS Lambda:</strong> The <a
  * href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function

api/include/opentelemetry/semconv/incubating/system_metrics.h

@@ -263,7 +263,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
  * Time disk spent activated
  * <p>
  * The real elapsed time ("wall clock") used in the I/O path (time from operations running in
- * parallel are not counted). Measured as: <p> <ul> <li>Linux: Field 13 from <a
+ * parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
  * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
  *   <li>Windows: The complement of
  * <a
@@ -380,7 +380,7 @@ CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
  * Sum of the time each operation took to complete
  * <p>
  * Because it is the sum of time each request took, parallel-issued requests each contribute to make
- * the count grow. Measured as: <p> <ul> <li>Linux: Fields 7 & 11 from <a
+ * the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
  * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
  *   <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
  * (similar for Writes)</li>
@@ -888,7 +888,6 @@ CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
  * Count of packets that are dropped or discarded even though there was no error
  * <p>
  * Measured as:
- * <p>
  * <ul>
  *   <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
  * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
@@ -937,7 +936,6 @@ CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
  * Count of network errors detected
  * <p>
  * Measured as:
- * <p>
  * <ul>
  *   <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
  * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>

api/include/opentelemetry/semconv/incubating/url_attributes.h

@@ -59,7 +59,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
  *
  * Query string values for the following keys SHOULD be redacted by default and replaced by the
  * value @code REDACTED @endcode:
- * <p>
  * <ul>
  *   <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
@@ -110,7 +109,7 @@ static constexpr const char *kUrlPort = "url.port";
  * can identify it. <p>
  *
  * Query string values for the following keys SHOULD be redacted by default and replaced by the
- * value @code REDACTED @endcode: <p> <ul> <li><a
+ * value @code REDACTED @endcode: <ul> <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
  * AWSAccessKeyId @endcode</a></li> <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code

api/include/opentelemetry/semconv/url_attributes.h

@@ -39,7 +39,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
  *
  * Query string values for the following keys SHOULD be redacted by default and replaced by the
  * value @code REDACTED @endcode:
- * <p>
  * <ul>
  *   <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
@@ -73,7 +72,7 @@ static constexpr const char *kUrlPath = "url.path";
  * can identify it. <p>
  *
  * Query string values for the following keys SHOULD be redacted by default and replaced by the
- * value @code REDACTED @endcode: <p> <ul> <li><a
+ * value @code REDACTED @endcode: <ul> <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
  * AWSAccessKeyId @endcode</a></li> <li><a
  * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code