Skip to content

Commit aa5e0d1

Browse files
committed
fix for prometheus
Signed-off-by: Emelia Lei <[email protected]>
1 parent d203f20 commit aa5e0d1

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <bdlf_bind.h>
3939
#include <bdlt_currenttime.h>
4040
#include <bsl_atomic.h>
41+
#include <bsl_string_view.h>
4142
#include <bsl_vector.h>
4243
#include <bsla_annotations.h>
4344
#include <bslmt_condition.h>
@@ -68,61 +69,61 @@ class Tagger {
6869

6970
public:
7071
// MANIPULATORS
71-
Tagger& setCluster(const bslstl::StringRef& value)
72+
Tagger& setCluster(bsl::string_view value)
7273
{
7374
labels["Cluster"] = value;
7475
return *this;
7576
}
7677

77-
Tagger& setDomain(const bslstl::StringRef& value)
78+
Tagger& setDomain(bsl::string_view value)
7879
{
7980
labels["Domain"] = value;
8081
return *this;
8182
}
8283

83-
Tagger& setTier(const bslstl::StringRef& value)
84+
Tagger& setTier(bsl::string_view value)
8485
{
8586
labels["Tier"] = value;
8687
return *this;
8788
}
8889

89-
Tagger& setQueue(const bslstl::StringRef& value)
90+
Tagger& setQueue(bsl::string_view value)
9091
{
9192
labels["Queue"] = value;
9293
return *this;
9394
}
9495

95-
Tagger& setRole(const bslstl::StringRef& value)
96+
Tagger& setRole(bsl::string_view value)
9697
{
9798
labels["Role"] = value;
9899
return *this;
99100
}
100101

101-
Tagger& setInstance(const bslstl::StringRef& value)
102+
Tagger& setInstance(bsl::string_view value)
102103
{
103104
labels["Instance"] = value;
104105
return *this;
105106
}
106107

107-
Tagger& setRemoteHost(const bslstl::StringRef& value)
108+
Tagger& setRemoteHost(bsl::string_view value)
108109
{
109110
labels["RemoteHost"] = value;
110111
return *this;
111112
}
112113

113-
Tagger& setDataType(const bslstl::StringRef& value)
114+
Tagger& setDataType(bsl::string_view value)
114115
{
115116
labels["DataType"] = value;
116117
return *this;
117118
}
118119

119-
Tagger& setAppId(const bslstl::StringRef& value)
120+
Tagger& setAppId(bsl::string_view value)
120121
{
121122
labels["AppId"] = value;
122123
return *this;
123124
}
124125

125-
Tagger& setPort(const bslstl::StringRef& value)
126+
Tagger& setPort(bsl::string_view value)
126127
{
127128
labels["Port"] = value;
128129
return *this;
@@ -651,8 +652,8 @@ void PrometheusStatConsumer::captureClusterStats(const LeaderSet& leaders)
651652
clusterIt->datum();
652653
bdld::DatumMapRef map = mdSp->datum().theMap();
653654

654-
bslstl::StringRef upstream = map.find("upstream")->theString();
655-
tagger.setRemoteHost(upstream.isEmpty() ? "_none_" : upstream);
655+
bsl::string_view upstream = map.find("upstream")->theString();
656+
tagger.setRemoteHost(upstream.empty() ? "_none_" : upstream);
656657
}
657658

658659
for (DatapointDefCIter dpIt = bdlb::ArrayUtil::begin(defs);
@@ -787,7 +788,7 @@ void PrometheusStatConsumer::captureDomainStats(const LeaderSet& leaders)
787788
bslma::ManagedPtr<bdld::ManagedDatum> mdSp = domainIt->datum();
788789
bdld::DatumMapRef map = mdSp->datum().theMap();
789790

790-
const bslstl::StringRef clusterName = map.find("cluster")->theString();
791+
const bsl::string_view clusterName = map.find("cluster")->theString();
791792

792793
if (leaders.find(clusterName) == leaders.end()) {
793794
// is NOT leader

src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class PrometheusStatConsumer : public mqbplug::StatConsumer {
9494

9595
private:
9696
// PRIVATE TYPES
97-
using LeaderSet = bsl::unordered_set<bslstl::StringRef>;
97+
using LeaderSet = bsl::unordered_set<bsl::string_view>;
9898

9999
struct DatapointDef {
100100
const char* d_name;
@@ -251,7 +251,7 @@ class PrometheusStatConsumer : public mqbplug::StatConsumer {
251251
// ACCESSORS
252252

253253
/// Return plugin name
254-
bslstl::StringRef name() const override;
254+
bsl::string_view name() const override;
255255

256256
/// Return true if Prometheus reporting is enabled, false otherwise.
257257
bool isEnabled() const override;
@@ -296,7 +296,7 @@ inline bsls::TimeInterval PrometheusStatConsumer::publishInterval() const
296296
return d_publishInterval;
297297
}
298298

299-
inline bslstl::StringRef PrometheusStatConsumer::name() const
299+
inline bsl::string_view PrometheusStatConsumer::name() const
300300
{
301301
return "PrometheusStatConsumer";
302302
}

0 commit comments

Comments
 (0)