Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit e281389

Browse files
author
Ian Sturdy
authored
Move measure registration to Measure from MeasureRegistry. (#123)
Also: - Rename MeasureInt -> MeasureInt64 - Swap the argument order of units and description when registering measures.
1 parent 6f0408e commit e281389

26 files changed

Lines changed: 226 additions & 226 deletions

‎examples/helloworld/helloworld.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ ABSL_CONST_INIT const absl::string_view kVideoSizeMeasureName =
3737
// The resource owner defines and registers a measure. A function exposing a
3838
// function-local static is the recommended style, ensuring that the measure is
3939
// only registered once.
40-
opencensus::stats::MeasureInt VideoSizeMeasure() {
41-
static const opencensus::stats::MeasureInt video_size =
42-
opencensus::stats::MeasureRegistry::RegisterInt(
43-
kVideoSizeMeasureName, "By", "size of processed videos");
40+
opencensus::stats::MeasureInt64 VideoSizeMeasure() {
41+
static const opencensus::stats::MeasureInt64 video_size =
42+
opencensus::stats::MeasureInt64::Register(
43+
kVideoSizeMeasureName, "size of processed videos", "By");
4444
return video_size;
4545
}
4646

‎opencensus/exporters/stats/prometheus/internal/prometheus_test_server.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ int main(int argc, char** argv) {
3434
// Create a view and register it with the exporter.
3535
const std::string foo_usage_measure_name = "example.com/Foo/FooUsage";
3636
const opencensus::stats::MeasureDouble foo_usage =
37-
opencensus::stats::MeasureRegistry::RegisterDouble(
38-
foo_usage_measure_name, "foos", "Usage of foos.");
37+
opencensus::stats::MeasureDouble::Register(foo_usage_measure_name,
38+
"Usage of foos.", "foos");
3939
const auto view_descriptor =
4040
opencensus::stats::ViewDescriptor()
4141
.set_name("example.com/Bar/FooUsage-sum-cumulative-key1-key2")

‎opencensus/exporters/stats/prometheus/internal/prometheus_utils_test.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ void CompareMetricFamilies(const io::prometheus::client::MetricFamily& actual,
5050
}
5151

5252
TEST(SetMetricFamilyTest, CountDouble) {
53-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
54-
"measure_count_double", "units", "");
53+
const auto measure = opencensus::stats::MeasureDouble::Register(
54+
"measure_count_double", "", "units");
5555
const std::string task = "test_task";
5656
const std::string view_name = "test_descriptor";
5757
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
@@ -86,8 +86,8 @@ TEST(SetMetricFamilyTest, CountDouble) {
8686
}
8787

8888
TEST(SetMetricFamilyTest, SumDouble) {
89-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
90-
"measure_sum_double", "units", "");
89+
const auto measure = opencensus::stats::MeasureDouble::Register(
90+
"measure_sum_double", "", "units");
9191
const std::string task = "test_task";
9292
const std::string view_name = "test_descriptor";
9393
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
@@ -122,8 +122,8 @@ TEST(SetMetricFamilyTest, SumDouble) {
122122
}
123123

124124
TEST(SetMetricFamilyTest, SumInt) {
125-
const auto measure = opencensus::stats::MeasureRegistry::RegisterInt(
126-
"measure_sum_int", "units", "");
125+
const auto measure =
126+
opencensus::stats::MeasureInt64::Register("measure_sum_int", "", "units");
127127
const std::string task = "test_task";
128128
const std::string view_name = "test_descriptor";
129129
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
@@ -158,8 +158,8 @@ TEST(SetMetricFamilyTest, SumInt) {
158158
}
159159

160160
TEST(StackdriverUtilsTest, MakeTimeSeriesDistributionDouble) {
161-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
162-
"measure_distribution_double", "units", "");
161+
const auto measure = opencensus::stats::MeasureDouble::Register(
162+
"measure_distribution_double", "", "units");
163163
const std::string view_name = "test_descriptor";
164164
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
165165
const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");

‎opencensus/exporters/stats/stackdriver/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ values.
8989
9090
The Stackdriver data type depends on the
9191
view's measure type and aggregation--count aggregation to `INT64`, sum
92-
aggregation to `INT64` for `MeasureInt` and `DOUBLE` for `MeasureDouble`, and
92+
aggregation to `INT64` for `MeasureInt64` and `DOUBLE` for `MeasureDouble`, and
9393
distribution aggregation to `DISTRIBUTION`. Exported distributions omit the
9494
range as it is not supported by Stackdriver.

‎opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ constexpr char kGoogleStackdriverStatsAddress[] = "monitoring.googleapis.com";
5151
constexpr char kTestMeasureName[] = "opencensus.io/TestMeasure";
5252
opencensus::stats::MeasureDouble TestMeasure() {
5353
static const opencensus::stats::MeasureDouble foo_usage =
54-
opencensus::stats::MeasureRegistry::RegisterDouble(
55-
kTestMeasureName, "1{test units}", "Test measure.");
54+
opencensus::stats::MeasureDouble::Register(
55+
kTestMeasureName, "Test measure.", "1{test units}");
5656
return foo_usage;
5757
}
5858

‎opencensus/exporters/stats/stackdriver/internal/stackdriver_utils_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ TEST(StackdriverUtilsTest, SetMetricDescriptorMetricKind) {
8585
TEST(StackdriverUtilsTest, SetMetricDescriptorValueType) {
8686
auto view_descriptor = opencensus::stats::ViewDescriptor();
8787
google::api::MetricDescriptor metric_descriptor;
88-
opencensus::stats::MeasureRegistry::RegisterDouble("double_measure", "", "");
89-
opencensus::stats::MeasureRegistry::RegisterInt("int_measure", "", "");
88+
opencensus::stats::MeasureDouble::Register("double_measure", "", "");
89+
opencensus::stats::MeasureInt64::Register("int_measure", "", "");
9090

9191
// Sum depends on measure type.
9292
view_descriptor.set_aggregation(opencensus::stats::Aggregation::Sum());
@@ -124,7 +124,7 @@ TEST(StackdriverUtilsTest, SetMetricDescriptorValueType) {
124124

125125
TEST(StackdriverUtilsTest, SetMetricDescriptorUnits) {
126126
const std::string units = "test_units";
127-
opencensus::stats::MeasureRegistry::RegisterDouble("measure", units, "");
127+
opencensus::stats::MeasureDouble::Register("measure", "", units);
128128
const auto view_descriptor =
129129
opencensus::stats::ViewDescriptor().set_measure("measure");
130130
google::api::MetricDescriptor metric_descriptor;
@@ -144,8 +144,8 @@ TEST(StackdriverUtilsTest, SetMetricDescriptorDescription) {
144144
}
145145

146146
TEST(StackdriverUtilsTest, MakeTimeSeriesSumDouble) {
147-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
148-
"measure_sum_double", "", "");
147+
const auto measure =
148+
opencensus::stats::MeasureDouble::Register("measure_sum_double", "", "");
149149
const std::string task = "test_task";
150150
const std::string view_name = "test_view";
151151
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
@@ -185,8 +185,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesSumDouble) {
185185
}
186186

187187
TEST(StackdriverUtilsTest, MakeTimeSeriesSumInt) {
188-
const auto measure = opencensus::stats::MeasureRegistry::RegisterInt(
189-
"measure_sum_int", "", "");
188+
const auto measure =
189+
opencensus::stats::MeasureInt64::Register("measure_sum_int", "", "");
190190
const std::string task = "test_task";
191191
const std::string view_name = "test_descriptor";
192192
const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
@@ -227,7 +227,7 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesSumInt) {
227227
}
228228

229229
TEST(StackdriverUtilsTest, MakeTimeSeriesCountDouble) {
230-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
230+
const auto measure = opencensus::stats::MeasureDouble::Register(
231231
"measure_count_double", "", "");
232232
const std::string task = "test_task";
233233
const std::string view_name = "test_descriptor";
@@ -270,7 +270,7 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesCountDouble) {
270270
}
271271

272272
TEST(StackdriverUtilsTest, MakeTimeSeriesDistributionDouble) {
273-
const auto measure = opencensus::stats::MeasureRegistry::RegisterDouble(
273+
const auto measure = opencensus::stats::MeasureDouble::Register(
274274
"measure_distribution_double", "", "");
275275
const std::string task = "test_task";
276276
const std::string view_name = "test_view";

‎opencensus/plugins/grpc/internal/measures.cc‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -33,117 +33,117 @@ constexpr char kCount[] = "1";
3333
} // namespace
3434

3535
// Client
36-
stats::MeasureInt RpcClientErrorCount() {
37-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
38-
kRpcClientErrorCountMeasureName, kCount, "RPC Errors");
36+
stats::MeasureInt64 RpcClientErrorCount() {
37+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
38+
kRpcClientErrorCountMeasureName, "RPC Errors", kCount);
3939
return measure;
4040
}
4141

4242
stats::MeasureDouble RpcClientRequestBytes() {
43-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
44-
kRpcClientRequestBytesMeasureName, kUnitBytes, "Request bytes");
43+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
44+
kRpcClientRequestBytesMeasureName, "Request bytes", kUnitBytes);
4545
return measure;
4646
}
4747

4848
stats::MeasureDouble RpcClientResponseBytes() {
49-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
50-
kRpcClientResponseBytesMeasureName, kUnitBytes, "Response bytes");
49+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
50+
kRpcClientResponseBytesMeasureName, "Response bytes", kUnitBytes);
5151
return measure;
5252
}
5353

5454
stats::MeasureDouble RpcClientRoundtripLatency() {
55-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
56-
kRpcClientRoundtripLatencyMeasureName, kUnitMilliseconds,
57-
"RPC roundtrip latency msec");
55+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
56+
kRpcClientRoundtripLatencyMeasureName, "RPC roundtrip latency msec",
57+
kUnitMilliseconds);
5858
return measure;
5959
}
6060

6161
stats::MeasureDouble RpcClientServerElapsedTime() {
62-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
63-
kRpcClientServerElapsedTimeMeasureName, kUnitMilliseconds,
64-
"Server elapsed time in msecs");
62+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
63+
kRpcClientServerElapsedTimeMeasureName, "Server elapsed time in msecs",
64+
kUnitMilliseconds);
6565
return measure;
6666
}
6767

68-
stats::MeasureInt RpcClientStartedCount() {
69-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
70-
kRpcClientStartedCountMeasureName, kCount,
71-
"Number of client RPCs (streams) started");
68+
stats::MeasureInt64 RpcClientStartedCount() {
69+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
70+
kRpcClientStartedCountMeasureName,
71+
"Number of client RPCs (streams) started", kCount);
7272
return measure;
7373
}
7474

75-
stats::MeasureInt RpcClientFinishedCount() {
76-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
77-
kRpcClientFinishedCountMeasureName, kCount,
78-
"Number of client RPCs (streams) finished");
75+
stats::MeasureInt64 RpcClientFinishedCount() {
76+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
77+
kRpcClientFinishedCountMeasureName,
78+
"Number of client RPCs (streams) finished", kCount);
7979
return measure;
8080
}
8181

82-
stats::MeasureInt RpcClientRequestCount() {
83-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
84-
kRpcClientRequestCountMeasureName, kCount,
85-
"Number of client RPC request messages");
82+
stats::MeasureInt64 RpcClientRequestCount() {
83+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
84+
kRpcClientRequestCountMeasureName,
85+
"Number of client RPC request messages", kCount);
8686
return measure;
8787
}
8888

89-
stats::MeasureInt RpcClientResponseCount() {
90-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
91-
kRpcClientResponseCountMeasureName, kCount,
92-
"Number of client RPC response messages");
89+
stats::MeasureInt64 RpcClientResponseCount() {
90+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
91+
kRpcClientResponseCountMeasureName,
92+
"Number of client RPC response messages", kCount);
9393
return measure;
9494
}
9595

9696
// Server
97-
stats::MeasureInt RpcServerErrorCount() {
98-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
99-
kRpcServerErrorCountMeasureName, kCount, "RPC Errors");
97+
stats::MeasureInt64 RpcServerErrorCount() {
98+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
99+
kRpcServerErrorCountMeasureName, "RPC Errors", kCount);
100100
return measure;
101101
}
102102

103103
stats::MeasureDouble RpcServerRequestBytes() {
104-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
105-
kRpcServerRequestBytesMeasureName, kUnitBytes, "Request bytes");
104+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
105+
kRpcServerRequestBytesMeasureName, "Request bytes", kUnitBytes);
106106
return measure;
107107
}
108108

109109
stats::MeasureDouble RpcServerResponseBytes() {
110-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
111-
kRpcServerResponseBytesMeasureName, kUnitBytes, "Response bytes");
110+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
111+
kRpcServerResponseBytesMeasureName, "Response bytes", kUnitBytes);
112112
return measure;
113113
}
114114

115115
stats::MeasureDouble RpcServerServerElapsedTime() {
116-
static stats::MeasureDouble measure = stats::MeasureRegistry::RegisterDouble(
117-
kRpcServerServerElapsedTimeMeasureName, kUnitMilliseconds,
118-
"Server elapsed time in msecs");
116+
static stats::MeasureDouble measure = stats::MeasureDouble::Register(
117+
kRpcServerServerElapsedTimeMeasureName, "Server elapsed time in msecs",
118+
kUnitMilliseconds);
119119
return measure;
120120
}
121121

122-
stats::MeasureInt RpcServerStartedCount() {
123-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
124-
kRpcServerStartedCountMeasureName, kCount,
125-
"Number of server RPCs (streams) started");
122+
stats::MeasureInt64 RpcServerStartedCount() {
123+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
124+
kRpcServerStartedCountMeasureName,
125+
"Number of server RPCs (streams) started", kCount);
126126
return measure;
127127
}
128128

129-
stats::MeasureInt RpcServerFinishedCount() {
130-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
131-
kRpcServerFinishedCountMeasureName, kCount,
132-
"Number of server RPCs (streams) finished");
129+
stats::MeasureInt64 RpcServerFinishedCount() {
130+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
131+
kRpcServerFinishedCountMeasureName,
132+
"Number of server RPCs (streams) finished", kCount);
133133
return measure;
134134
}
135135

136-
stats::MeasureInt RpcServerRequestCount() {
137-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
138-
kRpcServerRequestCountMeasureName, kCount,
139-
"Number of server RPC request messages");
136+
stats::MeasureInt64 RpcServerRequestCount() {
137+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
138+
kRpcServerRequestCountMeasureName,
139+
"Number of server RPC request messages", kCount);
140140
return measure;
141141
}
142142

143-
stats::MeasureInt RpcServerResponseCount() {
144-
static stats::MeasureInt measure = stats::MeasureRegistry::RegisterInt(
145-
kRpcServerResponseCountMeasureName, kCount,
146-
"Number of server RPC response messages");
143+
stats::MeasureInt64 RpcServerResponseCount() {
144+
static stats::MeasureInt64 measure = stats::MeasureInt64::Register(
145+
kRpcServerResponseCountMeasureName,
146+
"Number of server RPC response messages", kCount);
147147
return measure;
148148
}
149149

‎opencensus/plugins/grpc/internal/measures.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020

2121
namespace opencensus {
2222

23-
stats::MeasureInt RpcClientErrorCount();
23+
stats::MeasureInt64 RpcClientErrorCount();
2424
stats::MeasureDouble RpcClientRequestBytes();
2525
stats::MeasureDouble RpcClientResponseBytes();
2626
stats::MeasureDouble RpcClientRoundtripLatency();
2727
stats::MeasureDouble RpcClientServerElapsedTime();
28-
stats::MeasureInt RpcClientStartedCount();
29-
stats::MeasureInt RpcClientFinishedCount();
30-
stats::MeasureInt RpcClientRequestCount();
31-
stats::MeasureInt RpcClientResponseCount();
28+
stats::MeasureInt64 RpcClientStartedCount();
29+
stats::MeasureInt64 RpcClientFinishedCount();
30+
stats::MeasureInt64 RpcClientRequestCount();
31+
stats::MeasureInt64 RpcClientResponseCount();
3232

33-
stats::MeasureInt RpcServerErrorCount();
33+
stats::MeasureInt64 RpcServerErrorCount();
3434
stats::MeasureDouble RpcServerRequestBytes();
3535
stats::MeasureDouble RpcServerResponseBytes();
3636
stats::MeasureDouble RpcServerServerElapsedTime();
37-
stats::MeasureInt RpcServerStartedCount();
38-
stats::MeasureInt RpcServerFinishedCount();
39-
stats::MeasureInt RpcServerRequestCount();
40-
stats::MeasureInt RpcServerResponseCount();
37+
stats::MeasureInt64 RpcServerStartedCount();
38+
stats::MeasureInt64 RpcServerFinishedCount();
39+
stats::MeasureInt64 RpcServerRequestCount();
40+
stats::MeasureInt64 RpcServerResponseCount();
4141

4242
} // namespace opencensus
4343

‎opencensus/stats/examples/exporter_example.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ constexpr char kFooUsageMeasureName[] = "example.com/Foo/FooUsage";
2929

3030
opencensus::stats::MeasureDouble FooUsage() {
3131
static const opencensus::stats::MeasureDouble foo_usage =
32-
opencensus::stats::MeasureRegistry::RegisterDouble(
33-
kFooUsageMeasureName, "foos", "Usage of foos.");
32+
opencensus::stats::MeasureDouble::Register(kFooUsageMeasureName, "foos",
33+
"Usage of foos.");
3434
return foo_usage;
3535
}
3636

‎opencensus/stats/examples/view_and_recording_example.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ constexpr char kFooUsageMeasureName[] = "example.com/Foo/FooUsage";
2626
// only registered once.
2727
opencensus::stats::MeasureDouble FooUsage() {
2828
static const opencensus::stats::MeasureDouble foo_usage =
29-
opencensus::stats::MeasureRegistry::RegisterDouble(
30-
kFooUsageMeasureName, "foos", "Usage of foos.");
29+
opencensus::stats::MeasureDouble::Register(kFooUsageMeasureName,
30+
"Usage of foos.", "foos");
3131
return foo_usage;
3232
}
3333

0 commit comments

Comments
 (0)