Skip to content

Commit 9ba90b2

Browse files
authored
Merge pull request #3 from Dharin-shah/main
add readme to individual plugin
2 parents f143830 + 42e2795 commit 9ba90b2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"build": "lerna run copyfiles && node ./scripts/build.js",
1111
"watch": "lerna run copyfiles && node ./scripts/build.js --watch",
1212
"bootstrap": "lerna bootstrap --no-ci",
13-
"test": "run-s \"test:*\"",
13+
"test": "lerna run copyfiles && node ./scripts/build.js && run-s \"test:*\"",
1414
"test:lint": "lerna exec --stream -- npx eslint .",
1515
"test:unit": "lerna run --stream test:unit",
1616
"test:e2e": "lerna run --stream test:e2e",

packages/opentelemetry/README.md

Whitespace-only changes.

packages/opentelemetry/lib/tracing/tracer.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ class Tracer {
1818
*/
1919
createSpanObject (name, parentSpan = null, spanOptions = null) {
2020
//TODO - verify setting context from parentSpan
21-
const context = parentSpan ? setSpan(TraceAPI.context.active(), parentSpan) : null;
22-
return this._tracer.startSpan(name, spanOptions, context);
21+
const context = parentSpan ? parentSpan.context() : TraceAPI.context.active();
22+
const span = this._tracer.startSpan(name, spanOptions, context);
23+
setSpan(context, span);
24+
return span;
2325
}
2426

2527
/**

0 commit comments

Comments
 (0)