Skip to content

feat: move aws/gcp detectors from opentelemetry-js repo#593

Merged
obecny merged 9 commits intoopen-telemetry:mainfrom
legendecas:move-detectors
Aug 4, 2021
Merged

feat: move aws/gcp detectors from opentelemetry-js repo#593
obecny merged 9 commits intoopen-telemetry:mainfrom
legendecas:move-detectors

Conversation

@legendecas
Copy link
Member

Which problem is this PR solving?

Fixes open-telemetry/opentelemetry-js#1689

Short description of the changes

  • move aws/gcp detectors from optentelemetry-js repo
  • migrate @opentelemetry/resources/test/util/resource-assertions.ts to local private project @opentelemetry/test-utils.

@legendecas legendecas requested a review from a team July 28, 2021 07:16
@codecov
Copy link

codecov bot commented Jul 28, 2021

Codecov Report

Merging #593 (abc6012) into main (17c0667) will increase coverage by 0.15%.
The diff coverage is 97.55%.

@@            Coverage Diff             @@
##             main     #593      +/-   ##
==========================================
+ Coverage   94.78%   94.94%   +0.15%     
==========================================
  Files         179      195      +16     
  Lines       10976    11630     +654     
  Branches     1088     1115      +27     
==========================================
+ Hits        10404    11042     +638     
- Misses        572      588      +16     
Impacted Files Coverage Δ
...opentelemetry-resource-detector-aws/src/version.ts 0.00% <0.00%> (ø)
...opentelemetry-resource-detector-gcp/src/version.ts 0.00% <0.00%> (ø)
...ource-detector-aws/src/detectors/AwsEksDetector.ts 91.25% <91.25%> (ø)
...detector-aws/test/detectors/AwsEc2Detector.test.ts 95.16% <95.16%> (ø)
...detector-aws/src/detectors/AwsBeanstalkDetector.ts 95.65% <95.65%> (ø)
...resource-detector-gcp/src/detectors/GcpDetector.ts 95.83% <95.83%> (ø)
...ource-detector-aws/src/detectors/AwsEc2Detector.ts 97.91% <97.91%> (ø)
...ource-detector-aws/src/detectors/AwsEcsDetector.ts 100.00% <100.00%> (ø)
...ce-detector-aws/src/detectors/AwsLambdaDetector.ts 100.00% <100.00%> (ø)
...metry-resource-detector-aws/src/detectors/index.ts 100.00% <100.00%> (ø)
... and 22 more

Copy link
Member

@Flarna Flarna left a comment

Choose a reason for hiding this comment

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

Just minor nits.

But i set it to need work to block merging until contrib 0.24.0 is out as these packages have been released already via core repo in version 0.24.0

@legendecas
Copy link
Member Author

@Flarna thanks for reviews. Updated, PTAL again :)

Co-authored-by: Gerhard Stöbich <deb2001-github@yahoo.de>
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 2, 2021

CLA Signed

The committers are authorized under a signed CLA.

@rauno56
Copy link
Member

rauno56 commented Aug 3, 2021

This also requires a companion-PR to remove the code from opentelemetry-js.

@obecny
Copy link
Member

obecny commented Aug 3, 2021

is there an easy way to make diff this vs open-telemetry/opentelemetry-js#2392 ?

@legendecas
Copy link
Member Author

legendecas commented Aug 4, 2021

@obecny suppose we have those two repo in a root directory, and opentelemetry-js is on main branch, we can use diff

> diff -r --exclude package-lock.json --exclude node_modules \
  opentelemetry-js/packages/opentelemetry-resource-detector-aws/ \
  opentelemetry-js-contrib/detectors/node/opentelemetry-resource-detector-aws/

Copy link
Member

@obecny obecny 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 obecny added the enhancement New feature or request label Aug 4, 2021
@obecny obecny merged commit 186a4bd into open-telemetry:main Aug 4, 2021
@legendecas legendecas deleted the move-detectors branch August 4, 2021 17:32
@dyladan dyladan mentioned this pull request Feb 28, 2022
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.

Move resource detectors to contrib

4 participants