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

Add EKS cluster name detection #27408

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ee7c864
Add k8s cluster name detection in EKS environment
crobert-1 Oct 3, 2023
46d86fb
Update readme with permissions requirement.
crobert-1 Oct 3, 2023
f3ed481
Add permissions requirement
crobert-1 Oct 3, 2023
567bc6f
Update dead links
crobert-1 Oct 3, 2023
7339f0c
Update broken links
crobert-1 Oct 3, 2023
19348a2
Update processor/resourcedetectionprocessor/README.md
crobert-1 Oct 3, 2023
8810443
Changes requested by dashpole:
crobert-1 Oct 3, 2023
73315bc
Fix CICD failures
crobert-1 Oct 3, 2023
91cd314
Changes requested by jinja2
crobert-1 Oct 4, 2023
5315876
Use proper context, set higher default timeout
crobert-1 Oct 10, 2023
95191b2
Remove slices import since it's not introduced until later go versions
crobert-1 Oct 11, 2023
baa172d
Disable k8s cluster name by default
crobert-1 Oct 12, 2023
1e1bb17
Run make generate
crobert-1 Oct 12, 2023
fdad8c6
Fix test for disabled value
crobert-1 Oct 12, 2023
9fd765b
TESTING: Check if longer timeout will allow lint to succeed
crobert-1 Oct 17, 2023
5cc324e
TEST: Increase timeout to possibly allow linting pass
crobert-1 Oct 17, 2023
d12a15f
TEST: Increase timeout even more
crobert-1 Oct 17, 2023
fa57b20
TEST: More timeout increases
crobert-1 Oct 18, 2023
4c3ffb7
Keep increasing timeouts
crobert-1 Oct 18, 2023
836d2cb
TEST: Skip failing lint test
crobert-1 Oct 23, 2023
456afe6
TEST: Skip entire cmd dir for linting
crobert-1 Oct 23, 2023
edd762e
TEST: Increase memory garbage collection frequency
crobert-1 Oct 23, 2023
de0620d
TEST: Increase memory allowance
crobert-1 Oct 23, 2023
08879a4
Test: reduce memory usage
crobert-1 Oct 23, 2023
f36249e
TEST: GC set to 25
crobert-1 Oct 23, 2023
d0c58be
TEST: GC to 37
crobert-1 Oct 23, 2023
7ac141a
TEST: GC to 43
crobert-1 Oct 23, 2023
d0be0b2
TEST: GC to 45
crobert-1 Oct 24, 2023
e6eb190
Revert timeout changes back to original values
crobert-1 Oct 26, 2023
69139b8
Increase timeout
crobert-1 Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/eks_cluster_name.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: resourcedetectionprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add k8s cluster name detection when running in EKS

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [26794]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ fmt: $(GOIMPORTS)

.PHONY: lint
lint: $(LINT) checklicense misspell
$(LINT) run --allow-parallel-runners --verbose --build-tags integration --timeout=30m --path-prefix $(shell basename "$(CURDIR)")
GOGC=45 $(LINT) run --allow-parallel-runners --verbose --build-tags integration --timeout=40m --path-prefix $(shell basename "$(CURDIR)")

.PHONY: govulncheck
govulncheck: $(GOVULNCHECK)
Expand Down
1 change: 1 addition & 0 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ require (
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
Expand Down
7 changes: 7 additions & 0 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ require (
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
Expand Down
7 changes: 7 additions & 0 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ require (
github.com/Showmax/go-fqdn v1.0.0 // indirect
github.com/antonmedv/expr v1.15.3 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.7.2 // indirect
github.com/aws/smithy-go v1.14.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
Expand Down
27 changes: 27 additions & 0 deletions exporter/datadogexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions exporter/datadogexporter/integrationtest/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ require (
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
Expand Down
Loading