diff --git a/third_party/tsl/tsl/lib/monitoring/collection_registry.cc b/third_party/tsl/tsl/lib/monitoring/collection_registry.cc index cece3434208ac..1e1b15d6825ad 100644 --- a/third_party/tsl/tsl/lib/monitoring/collection_registry.cc +++ b/third_party/tsl/tsl/lib/monitoring/collection_registry.cc @@ -56,7 +56,7 @@ void Collector::CollectMetricDescriptor( metric_descriptor->name = string(metric_def->name()); metric_descriptor->description = string(metric_def->description()); - for (const StringPiece label_name : metric_def->label_descriptions()) { + for (const absl::string_view label_name : metric_def->label_descriptions()) { metric_descriptor->label_names.emplace_back(label_name); } diff --git a/third_party/tsl/tsl/lib/monitoring/collection_registry.h b/third_party/tsl/tsl/lib/monitoring/collection_registry.h index 7af6c87e51f0b..8d554991b522c 100644 --- a/third_party/tsl/tsl/lib/monitoring/collection_registry.h +++ b/third_party/tsl/tsl/lib/monitoring/collection_registry.h @@ -272,7 +272,7 @@ class CollectionRegistry { CollectionFunction collection_function; uint64 registration_time_millis; }; - std::map registry_ TF_GUARDED_BY(mu_); + std::map registry_ TF_GUARDED_BY(mu_); CollectionRegistry(const CollectionRegistry&) = delete; void operator=(const CollectionRegistry&) = delete; diff --git a/third_party/tsl/tsl/lib/monitoring/metric_def.h b/third_party/tsl/tsl/lib/monitoring/metric_def.h index ab454664691b1..b23ea3c79060f 100644 --- a/third_party/tsl/tsl/lib/monitoring/metric_def.h +++ b/third_party/tsl/tsl/lib/monitoring/metric_def.h @@ -123,9 +123,9 @@ class AbstractMetricDef { ValueType value_type() const { return value_type_; } - StringPiece name() const { return name_; } + absl::string_view name() const { return name_; } - StringPiece description() const { return description_; } + absl::string_view description() const { return description_; } const std::vector& label_descriptions() const { return label_descriptions_; @@ -136,7 +136,8 @@ class AbstractMetricDef { friend class MetricDef; AbstractMetricDef(const MetricKind kind, const ValueType value_type, - const StringPiece name, const StringPiece description, + const absl::string_view name, + const absl::string_view description, const std::vector& label_descriptions) : kind_(kind), value_type_(value_type), @@ -168,7 +169,7 @@ template class MetricDef : public AbstractMetricDef { public: template - MetricDef(const StringPiece name, const StringPiece description, + MetricDef(const absl::string_view name, const absl::string_view description, const LabelDesc&... label_descriptions) : AbstractMetricDef(metric_kind, internal::GetValueType(), name, description, {label_descriptions...}) {