Update APIs to match functional design

Author: duncanpo

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

@@ -71,6 +71,9 @@
     	       keys {mustBeVector, mustBeText}
                values {mustBeVector, mustBeText}
             end
+            if length(keys) ~= length(values)
+                error("Keys and values must be the same length.")
+            end
             obj.Proxy.setEntries(string(keys(:)), string(values(:)));
         end
 
@@ -81,10 +84,11 @@
             end
             obj.Proxy.deleteEntries(string(keys(:)));
         end
-    end
 
-    methods (Access = ?opentelemetry.baggage.Context)
         function context = insertBaggage(obj, context)
+            if nargin < 2
+                context = opentelemetry.context.getCurrentContext();
+            end
             contextid = obj.Proxy.insertBaggage(context.Proxy.ID);
             contextproxy = libmexclass.proxy.Proxy("Name", ...
                 "libmexclass.opentelemetry.ContextProxy", "ID", contextid);

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

@@ -24,13 +24,19 @@
 
     methods
         function newcontext = extract(obj, carrier, context)
+            if nargin < 3
+                context = opentelemetry.context.getCurrentContext();
+            end
             newcontextid = obj.Proxy.extract(carrier.Proxy.ID, context.Proxy.ID);
             newcontextproxy = libmexclass.proxy.Proxy("Name", ...
                 "libmexclass.opentelemetry.ContextProxy", "ID", newcontextid);
     	    newcontext = opentelemetry.context.Context(newcontextproxy);
         end
 
         function newcarrier = inject(obj, carrier, context)
+            if nargin < 3
+                context = opentelemetry.context.getCurrentContext();
+            end
             newcarrierid = obj.Proxy.inject(carrier.Proxy.ID, context.Proxy.ID);
             newcarrierproxy = libmexclass.proxy.Proxy("Name", ...
                 "libmexclass.opentelemetry.TextMapCarrierProxy", "ID", newcarrierid);

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

@@ -157,8 +157,8 @@ function setStatus(obj, status, description)
     	    obj.Proxy.setStatus(status, description);
     	end
 
-        function context = getContext(obj)
-            contextid = obj.Proxy.getContext();
+        function context = getSpanContext(obj)
+            contextid = obj.Proxy.getSpanContext();
             contextproxy = libmexclass.proxy.Proxy("Name", ...
                 "libmexclass.opentelemetry.SpanContextProxy", "ID", contextid);
             context = opentelemetry.trace.SpanContext(contextproxy);
@@ -169,6 +169,9 @@ function setStatus(obj, status, description)
         end
 
         function context = insertSpan(obj, context)
+            if nargin < 2
+                context = opentelemetry.context.getCurrentContext();
+            end
             contextid = obj.Proxy.insertSpan(context.Proxy.ID);
             contextproxy = libmexclass.proxy.Proxy("Name", ...
                 "libmexclass.opentelemetry.ContextProxy", "ID", contextid);

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

@@ -31,7 +31,7 @@ class SpanProxy : public libmexclass::proxy::Proxy {
 
     void setStatus(libmexclass::proxy::method::Context& context);
 
-    void getContext(libmexclass::proxy::method::Context& context);
+    void getSpanContext(libmexclass::proxy::method::Context& context);
 
     void isRecording(libmexclass::proxy::method::Context& context);
 

api/trace/src/SpanProxy.cpp

@@ -37,7 +37,7 @@ SpanProxy::SpanProxy(const libmexclass::proxy::FunctionArguments& constructor_ar
     REGISTER_METHOD(SpanProxy, addEvent);
     REGISTER_METHOD(SpanProxy, updateName);
     REGISTER_METHOD(SpanProxy, setStatus);
-    REGISTER_METHOD(SpanProxy, getContext);
+    REGISTER_METHOD(SpanProxy, getSpanContext);
     REGISTER_METHOD(SpanProxy, isRecording);
     REGISTER_METHOD(SpanProxy, insertSpan);
 }
@@ -138,7 +138,7 @@ void SpanProxy::setStatus(libmexclass::proxy::method::Context& context) {
     CppSpan->SetStatus(code, descr);
 }
 
-void SpanProxy::getContext(libmexclass::proxy::method::Context& context) {
+void SpanProxy::getSpanContext(libmexclass::proxy::method::Context& context) {
     trace_api::SpanContext sc = CppSpan->GetContext();
 
     // instantiate a SpanContextProxy instance

test/tcontextPropagation.m

@@ -34,8 +34,7 @@ function testExtract(testCase)
 
 carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.headers);
 propagator = opentelemetry.trace.propagation.TraceContextPropagator();
-context = opentelemetry.context.getCurrentContext();
-newcontext = propagator.extract(carrier, context);
+newcontext = propagator.extract(carrier);
 tp = opentelemetry.sdk.trace.TracerProvider();
 tr = getTracer(tp, "bar");
 sp = startSpan(tr, "quux", Context=newcontext);
@@ -51,7 +50,7 @@ function testExtract(testCase)
 verifyEqual(testCase, string(results.resourceSpans.scopeSpans.spans.parentSpanId), ...
     testCase.TestData.spanId);
 % check trace state in span context
-spancontext = getContext(sp);
+spancontext = getSpanContext(sp);
 verifyEqual(testCase, spancontext.TraceState, testCase.TestData.traceState);
 end
 
@@ -66,9 +65,8 @@ function testInject(testCase)
 
 % inject the current context
 propagator = opentelemetry.trace.propagation.TraceContextPropagator();
-context = opentelemetry.context.getCurrentContext();
 carrier = opentelemetry.context.propagation.TextMapCarrier();
-carrier = propagator.inject(carrier, context);
+carrier = propagator.inject(carrier);
 headers = carrier.Headers;
 
 endSpan(sp);
@@ -102,7 +100,7 @@ function testGetSetTextMapPropagator(testCase)
 context = opentelemetry.context.Context();
 newcontext = p.extract(carrier, context);
 span = opentelemetry.trace.Context.extractSpan(newcontext);
-spancontext = getContext(span);
+spancontext = getSpanContext(span);
 
 % verify the extracted trace and span ID and trace state match the headers
 verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -121,7 +119,7 @@ function testExtractContext(testCase)
 carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.headers);
 context = opentelemetry.context.propagation.extractContext(carrier);
 span = opentelemetry.trace.Context.extractSpan(context);
-spancontext = getContext(span);
+spancontext = getSpanContext(span);
 
 % verify extracted trace and span IDs and trace state
 verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -140,7 +138,7 @@ function testInjectContext(testCase)
 tp = opentelemetry.sdk.trace.TracerProvider();
 tr = getTracer(tp, "foo");
 sp = startSpan(tr, "bar");
-spancontext = getContext(sp);
+spancontext = getSpanContext(sp);
 scope = makeCurrent(sp); %#ok<NASGU>
 
 % inject
@@ -157,8 +155,7 @@ function testExtractBaggage(testCase)
 
 carrier = opentelemetry.context.propagation.TextMapCarrier(testCase.TestData.baggageHeaders);
 propagator = opentelemetry.baggage.propagation.BaggagePropagator();
-context = opentelemetry.context.getCurrentContext();
-newcontext = propagator.extract(carrier, context);
+newcontext = propagator.extract(carrier);
 bag = opentelemetry.baggage.Context.extractBaggage(newcontext);
 bag = bag.Entries;
 
@@ -242,8 +239,7 @@ function testCompositeExtract(testCase)
 propagator = opentelemetry.context.propagation.CompositePropagator(...
     opentelemetry.trace.propagation.TraceContextPropagator, ...
     opentelemetry.baggage.propagation.BaggagePropagator);
-context = opentelemetry.context.getCurrentContext();
-newcontext = propagator.extract(carrier, context);
+newcontext = propagator.extract(carrier);
 
 % extract baggage from context and verify
 bag = opentelemetry.baggage.Context.extractBaggage(newcontext);
@@ -272,7 +268,7 @@ function testCompositeExtract(testCase)
 verifyEqual(testCase, string(results.resourceSpans.scopeSpans.spans.parentSpanId), ...
     testCase.TestData.spanId);
 % check trace state in span context
-spancontext = getContext(sp);
+spancontext = getSpanContext(sp);
 verifyEqual(testCase, spancontext.TraceState, testCase.TestData.traceState);
 end
 
@@ -349,7 +345,7 @@ function testExtractContextComposite(testCase)
 
 % extract span and verify
 span = opentelemetry.trace.Context.extractSpan(context);
-spancontext = getContext(span);
+spancontext = getSpanContext(span);
 
 % verify extracted trace and span IDs and trace state
 verifyEqual(testCase, spancontext.TraceId, testCase.TestData.traceId);
@@ -390,7 +386,7 @@ function testInjectContextComposite(testCase)
 % verify the injected traceparent contains the trace and span IDs
 traceparentrow = find(headers(:,1) == "traceparent");
 verifyNotEmpty(testCase, traceparentrow);
-spancontext = getContext(sp);
+spancontext = getSpanContext(sp);
 verifySubstring(testCase, headers(traceparentrow,2), spancontext.TraceId);
 verifySubstring(testCase, headers(traceparentrow,2), spancontext.SpanId);
-end
+end

test/ttrace.m

@@ -214,7 +214,7 @@ function testSpanContext(testCase)
 tp = opentelemetry.sdk.trace.TracerProvider();
 tr = getTracer(tp, "foo");
 sp = startSpan(tr, "bar");
-ctxt = getContext(sp);
+ctxt = getSpanContext(sp);
 endSpan(sp);
 
 % perform test comparisons
@@ -501,7 +501,7 @@ function testLinks(testCase)
 tp = opentelemetry.sdk.trace.TracerProvider();
 tr = getTracer(tp, "foo");
 sp1 = startSpan(tr, "bar");
-ctxt1 = getContext(sp1);
+ctxt1 = getSpanContext(sp1);
 % one link, no attributes
 l1 = opentelemetry.trace.Link(ctxt1);
 sp2 = startSpan(tr, "quux", "Links", l1);
@@ -510,7 +510,7 @@ function testLinks(testCase)
 
 % two links, with attributes in one link
 sp3 = startSpan(tr, "baz");
-ctxt3 = getContext(sp3);
+ctxt3 = getSpanContext(sp3);
 l2attributes = {"StringScalar", "abcde", "DoubleArray", magic(3)};
 l2 = opentelemetry.trace.Link(ctxt1, l2attributes{:});
 l3 = opentelemetry.trace.Link(ctxt3);
@@ -548,4 +548,4 @@ function testLinks(testCase)
 % second link
 verifyEqual(testCase, string(results{2}.resourceSpans.scopeSpans.spans.links{2}.traceId), ctxt3.TraceId);
 verifyEqual(testCase, string(results{2}.resourceSpans.scopeSpans.spans.links{2}.spanId), ctxt3.SpanId);
-end
+end