Skip to content

Commit ac7e5d1

Browse files
committed
Update opentelemetry-cpp to 1.14.2
1 parent ef88849 commit ac7e5d1

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
path: OpenTelemetry-Matlab
100100
- name: Read version
101101
id: getversion
102-
run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
102+
run: echo "version=$(cat VERSION.txt)" >> $GITHUB_OUTPUT
103103
- name: Download Artifacts
104104
uses: actions/download-artifact@v3
105105
with:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ endif()
8989
set(CLIENT_PROJECT_NAME otel-matlab)
9090

9191
# read version number
92-
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION OTEL_MATLAB_VERSION_RAW)
92+
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt OTEL_MATLAB_VERSION_RAW)
9393
string(STRIP ${OTEL_MATLAB_VERSION_RAW} OTEL_MATLAB_VERSION)
9494

9595

@@ -130,7 +130,7 @@ else()
130130
include(ExternalProject)
131131
set(OTEL_CPP_PROJECT_NAME opentelemetry-cpp)
132132
set(OTEL_CPP_GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp.git")
133-
set(OTEL_CPP_GIT_TAG "e1119ed")
133+
set(OTEL_CPP_GIT_TAG "a799f4a")
134134

135135
if(DEFINED OTEL_CPP_PREFIX)
136136
string(REPLACE "\\" "/" OTEL_CPP_PREFIX ${OTEL_CPP_PREFIX})
@@ -416,7 +416,7 @@ set(OTLP_GRPC_EXPORTER_MATLAB_SOURCES
416416
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcSpanExporter.m
417417
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcMetricExporter.m
418418
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcValidator.m)
419-
set(OTLP_MISC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION)
419+
set(OTLP_MISC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt)
420420

421421
set(OTLP_EXPORTERS_DIR +opentelemetry/+exporters/+otlp)
422422

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ MATLAB® interface to [OpenTelemetry™](https://opentelemetry.io/), base
66
### Status
77
- Tracing and metrics are fully supported. Logs will be in the future.
88
- Supported and tested on Windows®, Linux®, and macOS.
9-
- Attributes in asynchronous metric instruments are currently ignored because of an issue in the opentelemetry-cpp layer.
109

1110
### MathWorks Products (https://www.mathworks.com)
1211

File renamed without changes.

test/tmetrics.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,6 @@ function testAsynchronousInstrumentBasic(testCase, create_async, datapoint_name)
541541

542542
function testAsynchronousInstrumentAttributes(testCase, create_async, datapoint_name)
543543
% test for attributes when observing metrics for an observable counter
544-
545-
testCase.assumeTrue(false, "Asynchronous metrics attributes incorrectly ignored due to issue in opentelemetry-cpp 1.14.0");
546-
547544
countername = "bar";
548545
callback = @callbackWithAttributes;
549546

@@ -604,8 +601,6 @@ function testAsynchronousInstrumentAnonymousCallback(testCase, create_async, dat
604601
function testAsynchronousInstrumentMultipleCallbacks(testCase, create_async, datapoint_name)
605602
% Observable counter with more than one callbacks
606603

607-
testCase.assumeTrue(false, "Asynchronous metrics attributes incorrectly ignored due to issue in opentelemetry-cpp 1.14.0");
608-
609604
countername = "bar";
610605

611606
p = opentelemetry.sdk.metrics.MeterProvider(testCase.ShortIntervalReader);

test/ttrace.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ function testBasic(testCase)
8888

8989
versionidx = find(resourcekeys == "telemetry.sdk.version");
9090
verifyNotEmpty(testCase, versionidx);
91-
verifyEqual(testCase, results.resourceSpans.resource.attributes(versionidx).value.stringValue, '1.2.0');
91+
versionstr = strip(fileread(fullfile("..", "VERSION.txt")));
92+
verifyEqual(testCase, results.resourceSpans.resource.attributes(versionidx).value.stringValue, versionstr);
9293

9394
nameidx = find(resourcekeys == "telemetry.sdk.name");
9495
verifyNotEmpty(testCase, nameidx);

0 commit comments

Comments
 (0)