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

Add Amazon EKS Resource Detector #465

Merged
merged 50 commits into from
Dec 4, 2020
Merged

Add Amazon EKS Resource Detector #465

merged 50 commits into from
Dec 4, 2020

Conversation

wilguo
Copy link
Contributor

@wilguo wilguo commented Nov 23, 2020

This PR adds an EKS Resource Detector.

Functionalities:

  • If the EKS resource detector detects that it is running on EKS, then it will populate the resource object with metadata. The metadata will include the containerId and clusterName.
  • If the EKS resource detector detects that the application is not running on EKS, then it will return an empty Resource

List of Changes:

  • Add functionality for Amazon EKS resource detector defined above
  • Add corresponding unit tests for Amazon EKS resource detector to detect when running in EKS and when running not in EKS

Aneurysm9
Aneurysm9 reviewed Nov 27, 2020
View reviewed changes
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/eks_resource_detector.go Outdated Show resolved Hide resolved
wilguo and others added 8 commits November 27, 2020 12:04
@wilguo @Aneurysm9
Change "GET" to use http.MethodGet
8e43f34 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for retrieving auth configmap
be46135 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for HTTP request
1bcfc40 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for executing HTTP request
388dbe2 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for HTTP response
0cf7144 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for getClusterName
a549e85 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for parsing JSON for clusterName
d9b7a50 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@wilguo @Aneurysm9
Update error message for reading file
666ce5f 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
wilguo and others added 14 commits December 3, 2020 12:28
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
74229e2 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
c23b0a1 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
b4181f0 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
88b4980 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
f2616cb 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
7208ab0 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
48b9725 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector.go
0d6d0c9 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector_test.go
16c436d 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector_test.go
6306b4f 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector_test.go
4f304a6 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/eks_resource_detector_test.go
9c042fc 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo
Fix build error and address changes to PR
ed13bce
@wilguo
Change getContainerID() to use regex
52f25a6
@wilguo wilguo mentioned this pull request Dec 3, 2020
Closed
@wilguo wilguo requested a review from MrAlias December 3, 2020 23:57
MrAlias
MrAlias reviewed Dec 4, 2020
View reviewed changes
detectors/aws/eks/detector.go Outdated Show resolved Hide resolved
detectors/aws/eks/detector.go Outdated Show resolved Hide resolved
wilguo and others added 3 commits December 4, 2020 10:59
@wilguo @MrAlias
Update detectors/aws/eks/detector.go
ff1170d 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo @MrAlias
Update detectors/aws/eks/detector.go
861b905 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@wilguo
Merge branch 'master' into wilguo-eksdetector
1b0ec9c
@MrAlias
Copy link
Contributor

MrAlias commented Dec 4, 2020

cycling to see if it clears the checks.

@MrAlias MrAlias closed this Dec 4, 2020
@MrAlias MrAlias reopened this Dec 4, 2020
@wilguo
Copy link
Contributor Author

wilguo commented Dec 4, 2020

Should I try and trigger a new commit for circleci to run again?

@MrAlias MrAlias merged commit b02fae7 into open-telemetry:master Dec 4, 2020
@MrAlias
Copy link
Contributor

MrAlias commented Dec 4, 2020

Should I try and trigger a new commit for circleci to run again?

Should be all set.

@Aneurysm9 Aneurysm9 mentioned this pull request Dec 11, 2020
Merged
plantfansam referenced this pull request in plantfansam/opentelemetry-go-contrib Mar 18, 2022
@krnowak
Use latest version of golang 1.13 in CI (#465)
5d6654d 
CircleCI has golang images without the patch versions which contain
the latest patch version of golang. That way we do not need to
remember to update the CI config on every patch release.
@pellared pellared added this to the untracked milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dashpole dashpole dashpole left review comments

@XSAM XSAM XSAM approved these changes

@MrAlias MrAlias MrAlias approved these changes

@jmacd jmacd jmacd approved these changes

@evantorrie evantorrie Awaiting requested review from evantorrie

@lizthegrey lizthegrey Awaiting requested review from lizthegrey

@Aneurysm9 Aneurysm9 Awaiting requested review from Aneurysm9

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
untracked
Development

Successfully merging this pull request may close these issues.
8 participants
@wilguo @alolita @MrAlias @Aneurysm9 @dashpole @jmacd @XSAM @pellared