From 6673e63d7c8c918fb31a5e3bdfb26c2fcdd8e698 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Wed, 3 Sep 2025 17:23:33 -0400 Subject: [PATCH 1/4] update vcpkg baseline --- CMakeLists.txt | 6 ++---- cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake | 5 +++-- vcpkg.json | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 188c15d..2147f62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,7 +423,7 @@ if(WIN32) if(WITH_OTLP_HTTP) set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} - $) + $) 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} - $ $/../bin/${OPENSSL_DLL} - $/../bin/${OPENSSL_CRYPTO_DLL} - $) + $/../bin/${OPENSSL_CRYPTO_DLL}) endif() else() set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX}) diff --git a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake b/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake index 215e1d2..9cb381d 100644 --- a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake +++ b/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) diff --git a/vcpkg.json b/vcpkg.json index 22b6db0..a295500 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -25,5 +25,5 @@ ] } }, - "builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a" + "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625" } From 8477e96d3145fdfa5c9c5b391af8ee5d9952f230 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Wed, 3 Sep 2025 20:03:29 -0400 Subject: [PATCH 2/4] add a Mac debug workflow --- .github/workflows/debug_mac_dependencies.yml | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/debug_mac_dependencies.yml diff --git a/.github/workflows/debug_mac_dependencies.yml b/.github/workflows/debug_mac_dependencies.yml new file mode 100644 index 0000000..0744681 --- /dev/null +++ b/.github/workflows/debug_mac_dependencies.yml @@ -0,0 +1,36 @@ +name: "Debug MacOS Dependencies" +on: + workflow_dispatch: + push: + branches: + - 'mac_dependencies' +jobs: + build-macos: + runs-on: macos-14 + 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=ON -DWITH_OTLP_FILE=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake --build build --config Release --target install -v + - name: Compress into single artifact + working-directory: ${{ github.workspace }} + run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: otel-matlab-macos.tar.gz + path: ${{ github.workspace }}/otel-matlab-macos.tar.gz From ec9cf9cedb1390db2ded1300952a9d75456cfdfb Mon Sep 17 00:00:00 2001 From: duncanpo Date: Wed, 3 Sep 2025 20:04:34 -0400 Subject: [PATCH 3/4] fix typo in debug workflow --- .github/workflows/debug_mac_dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debug_mac_dependencies.yml b/.github/workflows/debug_mac_dependencies.yml index 0744681..d4c2d3c 100644 --- a/.github/workflows/debug_mac_dependencies.yml +++ b/.github/workflows/debug_mac_dependencies.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - 'mac_dependencies' + - 'mac_dependencies_2' jobs: build-macos: runs-on: macos-14 From c6df88a6b2ad32487eccfe7b933cdf78b4fbb7de Mon Sep 17 00:00:00 2001 From: duncanpo Date: Thu, 4 Sep 2025 07:14:15 -0400 Subject: [PATCH 4/4] remove debug workflow --- .github/workflows/debug_mac_dependencies.yml | 36 -------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/debug_mac_dependencies.yml diff --git a/.github/workflows/debug_mac_dependencies.yml b/.github/workflows/debug_mac_dependencies.yml deleted file mode 100644 index d4c2d3c..0000000 --- a/.github/workflows/debug_mac_dependencies.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: "Debug MacOS Dependencies" -on: - workflow_dispatch: - push: - branches: - - 'mac_dependencies_2' -jobs: - build-macos: - runs-on: macos-14 - 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=ON -DWITH_OTLP_FILE=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - cmake --build build --config Release --target install -v - - name: Compress into single artifact - working-directory: ${{ github.workspace }} - run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: otel-matlab-macos.tar.gz - path: ${{ github.workspace }}/otel-matlab-macos.tar.gz