[EDOT] - add header setter extension by VihasMakwana · Pull Request #9903 · elastic/elastic-agent

VihasMakwana · 2025-09-12T09:11:59Z

What does this PR do?

This PR adds headersettetextension to EDOT.

Why is it important?

This extension is pretty useful to set headers based on request context/based on the configurations and can be helpful to route requests to various backends. We recently got an issue for same.

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

Build elastic-agent from this branch.
Run the following config:

receivers:
  filelog:
    include: [ /var/log/system.log ]
    start_at: beginning
    storage: file_storage/filelogreceiver

exporters:
  debug:
    verbosity: detailed
    sampling_initial: 10000
    sampling_thereafter: 10000

extensions:
  headers_setter:
    headers:
    - action: upsert
      key: User-ID
      value: user_id

service:
  extensions: [headers_setter]
  pipelines:
    logs:
      receivers: [filelog]
      exporters:
        - debug

Related issues

Closes Add OTel Collector Contrib headerssetterextension to EDOT #9889

mergify · 2025-09-12T09:12:41Z

This pull request does not have a backport label. Could you fix it @VihasMakwana? 🙏
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.

elasticmachine · 2025-09-12T13:43:51Z

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

swiatekm

Can you add the extension to tests which ensure the components we ship actually start correctly? https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/testdata/all-components.yml for example.

swiatekm · 2025-09-15T16:37:32Z

Do we need to backport this?

swiatekm · 2025-09-17T09:48:54Z

I'm seeing the same test failures here as in #9952, which suggests broader breakage.

swiatekm · 2025-09-18T11:11:29Z

@VihasMakwana can you rebase on main? This should fix the test failures.

…DOT.yaml

elasticmachine · 2025-09-19T08:20:07Z

⏳ Build in-progress, with failures

Buildkite Build
Commit: 6ed6e9b

Failed CI Steps

check-ci

History

💔 Build #27087 failed 2969963
💔 Build #26925 failed 8101f16
💔 Build #26911 failed a1ae270
💔 Build #26899 failed a1ae270
💔 Build #26897 failed 8cbb4a1

cc @VihasMakwana

elastic-sonarqube · 2025-09-19T10:11:08Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

* add header setter extensions * go.mod and notice * revert otel.yml * add header setter to test config * spelling * go.mod * doc (cherry picked from commit 593a8b9) # Conflicts: # go.mod # internal/pkg/otel/components.go

mykola-elastic · 2025-09-19T11:13:13Z

 	"go.opentelemetry.io/collector/receiver"

 	// Receivers:
+	headersetterextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension"


It is not a receiver, extension section is below (lines 63 and down) @swiatekm @VihasMakwana

noticed because it caused some merge conflicts in #9858

Added a small fix in the PR: #10079

* [EDOT] - add header setter extension (#9903) * add header setter extensions * go.mod and notice * revert otel.yml * add header setter to test config * spelling * go.mod * doc (cherry picked from commit 593a8b9) # Conflicts: # go.mod # internal/pkg/otel/components.go * notice and conflicts --------- Co-authored-by: Vihas Makwana <121151420+VihasMakwana@users.noreply.github.com> Co-authored-by: Vihas <vihas.makwana@elastic.co>

* add header setter extensions * go.mod and notice * revert otel.yml * add header setter to test config * spelling * go.mod * doc

add header setter extensions

c534ffb

mergify Bot assigned VihasMakwana Sep 12, 2025

VihasMakwana and others added 2 commits September 12, 2025 18:45

go.mod and notice

d575bf2

Merge branch 'main' into add-header-setter

bb17a98

VihasMakwana marked this pull request as ready for review September 12, 2025 13:17

VihasMakwana requested a review from a team as a code owner September 12, 2025 13:17

VihasMakwana requested review from andrzej-stencel, kaanyalti and pkoutsovasilis September 12, 2025 13:17

revert otel.yml

18901db

pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 12, 2025

swiatekm previously approved these changes Sep 12, 2025

View reviewed changes

swiatekm self-requested a review September 12, 2025 15:44

swiatekm reviewed Sep 12, 2025

View reviewed changes

Merge branch 'main' into add-header-setter

bc8ef92

VihasMakwana dismissed swiatekm’s stale review via 1931466 September 15, 2025 08:42

add header setter to test config

7f439e5

VihasMakwana force-pushed the add-header-setter branch from 1931466 to 7f439e5 Compare September 15, 2025 08:42

spelling

f21426f

VihasMakwana requested a review from swiatekm September 15, 2025 10:22

swiatekm previously approved these changes Sep 15, 2025

View reviewed changes

Merge branch 'main' into add-header-setter

b4a1792

VihasMakwana dismissed swiatekm’s stale review via b4a1792 September 16, 2025 05:44

VihasMakwana added the backport-9.1 Automated backport to the 9.1 branch label Sep 16, 2025

VihasMakwana requested a review from swiatekm September 16, 2025 05:48

go.mod

8cbb4a1

pkoutsovasilis reviewed Sep 16, 2025

View reviewed changes

Comment thread internal/pkg/otel/README.md Outdated

swiatekm mentioned this pull request Sep 17, 2025

Fix flaky integration tests for the monitoring endpoint #10004

Merged

3 tasks

Merge branch 'main' into add-header-setter

2969963

andrzej-stencel previously approved these changes Sep 19, 2025

View reviewed changes

Comment thread changelog/fragments/1757668211-add-headersetter-extension-to-EDOT.yaml Outdated

Update changelog/fragments/1757668211-add-headersetter-extension-to-E…

6ed6e9b

…DOT.yaml

andrzej-stencel dismissed their stale review via 6ed6e9b September 19, 2025 07:59

go mod tidy

ad0a24a

VihasMakwana requested a review from andrzej-stencel September 19, 2025 08:46

swiatekm approved these changes Sep 19, 2025

View reviewed changes

VihasMakwana merged commit 593a8b9 into elastic:main Sep 19, 2025
23 checks passed

swiatekm added the backport-8.19 Automated backport to the 8.19 branch label Sep 19, 2025

mergify Bot mentioned this pull request Sep 19, 2025

[9.1] (backport #9903) [EDOT] - add header setter extension #10050

Merged

8 tasks

mergify Bot mentioned this pull request Sep 19, 2025

[8.19] (backport #9903) [EDOT] - add header setter extension #10051

Merged

8 tasks

mykola-elastic reviewed Sep 19, 2025

View reviewed changes

mykola-elastic mentioned this pull request Sep 22, 2025

internal/pkg/otel/components.go: put import of headersetterextension to the right section #10079

Merged

mergify Bot mentioned this pull request Sep 22, 2025

[8.19] (backport #10079) internal/pkg/otel/components.go: put import of headersetterextension to the right section #10085

Closed

swiatekm removed backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Sep 22, 2025

intxgo pushed a commit to intxgo/elastic-agent that referenced this pull request Sep 24, 2025

[EDOT] - add header setter extension (elastic#9903)

add0c67

* add header setter extensions * go.mod and notice * revert otel.yml * add header setter to test config * spelling * go.mod * doc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[EDOT] - add header setter extension#9903

[EDOT] - add header setter extension#9903
VihasMakwana merged 14 commits intoelastic:mainfrom
VihasMakwana:add-header-setter

VihasMakwana commented Sep 12, 2025 •

edited

Loading

Uh oh!

mergify Bot commented Sep 12, 2025

Uh oh!

elasticmachine commented Sep 12, 2025

Uh oh!

swiatekm left a comment

Uh oh!

swiatekm commented Sep 15, 2025

Uh oh!

Uh oh!

swiatekm commented Sep 17, 2025

Uh oh!

swiatekm commented Sep 18, 2025

Uh oh!

Uh oh!

elasticmachine commented Sep 19, 2025

Uh oh!

elastic-sonarqube Bot commented Sep 19, 2025

Uh oh!

Uh oh!

mykola-elastic Sep 19, 2025 •

edited

Loading

Uh oh!

mykola-elastic Sep 19, 2025

Uh oh!

mykola-elastic Sep 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

VihasMakwana commented Sep 12, 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?

Disruptive User Impact

How to test this PR locally

Related issues

Uh oh!

mergify Bot commented Sep 12, 2025

Uh oh!

elasticmachine commented Sep 12, 2025

Uh oh!

swiatekm left a comment

Choose a reason for hiding this comment

Uh oh!

swiatekm commented Sep 15, 2025

Uh oh!

Uh oh!

swiatekm commented Sep 17, 2025

Uh oh!

swiatekm commented Sep 18, 2025

Uh oh!

Uh oh!

elasticmachine commented Sep 19, 2025

⏳ Build in-progress, with failures

Failed CI Steps

History

Uh oh!

elastic-sonarqube Bot commented Sep 19, 2025

Quality Gate passed

Uh oh!

Uh oh!

mykola-elastic Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mykola-elastic Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

mykola-elastic Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

VihasMakwana commented Sep 12, 2025 •

edited

Loading

mykola-elastic Sep 19, 2025 •

edited

Loading