k8s: Add `service.instance.id` to k8s attributes by osullivandonal · Pull Request #11844 · elastic/elastic-agent

osullivandonal · 2025-12-16T11:44:05Z

What does this PR do?

This PR adds service.instance.id to the k8s attributes.

Why is it important?

These changes will allow some apps in Kibana to correlate otel signals.

Checklist

I have read and understood the pull request guidelines of this project.
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in ./changelog/fragments using the changelog tool
I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

This solves this issue -> #11598

Questions to ask yourself

How are we going to support this in production?
How are we going to measure its adoption?
How are we going to debug this?
What are the metrics I should take care of?
...

kube-stack

managed_otlp kube-stack

mergify · 2025-12-16T11:44:48Z

This pull request does not have a backport label. Could you fix it @osullivandonal? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
backport-active-all is the label that automatically backports to all active branches.
backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

…e-id-to-k8s-attributes

github-actions · 2025-12-16T16:24:09Z

@Mergifyio backport 9.1 9.2 9.3

mergify · 2025-12-16T16:24:18Z

backport 9.1 9.2 9.3

❌ No backport have been created

Details

#11851 [9.1] (backport #11844) k8s: Add service.instance.id to k8s attributes has been created for branch 9.1 but encountered conflicts
#11852 [9.2] (backport #11844) k8s: Add service.instance.id to k8s attributes has been created for branch 9.2
Backport to branch 9.3 failed

GitHub error: Branch not found

* Add service.instance.id to the EDOT collector and daemoncollector for kube-stack * Add service.instance.id to the EDOT collector and daemoncollector for managed_otlp kube-stack * Add a changelog for adding service.instance.id to the k8s attributes (cherry picked from commit 1d0d9da) # Conflicts: # deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml

elasticmachine · 2025-12-16T16:24:32Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: a8907e3

Failed CI Steps

History

💚 Build #32152 succeeded 97b78ed

cc @osullivandonal

* Add service.instance.id to the EDOT collector and daemoncollector for kube-stack * Add service.instance.id to the EDOT collector and daemoncollector for managed_otlp kube-stack * Add a changelog for adding service.instance.id to the k8s attributes (cherry picked from commit 1d0d9da)

…tes (#11851) * k8s: Add `service.instance.id` to k8s attributes (#11844) * Add service.instance.id to the EDOT collector and daemoncollector for kube-stack * Add service.instance.id to the EDOT collector and daemoncollector for managed_otlp kube-stack * Add a changelog for adding service.instance.id to the k8s attributes (cherry picked from commit 1d0d9da) # Conflicts: # deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml * Resolve conflicts with 9.1 for managed_otlp, as k8sattribues does not contain service.name or service.version, service.instance.id shouldn't be added. * Resolve other conflicts in managed_otlp The managed_otlp file doesn't contain service.name, service.version, so we shouldn't add service.instance.id to it --------- Co-authored-by: Dónal O'Sullivan <92297851+osullivandonal@users.noreply.github.com> Co-authored-by: Dónal O'Sullivan <donal.osullivan@elastic.co>

* Add service.instance.id to the EDOT collector and daemoncollector for kube-stack * Add service.instance.id to the EDOT collector and daemoncollector for managed_otlp kube-stack * Add a changelog for adding service.instance.id to the k8s attributes (cherry picked from commit 1d0d9da) Co-authored-by: Dónal O'Sullivan <92297851+osullivandonal@users.noreply.github.com>

osullivandonal added 2 commits December 16, 2025 11:27

Add service.instance.id to the EDOT collector and daemoncollector for

6cf9c55

kube-stack

Add service.instance.id to the EDOT collector and daemoncollector for

97b78ed

managed_otlp kube-stack

osullivandonal requested a review from a team as a code owner December 16, 2025 11:44

mergify bot assigned osullivandonal Dec 16, 2025

osullivandonal added the backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches label Dec 16, 2025

dmathieu previously approved these changes Dec 16, 2025

View reviewed changes

florianl previously approved these changes Dec 16, 2025

View reviewed changes

ChrsMark previously approved these changes Dec 16, 2025

View reviewed changes

Add a changelog for adding service.instance.id to the k8s attributes

b132855

osullivandonal dismissed stale reviews from ChrsMark, florianl, and dmathieu via b132855 December 16, 2025 14:01

Merge remote-tracking branch 'upstream/main' into add-service-instanc…

959b593

…e-id-to-k8s-attributes

dmathieu approved these changes Dec 16, 2025

View reviewed changes

Merge remote-tracking branch 'upstream/main' into add-service-instanc…

a8907e3

…e-id-to-k8s-attributes

osullivandonal enabled auto-merge (squash) December 16, 2025 14:57

florianl approved these changes Dec 16, 2025

View reviewed changes

osullivandonal merged commit 1d0d9da into elastic:main Dec 16, 2025
22 checks passed

mergify bot mentioned this pull request Dec 16, 2025

[9.1] (backport #11844) k8s: Add service.instance.id to k8s attributes #11851

Merged

8 tasks

mergify bot mentioned this pull request Dec 16, 2025

[9.2] (backport #11844) k8s: Add service.instance.id to k8s attributes #11852

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

k8s: Add `service.instance.id` to k8s attributes#11844

k8s: Add `service.instance.id` to k8s attributes#11844
osullivandonal merged 5 commits intoelastic:mainfrom
osullivandonal:add-service-instance-id-to-k8s-attributes

osullivandonal commented Dec 16, 2025 •

edited

Loading

mergify bot commented Dec 16, 2025

Uh oh!

github-actions bot commented Dec 16, 2025

mergify bot commented Dec 16, 2025 •

edited

Loading

elasticmachine commented Dec 16, 2025

Labels

5 participants

Conversation

osullivandonal commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Checklist

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

mergify bot commented Dec 16, 2025

Uh oh!

github-actions bot commented Dec 16, 2025

mergify bot commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ No backport have been created

elasticmachine commented Dec 16, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

History

Labels

5 participants

osullivandonal commented Dec 16, 2025 •

edited

Loading

mergify bot commented Dec 16, 2025 •

edited

Loading