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 #37756) Pass context with timeout to FQDN lookup #37849

Merged
merged 2 commits into from
Feb 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #37756 done by Mergify.
Cherry-pick of e4b448f has failed:

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

You are currently cherry-picking commit e4b448f0d1.
  (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:
	modified:   CHANGELOG.next.asciidoc
	modified:   libbeat/cmd/instance/beat.go
	modified:   libbeat/processors/add_host_metadata/add_host_metadata.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

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

* Pass context with timeout to FQDN lookup

* Add temporary gomod replace

* Add CHANGELOG entry

* Update dependency

* Update method calls

* Add nolint for rand deprecation warning

* Make linter happy

(cherry picked from commit e4b448f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested review from a team as code owners February 2, 2024 21:05
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 2, 2024
@mergify mergify bot requested review from belimawr and fearful-symmetry and removed request for a team February 2, 2024 21:05
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 2, 2024
@botelastic
Copy link

botelastic bot commented Feb 2, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 7 min 42 sec

Pipeline error 1

This error is likely related to the pipeline itself. Click here
and then you will see the error (either incorrect syntax or an invalid configuration).

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ycombinator ycombinator enabled auto-merge (squash) February 2, 2024 21:36
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2024-02-02T21:36:14.574+0000

  • Duration: 169 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 28700
Skipped 2015
Total 30715

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ycombinator ycombinator merged commit 946f703 into 8.12 Feb 3, 2024
114 of 116 checks passed
@ycombinator ycombinator deleted the mergify/bp/8.12/pr-37756 branch February 3, 2024 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants