Skip to content

Commit c10af76

Browse files
dnarula-mwdnarula-mw
committed
Addressing PR comments
1 parent 5df8f72 commit c10af76

File tree

3 files changed

+40
-55
lines changed

3 files changed

+40
-55
lines changed

‎sdk/metrics/+opentelemetry/+sdk/+metrics/View.m‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,46 +23,43 @@
2323
methods
2424
function obj = View(options)
2525
arguments
26-
options.name=""
27-
options.description=""
28-
options.unit=""
29-
options.instrumentName=""
30-
options.instrumentType=""
31-
options.meterName=""
32-
options.meterVersion=""
33-
options.meterSchemaURL=""
34-
options.attributeKeys=""
35-
options.aggregation=""
36-
options.histogramBinEdges=[]
26+
options.Name=""
27+
options.Description=""
28+
options.Unit=""
29+
options.InstrumentName=""
30+
options.InstrumentType=""
31+
options.MeterName=""
32+
options.MeterVersion=""
33+
options.MeterSchemaURL=""
34+
options.AttributeKeys=""
35+
options.Aggregation=""
36+
options.HistogramBinEdges=[]
3737
end
3838

39-
instrumentTypeCategory = int32(find(options.instrumentType==["kCounter", "kHistogram", "kUpDownCounter", "kObservableCounter", "kObservableGauge", "kObservableUpDownCounter"])-1);
39+
instrument_types = ["Counter", "Histogram", "UpDownCounter", "ObservableCounter", "ObservableGauge", "ObservableUpDownCounter"];
40+
instrument_type = validatestring(options.InstrumentType, instrument_types);
41+
instrumentTypeCategory = find(instrument_type==instrument_types)-1;
4042

41-
aggregationCategory = int32(find(options.aggregation==["kDrop", "kHistogram", "kLastValue", "kSum", "kDefault"])-1);
42-
43-
if(numel(instrumentTypeCategory)==0)
44-
instrumentTypeCategory = int32(-1);
45-
end
46-
if(numel(aggregationCategory)==0)
47-
aggregationCategory = int32(-1);
48-
end
43+
aggregation_types = ["Drop", "Histogram", "LastValue", "Sum", "Default"];
44+
aggregation_type = validatestring(options.Aggregation, aggregation_types);
45+
aggregationCategory = find(aggregation_type==aggregation_types)-1;
4946

5047
obj.Proxy = libmexclass.proxy.Proxy("Name", "libmexclass.opentelemetry.sdk.ViewProxy", ...
51-
"ConstructorArguments", {options.name, options.description, options.unit, options.instrumentName, ...
52-
instrumentTypeCategory, options.meterName, options.meterVersion, options.meterSchemaURL, ...
53-
options.attributeKeys, aggregationCategory, options.histogramBinEdges});
48+
"ConstructorArguments", {options.Name, options.Description, options.Unit, options.InstrumentName, ...
49+
instrumentTypeCategory, options.MeterName, options.MeterVersion, options.MeterSchemaURL, ...
50+
options.AttributeKeys, aggregationCategory, options.HistogramBinEdges});
5451

55-
obj.Name = options.name;
56-
obj.Description = options.description;
57-
obj.Unit = options.unit;
58-
obj.InstrumentName = options.instrumentName;
59-
obj.InstrumentType = options.instrumentType;
60-
obj.MeterName = options.meterName;
61-
obj.MeterVersion = options.meterVersion;
62-
obj.MeterSchemaURL = options.meterSchemaURL;
63-
obj.AttributeKeys = options.attributeKeys;
64-
obj.Aggregation = options.aggregation;
65-
obj.HistogramBinEdges = options.histogramBinEdges;
52+
obj.Name = options.Name;
53+
obj.Description = options.Description;
54+
obj.Unit = options.Unit;
55+
obj.InstrumentName = options.InstrumentName;
56+
obj.InstrumentType = options.InstrumentType;
57+
obj.MeterName = options.MeterName;
58+
obj.MeterVersion = options.MeterVersion;
59+
obj.MeterSchemaURL = options.MeterSchemaURL;
60+
obj.AttributeKeys = options.AttributeKeys;
61+
obj.Aggregation = options.Aggregation;
62+
obj.HistogramBinEdges = options.HistogramBinEdges;
6663
end
6764
end
6865
end

‎sdk/metrics/src/ViewProxy.cpp‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,15 @@ libmexclass::proxy::MakeResult ViewProxy::make(const libmexclass::proxy::Functio
2929
matlab::data::StringArray unit_mda = constructor_arguments[2];
3030
auto unit = unit_mda[0];
3131

32-
matlab::data::TypedArray<int> aggregation_type_mda = constructor_arguments[9];
33-
metrics_sdk::AggregationType aggregation_type;
34-
if(static_cast<int>(aggregation_type_mda[0]) == -1){
35-
aggregation_type = metrics_sdk::AggregationType::kDefault;
36-
}else{
37-
aggregation_type = static_cast<metrics_sdk::AggregationType>(static_cast<int>(aggregation_type_mda[0]));
38-
}
32+
matlab::data::TypedArray<double> aggregation_type_mda = constructor_arguments[9];
33+
metrics_sdk::AggregationType aggregation_type = static_cast<metrics_sdk::AggregationType>(static_cast<int>(aggregation_type_mda[0]));
3934

4035
std::shared_ptr<metrics_sdk::HistogramAggregationConfig> aggregation_config = std::shared_ptr<metrics_sdk::HistogramAggregationConfig>(new metrics_sdk::HistogramAggregationConfig());
4136
if(aggregation_type == metrics_sdk::AggregationType::kHistogram){
4237
matlab::data::TypedArray<double> histogramBinEdges_mda = constructor_arguments[10];
4338
std::vector<double> histogramBinEdges;
44-
if(histogramBinEdges_mda.getNumberOfElements() > 0){
45-
for (auto h : histogramBinEdges_mda) {
46-
histogramBinEdges.push_back(h);
47-
}
39+
for (auto h : histogramBinEdges_mda) {
40+
histogramBinEdges.push_back(h);
4841
}
4942
aggregation_config->boundaries_ = histogramBinEdges;
5043
}
@@ -55,7 +48,7 @@ libmexclass::proxy::MakeResult ViewProxy::make(const libmexclass::proxy::Functio
5548
attributes_processor = std::unique_ptr<metrics_sdk::AttributesProcessor>(new metrics_sdk::DefaultAttributesProcessor());
5649
}else{
5750
std::unordered_map<std::string, bool> allowed_attribute_keys;
58-
for (int a=0; a<attributes_mda.getNumberOfElements(); a++) {
51+
for (size_t a=0; a<attributes_mda.getNumberOfElements(); a++) {
5952
allowed_attribute_keys[attributes_mda[a]] = true;
6053
}
6154
attributes_processor = std::unique_ptr<metrics_sdk::AttributesProcessor>(new metrics_sdk::FilteringAttributesProcessor(allowed_attribute_keys));
@@ -66,13 +59,8 @@ libmexclass::proxy::MakeResult ViewProxy::make(const libmexclass::proxy::Functio
6659

6760

6861
// Create Instrument Selector
69-
matlab::data::TypedArray<int> instrument_type_mda = constructor_arguments[4];
70-
metrics_sdk::InstrumentType instrument_type;
71-
if(static_cast<int>(instrument_type_mda[0]) == -1){
72-
instrument_type = metrics_sdk::InstrumentType::kCounter;
73-
}else{
74-
instrument_type = static_cast<metrics_sdk::InstrumentType>(static_cast<int>(instrument_type_mda[0]));
75-
}
62+
matlab::data::TypedArray<double> instrument_type_mda = constructor_arguments[4];
63+
metrics_sdk::InstrumentType instrument_type = static_cast<metrics_sdk::InstrumentType>(static_cast<int>(instrument_type_mda[0]));
7664

7765
matlab::data::StringArray instrument_name_mda = constructor_arguments[3];
7866
auto instrument_name = static_cast<std::string>(instrument_name_mda[0]);

‎test/tmetrics_sdk.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function testViewBasic(testCase)
151151

152152
view_name = "counter_view";
153153
view_description = "view_description";
154-
view = opentelemetry.sdk.metrics.View(name="counter_view", description="view_description", instrumentName="mycounter", instrumentType="kCounter", meterName="mymeter", meterVersion="1.2.0", meterSchemaURL="", aggregation="kSum");
154+
view = opentelemetry.sdk.metrics.View(Name="counter_view", Description="view_description", InstrumentName="mycounter", InstrumentType="Counter", MeterName="mymeter", MeterVersion="1.2.0", MeterSchemaURL="", Aggregation="Sum");
155155

156156
addView(mp, view);
157157

@@ -186,7 +186,7 @@ function testViewHistogram(testCase)
186186
view_name = "histogram_view";
187187
view_description = "view_description";
188188
bin_edges = [0; 100; 200; 300; 400; 500];
189-
view = opentelemetry.sdk.metrics.View(name="histogram_view", description="view_description", instrumentName="myhistogram", instrumentType="kHistogram", meterName="mymeter", aggregation="kHistogram", histogramBinEdges=bin_edges);
189+
view = opentelemetry.sdk.metrics.View(Name="histogram_view", Description="view_description", InstrumentName="myhistogram", InstrumentType="Histogram", MeterName="mymeter", Aggregation="Histogram", HistogramBinEdges=bin_edges);
190190

191191
addView(mp, view);
192192

0 commit comments

Comments
 (0)