Skip to content

Commit 1271789

Browse files
duncanpoduncanpo
committed
Update APIs to match functional design
1 parent c365832 commit 1271789

File tree

7 files changed

+36
-27
lines changed

7 files changed

+36
-27
lines changed

‎api/baggage/+opentelemetry/+baggage/Baggage.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
keys {mustBeVector, mustBeText}
7272
values {mustBeVector, mustBeText}
7373
end
74+
if length(keys) ~= length(values)
75+
error("Keys and values must be the same length.")
76+
end
7477
obj.Proxy.setEntries(string(keys(:)), string(values(:)));
7578
end
7679

@@ -81,10 +84,11 @@
8184
end
8285
obj.Proxy.deleteEntries(string(keys(:)));
8386
end
84-
end
8587

86-
methods (Access = ?opentelemetry.baggage.Context)
8788
function context = insertBaggage(obj, context)
89+
if nargin < 2
90+
context = opentelemetry.context.getCurrentContext();
91+
end
8892
contextid = obj.Proxy.insertBaggage(context.Proxy.ID);
8993
contextproxy = libmexclass.proxy.Proxy("Name", ...
9094
"libmexclass.opentelemetry.ContextProxy", "ID", contextid);

‎api/context/+opentelemetry/+context/+propagation/TextMapPropagator.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,19 @@
2424

2525
methods
2626
function newcontext = extract(obj, carrier, context)
27+
if nargin < 3
28+
context = opentelemetry.context.getCurrentContext();
29+
end
2730
newcontextid = obj.Proxy.extract(carrier.Proxy.ID, context.Proxy.ID);
2831
newcontextproxy = libmexclass.proxy.Proxy("Name", ...
2932
"libmexclass.opentelemetry.ContextProxy", "ID", newcontextid);
3033
newcontext = opentelemetry.context.Context(newcontextproxy);
3134
end
3235

3336
function newcarrier = inject(obj, carrier, context)
37+
if nargin < 3
38+
context = opentelemetry.context.getCurrentContext();
39+
end
3440
newcarrierid = obj.Proxy.inject(carrier.Proxy.ID, context.Proxy.ID);
3541
newcarrierproxy = libmexclass.proxy.Proxy("Name", ...
3642
"libmexclass.opentelemetry.TextMapCarrierProxy", "ID", newcarrierid);

‎api/trace/+opentelemetry/+trace/Span.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ function setStatus(obj, status, description)
157157
obj.Proxy.setStatus(status, description);
158158
end
159159

160-
function context = getContext(obj)
161-
contextid = obj.Proxy.getContext();
160+
function context = getSpanContext(obj)
161+
contextid = obj.Proxy.getSpanContext();
162162
contextproxy = libmexclass.proxy.Proxy("Name", ...
163163
"libmexclass.opentelemetry.SpanContextProxy", "ID", contextid);
164164
context = opentelemetry.trace.SpanContext(contextproxy);
@@ -169,6 +169,9 @@ function setStatus(obj, status, description)
169169
end
170170

171171
function context = insertSpan(obj, context)
172+
if nargin < 2
173+
context = opentelemetry.context.getCurrentContext();
174+
end
172175
contextid = obj.Proxy.insertSpan(context.Proxy.ID);
173176
contextproxy = libmexclass.proxy.Proxy("Name", ...
174177
"libmexclass.opentelemetry.ContextProxy", "ID", contextid);

‎api/trace/include/opentelemetry-matlab/trace/SpanProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SpanProxy : public libmexclass::proxy::Proxy {
3131

3232
void setStatus(libmexclass::proxy::method::Context& context);
3333

34-
void getContext(libmexclass::proxy::method::Context& context);
34+
void getSpanContext(libmexclass::proxy::method::Context& context);
3535

3636
void isRecording(libmexclass::proxy::method::Context& context);
3737

‎api/trace/src/SpanProxy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SpanProxy::SpanProxy(const libmexclass::proxy::FunctionArguments& constructor_ar
3737
REGISTER_METHOD(SpanProxy, addEvent);
3838
REGISTER_METHOD(SpanProxy, updateName);
3939
REGISTER_METHOD(SpanProxy, setStatus);
40-
REGISTER_METHOD(SpanProxy, getContext);
40+
REGISTER_METHOD(SpanProxy, getSpanContext);
4141
REGISTER_METHOD(SpanProxy, isRecording);
4242
REGISTER_METHOD(SpanProxy, insertSpan);
4343
}
@@ -138,7 +138,7 @@ void SpanProxy::setStatus(libmexclass::proxy::method::Context& context) {
138138
CppSpan->SetStatus(code, descr);
139139
}
140140

141-
void SpanProxy::getContext(libmexclass::proxy::method::Context& context) {
141+
void SpanProxy::getSpanContext(libmexclass::proxy::method::Context& context) {
142142
trace_api::SpanContext sc = CppSpan->GetContext();
143143

144144
// instantiate a SpanContextProxy instance

‎test/tcontextPropagation.m

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ function testExtract(testCase)
3434

3535
carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.headers);
3636
propagator = opentelemetry.trace.propagation.TraceContextPropagator();
37-
context = opentelemetry.context.getCurrentContext();
38-
newcontext = propagator.extract(carrier, context);
37+
newcontext = propagator.extract(carrier);
3938
tp = opentelemetry.sdk.trace.TracerProvider();
4039
tr = getTracer(tp, "bar");
4140
sp = startSpan(tr, "quux", Context=newcontext);
@@ -51,7 +50,7 @@ function testExtract(testCase)
5150
verifyEqual(testCase, string(results.resourceSpans.scopeSpans.spans.parentSpanId), ...
5251
testCase.TestData.spanId);
5352
% check trace state in span context
54-
spancontext = getContext(sp);
53+
spancontext = getSpanContext(sp);
5554
verifyEqual(testCase, spancontext.TraceState, testCase.TestData.traceState);
5655
end
5756

@@ -66,9 +65,8 @@ function testInject(testCase)
6665

6766
% inject the current context
6867
propagator = opentelemetry.trace.propagation.TraceContextPropagator();
69-
context = opentelemetry.context.getCurrentContext();
7068
carrier = opentelemetry.context.propagation.TextMapCarrier();
71-
carrier = propagator.inject(carrier, context);
69+
carrier = propagator.inject(carrier);
7270
headers = carrier.Headers;
7371

7472
endSpan(sp);
@@ -102,7 +100,7 @@ function testGetSetTextMapPropagator(testCase)
102100
context = opentelemetry.context.Context();
103101
newcontext = p.extract(carrier, context);
104102
span = opentelemetry.trace.Context.extractSpan(newcontext);
105-
spancontext = getContext(span);
103+
spancontext = getSpanContext(span);
106104

107105
% verify the extracted trace and span ID and trace state match the headers
108106
verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -121,7 +119,7 @@ function testExtractContext(testCase)
121119
carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.headers);
122120
context = opentelemetry.context.propagation.extractContext(carrier);
123121
span = opentelemetry.trace.Context.extractSpan(context);
124-
spancontext = getContext(span);
122+
spancontext = getSpanContext(span);
125123

126124
% verify extracted trace and span IDs and trace state
127125
verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -140,7 +138,7 @@ function testInjectContext(testCase)
140138
tp = opentelemetry.sdk.trace.TracerProvider();
141139
tr = getTracer(tp, "foo");
142140
sp = startSpan(tr, "bar");
143-
spancontext = getContext(sp);
141+
spancontext = getSpanContext(sp);
144142
scope = makeCurrent(sp); %#ok<NASGU>
145143

146144
% inject
@@ -157,8 +155,7 @@ function testExtractBaggage(testCase)
157155

158156
carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.baggageHeaders);
159157
propagator = opentelemetry.baggage.propagation.BaggagePropagator();
160-
context = opentelemetry.context.getCurrentContext();
161-
newcontext = propagator.extract(carrier, context);
158+
newcontext = propagator.extract(carrier);
162159
bag = opentelemetry.baggage.Context.extractBaggage(newcontext);
163160
bag = bag.Entries;
164161

@@ -242,8 +239,7 @@ function testCompositeExtract(testCase)
242239
propagator = opentelemetry.context.propagation.CompositePropagator(...
243240
opentelemetry.trace.propagation.TraceContextPropagator, ...
244241
opentelemetry.baggage.propagation.BaggagePropagator);
245-
context = opentelemetry.context.getCurrentContext();
246-
newcontext = propagator.extract(carrier, context);
242+
newcontext = propagator.extract(carrier);
247243

248244
% extract baggage from context and verify
249245
bag = opentelemetry.baggage.Context.extractBaggage(newcontext);
@@ -272,7 +268,7 @@ function testCompositeExtract(testCase)
272268
verifyEqual(testCase, string(results.resourceSpans.scopeSpans.spans.parentSpanId), ...
273269
testCase.TestData.spanId);
274270
% check trace state in span context
275-
spancontext = getContext(sp);
271+
spancontext = getSpanContext(sp);
276272
verifyEqual(testCase, spancontext.TraceState, testCase.TestData.traceState);
277273
end
278274

@@ -349,7 +345,7 @@ function testExtractContextComposite(testCase)
349345

350346
% extract span and verify
351347
span = opentelemetry.trace.Context.extractSpan(context);
352-
spancontext = getContext(span);
348+
spancontext = getSpanContext(span);
353349

354350
% verify extracted trace and span IDs and trace state
355351
verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -390,7 +386,7 @@ function testInjectContextComposite(testCase)
390386
% verify the injected traceparent contains the trace and span IDs
391387
traceparentrow = find(headers(:,1) == "traceparent");
392388
verifyNotEmpty(testCase, traceparentrow);
393-
spancontext = getContext(sp);
389+
spancontext = getSpanContext(sp);
394390
verifySubstring(testCase, headers(traceparentrow,2), spancontext.TraceId);
395391
verifySubstring(testCase, headers(traceparentrow,2), spancontext.SpanId);
396-
end
392+
end

‎test/ttrace.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ function testSpanContext(testCase)
214214
tp = opentelemetry.sdk.trace.TracerProvider();
215215
tr = getTracer(tp, "foo");
216216
sp = startSpan(tr, "bar");
217-
ctxt = getContext(sp);
217+
ctxt = getSpanContext(sp);
218218
endSpan(sp);
219219

220220
% perform test comparisons
@@ -501,7 +501,7 @@ function testLinks(testCase)
501501
tp = opentelemetry.sdk.trace.TracerProvider();
502502
tr = getTracer(tp, "foo");
503503
sp1 = startSpan(tr, "bar");
504-
ctxt1 = getContext(sp1);
504+
ctxt1 = getSpanContext(sp1);
505505
% one link, no attributes
506506
l1 = opentelemetry.trace.Link(ctxt1);
507507
sp2 = startSpan(tr, "quux", "Links", l1);
@@ -510,7 +510,7 @@ function testLinks(testCase)
510510

511511
% two links, with attributes in one link
512512
sp3 = startSpan(tr, "baz");
513-
ctxt3 = getContext(sp3);
513+
ctxt3 = getSpanContext(sp3);
514514
l2attributes = {"StringScalar", "abcde", "DoubleArray", magic(3)};
515515
l2 = opentelemetry.trace.Link(ctxt1, l2attributes{:});
516516
l3 = opentelemetry.trace.Link(ctxt3);
@@ -548,4 +548,4 @@ function testLinks(testCase)
548548
% second link
549549
verifyEqual(testCase, string(results{2}.resourceSpans.scopeSpans.spans.links{2}.traceId), ctxt3.TraceId);
550550
verifyEqual(testCase, string(results{2}.resourceSpans.scopeSpans.spans.links{2}.spanId), ctxt3.SpanId);
551-
end
551+
end

0 commit comments

Comments
 (0)