feat: add baggage support to the opentracing shim #918

rubenvp8510 · 2020-03-31T20:38:04Z

Signed-off-by: Ruben Vargas [email protected]

Which problem is this PR solving?

Fixes Add baggage support to the opentracing shim #329

Short description of the changes

Added baggage support for the opentracing shim.

mayurkale22 · 2020-03-31T21:00:22Z

@bg451 Would be nice if you can review this one.

dyladan · 2020-03-31T23:52:07Z

This looks like it just stores the baggage directly as a correlation context entry, making it impossible to distinguish between our keys and baggage-shim keys. Is there any spec for this yet?

rubenvp8510 · 2020-04-01T00:27:14Z

I haven't found anything on related on the spec but saw how other clients (specifically opentelemetry-java) implemented this. may be I miss understood something?

dyladan · 2020-04-01T00:34:09Z

I don't think you've misunderstood, I just expected there to be some specification to ensure all the various clients would work together cohesively. I'll review this today or tomorrow.

rubenvp8510 · 2020-04-29T18:22:48Z

Any thoughts about this? Should I modify the implementation?

Thanks.

dyladan · 2020-04-29T18:49:53Z

I'm sorry the baggage PRs are waiting on spec issues which have been sitting around for a while. This should be resolved soon I hope.

dyladan

Sorry this has sat for so long without any attention. Apart from the minor conflict, I think this looks like good work.

@open-telemetry/javascript-approvers can we please get some eyes on this? It is a small PR and should be no trouble to merge.

@rubenvp8510 if you don't want to or dont have time to resolve the conflicts, I can resolve them for you. Your contribution history will be maintained.

rubenvp8510 · 2020-07-15T15:14:09Z

@dyladan No problem, I can solve the conflicts and will update the PR.

Thanks!

Signed-off-by: Ruben Vargas <[email protected]>

linux-foundation-easycla · 2020-07-17T19:06:29Z

The committers are authorized under a signed CLA.

✅ Ruben Vargas Palma (449063c, 82fa8d2)

codecov · 2020-07-17T19:10:03Z

Codecov Report

Merging #918 into master will increase coverage by 0.23%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #918      +/-   ##
==========================================
+ Coverage   93.30%   93.53%   +0.23%     
==========================================
  Files         144      148       +4     
  Lines        4030     4144     +114     
  Branches      816      840      +24     
==========================================
+ Hits         3760     3876     +116     
+ Misses        270      268       -2

Impacted Files	Coverage Δ
...ackages/opentelemetry-shim-opentracing/src/shim.ts	`88.00% <100.00%> (+3.74%)`	⬆️
...ackages/opentelemetry-exporter-zipkin/src/types.ts	`100.00% <0.00%> (ø)`
...ckages/opentelemetry-exporter-zipkin/src/zipkin.ts	`98.46% <0.00%> (ø)`
...ackages/opentelemetry-exporter-zipkin/src/utils.ts	`100.00% <0.00%> (ø)`
...ges/opentelemetry-exporter-zipkin/src/transform.ts	`100.00% <0.00%> (ø)`
packages/opentelemetry-tracing/src/Span.ts	`100.00% <0.00%> (+1.25%)`	⬆️

rubenvp8510 · 2020-07-17T19:58:40Z

Rebased and added the extraction/injection of the baggage.

packages/opentelemetry-shim-opentracing/src/shim.ts

Signed-off-by: Ruben Vargas <[email protected]>

dyladan

Looks good thanks for being patient with us.

dyladan · 2020-07-20T18:46:35Z

@open-telemetry/javascript-approvers this has been a long time waiting and I would like to get it reviewed as it should be a fairly uncontroversial change.

packages/opentelemetry-shim-opentracing/src/shim.ts

packages/opentelemetry-shim-opentracing/test/Shim.test.ts

Signed-off-by: Ruben Vargas <[email protected]>

rubenvp8510 · 2020-07-22T03:00:20Z

Also added some propagation tests.

obecny

lgtm

mayurkale22

It would be nice if you can update https://github.com/open-telemetry/opentelemetry-js#release-schedule (Support for Tags/Baggage) with Beta v0.10.0 and today's date.

@dyladan could you please include this in proposed release PR?

packages/opentelemetry-shim-opentracing/src/shim.ts

Signed-off-by: Ruben Vargas <[email protected]>

dyladan · 2020-07-24T14:46:38Z

@dyladan could you please include this in proposed release PR?

sure no problem

dyladan · 2020-07-27T17:34:38Z

All 3 maintainers have approved I think this can be merged. @obecny @mayurkale22

* upstream/master: fix: add missing grpc-js index (open-telemetry#1358) chore: 0.10.0 release proposal (open-telemetry#1345) Proto update to latest to support arrays and maps (open-telemetry#1339) feat: add OTEL_LOG_LEVEL env var (open-telemetry#974) Add nodejs sdk package (open-telemetry#1187) feat: add baggage support to the opentracing shim (open-telemetry#918) Removing default span attributes (open-telemetry#1342)

Co-authored-by: Mayur Kale <[email protected]>

* feat: graceful shutdown for tracing and metrics * fix: wording in test case * fix: typo * fix meterprovider config to use bracket notation Co-authored-by: Daniel Dyla <[email protected]> * fix meterprovider config to use bracket notation Co-authored-by: Daniel Dyla <[email protected]> * fix: add callbacks to shutdown methods * fix: merge conflict * simplify meter shutdown code Co-authored-by: Daniel Dyla <[email protected]> * fix: fix one-liner * private function name style fix Co-authored-by: Daniel Dyla <[email protected]> * fix: naming of private member variables * fix: graceful shutdown now works in browser * fix: window event listener will trigger once * fix: modify global shutdown helper functions * fix: remove callback from remove listener args * fix: change global shutdown function names and simplify functionality * fix: add rest of function refactoring and simplification * fix: remove unintended code snippet * fix: refactor naming of listener cleanup function and fix sandbox issue * fix: make global shutdown cleanup local * fix: change interval of MeterProvider collection to ensure it does not trigger through clock * chore: removing _cleanupGlobalShutdownListeners * fix: remove unnecesary trace provider member function * Removing default span attributes (#1342) * refactor(opentelemetry-tracing): removing default span attributes Signed-off-by: Aravin Sivakumar <[email protected]> * refactor(opentelemetry-tracing): removing default span attributed from tracer object Signed-off-by: Aravin Sivakumar <[email protected]> * refactor(opentelemetry-tracing): removing accidental add to package.json Signed-off-by: Aravin Sivakumar <[email protected]> * refactor(opentelemetry-tracing): removing redundant test and fixing suggestions by Shawn and Daniel Signed-off-by: Aravin Sivakumar <[email protected]> * feat: add baggage support to the opentracing shim (#918) Co-authored-by: Mayur Kale <[email protected]> * Add nodejs sdk package (#1187) Co-authored-by: Naseem <[email protected]> Co-authored-by: legendecas <[email protected]> Co-authored-by: Mark Wolff <[email protected]> Co-authored-by: Matthew Wear <[email protected]> * feat: add OTEL_LOG_LEVEL env var (#974) * Proto update to latest to support arrays and maps (#1339) * chore: 0.10.0 release proposal (#1345) * fix: add missing grpc-js index (#1358) * chore: 0.10.1 release proposal (#1359) * feat(api/context-base): change compile target to es5 (#1368) * Feat: Make ID generator configurable (#1331) Co-authored-by: Daniel Dyla <[email protected]> * fix: require grpc-js instead of grpc in grpc-js example (#1364) Co-authored-by: Bartlomiej Obecny <[email protected]> * chore(deps): update all non-major dependencies (#1371) * chore: bump metapackage dependencies (#1383) * chore: 0.10.2 proposal (#1382) * fix: remove unnecesary trace provider member function * refactor(metrics): distinguish different aggregator types (#1325) Co-authored-by: Daniel Dyla <[email protected]> * Propagate b3 parentspanid and debug flag (#1346) * feat: Export MinMaxLastSumCountAggregator metrics to the collector as Summary (#1320) Co-authored-by: Daniel Dyla <[email protected]> * feat: Collector Metric Exporter for the Web (#1308) Co-authored-by: Daniel Dyla <[email protected]> * Fix issues in TypeScript getting started example code (#1374) Co-authored-by: Daniel Dyla <[email protected]> * chore: deploy canary releases (#1384) * fix: protos pull * fix: address marius' feedback * chore: deleting removeAllListeners from prometheus, fixing tests, cleanu of events when using shutdown notifier * fix: add documentation and cleanup code * fix: remove async label from shutdown and cleanup test case * fix: update controller collect to return promise * fix: make downsides of disabling graceful shutdown more apparent Co-authored-by: Daniel Dyla <[email protected]> Co-authored-by: Bartlomiej Obecny <[email protected]> Co-authored-by: Aravin <[email protected]> Co-authored-by: Ruben Vargas Palma <[email protected]> Co-authored-by: Mayur Kale <[email protected]> Co-authored-by: Naseem <[email protected]> Co-authored-by: legendecas <[email protected]> Co-authored-by: Mark Wolff <[email protected]> Co-authored-by: Matthew Wear <[email protected]> Co-authored-by: Naseem <[email protected]> Co-authored-by: Mark Wolff <[email protected]> Co-authored-by: Cong Zou <[email protected]> Co-authored-by: Reginald McDonald <[email protected]> Co-authored-by: WhiteSource Renovate <[email protected]> Co-authored-by: srjames90 <[email protected]> Co-authored-by: David W <[email protected]> Co-authored-by: Mick Dekkers <[email protected]>

rubenvp8510 requested review from bg451, dyladan, markwolff, mayurkale22, obecny, OlivierAlbertini, rochdev and vmarchaud as code owners March 31, 2020 20:38

rubenvp8510 force-pushed the baggage branch from dc54078 to 6ce1031 Compare March 31, 2020 20:59

dyladan approved these changes Jul 15, 2020

View reviewed changes

rubenvp8510 added 2 commits July 17, 2020 12:49

feat: add baggage support to the opentracing shim

449063c

Signed-off-by: Ruben Vargas <[email protected]>

feat: propagate correlational context on shim

82fa8d2

Signed-off-by: Ruben Vargas <[email protected]>

rubenvp8510 force-pushed the baggage branch from 6ce1031 to 82fa8d2 Compare July 17, 2020 19:06

rubenvp8510 requested review from legendecas, mwear and naseemkullah as code owners July 17, 2020 19:06

rubenvp8510 requested a review from dyladan July 17, 2020 19:59

dyladan reviewed Jul 17, 2020

View reviewed changes

packages/opentelemetry-shim-opentracing/src/shim.ts Outdated Show resolved Hide resolved

packages/opentelemetry-shim-opentracing/src/shim.ts Outdated Show resolved Hide resolved

dyladan reviewed Jul 17, 2020

View reviewed changes

packages/opentelemetry-shim-opentracing/src/shim.ts Show resolved Hide resolved

dyladan self-requested a review July 17, 2020 21:43

chore: remove redundant api import

02b4c4d

Signed-off-by: Ruben Vargas <[email protected]>

dyladan approved these changes Jul 20, 2020

View reviewed changes

obecny reviewed Jul 21, 2020

View reviewed changes

rubenvp8510 added 3 commits July 21, 2020 19:05

chore: small style changes

e81c8d0

Signed-off-by: Ruben Vargas <[email protected]>

fix: handle repeated keys in baggage, added test

474013d

Signed-off-by: Ruben Vargas <[email protected]>

chore: test baggage propagation

ad0411b

Signed-off-by: Ruben Vargas <[email protected]>

rubenvp8510 requested review from obecny and dyladan July 22, 2020 03:00

dyladan approved these changes Jul 22, 2020

View reviewed changes

obecny approved these changes Jul 22, 2020

View reviewed changes

mayurkale22 approved these changes Jul 23, 2020

View reviewed changes

packages/opentelemetry-shim-opentracing/src/shim.ts Outdated Show resolved Hide resolved

packages/opentelemetry-shim-opentracing/src/shim.ts Outdated Show resolved Hide resolved

chore: rename some variables

73b29d5

Signed-off-by: Ruben Vargas <[email protected]>

dyladan mentioned this pull request Jul 24, 2020

chore: 0.10.0 release proposal #1345

Merged

mayurkale22 added 2 commits July 24, 2020 10:46

Merge branch 'master' into baggage

f8466bd

Merge branch 'master' into baggage

0198f09

dyladan added the enhancement New feature or request label Jul 27, 2020

mayurkale22 merged commit 5f859d1 into open-telemetry:master Jul 27, 2020

jonahrosenblum pushed a commit to jonahrosenblum/opentelemetry-js that referenced this pull request Aug 8, 2020

feat: add baggage support to the opentracing shim (open-telemetry#918)

5597957

Co-authored-by: Mayur Kale <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add baggage support to the opentracing shim #918

feat: add baggage support to the opentracing shim #918

rubenvp8510 commented Mar 31, 2020 •

edited

Loading

mayurkale22 commented Mar 31, 2020

dyladan commented Mar 31, 2020

rubenvp8510 commented Apr 1, 2020

dyladan commented Apr 1, 2020

rubenvp8510 commented Apr 29, 2020

dyladan commented Apr 29, 2020

dyladan left a comment

rubenvp8510 commented Jul 15, 2020

linux-foundation-easycla bot commented Jul 17, 2020 •

edited

Loading

codecov bot commented Jul 17, 2020 •

edited

Loading

rubenvp8510 commented Jul 17, 2020

dyladan left a comment

dyladan commented Jul 20, 2020

rubenvp8510 commented Jul 22, 2020

obecny left a comment

mayurkale22 left a comment

dyladan commented Jul 24, 2020

dyladan commented Jul 27, 2020

feat: add baggage support to the opentracing shim #918

feat: add baggage support to the opentracing shim #918

Conversation

rubenvp8510 commented Mar 31, 2020 • edited Loading

Which problem is this PR solving?

Short description of the changes

mayurkale22 commented Mar 31, 2020

dyladan commented Mar 31, 2020

rubenvp8510 commented Apr 1, 2020

dyladan commented Apr 1, 2020

rubenvp8510 commented Apr 29, 2020

dyladan commented Apr 29, 2020

dyladan left a comment

Choose a reason for hiding this comment

rubenvp8510 commented Jul 15, 2020

linux-foundation-easycla bot commented Jul 17, 2020 • edited Loading

codecov bot commented Jul 17, 2020 • edited Loading

Codecov Report

rubenvp8510 commented Jul 17, 2020

dyladan left a comment

Choose a reason for hiding this comment

dyladan commented Jul 20, 2020

rubenvp8510 commented Jul 22, 2020

obecny left a comment

Choose a reason for hiding this comment

mayurkale22 left a comment

Choose a reason for hiding this comment

dyladan commented Jul 24, 2020

dyladan commented Jul 27, 2020

rubenvp8510 commented Mar 31, 2020 •

edited

Loading

linux-foundation-easycla bot commented Jul 17, 2020 •

edited

Loading

codecov bot commented Jul 17, 2020 •

edited

Loading