Merge branch 'main' into testing

Author: MWSestabro

.github/workflows/build_and_test_full.yml

@@ -9,7 +9,7 @@ env:
   MLM_LICENSE_TOKEN: ${{ secrets.MLM_LICENSE_TOKEN }}
 jobs:
     get_version:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         outputs:
           version: ${{ steps.getversion.outputs.latest_tag }}
         steps:
@@ -25,9 +25,7 @@ jobs:
               working-directory: opentelemetry-matlab
               run: echo "latest_tag=$(sed -re 's/^v?([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)?.*/\1/' <<< $(git describe --tags --abbrev=0))" >> $GITHUB_OUTPUT
     build-and-run-tests-ubuntu:
-        # Running on ubuntu-latest would use a glibc version that is incompatible when using the built mex files on a Debian 11 
-        # Instead, run on ubuntu-20.04
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         needs: get_version
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
@@ -57,9 +55,7 @@ jobs:
               with:
                  select-by-folder: opentelemetry-matlab/test
     code-coverage-build-and-run-tests-ubuntu:
-        # Running on ubuntu-latest would use a glibc version that is incompatible when using the built mex files on a Debian 11 
-        # Instead, run on ubuntu-20.04
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         needs: get_version
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"

.github/workflows/build_and_test_simple.yml

@@ -10,7 +10,7 @@ env:
   MLM_LICENSE_TOKEN: ${{ secrets.MLM_LICENSE_TOKEN }}
 jobs:
     get_version:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         outputs:
           version: ${{ steps.getversion.outputs.latest_tag }}
         steps:
@@ -26,9 +26,7 @@ jobs:
               working-directory: opentelemetry-matlab
               run: echo "latest_tag=$(sed -re 's/^v?([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)?.*/\1/' <<< $(git describe --tags --abbrev=0))" >> $GITHUB_OUTPUT
     build-and-run-tests-ubuntu:
-        # Running on ubuntu-latest would use a glibc version that is incompatible when using the built mex files on a Debian 11 
-        # Instead, run on ubuntu-20.04
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         needs: get_version
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"

.github/workflows/create_release.yml

@@ -5,9 +5,7 @@ on:
         - '[0-9]+.[0-9]+.[0-9]+'
 jobs:
     build-ubuntu:
-        # Running on ubuntu-latest would use a glibc version that is incompatible when using the built mex files on a Debian 11 
-        # Instead, run on ubuntu-20.04
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
         steps:
@@ -24,7 +22,7 @@ jobs:
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
               run: |
-                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
+                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DWITH_OTLP_FILE=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Compress into single artifact
               working-directory: ${{ github.workspace }}
@@ -54,7 +52,7 @@ jobs:
               shell: cmd
               run: |
                   call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-                  cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
+                  cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DWITH_OTLP_FILE=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Compress into single artifact
               working-directory: ${{ github.workspace }}
@@ -85,7 +83,7 @@ jobs:
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
               run: |
-                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_GRPC=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
+                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DWITH_OTLP_FILE=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Compress into single artifact
               working-directory: ${{ github.workspace }}
@@ -97,7 +95,7 @@ jobs:
                 path: ${{ github.workspace }}/otel-matlab-${{ matrix.os }}.tar.gz
     package-mltbx:
         name: Package MATLAB Toolbox (MLTBX) Files
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         permissions:
           contents: write
         needs:

CMakeLists.txt

@@ -191,10 +191,13 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
    include(ExternalProject)
    set(OTEL_CPP_PROJECT_NAME opentelemetry-cpp)
    set(OTEL_CPP_GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp.git")
-   set(OTEL_CPP_GIT_TAG "fa0a520")
+   set(OTEL_CPP_GIT_TAG "955a807")
 
    set(OTEL_CPP_CXX_STANDARD 14)
 
+   # The synchronous gauge metric instrument is only defined in ABI version 2
+   set(OTEL_CPP_ABI_VERSION OPENTELEMETRY_ABI_VERSION_NO=2)
+
    set(PATCHES_DIR ${CMAKE_SOURCE_DIR}/patches)
    if(SKIP_OTEL_CPP_PATCH)
        set(patch_comand "")
@@ -209,14 +212,16 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
        set(patch_command "")
    endif()
 
+   # Note: examples are temporarily turned off (-DWITH_EXAMPLES=OFF) due to a build issue that is now fixed in #3284
+   # Renable examples after pulling in the fix
    ExternalProject_Add(
        ${OTEL_CPP_PROJECT_NAME}
        GIT_REPOSITORY ${OTEL_CPP_GIT_REPOSITORY}
        GIT_TAG ${OTEL_CPP_GIT_TAG}
        PREFIX ${OTEL_CPP_PREFIX}
        UPDATE_DISCONNECTED 1
        PATCH_COMMAND ${patch_command}
-       CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DWITH_OTLP_FILE=${WITH_OTLP_FILE} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR} ${TRIPLET_DEFINITIONS}
+       CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_ABI_VERSION_1=OFF -DWITH_ABI_VERSION_2=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DWITH_OTLP_FILE=${WITH_OTLP_FILE} -DWITH_EXAMPLES=OFF -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR} ${TRIPLET_DEFINITIONS}
        BUILD_BYPRODUCTS ${OTEL_CPP_LIBRARIES}
        INSTALL_DIR ${OTEL_CPP_PREFIX}
        INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX} --config $<CONFIG>
@@ -291,6 +296,7 @@ set(OPENTELEMETRY_PROXY_SOURCES
     ${METRICS_API_SOURCE_DIR}/CounterProxy.cpp
     ${METRICS_API_SOURCE_DIR}/UpDownCounterProxy.cpp
     ${METRICS_API_SOURCE_DIR}/HistogramProxy.cpp
+    ${METRICS_API_SOURCE_DIR}/GaugeProxy.cpp
     ${METRICS_API_SOURCE_DIR}/SynchronousInstrumentProxyFactory.cpp
     ${METRICS_API_SOURCE_DIR}/MeasurementFetcher.cpp
     ${METRICS_API_SOURCE_DIR}/AsynchronousInstrumentProxy.cpp
@@ -365,6 +371,8 @@ if(WITH_OTLP_FILE)
     target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE WITH_OTLP_FILE)
 endif()
 
+target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OTEL_CPP_ABI_VERSION})
+
 # pass in version number
 target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE OTEL_MATLAB_VERSION="${OTEL_MATLAB_VERSION}")
 if(WIN32)

OtelMatlabProxyFactory.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023-2024 The MathWorks, Inc.
+// Copyright 2023-2025 The MathWorks, Inc.
 
 #include "OtelMatlabProxyFactory.h"
 
@@ -8,7 +8,10 @@
 //#include "opentelemetry-matlab/trace/ScopeProxy.h"
 #include "opentelemetry-matlab/trace/SpanContextProxy.h"
 #include "opentelemetry-matlab/trace/TraceContextPropagatorProxy.h"
+#include "opentelemetry-matlab/trace/NoOpTracerProviderProxy.h"
+#include "opentelemetry-matlab/metrics/NoOpMeterProviderProxy.h"
 #include "opentelemetry-matlab/logs/LoggerProviderProxy.h"
+#include "opentelemetry-matlab/logs/NoOpLoggerProviderProxy.h"
 #include "opentelemetry-matlab/context/propagation/TextMapCarrierProxy.h"
 #include "opentelemetry-matlab/context/propagation/TextMapPropagatorProxy.h"
 #include "opentelemetry-matlab/context/propagation/CompositePropagatorProxy.h"
@@ -57,6 +60,9 @@ OtelMatlabProxyFactory::make_proxy(const libmexclass::proxy::ClassName& class_na
     REGISTER_PROXY(libmexclass.opentelemetry.SpanProxy, libmexclass::opentelemetry::SpanProxy);
     //REGISTER_PROXY(libmexclass.opentelemetry.ScopeProxy, libmexclass::opentelemetry::ScopeProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.SpanContextProxy, libmexclass::opentelemetry::SpanContextProxy);
+    REGISTER_PROXY(libmexclass.opentelemetry.NoOpTracerProviderProxy, libmexclass::opentelemetry::NoOpTracerProviderProxy);
+    REGISTER_PROXY(libmexclass.opentelemetry.NoOpMeterProviderProxy, libmexclass::opentelemetry::NoOpMeterProviderProxy);
+    REGISTER_PROXY(libmexclass.opentelemetry.NoOpLoggerProviderProxy, libmexclass::opentelemetry::NoOpLoggerProviderProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.TextMapCarrierProxy, libmexclass::opentelemetry::TextMapCarrierProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.ContextProxy, libmexclass::opentelemetry::ContextProxy);
     REGISTER_PROXY(libmexclass.opentelemetry.TokenProxy, libmexclass::opentelemetry::TokenProxy);

api/logs/+opentelemetry/+logs/+internal/NoOpLoggerProvider.m

@@ -0,0 +1,20 @@
+classdef NoOpLoggerProvider < handle
+    % A no-op logger provider does nothing and is used to disable logging.
+    % For internal use only.
+
+    % Copyright 2025 The MathWorks, Inc.
+
+    properties (Access=private)
+        Proxy   % Proxy object to interface C++ code
+    end
+
+    methods (Access=?opentelemetry.logs.Provider)
+        function obj = NoOpLoggerProvider()
+            % constructs a no-op LoggerProvider and sets it as the global
+            % instance
+            obj.Proxy = libmexclass.proxy.Proxy("Name", ...
+                "libmexclass.opentelemetry.NoOpLoggerProviderProxy", ...
+                "ConstructorArguments", {});
+        end
+    end
+end

api/logs/+opentelemetry/+logs/Logger.m

@@ -1,7 +1,7 @@
 classdef Logger < handle
     % A logger that is used to emit log records
 
-    % Copyright 2024 The MathWorks, Inc.
+    % Copyright 2024-2025 The MathWorks, Inc.
 
     properties (SetAccess=immutable)
         Name    (1,1) string   % Logger name
@@ -38,7 +38,9 @@ function emitLogRecord(obj, severity, body, trailingnames, trailingvalues)
             %    Parameters are:
             %       "Context"   - Span contained in a context object.
             %       "Timestamp" - Timestamp of the log record specified as a
-            %                     datetime. Default is the current time.
+            %                     datetime. Default is the current time. If
+            %                     Timestamp does not have a time zone 
+            %                     specified, it is interpreted as a UTC time.
             %       "Attributes" - Attribute name-value pairs specified as
             %                      a dictionary.
             %

api/logs/+opentelemetry/+logs/Provider.m

@@ -1,7 +1,7 @@
 classdef Provider
 % Get and set the global instance of logger provider
 
-% Copyright 2024 The MathWorks, Inc.
+% Copyright 2024-2025 The MathWorks, Inc.
 
     methods (Static)
         function p = getLoggerProvider()
@@ -19,10 +19,22 @@ function setLoggerProvider(p)
             %    OPENTELEMETRY.LOGS.PROVIDER.SETLOGGERPROVIDER(LP) sets
             %    LP as the global instance of logger provider.
             %
-            %    See also OPENTELEMETRY.LOGS.PROVIDER.GETTRACERPROVIDER
+            %    See also OPENTELEMETRY.LOGS.PROVIDER.GETLOGGERPROVIDER, 
+            %    OPENTELEMETRY.LOGS.PROVIDER.UNSETLOGGERPROVIDER
 
             p.setLoggerProvider();
         end
+
+        function unsetLoggerProvider()
+            % Unset the global instance of logger provider, which disables
+            % logging
+            %    OPENTELEMETRY.LOGS.PROVIDER.UNSETLOGGERPROVIDER() unsets
+            %    the global instance of logger provider.
+            %
+            %    See also OPENTELEMETRY.LOGS.PROVIDER.SETLOGGERPROVIDER
+
+            opentelemetry.logs.internal.NoOpLoggerProvider;
+        end
     end
 
 end

api/logs/include/opentelemetry-matlab/logs/NoOpLoggerProviderProxy.h

@@ -0,0 +1,29 @@
+// Copyright 2025 The MathWorks, Inc.
+
+#pragma once
+
+#include "libmexclass/proxy/Proxy.h"
+
+#include "opentelemetry/logs/logger_provider.h"
+#include "opentelemetry/logs/provider.h"
+#include "opentelemetry/logs/noop.h"
+
+namespace logs_api = opentelemetry::logs;
+namespace nostd = opentelemetry::nostd;
+
+namespace libmexclass::opentelemetry {
+class NoOpLoggerProviderProxy : public libmexclass::proxy::Proxy {
+  public:
+    NoOpLoggerProviderProxy(nostd::shared_ptr<logs_api::LoggerProvider> lp) : CppLoggerProvider(lp) {
+        // set as global LoggerProvider instance
+        logs_api::Provider::SetLoggerProvider(CppLoggerProvider);
+    } 
+
+    static libmexclass::proxy::MakeResult make(const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+        return std::make_shared<NoOpLoggerProviderProxy>(nostd::shared_ptr<logs_api::LoggerProvider>(new logs_api::NoopLoggerProvider()));
+    }
+
+  protected:
+    nostd::shared_ptr<logs_api::LoggerProvider> CppLoggerProvider;
+};
+} // namespace libmexclass::opentelemetry

api/logs/src/LoggerProxy.cpp

@@ -9,6 +9,7 @@
 #include "opentelemetry/logs/log_record.h"
 #include "opentelemetry/trace/context.h"
 #include "opentelemetry/context/context.h"
+#include "opentelemetry/common/timestamp.h"
 
 #include "MatlabDataArray.hpp"
 
@@ -40,6 +41,12 @@ void LoggerProxy::emitLogRecord(libmexclass::proxy::method::Context& context) {
 
     nostd::unique_ptr<logs_api::LogRecord> rec = CppLogger->CreateLogRecord();
 
+    // Do not use the default timestamp, which is set to the start of UNIX epoch. Set both the 
+    // default timestamp and default observed timestamp to the current time
+    auto now = common::SystemTimestamp(std::chrono::system_clock::now());
+    rec->SetTimestamp(now);
+    rec->SetObservedTimestamp(now);
+
     // Add size attribute if body is nonscalar
     if (array_body) {
        rec->SetAttribute(bodyattrs.Attributes.back().first, bodyattrs.Attributes.back().second);