Metrics cleanup

.gitignore

@@ -4,3 +4,4 @@ build
 # Autosave files
 *.asv
 *.swp
+.vscode/settings.json

CMakeLists.txt

@@ -216,6 +216,7 @@ set(OPENTELEMETRY_PROXY_SOURCES
     ${TRACE_API_SOURCE_DIR}/SpanProxy.cpp
     ${TRACE_API_SOURCE_DIR}/SpanContextProxy.cpp
     ${COMMON_API_SOURCE_DIR}/attribute.cpp
+    ${METRICS_API_SOURCE_DIR}/MeterProviderProxy.cpp
     ${METRICS_API_SOURCE_DIR}/MeterProxy.cpp
     ${METRICS_API_SOURCE_DIR}/CounterProxy.cpp
     ${METRICS_API_SOURCE_DIR}/UpDownCounterProxy.cpp
@@ -230,14 +231,19 @@ set(OPENTELEMETRY_PROXY_SOURCES
     ${TRACE_SDK_SOURCE_DIR}/BatchSpanProcessorProxy.cpp
     ${TRACE_SDK_SOURCE_DIR}/ParentBasedSamplerProxy.cpp
     ${METRICS_SDK_SOURCE_DIR}/MeterProviderProxy.cpp
+    ${METRICS_SDK_SOURCE_DIR}/PeriodicExportingMetricReaderProxy.cpp
     ${COMMON_SDK_SOURCE_DIR}/resource.cpp)
 if(WITH_OTLP_HTTP)
-    set(OPENTELEMETRY_PROXY_SOURCES ${OPENTELEMETRY_PROXY_SOURCES} 
-	${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpSpanExporterProxy.cpp)
+    set(OPENTELEMETRY_PROXY_SOURCES 
+    ${OPENTELEMETRY_PROXY_SOURCES} 
+    ${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpSpanExporterProxy.cpp
+    ${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpMetricExporterProxy.cpp)
 endif()
 if(WITH_OTLP_GRPC)
-    set(OPENTELEMETRY_PROXY_SOURCES ${OPENTELEMETRY_PROXY_SOURCES} 
-        ${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcSpanExporterProxy.cpp)
+    set(OPENTELEMETRY_PROXY_SOURCES 
+    ${OPENTELEMETRY_PROXY_SOURCES}
+    ${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcSpanExporterProxy.cpp
+    ${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcMetricExporterProxy.cpp)
 endif()
 
 libmexclass_client_add_proxy_library(
@@ -391,9 +397,17 @@ set(BAGGAGE_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/baggage/+opentele
 set(COMMON_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/common/+opentelemetry)
 set(TRACE_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/trace/+opentelemetry)
 set(METRICS_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/metrics/+opentelemetry)
-set(DEFAULT_EXPORTER_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultSpanExporter.m)
-set(OTLP_HTTP_EXPORTER_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpSpanExporter.m)
-set(OTLP_GRPC_EXPORTER_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcSpanExporter.m)
+set(COMMON_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/common/+opentelemetry)
+set(DEFAULT_EXPORTER_MATLAB_SOURCES 
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultSpanExporter.m
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultMetricExporter.m)
+set(OTLP_HTTP_EXPORTER_MATLAB_SOURCES 
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpSpanExporter.m
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpMetricExporter.m)
+set(OTLP_GRPC_EXPORTER_MATLAB_SOURCES 
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcSpanExporter.m
+    ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcMetricExporter.m)
+
 
 set(OTLP_EXPORTERS_DIR +opentelemetry/+exporters/+otlp)
 
@@ -404,6 +418,7 @@ install(DIRECTORY ${BAGGAGE_API_MATLAB_SOURCES} DESTINATION .)
 install(DIRECTORY ${COMMON_API_MATLAB_SOURCES} DESTINATION .)
 install(DIRECTORY ${TRACE_SDK_MATLAB_SOURCES} DESTINATION .)
 install(DIRECTORY ${METRICS_SDK_MATLAB_SOURCES} DESTINATION .)
+install(DIRECTORY ${COMMON_SDK_MATLAB_SOURCES} DESTINATION .)
 install(FILES ${DEFAULT_EXPORTER_MATLAB_SOURCES} DESTINATION ${OTLP_EXPORTERS_DIR})
 if(WITH_OTLP_HTTP)
     install(FILES ${OTLP_HTTP_EXPORTER_MATLAB_SOURCES} DESTINATION ${OTLP_EXPORTERS_DIR})

OtelMatlabProxyFactory.cpp

@@ -23,17 +23,21 @@
 #include "opentelemetry-matlab/sdk/trace/TraceIdRatioBasedSamplerProxy.h"
 #include "opentelemetry-matlab/sdk/trace/ParentBasedSamplerProxy.h"
 #include "opentelemetry-matlab/sdk/metrics/MeterProviderProxy.h"
+#include "opentelemetry-matlab/sdk/metrics/PeriodicExportingMetricReaderProxy.h"
 #ifdef WITH_OTLP_HTTP
     #include "opentelemetry-matlab/exporters/otlp/OtlpHttpSpanExporterProxy.h"
+    #include "opentelemetry-matlab/exporters/otlp/OtlpHttpMetricExporterProxy.h"
 #endif
 #ifdef WITH_OTLP_GRPC
     #include "opentelemetry-matlab/exporters/otlp/OtlpGrpcSpanExporterProxy.h"
+    #include "opentelemetry-matlab/exporters/otlp/OtlpGrpcMetricExporterProxy.h"
 #endif
 
 libmexclass::proxy::MakeResult
 OtelMatlabProxyFactory::make_proxy(const libmexclass::proxy::ClassName& class_name,
                                const libmexclass::proxy::FunctionArguments& constructor_arguments) {
 
+    REGISTER_PROXY(libmexclass.opentelemetry.MeterProviderProxy, libmexclass::opentelemetry::MeterProviderProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.TracerProviderProxy, libmexclass::opentelemetry::TracerProviderProxy);
     //REGISTER_PROXY(libmexclass.opentelemetry.TracerProxy, libmexclass::opentelemetry::TracerProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.SpanProxy, libmexclass::opentelemetry::SpanProxy);
@@ -57,12 +61,15 @@ OtelMatlabProxyFactory::make_proxy(const libmexclass::proxy::ClassName& class_na
     REGISTER_PROXY(libmexclass.opentelemetry.sdk.ParentBasedSamplerProxy, libmexclass::opentelemetry::sdk::ParentBasedSamplerProxy);
 
     REGISTER_PROXY(libmexclass.opentelemetry.sdk.MeterProviderProxy, libmexclass::opentelemetry::sdk::MeterProviderProxy);
+    REGISTER_PROXY(libmexclass.opentelemetry.sdk.PeriodicExportingMetricReaderProxy, libmexclass::opentelemetry::sdk::PeriodicExportingMetricReaderProxy);
 
     #ifdef WITH_OTLP_HTTP
         REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpHttpSpanExporterProxy, libmexclass::opentelemetry::exporters::OtlpHttpSpanExporterProxy);
+        REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpHttpMetricExporterProxy, libmexclass::opentelemetry::exporters::OtlpHttpMetricExporterProxy);
     #endif
     #ifdef WITH_OTLP_GRPC
         REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpGrpcSpanExporterProxy, libmexclass::opentelemetry::exporters::OtlpGrpcSpanExporterProxy);
+        REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpGrpcMetricExporterProxy, libmexclass::opentelemetry::exporters::OtlpGrpcMetricExporterProxy);
     #endif
     return nullptr;
 }

api/metrics/+opentelemetry/+metrics/Counter.m

@@ -1,59 +1,20 @@
-classdef Counter < handle
-    % Counter is a value that accumulates over time,
-    % you can think of this like an odometer on a car; it only ever goes up.
+classdef Counter < opentelemetry.metrics.SynchronousInstrument
+    % Counter is a value that accumulates over time and can only increase
+    % but not decrease.
 
     % Copyright 2023 The MathWorks, Inc.
 
-    properties (SetAccess=immutable)
-        Name        (1,1) string  
-        Description (1,1) string   
-        Unit        (1,1) string   
-    end
-
-    properties (Access=private)
-        Proxy   % Proxy object to interface C++ code
-    end
-
     methods (Access={?opentelemetry.metrics.Meter})
-
-        function obj = Counter(proxy, ctname, ctdescription, ctunit)
+        function obj = Counter(proxy, name, description, unit)
             % Private constructor. Use createCounter method of Meter
             % to create Counters.
-            obj.Proxy = proxy;
-            obj.Name = ctname;
-            obj.Description = ctdescription;
-            obj.Unit = ctunit;
+            [email protected](proxy, name, description, unit);
         end
-
     end
-
+       
     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
+end

api/metrics/+opentelemetry/+metrics/Histogram.m

@@ -1,55 +1,19 @@
-classdef Histogram < handle
-    % Histogram is an instrument that adds or reduce values.
+classdef Histogram < opentelemetry.metrics.SynchronousInstrument
+    % Histogram is an instrument that aggregates values into bins
 
     % Copyright 2023 The MathWorks, Inc.
 
-    properties (SetAccess=immutable)
-        Name        (1,1) string  
-        Description (1,1) string   
-        Unit        (1,1) string   
-    end
-
-    properties (Access=public)
-        Proxy   % Proxy object to interface C++ code
-    end
-
     methods (Access={?opentelemetry.metrics.Meter})
-
-        function obj = Histogram(proxy, hiname, hidescription, hiunit)
+        function obj = Histogram(proxy, name, description, unit)
             % Private constructor. Use createHistogram method of Meter
             % to create Histograms.
-            obj.Proxy = proxy;
-            obj.Name = hiname;
-            obj.Description = hidescription;
-            obj.Unit = hiunit;
+            [email protected](proxy, name, description, unit);
         end
-
     end
-
+       
     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

api/metrics/+opentelemetry/+metrics/Meter.m

@@ -14,7 +14,7 @@
         Proxy   % Proxy object to interface C++ code
     end
 
-    methods (Access={?opentelemetry.sdk.metrics.MeterProvider})
+    methods (Access={?opentelemetry.sdk.metrics.MeterProvider, ?opentelemetry.metrics.MeterProvider})
 
         function obj = Meter(proxy, mtname, mtversion, mtschema)
             % Private constructor. Use getMeter method of MeterProvider
@@ -37,7 +37,10 @@
                 ctunit = ""
             end
             import opentelemetry.common.mustBeScalarString
-            ctname = mustBeScalarString(ctname);          
+            ctname = mustBeScalarString(ctname);
+            % cpp-opentelemetry end does not allow string input with spaces,
+            % replace any spaces with underscores as a temporary fix
+            ctname = strrep(ctname, ' ', '_');
             ctdescription = mustBeScalarString(ctdescription);
             ctunit = mustBeScalarString(ctunit);
             id = obj.Proxy.createCounter(ctname, ctdescription, ctunit);
@@ -56,7 +59,10 @@
             end
 
             import opentelemetry.common.mustBeScalarString
-            ctname = mustBeScalarString(ctname);          
+            ctname = mustBeScalarString(ctname);
+            % cpp-opentelemetry end does not allow string input with spaces,
+            % replace any spaces with underscores as a temporary fix
+            ctname = strrep(ctname, ' ', '_');
             ctdescription = mustBeScalarString(ctdescription);
             ctunit = mustBeScalarString(ctunit);
             id = obj.Proxy.createUpDownCounter(ctname, ctdescription, ctunit);
@@ -75,7 +81,10 @@
             end
 
             import opentelemetry.common.mustBeScalarString
-            hiname = mustBeScalarString(hiname);          
+            hiname = mustBeScalarString(hiname);
+            % cpp-opentelemetry end does not allow string input with spaces,
+            % replace any spaces with underscores as a temporary fix
+            hiname = strrep(hiname, ' ', '_');
             hidescription = mustBeScalarString(hidescription);
             hiunit = mustBeScalarString(hiunit);
             id = obj.Proxy.createHistogram(hiname, hidescription, hiunit);

api/metrics/+opentelemetry/+metrics/MeterProvider.m

@@ -0,0 +1,69 @@
+classdef MeterProvider < handle
+    % A meter provider stores a set of configurations used in a distributed
+    % metrics system.
+
+    % Copyright 2023 The MathWorks, Inc.
+
+    properties (Access={?opentelemetry.sdk.metrics.MeterProvider, ?opentelemetry.sdk.common.Cleanup})
+        Proxy   % Proxy object to interface C++ code
+    end
+
+    methods (Access={?opentelemetry.metrics.Provider, ?opentelemetry.sdk.metrics.MeterProvider})
+        function obj = MeterProvider(skip)
+            % constructor
+            % "skip" input signals skipping construction
+            if nargin < 1 || skip ~= "skip"
+                obj.Proxy = libmexclass.proxy.Proxy("Name", ...
+                    "libmexclass.opentelemetry.MeterProviderProxy", ...
+                    "ConstructorArguments", {});
+            end
+        end
+    end
+
+    methods
+        function meter = getMeter(obj, mname, mversion, mschema)
+            % GETMETER Create a meter object used to generate metrics.
+            %    M = GETMETER(MP, NAME) returns a meter with the name
+            %    NAME that uses all the configurations specified in meter
+            %    provider MP.
+            %
+            %    M = GETMETER(MP, NAME, VERSION, SCHEMA) also specifies
+            %    the meter version and the URL that documents the schema
+            %    of the generated meters.
+            %
+            %    See also OPENTELEMETRY.METRICS.METER
+            arguments
+                obj
+                mname
+                mversion = ""
+                mschema = ""
+            end
+            % name, version, schema accepts any types that can convert to a
+            % string
+            import opentelemetry.common.mustBeScalarString
+            mname = mustBeScalarString(mname);          
+            mversion = mustBeScalarString(mversion);
+            mschema = mustBeScalarString(mschema);
+            id = obj.Proxy.getMeter(mname, mversion, mschema);
+            meterproxy = libmexclass.proxy.Proxy("Name", ...
+                "libmexclass.opentelemetry.MeterProxy", "ID", id);
+            meter = opentelemetry.metrics.Meter(meterproxy, mname, mversion, mschema);
+        end
+
+        function setMeterProvider(obj)
+            % SETMETERPROVIDER Set global instance of meter provider
+            %    SETMETERPROVIDER(MP) sets the meter provider MP as
+            %    the global instance.
+            %
+            %    See also OPENTELEMETRY.METRICS.PROVIDER.GETMETERPROVIDER
+            obj.Proxy.setMeterProvider();
+        end
+    end
+
+    methods(Access=?opentelemetry.sdk.common.Cleanup)
+        function postShutdown(obj)
+            % POSTSHUTDOWN  Handle post-shutdown tasks
+            obj.Proxy.postShutdown();
+        end
+    end
+end

api/metrics/+opentelemetry/+metrics/Provider.m

@@ -0,0 +1,27 @@
+classdef Provider
+% Get and set the global instance of meter provider
+
+% Copyright 2023 The MathWorks, Inc.
+
+    methods (Static)
+        function p = getMeterProvider()
+            % Get the global instance of meter provider
+            %    MP = OPENTELEMETRY.METRICS.PROVIDER.GETMETERPROVIDER gets
+            %    the global instance of meter provider.
+            %
+            %    See also OPENTELEMETRY.METRICS.PROVIDER.SETMETERPROVIDER
+
+            p = opentelemetry.metrics.MeterProvider();
+        end
+
+        function setMeterProvider(p)
+            % Set the global instance of meter provider
+            %    OPENTELEMETRY.METRICS.PROVIDER.GETMETERPROVIDER(MP) sets
+            %    MP as the global instance of meter provider.
+            %
+            %    See also OPENTELEMETRY.METRICS.PROVIDER.GETMETERPROVIDER
+            p.setMeterProvider();
+        end
+    end
+
+end