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.

Sign up for GitHub

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

Jump to bottom

fix: require grpc-js instead of grpc in grpc-js example #1364

Merged
merged 2 commits into from
Jul 31, 2020
Merged

fix: require grpc-js instead of grpc in grpc-js example #1364

merged 2 commits into from
Jul 31, 2020

Conversation

reggiemcdonald
Copy link
Contributor

Signed-off-by: reggiemcdonald [email protected]

Which problem is this PR solving?

In #1362, it was decided that the grpc examples should be refactored to use the proto-loader. This PR provides a temporary fix to the grpc-js example while that refactor is completed.

Short description of the changes

  • Changes the import statement in the generated files to use @grpc/grpc-js instead of grpc

@reggiemcdonald reggiemcdonald mentioned this pull request Jul 28, 2020
Closed
@codecov
Copy link

codecov bot commented Jul 28, 2020 •
edited
Loading

Codecov Report

Merging #1364 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1364   +/-   ##
=======================================
  Coverage   93.61%   93.61%           
=======================================
  Files         149      149           
  Lines        4261     4261           
  Branches      870      870           
=======================================
  Hits         3989     3989           
  Misses        272      272

@dyladan dyladan added the Merge:LGTM This PR is ready to be merged by a Maintainer (has enough valid approvals, successful build, etc.) label Jul 31, 2020
@dyladan dyladan merged commit b76df8e into open-telemetry:master Jul 31, 2020
jonahrosenblum pushed a commit to jonahrosenblum/opentelemetry-js that referenced this pull request Aug 8, 2020
@reggiemcdonald @obecny @jonahrosenblum
fix: require grpc-js instead of grpc in grpc-js example (open-telemet…
e6d49b4 
…ry#1364)

Co-authored-by: Bartlomiej Obecny <[email protected]>
obecny added a commit that referenced this pull request Aug 17, 2020
@jonahrosenblum @dyladan
@obecny @aravinsiva @rubenvp8510 @mayurkale22 @naseemkullah @legendecas @markwolff @mwear @EdZou @reggiemcdonald @renovate-bot @srjames90 @davidwitten @mickdekkers
Add Graceful Shutdown Support (#1321)
b884eec 
* 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]>
pichlermarc pushed a commit to dynatrace-oss-contrib/opentelemetry-js that referenced this pull request Dec 15, 2023
@mwear @blumamir
feat(detector-gcp): collect hostname resource attribute from GCP Meta…
33c57cc 
…data API (open-telemetry#1364)

* feat: collect hostname resource attribute from GCP Metadata API

* chore: remove unneeded changelog entry

---------

Co-authored-by: Amir Blum <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@obecny obecny obecny approved these changes

@dyladan dyladan dyladan approved these changes

@markwolff markwolff markwolff approved these changes

@mayurkale22 mayurkale22 mayurkale22 approved these changes

@naseemkullah naseemkullah naseemkullah approved these changes

@legendecas legendecas Awaiting requested review from legendecas

@mwear mwear Awaiting requested review from mwear

@OlivierAlbertini OlivierAlbertini Awaiting requested review from OlivierAlbertini

@vmarchaud vmarchaud Awaiting requested review from vmarchaud

Assignees
No one assigned
Labels
Merge:LGTM This PR is ready to be merged by a Maintainer (has enough valid approvals, successful build, etc.)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

grpc-js example has missing dependency
6 participants
@reggiemcdonald @obecny @dyladan @markwolff @mayurkale22 @naseemkullah