Complex number handling and more code sharing between metric instruments

mathworks · Nov 9, 2023 · 9f9fbc7 · 9f9fbc7
1 parent adb6cd3
commit 9f9fbc7
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 226 deletions.
diff --git a/api/metrics/+opentelemetry/+metrics/Counter.m b/api/metrics/+opentelemetry/+metrics/Counter.m
@@ -14,23 +14,7 @@
 
     methods
         function add(obj, value, varargin)
-            % input value must be a numerical scalar
-            if isnumeric(value) && isscalar(value)
-                if nargin == 2
-                    obj.Proxy.add(value);
-                elseif isa(varargin{1}, "dictionary")
-                    attrkeys = keys(varargin{1});
-                    attrvals = values(varargin{1},"cell");
-                    if all(cellfun(@iscell, attrvals))
-                        attrvals = [attrvals{:}];
-                    end
-                    obj.Proxy.add(value, attrkeys, attrvals);
-                else
-                    attrkeys = [varargin{1:2:length(varargin)}]';
-                    attrvals = [varargin(2:2:length(varargin))]';
-                    obj.Proxy.add(value, attrkeys, attrvals);
-                end
-            end
+            obj.processValue(value, varargin{:});
         end
     end
 end
diff --git a/api/metrics/+opentelemetry/+metrics/Histogram.m b/api/metrics/+opentelemetry/+metrics/Histogram.m
@@ -13,23 +13,7 @@
 
     methods
         function record(obj, value, varargin)
-            % input value must be a numerical scalar
-            if isnumeric(value) && isscalar(value)
-                if nargin == 2
-                    obj.Proxy.record(value);
-                elseif isa(varargin{1}, "dictionary")
-                    attrkeys = keys(varargin{1});
-                    attrvals = values(varargin{1},"cell");
-                    if all(cellfun(@iscell, attrvals))
-                        attrvals = [attrvals{:}];
-                    end
-                    obj.Proxy.record(value, attrkeys, attrvals);
-                else
-                    attrkeys = [varargin{1:2:length(varargin)}]';
-                    attrvals = [varargin(2:2:length(varargin))]';
-                    obj.Proxy.record(value, attrkeys, attrvals);
-                end
-            end
+            obj.processValue(value, varargin{:});
         end
     end
 end
diff --git a/api/metrics/+opentelemetry/+metrics/SynchronousInstrument.m b/api/metrics/+opentelemetry/+metrics/SynchronousInstrument.m
@@ -9,7 +9,7 @@
         Unit        (1,1) string   
     end
 
-    properties (Access=protected)
+    properties (Access=private)
         Proxy   % Proxy object to interface C++ code
     end
 
@@ -20,5 +20,25 @@
             obj.Description = description;
             obj.Unit = unit;
         end
+
+        function processValue(obj, value, varargin)
+            % input value must be a numerical real scalar
+            if isnumeric(value) && isscalar(value) && isreal(value)
+                if nargin == 2
+                    obj.Proxy.processValue(value);
+                elseif isa(varargin{1}, "dictionary")
+                    attrkeys = keys(varargin{1});
+                    attrvals = values(varargin{1},"cell");
+                    if all(cellfun(@iscell, attrvals))
+                        attrvals = [attrvals{:}];
+                    end
+                    obj.Proxy.processValue(value, attrkeys, attrvals);
+                else
+                    attrkeys = [varargin{1:2:length(varargin)}]';
+                    attrvals = [varargin(2:2:length(varargin))]';
+                    obj.Proxy.processValue(value, attrkeys, attrvals);
+                end
+            end
+        end
     end
 end
diff --git a/api/metrics/+opentelemetry/+metrics/UpDownCounter.m b/api/metrics/+opentelemetry/+metrics/UpDownCounter.m
@@ -13,23 +13,7 @@
 
     methods
         function add(obj, value, varargin)
-            % input value must be a numerical scalar
-            if isnumeric(value) && isscalar(value)
-                if nargin == 2
-                    obj.Proxy.add(value);
-                elseif isa(varargin{1}, "dictionary")
-                    attrkeys = keys(varargin{1});
-                    attrvals = values(varargin{1},"cell");
-                    if all(cellfun(@iscell, attrvals))
-                        attrvals = [attrvals{:}];
-                    end
-                    obj.Proxy.add(value, attrkeys, attrvals);
-                else
-                    attrkeys = [varargin{1:2:length(varargin)}]';
-                    attrvals = [varargin(2:2:length(varargin))]';
-                    obj.Proxy.add(value, attrkeys, attrvals);
-                end
-            end
+            obj.processValue(value, varargin{:});
         end
     end
 end
diff --git a/api/metrics/include/opentelemetry-matlab/metrics/CounterProxy.h b/api/metrics/include/opentelemetry-matlab/metrics/CounterProxy.h
@@ -18,10 +18,10 @@ namespace libmexclass::opentelemetry {
 class CounterProxy : public libmexclass::proxy::Proxy {
   public:
     CounterProxy(nostd::shared_ptr<metrics_api::Counter<double> > ct) : CppCounter(ct) {
-       REGISTER_METHOD(CounterProxy, add);
+       REGISTER_METHOD(CounterProxy, processValue);
     }
 
-    void add(libmexclass::proxy::method::Context& context);
+    void processValue(libmexclass::proxy::method::Context& context);
 
   private:
 

diff --git a/api/metrics/include/opentelemetry-matlab/metrics/HistogramProxy.h b/api/metrics/include/opentelemetry-matlab/metrics/HistogramProxy.h
@@ -21,10 +21,10 @@ namespace libmexclass::opentelemetry {
 class HistogramProxy : public libmexclass::proxy::Proxy {
   public:
     HistogramProxy(nostd::shared_ptr<metrics_api::Histogram<double> > hist) : CppHistogram(hist) {
-       REGISTER_METHOD(HistogramProxy, record);
+       REGISTER_METHOD(HistogramProxy, processValue);
     }
 
-    void record(libmexclass::proxy::method::Context& context);
+    void processValue(libmexclass::proxy::method::Context& context);
 
   private:
 

diff --git a/api/metrics/include/opentelemetry-matlab/metrics/UpDownCounterProxy.h b/api/metrics/include/opentelemetry-matlab/metrics/UpDownCounterProxy.h
@@ -18,10 +18,10 @@ namespace libmexclass::opentelemetry {
 class UpDownCounterProxy : public libmexclass::proxy::Proxy {
   public:
     UpDownCounterProxy(nostd::shared_ptr<metrics_api::UpDownCounter<double> > ct) : CppUpDownCounter(ct) {
-       REGISTER_METHOD(UpDownCounterProxy, add);
+       REGISTER_METHOD(UpDownCounterProxy, processValue);
     }
 
-    void add(libmexclass::proxy::method::Context& context);
+    void processValue(libmexclass::proxy::method::Context& context);
 
   private:
 

diff --git a/api/metrics/src/CounterProxy.cpp b/api/metrics/src/CounterProxy.cpp
@@ -12,7 +12,7 @@
 namespace libmexclass::opentelemetry {
 
 
-void CounterProxy::add(libmexclass::proxy::method::Context& context){
+void CounterProxy::processValue(libmexclass::proxy::method::Context& context){
 
     matlab::data::Array value_mda = context.inputs[0];
     double value = static_cast<double>(value_mda[0]);

diff --git a/api/metrics/src/HistogramProxy.cpp b/api/metrics/src/HistogramProxy.cpp
@@ -12,7 +12,7 @@
 namespace libmexclass::opentelemetry {
 
 
-void HistogramProxy::record(libmexclass::proxy::method::Context& context){
+void HistogramProxy::processValue(libmexclass::proxy::method::Context& context){
     // Get value
     matlab::data::Array value_mda = context.inputs[0];
     double value = static_cast<double>(value_mda[0]);

diff --git a/api/metrics/src/UpDownCounterProxy.cpp b/api/metrics/src/UpDownCounterProxy.cpp
@@ -12,7 +12,7 @@
 namespace libmexclass::opentelemetry {
 
 
-void UpDownCounterProxy::add(libmexclass::proxy::method::Context& context){
+void UpDownCounterProxy::processValue(libmexclass::proxy::method::Context& context){
 
     matlab::data::Array value_mda = context.inputs[0];
     double value = static_cast<double>(value_mda[0]);