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

[8.12](backport #4147) Pass context with timeout to FQDN lookup #4262

Merged
merged 4 commits into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2024

This is an automatic backport of pull request #4147 done by Mergify.
Cherry-pick of 4c9d865 has failed:

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

You are currently cherry-picking commit 4c9d8658cd.
  (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)

Changes to be committed:
	new file:   changelog/fragments/1706213166-fqdn-ctx.yaml
	modified:   internal/pkg/composable/providers/host/host.go
	new file:   internal/pkg/util/host.go
	new file:   internal/pkg/util/host_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/application/info/agent_metadata.go

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team as a code owner February 14, 2024 18:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 14, 2024
@mergify mergify bot requested review from AndersonQ and pchila and removed request for a team February 14, 2024 18:46
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Feb 15, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@pierrehilbert pierrehilbert requested review from ycombinator and removed request for AndersonQ and pchila February 15, 2024 09:09
Copy link
Contributor Author

mergify bot commented Feb 19, 2024

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

2 similar comments
Copy link
Contributor Author

mergify bot commented Feb 26, 2024

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

Copy link
Contributor Author

mergify bot commented Mar 4, 2024

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

@ycombinator ycombinator added Team:Elastic-Agent Label for the Agent team and removed Team:Elastic-Agent Label for the Agent team conflicts There is a conflict in the backported pull request labels Mar 7, 2024
@ycombinator ycombinator enabled auto-merge (squash) March 7, 2024 17:28
@ycombinator ycombinator added the Team:Elastic-Agent Label for the Agent team label Mar 7, 2024
* Pass context with timeout to FQDN lookup

* Add temporary gomod replace

* Add CHANGELOG fragment

* Updating dependency

* Update method calls

* Extract function

* Fallback to OS-provided hostname on FQDN lookup error

* Refactoring: reuse

* Adding unit tests

* Add comment

(cherry picked from commit 4c9d865)

# Conflicts:
#	internal/pkg/agent/application/info/agent_metadata.go
@ycombinator ycombinator force-pushed the mergify/bp/8.12/pr-4147 branch from dd071fb to 510270b Compare March 7, 2024 17:28
Copy link

@ycombinator ycombinator merged commit 9e45526 into 8.12 Mar 7, 2024
9 checks passed
@ycombinator ycombinator deleted the mergify/bp/8.12/pr-4147 branch March 7, 2024 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants