Skip to content

Commit

Permalink
Update opentelemetry-cpp to 1.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
duncanpo committed Feb 29, 2024
1 parent ef88849 commit ac7e5d1
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
path: OpenTelemetry-Matlab
- name: Read version
id: getversion
run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
run: echo "version=$(cat VERSION.txt)" >> $GITHUB_OUTPUT
- name: Download Artifacts
uses: actions/download-artifact@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ endif()
set(CLIENT_PROJECT_NAME otel-matlab)

# read version number
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION OTEL_MATLAB_VERSION_RAW)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt OTEL_MATLAB_VERSION_RAW)
string(STRIP ${OTEL_MATLAB_VERSION_RAW} OTEL_MATLAB_VERSION)


Expand Down Expand Up @@ -130,7 +130,7 @@ else()
include(ExternalProject)
set(OTEL_CPP_PROJECT_NAME opentelemetry-cpp)
set(OTEL_CPP_GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp.git")
set(OTEL_CPP_GIT_TAG "e1119ed")
set(OTEL_CPP_GIT_TAG "a799f4a")

if(DEFINED OTEL_CPP_PREFIX)
string(REPLACE "\\" "/" OTEL_CPP_PREFIX ${OTEL_CPP_PREFIX})
Expand Down Expand Up @@ -416,7 +416,7 @@ set(OTLP_GRPC_EXPORTER_MATLAB_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcSpanExporter.m
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcMetricExporter.m
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcValidator.m)
set(OTLP_MISC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION)
set(OTLP_MISC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt)

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

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

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

Expand Down
File renamed without changes.
5 changes: 0 additions & 5 deletions test/tmetrics.m
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,6 @@ function testAsynchronousInstrumentBasic(testCase, create_async, datapoint_name)

function testAsynchronousInstrumentAttributes(testCase, create_async, datapoint_name)
% test for attributes when observing metrics for an observable counter

testCase.assumeTrue(false, "Asynchronous metrics attributes incorrectly ignored due to issue in opentelemetry-cpp 1.14.0");

countername = "bar";
callback = @callbackWithAttributes;

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

testCase.assumeTrue(false, "Asynchronous metrics attributes incorrectly ignored due to issue in opentelemetry-cpp 1.14.0");

countername = "bar";

p = opentelemetry.sdk.metrics.MeterProvider(testCase.ShortIntervalReader);
Expand Down
3 changes: 2 additions & 1 deletion test/ttrace.m
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ function testBasic(testCase)

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

nameidx = find(resourcekeys == "telemetry.sdk.name");
verifyNotEmpty(testCase, nameidx);
Expand Down

0 comments on commit ac7e5d1

Please sign in to comment.