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

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,6 +144,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/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,6 +81,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
@@ -121,7 +124,9 @@ jobs:
                   tar -xzvf otel-matlab-macos-14.tar.gz
                   tar -xzvf otel-matlab-windows.tar.gz
             - name: Install MATLAB
-              uses: matlab-actions/setup-matlab@v1
+              uses: matlab-actions/setup-matlab@v2
+              with:
+                release: R2025a
             - name: Run commands
               env:
                 MATLABPATH: OpenTelemetry-Matlab/tools

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 "b02e341")
    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})

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)