Skip to content

Commit 6e8dbd4

Browse files
committed
clean up tests by force flushing
1 parent b41694c commit 6e8dbd4

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

api/trace/include/opentelemetry-matlab/trace/TracerProviderProxy.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class TracerProviderProxy : public libmexclass::proxy::Proxy {
4848

4949
void postShutdown(libmexclass::proxy::method::Context& context) {
5050
// Replace tracer provider with a no-op instance. Subsequent tracers and spans won't be recorded
51-
CppTracerProvider.swap(nostd::shared_ptr<trace_api::TracerProvider>(new trace_api::NoopTracerProvider));
51+
nostd::shared_ptr<trace_api::TracerProvider> noop(new trace_api::NoopTracerProvider);
52+
CppTracerProvider.swap(noop);
5253
}
5354

5455
protected:

sdk/trace/src/TracerProviderProxy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ void TracerProviderProxy::shutdown(libmexclass::proxy::method::Context& context)
8181
matlab::data::ArrayFactory factory;
8282
auto result_mda = factory.createScalar(static_cast<trace_sdk::TracerProvider&>(*CppTracerProvider).Shutdown());
8383
context.outputs[0] = result_mda;
84-
CppTracerProvider.swap(nostd::shared_ptr<trace_api::TracerProvider>(new trace_api::NoopTracerProvider));
84+
nostd::shared_ptr<trace_api::TracerProvider> noop(new trace_api::NoopTracerProvider);
85+
CppTracerProvider.swap(noop);
8586
}
8687

8788
void TracerProviderProxy::forceFlush(libmexclass::proxy::method::Context& context) {

test/commonTeardown.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ function commonTeardown(testCase)
33
%
44
% Copyright 2023 The MathWorks, Inc.
55

6+
% Flush all spans that have not yet been exported
7+
tp = opentelemetry.trace.Provider.getTracerProvider();
8+
opentelemetry.sdk.trace.Cleanup.forceFlush(tp);
9+
610
% Terminate Collector if it is still running
711
terminateCollector(testCase);
812

@@ -19,4 +23,4 @@ function commonTeardown(testCase)
1923
end
2024
if exist(testCase.PidFile, "file")
2125
delete(testCase.PidFile);
22-
end
26+
end

0 commit comments

Comments
 (0)