Skip to content

[9.0] (backport #10454) Support proxy_url on otel translation logic #10590

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
Open
wants to merge 1 commit into
base: 9.0
Choose a base branch
from
Open

[9.0] (backport #10454) Support proxy_url on otel translation logic #10590

wants to merge 1 commit into from
+1,579 −0

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2025

What does this PR do?

This PR handles conversion logic for proxy_url

Why is it important?

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

How to test this PR locally

Related issues

This is an automatic backport of pull request #10454 done by [Mergify](https://mergify.com).

@khushijain21 @mergify
Support proxy_url on otel translation logic (#10454)
2a975fc 
* Support proxy_url on otel translation logic

* address comments

(cherry picked from commit 0e53334)

# Conflicts:
#	internal/pkg/otel/configtranslate/otelconfig.go
#	internal/pkg/otel/translate/otelconfig_test.go
#	internal/pkg/otel/translate/output_elasticsearch.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 15, 2025
@mergify mergify bot requested a review from a team as a code owner October 15, 2025 14:13
@mergify mergify bot requested review from michalpristas and pchila and removed request for a team October 15, 2025 14:13
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Oct 15, 2025
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 15, 2025

Cherry-pick of 0e53334 has failed:

On branch mergify/bp/9.0/pr-10454
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit 0e533344c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   internal/pkg/otel/configtranslate/otelconfig.go
	deleted by us:   internal/pkg/otel/translate/otelconfig_test.go
	deleted by us:   internal/pkg/otel/translate/output_elasticsearch.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Oct 15, 2025
Merged
8 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Oct 15, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 15, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @khushijain21

@pchila
Copy link
Member

pchila commented Oct 16, 2025

@khushijain21 Could you please resolve the conflicts for this backport ?

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2025

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

At least 1 approving review is required to merge this pull request.

Assignees

@khushijain21 khushijain21

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @pchila @khushijain21