Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proto update to latest to support arrays and maps #1339

Merged
merged 29 commits into from
Jul 27, 2020

Conversation

obecny
Copy link
Member

@obecny obecny commented Jul 22, 2020

Which problem is this PR solving?

Short description of the changes

  • Updating to latest proto adding support for arrays and maps,
  • working fine with latest 0.6 opentelemetry-collector

@codecov
Copy link

codecov bot commented Jul 22, 2020

Codecov Report

Merging #1339 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1339      +/-   ##
==========================================
+ Coverage   93.17%   93.18%   +0.01%     
==========================================
  Files         149      149              
  Lines        4218     4228      +10     
  Branches      867      869       +2     
==========================================
+ Hits         3930     3940      +10     
  Misses        288      288              
Impacted Files Coverage Δ
...ages/opentelemetry-exporter-collector/src/types.ts 100.00% <ø> (ø)
.../opentelemetry-exporter-collector/src/transform.ts 96.70% <100.00%> (+0.40%) ⬆️

Copy link
Member

@dyladan dyladan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine, but you've done significantly more than just update the protos. Can you update the title to reflect that (the title goes into the changelog directly)?

@obecny obecny changed the title Proto update Proto update to latest to support arrays and maps Jul 22, 2020
Copy link
Member

@mwear mwear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@obecny
Copy link
Member Author

obecny commented Jul 27, 2020

@open-telemetry/javascript-approvers ^^

@@ -1,11 +1,13 @@
'use strict';

const opentelemetry = require('@opentelemetry/api');
// const { ConsoleLogger, LogLevel} = require('@opentelemetry/core');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this?

Copy link
Member Author

@obecny obecny Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm keeping them for easier debugging only so that I can see which option has been chosen how the spans looks like etc. and recently have been using this quite heavily. Although not strong against not removing if you think they shouldn't be. But this is just an example mainly for devs so I guess it might be useful to have it in one place. WDYT ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mayurkale22

// logger: new ConsoleLogger(LogLevel.DEBUG),

and here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this is fine since it is an example.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mayurkale22 ok to merge?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

@dyladan dyladan added the enhancement New feature or request label Jul 27, 2020
@dyladan
Copy link
Member

dyladan commented Jul 27, 2020

Think this can be merged after mayur's comment is resolved

@obecny obecny merged commit 752e8c0 into open-telemetry:master Jul 27, 2020
@obecny obecny deleted the proto_update branch July 27, 2020 19:40
sidharthv96 added a commit to sidharthv96/opentelemetry-js that referenced this pull request Jul 28, 2020
* 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)
jonahrosenblum pushed a commit to jonahrosenblum/opentelemetry-js that referenced this pull request Aug 8, 2020
obecny added a commit that referenced this pull request Aug 17, 2020
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for arrays and maps for attribute values for OpenTelemetry Collector Exporter
4 participants