Merge remote-tracking branch 'origin/main' into testing

Author: MWSestabro

.github/workflows/create_release.yml

@@ -96,6 +96,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
@@ -105,8 +197,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
@@ -118,28 +215,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@v2
               with:
                 release: R2025a
-            - name: Run commands
+            - 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

@@ -423,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)
@@ -432,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})

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)

tools/packageMatlabInterface.m

@@ -5,18 +5,24 @@
 % the resulting .mltbx file location is taken from environment variable
 % OTEL_MATLAB_TOOLBOX_OUTPUT_FOLDER.
 
-% Copyright 2024 The MathWorks, Inc.
+% Copyright 2024-2025 The MathWorks, Inc.
 
 toolboxFolder = string(getenv("OTEL_MATLAB_TOOLBOX_FOLDER"));
 outputFolder = string(getenv("OTEL_MATLAB_TOOLBOX_OUTPUT_FOLDER"));
 toolboxVersion = string(getenv("OTEL_MATLAB_TOOLBOX_VERSION"));
+workingFolder = string(getenv("WORKING_FOLDER"));
+toolboxName = string(getenv("OTEL_MATLAB_TOOLBOX_NAME"));
+
+% cd to working folder
+cd(workingFolder);
 
 % Output folder must exist.
 mkdir(outputFolder);
 
 disp("Toolbox Folder: " + toolboxFolder);
 disp("Output Folder: " + outputFolder);
 disp("Toolbox Version:" + toolboxVersion);
+disp("Toolbox Name:" + toolboxName);
 
 identifier = "dc2cae2f-4f43-4d2c-b6ed-f1a59f0dfcdf";
 opts = matlab.addons.toolbox.ToolboxOptions(toolboxFolder, identifier);
@@ -33,6 +39,6 @@
 
 opts.MinimumMatlabRelease = "R2022a";
 
-opts.OutputFile = fullfile(outputFolder, "otel-matlab.mltbx");
+opts.OutputFile = fullfile(outputFolder, toolboxName + ".mltbx");
 disp("Output File: " + opts.OutputFile);
 matlab.addons.toolbox.packageToolbox(opts);

vcpkg.json

@@ -25,5 +25,5 @@
       ]
     }
   },
-  "builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
+  "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
 }