Skip to content

Commit 9dcfec5

Browse files
committed
Merge remote-tracking branch 'origin/main' into testing
2 parents e6a7cb0 + 4bbba44 commit 9dcfec5

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

.github/workflows/build_and_test_full.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ jobs:
148148
products: MATLAB_Compiler MATLAB_Compiler_SDK
149149
- name: Build OpenTelemetry-Matlab
150150
working-directory: opentelemetry-matlab
151+
env:
152+
CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4
151153
run: |
152154
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 }}
153155
cmake --build build --config Release --target install

.github/workflows/create_release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ jobs:
8585
products: MATLAB_Compiler
8686
- name: Build OpenTelemetry-Matlab
8787
working-directory: opentelemetry-matlab
88+
env:
89+
CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4
8890
run: |
8991
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 }}
9092
cmake --build build --config Release --target install

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else()
2828

2929
set(VCPKG_FETCH_CONTENT_NAME vcpkg)
3030
set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git")
31-
set(VCPKG_GIT_TAG "b02e341")
31+
set(VCPKG_GIT_TAG "ce613c4")
3232
FetchContent_Declare(
3333
${VCPKG_FETCH_CONTENT_NAME}
3434
GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY}

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
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.
55

66
### Status
7-
- Tracing, metrics, and logs are all fully supported.
8-
- Supported and tested on Windows®, Linux®, and macOS.
7+
1. Tracing, metrics, and logs are all fully supported and tested on Windows®, Linux®, and macOS.
8+
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.
9+
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.
10+
```
11+
export LD_PRELOAD="/lib/x86_64-linux-gnu/libstdc++.so.6"
12+
```
13+
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.
914

1015
### MathWorks Products (https://www.mathworks.com)
1116

vcpkg.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
"abseil",
2121
"c-ares",
2222
"re2",
23-
"openssl",
23+
{
24+
"name": "openssl",
25+
"version>=": "3.5.0"
26+
},
2427
"upb"
2528
]
2629
}

0 commit comments

Comments
 (0)