Skip to content

[processor/k8sattributes] support extracting labels and annotations from Deployments #38343

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
Merged
merged 11 commits into from
Jun 3, 2025
Merged

[processor/k8sattributes] support extracting labels and annotations from Deployments #38343

merged 11 commits into from
Jun 3, 2025

Conversation

odubajDT
Copy link
Contributor

@odubajDT odubajDT commented Mar 4, 2025 •
edited
Loading

Description

Add support for extraction of labels and annotations from Deployments. This change comes with elevated RBAC permissions - adding Deployment permissions to the ClusterRole

Link to tracking issue

Fixes #37957

@github-actions github-actions bot added the processor/k8sattributes k8s Attributes processor label Mar 4, 2025
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch 2 times, most recently from aff9e65 to cad5b00 Compare March 10, 2025 12:47
@odubajDT odubajDT changed the title [processor/k8sattributes] support extracting metadata from high-level workloads [processor/k8sattributes] support extracting labels and annotations from k8s Deployments Mar 11, 2025
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch 3 times, most recently from 7a3bd1f to f1745c9 Compare March 11, 2025 14:10
@odubajDT odubajDT changed the title [processor/k8sattributes] support extracting labels and annotations from k8s Deployments [processor/k8sattributes] support extracting labels and annotations from Deployments Mar 11, 2025
@odubajDT odubajDT marked this pull request as ready for review March 11, 2025 15:04
@odubajDT odubajDT requested a review from a team as a code owner March 11, 2025 15:04
odubajDT
odubajDT commented Mar 12, 2025
View reviewed changes
processor/k8sattributesprocessor/internal/kube/client.go
newInformer InformerProvider,
newNamespaceInformer InformerProviderNamespace,
newReplicaSetInformer InformerProviderReplicaSet,
informersFactory InformersFactoryList,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

small refactoring for potential future extensions

Copy link
Member

Choose a reason for hiding this comment

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

Usually we have refactorings in standalone PRs first :): https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#refactoring-work.

But I would be fine keeping this here if others agree.

odubajDT
odubajDT commented Mar 12, 2025
View reviewed changes
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch from e9e79c1 to 87e27be Compare March 12, 2025 11:17
atoulme
atoulme reviewed Mar 18, 2025
View reviewed changes
atoulme
atoulme reviewed Mar 18, 2025
View reviewed changes
atoulme
atoulme reviewed Mar 18, 2025
View reviewed changes
atoulme
atoulme reviewed Mar 18, 2025
View reviewed changes
processor/k8sattributesprocessor/internal/kube/client.go
@@ -996,6 +1091,22 @@ func (c *WatchClient) extractNamespaceLabelsAnnotations() bool {
return false
}

func (c *WatchClient) extractDeploymentLabelsAnnotations() bool {
Copy link
Contributor

Choose a reason for hiding this comment

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

is this also to be checked with which metrics are enabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure I understand...

atoulme
atoulme reviewed Mar 18, 2025
View reviewed changes
@atoulme atoulme marked this pull request as draft March 18, 2025 18:02
@odubajDT odubajDT marked this pull request as ready for review March 19, 2025 08:55
@atoulme atoulme marked this pull request as draft March 20, 2025 06:12
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch 2 times, most recently from 068fb3d to ee12fbe Compare March 20, 2025 09:51
@odubajDT odubajDT marked this pull request as ready for review March 20, 2025 09:53
@odubajDT odubajDT marked this pull request as ready for review April 28, 2025 08:08
@github-actions github-actions bot mentioned this pull request Apr 29, 2025
Closed
ChrsMark
ChrsMark reviewed Apr 29, 2025
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

I don't for-see any objections on the schema but let's wait for open-telemetry/semantic-conventions#2168 to get merged first before moving on with this one.

@odubajDT
Copy link
Contributor Author

I don't for-see any objections on the schema but let's wait for open-telemetry/semantic-conventions#2168 to get merged first before moving on with this one.

Should be merged now

@github-actions github-actions bot mentioned this pull request May 6, 2025
Closed
ChrsMark
ChrsMark reviewed May 7, 2025
View reviewed changes
processor/k8sattributesprocessor/internal/kube/client.go
newInformer InformerProvider,
newNamespaceInformer InformerProviderNamespace,
newReplicaSetInformer InformerProviderReplicaSet,
informersFactory InformersFactoryList,
Copy link
Member

Choose a reason for hiding this comment

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

Usually we have refactorings in standalone PRs first :): https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#refactoring-work.

But I would be fine keeping this here if others agree.

@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch from 7293f7f to 9645924 Compare May 7, 2025 10:57
@github-actions github-actions bot mentioned this pull request May 13, 2025
Closed
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch from 3f15293 to 0b73a42 Compare May 14, 2025 05:12
@github-actions github-actions bot mentioned this pull request May 20, 2025
Closed
ChrsMark
ChrsMark approved these changes May 22, 2025
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

LGTM

odubajDT added 11 commits May 23, 2025 11:42
@odubajDT
[processor/k8sattributes] support extracting labels and annotations f…
7ab0d43 
…rom Deployments

Signed-off-by: odubajDT <[email protected]>
@odubajDT
disable metrics
100816f 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
fix lint
21715c6 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
fix lint
724d3b9 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
adapt according to semconv
87790ce 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
small fix
cda1f01 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
fix test
8bbe814 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
move constants to top
20e0207 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
polish readme
0dede51 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
fix after rebase
f171d85 
Signed-off-by: odubajDT <[email protected]>
@odubajDT
add note
833dae8 
Signed-off-by: odubajDT <[email protected]>
@odubajDT odubajDT force-pushed the k8sattributes-processor-workload-informers branch from 0b73a42 to 833dae8 Compare May 23, 2025 09:48
@ChrsMark ChrsMark mentioned this pull request May 26, 2025
Open
@github-actions github-actions bot mentioned this pull request May 27, 2025
Closed
@atoulme atoulme merged commit 6b9e959 into open-telemetry:main Jun 3, 2025
175 checks passed
@github-actions github-actions bot added this to the next release milestone Jun 3, 2025
@odubajDT odubajDT mentioned this pull request Jun 3, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atoulme atoulme atoulme approved these changes

@ChrsMark ChrsMark ChrsMark approved these changes

@dmitryax dmitryax Awaiting requested review from dmitryax dmitryax is a code owner

@fatsheep9146 fatsheep9146 Awaiting requested review from fatsheep9146 fatsheep9146 is a code owner

@TylerHelmuth TylerHelmuth Awaiting requested review from TylerHelmuth TylerHelmuth is a code owner

Assignees

@atoulme atoulme

@codeboten codeboten

@bogdandrutu bogdandrutu

@MovieStoreGuy MovieStoreGuy

Labels
processor/k8sattributes k8s Attributes processor waiting-for-code-owners
Projects
None yet
Milestone
next release
Development

Successfully merging this pull request may close these issues.

[processor/k8sattributes] Add support for extracting labels and annotations from Deployments, StatefulSets, Jobs, and DaemonSets
6 participants
@odubajDT @atoulme @ChrsMark @codeboten @bogdandrutu @MovieStoreGuy