Added Code coverage changes to seperate branch

Author: MWSestabro

.github/workflows/build_and_test_full.yml

@@ -40,6 +40,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -70,6 +71,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -106,6 +108,8 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                # pin to R2024b because R2025a has an issue that causes a failure when building the context_propagation example
+                release: R2024b
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -140,9 +144,12 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
+              env:
+                 CMAKE_POLICY_VERSION_MINIMUM: 3.5   # required by upb because its cmake requirement is not compatible with cmake 4 
               run: |
                   cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install

.github/workflows/build_and_test_simple.yml

@@ -41,6 +41,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -70,6 +71,8 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                # pin to R2024b because R2025a has an issue that causes a failure when building the context_propagation example
+                release: R2024b
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -104,6 +107,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler MATLAB_Compiler_SDK
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab

.github/workflows/create_release.yml

@@ -18,6 +18,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -46,6 +47,7 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
@@ -79,9 +81,12 @@ jobs:
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
+                release: R2025a
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
+              env:
+                 CMAKE_POLICY_VERSION_MINIMUM: 3.5   # required by upb because its cmake requirement is not compatible with cmake 4 
               run: |
                   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
@@ -93,6 +98,98 @@ jobs:
               with: 
                 name: otel-matlab-${{ matrix.os }}.tar.gz
                 path: ${{ github.workspace }}/otel-matlab-${{ matrix.os }}.tar.gz
+    nogrpc-ubuntu:     # without gRPC exporter
+        runs-on: ubuntu-22.04
+        env:
+            OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
+        steps:
+            - name: Download OpenTelemetry-Matlab source
+              uses: actions/checkout@v3
+              with: 
+                path: opentelemetry-matlab
+            - name: Install ninja-build
+              run: sudo apt-get install ninja-build
+            - name: Install MATLAB
+              uses: matlab-actions/setup-matlab@v2
+              with:
+                release: R2025a
+                products: MATLAB_Compiler
+            - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
+              run: |
+                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=OFF -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 }}
+              run: tar -czf otel-matlab-nogrpc-ubuntu.tar.gz otel_matlab_install
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with: 
+                name: otel-matlab-nogrpc-ubuntu.tar.gz
+                path: ${{ github.workspace }}/otel-matlab-nogrpc-ubuntu.tar.gz
+    nogrpc-windows:   # without gRPC exporter
+        runs-on: windows-latest
+        env:
+            OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
+        steps:
+            - name: Download OpenTelemetry-Matlab source
+              uses: actions/checkout@v3
+              with: 
+                path: opentelemetry-matlab
+            - name: Install ninja-build
+              run: choco install ninja
+            - name: Install MATLAB
+              uses: matlab-actions/setup-matlab@v2
+              with:
+                release: R2025a
+                products: MATLAB_Compiler
+            - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
+              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=OFF -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 }}
+              run: tar -czf otel-matlab-nogrpc-windows.tar.gz otel_matlab_install
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with: 
+                name: otel-matlab-nogrpc-windows.tar.gz
+                path: ${{ github.workspace }}/otel-matlab-nogrpc-windows.tar.gz
+    nogrpc-macos:    # without gRPC exporter
+        runs-on: ${{ matrix.os }}
+        strategy:
+          matrix:
+            os: [macos-13, macos-14]   # runs on Mac with both Intel (macos-13) and Apple Silicon (macos-14) processors
+        env:
+            OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
+        steps:
+            - name: Download OpenTelemetry-Matlab source
+              uses: actions/checkout@v3
+              with: 
+                path: opentelemetry-matlab
+            - name: Install ninja-build
+              run: brew install ninja
+            - name: Install MATLAB
+              uses: matlab-actions/setup-matlab@v2
+              with:
+                release: R2025a
+                products: MATLAB_Compiler
+            - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
+              run: |
+                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=OFF -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 }}
+              run: tar -czf otel-matlab-nogrpc-${{ matrix.os }}.tar.gz otel_matlab_install
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with: 
+                name: otel-matlab-nogrpc-${{ matrix.os }}.tar.gz
+                path: ${{ github.workspace }}/otel-matlab-nogrpc-${{ matrix.os }}.tar.gz
     package-mltbx:
         name: Package MATLAB Toolbox (MLTBX) Files
         runs-on: ubuntu-22.04
@@ -102,8 +199,13 @@ jobs:
             - build-ubuntu
             - build-windows
             - build-macos
+            - nogrpc-ubuntu
+            - nogrpc-windows
+            - nogrpc-macos
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
+            WITHGRPC_FOLDER: "${{ github.workspace }}/withgrpc"
+            NOGRPC_FOLDER: "${{ github.workspace }}/nogrpc"
         steps:
             - name: Checkout OpenTelemetry-Matlab
               uses: actions/checkout@v3
@@ -115,26 +217,61 @@ jobs:
                 path: artifacts-downloaded
             - name: Decompress Artifacts
               run: |
-                  mv artifacts-downloaded/*/*.tar.gz .
+                  mkdir $WITHGRPC_FOLDER
+                  cd $WITHGRPC_FOLDER
+                  mv ../artifacts-downloaded/*/otel-matlab-ubuntu.tar.gz .
+                  mv ../artifacts-downloaded/*/otel-matlab-macos*.tar.gz .
+                  mv ../artifacts-downloaded/*/otel-matlab-windows.tar.gz .
                   tar -xzvf otel-matlab-ubuntu.tar.gz
                   tar -xzvf otel-matlab-macos-13.tar.gz
                   tar -xzvf otel-matlab-macos-14.tar.gz
                   tar -xzvf otel-matlab-windows.tar.gz
+            - name: Decompress Artifacts without gRPC exporter
+              run: |
+                  mkdir $NOGRPC_FOLDER
+                  cd $NOGRPC_FOLDER
+                  mv ../artifacts-downloaded/*/*nogrpc*.tar.gz .
+                  tar -xzvf otel-matlab-nogrpc-ubuntu.tar.gz
+                  tar -xzvf otel-matlab-nogrpc-macos-13.tar.gz
+                  tar -xzvf otel-matlab-nogrpc-macos-14.tar.gz
+                  tar -xzvf otel-matlab-nogrpc-windows.tar.gz
             - name: Install MATLAB
-              uses: matlab-actions/setup-matlab@v1
-            - name: Run commands
+              uses: matlab-actions/setup-matlab@v2
+              with:
+                release: R2025a
+            - name: Package Toolbox
+              env:
+                MATLABPATH: OpenTelemetry-Matlab/tools
+                WORKING_FOLDER: ${{ env.WITHGRPC_FOLDER }}
+                OTEL_MATLAB_TOOLBOX_FOLDER: otel_matlab_install
+                OTEL_MATLAB_TOOLBOX_OUTPUT_FOLDER: ${{ env.WITHGRPC_FOLDER }}
+                OTEL_MATLAB_TOOLBOX_VERSION: ${{ github.ref_name }}
+                OTEL_MATLAB_TOOLBOX_NAME: otel-matlab
+              uses: matlab-actions/run-command@v1
+              with:
+                command: packageMatlabInterface
+            - name: Package Toolbox without gRPC exporter
               env:
                 MATLABPATH: OpenTelemetry-Matlab/tools
+                WORKING_FOLDER: ${{ env.NOGRPC_FOLDER }}
                 OTEL_MATLAB_TOOLBOX_FOLDER: otel_matlab_install
-                OTEL_MATLAB_TOOLBOX_OUTPUT_FOLDER: 
+                OTEL_MATLAB_TOOLBOX_OUTPUT_FOLDER: ${{ env.NOGRPC_FOLDER }}
                 OTEL_MATLAB_TOOLBOX_VERSION: ${{ github.ref_name }}
+                OTEL_MATLAB_TOOLBOX_NAME: otel-matlab-nogrpc
               uses: matlab-actions/run-command@v1
               with:
                 command: packageMatlabInterface
+            - name: Compress Toolbox without gRPC exporter
+              working-directory: ${{ env.NOGRPC_FOLDER }}
+              run: tar -czf otel-matlab-nogrpc.mltbx.tar.gz otel-matlab-nogrpc.mltbx
             - name: Create release
               uses: softprops/action-gh-release@v2
+                # Upload toolbox without gRPC exporter in compressed format
+                # This is to avoid multiple .mltbx files, which will cause issues in MATLAB File Exchange
               with:
-                files: ./otel-matlab.mltbx
+                files: |
+                  ${{ env.WITHGRPC_FOLDER }}/otel-matlab.mltbx
+                  ${{ env.NOGRPC_FOLDER }}/otel-matlab-nogrpc.mltbx.tar.gz
                 name: "Version ${{ github.ref_name }}"
                 fail_on_unmatched_files: true
                 generate_release_notes: false

CMakeLists.txt

@@ -28,7 +28,7 @@ else()
 
    set(VCPKG_FETCH_CONTENT_NAME vcpkg)
    set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git")
-   set(VCPKG_GIT_TAG "f7423ee")
+   set(VCPKG_GIT_TAG "ce613c4")
    FetchContent_Declare(
        ${VCPKG_FETCH_CONTENT_NAME}
        GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY}
@@ -56,7 +56,11 @@ if(APPLE)
     # use libcurl as a shared library and load the MATLAB version at runtime
     # run uname -m to determine whether arm64 or x86_64
     exec_program(uname ARGS -m OUTPUT_VARIABLE MAC_HOST_SYSTEM)
-    set(VCPKG_OTEL_TRIPLET ${MAC_HOST_SYSTEM}-osx-otel-matlab)
+    if(${MAC_HOST_SYSTEM} STREQUAL "arm64")
+       set(VCPKG_OTEL_TRIPLET "arm64-osx-otel-matlab")
+    elseif(${MAC_HOST_SYSTEM} STREQUAL "x86_64")
+       set(VCPKG_OTEL_TRIPLET "x64-osx-otel-matlab")
+    endif()
     set(VCPKG_OVERLAY_TRIPLETS ${CMAKE_SOURCE_DIR}/cmake/vcpkg_triplets)
     set(VCPKG_TARGET_TRIPLET ${VCPKG_OTEL_TRIPLET})
     set(TRIPLET_DEFINITIONS -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET})
@@ -117,7 +121,7 @@ set(LIBMEXCLASS_FETCH_CONTENT_NAME libmexclass)
 
 set(LIBMEXCLASS_FETCH_CONTENT_GIT_REPOSITORY "https://github.com/mathworks/libmexclass.git")
 
-set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "bc2b9f2") 
+set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "3a3b581") 
 
 set(LIBMEXCLASS_FETCH_CONTENT_SOURCE_SUBDIR "libmexclass/cpp")
 
@@ -419,7 +423,7 @@ if(WIN32)
 
     if(WITH_OTLP_HTTP)
 	set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES}
-            $<TARGET_FILE:CURL::libcurl>)
+            $<TARGET_FILE:CURL::libcurl_shared>)
     endif()
 
     if(WITH_OTLP_GRPC)
@@ -428,10 +432,8 @@ if(WIN32)
 	set(OPENSSL_DLL libssl-3-x64.dll)
 	set(OPENSSL_CRYPTO_DLL libcrypto-3-x64.dll)
 	set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES}
-	    $<TARGET_FILE:c-ares::cares>
 	    $<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_DLL}
-	    $<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL}
-	    $<TARGET_FILE:re2::re2>)
+	    $<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL})
     endif()
 else()
     set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -544,3 +546,4 @@ install(FILES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} DESTINATION ${LIBMEXCLASS
 if(WITH_EXAMPLES)
    add_subdirectory(examples)
 endif()
+

README.md

@@ -4,8 +4,13 @@
 MATLAB® interface to [OpenTelemetry™](https://opentelemetry.io/), based on the [OpenTelemetry Specification](https://opentelemetry.io/docs/specs/otel/). OpenTelemetry is an observability framework for creating and managing telemetry data, such as traces, metrics, and logs. This data can then be sent to an observability back-end for monitoring, alerts, and analysis. 
 
 ### Status
-- Tracing, metrics, and logs are all fully supported. 
-- Supported and tested on Windows®, Linux®, and macOS.
+1. Tracing, metrics, and logs are all fully supported and tested on Windows®, Linux®, and macOS.
+2. On Linux, when running MATLAB R2025a or newer releases, the gRPC library used in the gRPC exporter in this package may conflict with the same library in MATLAB, causing MATLAB to crash. To avoid this issue, install otel-matlab-nogrpc.mltbx in [version 1.10.2](https://github.com/mathworks/OpenTelemetry-MATLAB/releases/tag/1.10.2), which excludes the gRPC exporter.
+3. If you are using [version 1.10.2](https://github.com/mathworks/OpenTelemetry-MATLAB/releases/tag/1.10.2) on Linux with MATLAB R2024a or older, you may run into an "Invalid MEX file" error due to an incompatible libstdc++ library. Define the environment variable LD_PRELOAD to point to the system libstdc++.so. For example, use the following command in a Bash shell on Ubuntu or Debian Linux.
+```
+export LD_PRELOAD="/lib/x86_64-linux-gnu/libstdc++.so.6"
+```
+4. OpenTelemetry currently does not support non-ASCII characters. Defining names or attributes with non-ASCII characters will cause the telemetry data to become invalid and fail to export.
 
 ### MathWorks Products (https://www.mathworks.com)
 

cmake/vcpkg_triplets/arm64-osx-otel-matlab.cmake

@@ -5,6 +5,12 @@ if(${PORT} MATCHES "(curl|zlib)")
 else()
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+# disable the script to fix rpath for curl, which makes an undesirable change to
+# the install name from @rpath/libcurl.4.dylib to @rpath/libcurl.4.8.0.dylib
+if(${PORT} MATCHES "curl")
+    set(VCPKG_FIXUP_MACHO_RPATH OFF)
+endif()
+
 
 set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES arm64)

cmake/vcpkg_triplets/x86_64-osx-otel-matlab.cmake renamed to cmake/vcpkg_triplets/x64-osx-otel-matlab.cmake

@@ -5,6 +5,11 @@ if(${PORT} MATCHES "(curl|zlib)")
 else()
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+# disable the script to fix rpath for curl, which makes an undesirable change to
+# the install name from @rpath/libcurl.4.dylib to @rpath/libcurl.4.8.0.dylib
+if(${PORT} MATCHES "curl")
+    set(VCPKG_FIXUP_MACHO_RPATH OFF)
+endif()
 
 set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES x86_64)

cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake

@@ -1,7 +1,8 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
-# Conflict with abseil_dll.dll used by Simulink. Use static library to avoid conflict.
-if(${PORT} MATCHES "abseil")
+# Conflict with abseil_dll.dll used by Simulink. cares.dll and re2.dll are also shipped with MATLAB. 
+# Use static libraries to avoid conflict.
+if(${PORT} MATCHES "(abseil|c-ares|re2)")
     set(VCPKG_LIBRARY_LINKAGE static)
 else()
     set(VCPKG_LIBRARY_LINKAGE dynamic)

test/callbacks/callbackWithAttributes3.m

@@ -1,7 +1,8 @@
 function result = callbackWithAttributes3()
 % Test callback function for asynchronous instruments that uses attributes
+% in a dictionary
 %
-% Copyright 2024 The MathWorks, Inc.
+% Copyright 2025 The MathWorks, Inc.
 
 value = 30;
 result = opentelemetry.metrics.ObservableResult;