Merge branch 'main' into etw-logger-fix

open-telemetry · Jun 2, 2022 · 705f747 · 705f747
2 parents a199531 + 93ef013
commit 705f747
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/include/opentelemetry/trace/span_context.h b/api/include/opentelemetry/trace/span_context.h
@@ -81,7 +81,7 @@ class SpanContext final
 
  bool IsRemote() const noexcept { return is_remote_; }
 
- static SpanContext GetInvalid() { return SpanContext(false, false); }
+ static SpanContext GetInvalid() noexcept { return SpanContext(false, false); }
 
  bool IsSampled() const noexcept { return trace_flags_.IsSampled(); }
 

diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
@@ -192,7 +192,7 @@ class PropertyValue : public PropertyVariant
  {}
 
  /**
- * @brief Convert owning PropertyValue to non-owning common::AttributeValue
+ * @brief Convert non-owning common::AttributeValue to owning PropertyValue.
  * @return
  */
  PropertyValue &FromAttributeValue(const common::AttributeValue &v)
@@ -222,7 +222,8 @@ class PropertyValue : public PropertyVariant
  break;
  }
  case common::AttributeType::kTypeString: {
- PropertyVariant::operator=(nostd::string_view(nostd::get<nostd::string_view>(v)).data());
+ PropertyVariant::operator=
+ (std::string{nostd::string_view(nostd::get<nostd::string_view>(v)).data()});
  break;
  }