Skip to content

[8.19](backport #51950) mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork#51955

Merged
efd6 merged 2 commits into
8.19from
mergify/bp/8.19/pr-51950
Jul 15, 2026
Merged

[8.19](backport #51950) mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork#51955
efd6 merged 2 commits into
8.19from
mergify/bp/8.19/pr-51950

Conversation

@mergify

@mergify mergify Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Proposed commit message

See title.

Checklist

  • 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. Where relevant, I have used the stresstest.sh script to run them under stress conditions and race detector to verify their stability.
  • I have added an entry in ./changelog/fragments using the changelog tool.

Disruptive User Impact

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


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

(cherry picked from commit 3de2668)

# Conflicts:
#	go.mod
#	go.sum
#	x-pack/filebeat/input/entityanalytics/provider/okta/conf.go
@mergify mergify Bot added the backport label Jul 15, 2026
@mergify mergify Bot requested a review from a team as a code owner July 15, 2026 07:41
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 15, 2026
@mergify mergify Bot requested review from a team as code owners July 15, 2026 07:41
@mergify mergify Bot requested review from AndersonQ and orestisfl and removed request for a team July 15, 2026 07:41
@mergify

mergify Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 3de2668 has failed:

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

You are currently cherry-picking commit 3de266859.
  (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:   NOTICE.txt
	new file:   changelog/fragments/1784080439-49092-lumberjack.yaml
	modified:   x-pack/filebeat/input/cel/config.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/conf.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/conf_test.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/conf_test.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go
	modified:   x-pack/filebeat/input/http_endpoint/config.go
	modified:   x-pack/filebeat/input/http_endpoint/config_test.go
	modified:   x-pack/filebeat/input/http_endpoint/handler_test.go
	modified:   x-pack/filebeat/input/httpjson/config_request.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   x-pack/filebeat/input/entityanalytics/provider/okta/conf.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 mergify Bot assigned efd6 Jul 15, 2026
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /test : Run the Buildkite pipeline.

@github-actions github-actions Bot added Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team labels Jul 15, 2026
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 15, 2026
@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@efd6 efd6 force-pushed the mergify/bp/8.19/pr-51950 branch from 19ec31c to 6f86509 Compare July 15, 2026 07:50
@efd6 efd6 enabled auto-merge (squash) July 15, 2026 07:50
@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

All three golangci-lint matrix jobs fail in the golangci-lint step on the same 20 findings across four changed files. Fix the reported lint issues in the PR head, then rerun the workflow; this is distinct from the earlier pre-commit conflict-marker failure.

Remediation

  • Update x-pack/filebeat/input/http_endpoint/handler_test.go to check the three ignored error returns at lines 660, 684, and 709; replace httptest.NewRequest at lines 228, 250, and 272 with httptest.NewRequestWithContext; use localized test loggers instead of logp.NewLogger; and change the two flagged equality assertions to the required assert.Equal form.
  • Update x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go to avoid global logp.L at lines 331, 395, and 505 and use require.Equal at lines 339 and 403.
  • Update x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go to use logptest.NewTestingLogger instead of deprecated logp.TestingSetup, and resolve the two G705 findings at lines 131 and 166 by making the test response writes safe or applying a narrowly scoped, documented test-only suppression if appropriate.
  • Apply the QF1001 De Morgan simplification reported at x-pack/filebeat/input/http_endpoint/config.go:110, then rerun golangci-lint for the PR.
Investigation details

Root Cause

The failed workflow is golangci-lint run 29398672862. The failing step is golangci-lint in all three matrix jobs: Ubuntu, Windows, and macOS. Each reports the same 20 findings in handler_test.go, graph_test.go, okta_test.go, and config.go.

Evidence

  • Workflow: https://github.com/elastic/beats/actions/runs/29398672862
  • Jobs: lint (ubuntu-latest), lint (windows-latest), and lint (macos-latest); each fails at step golangci-lint.
  • Key log excerpt: x-pack/filebeat/input/http_endpoint/handler_test.go:660:14: Error return value is not checked (errcheck); x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go:331:51: use of logp.L forbidden (forbidigo); x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go:131:17: G705: XSS via taint analysis (gosec); x-pack/filebeat/input/http_endpoint/config.go:110:25: QF1001: could apply De Morgan's law (staticcheck); and issues found.
  • The PR head is 6f8650964bdc9661c9ccc9c0c923c1efe563ed39; the findings are present in that head content.

Validation

Not run locally; this is a read-only workflow investigation based on the Actions logs and PR head contents.

Follow-up

After the lint fixes land, rerun the golangci-lint workflow and confirm all three platform jobs pass.


What is this? | From workflow: PR Actions Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@efd6 efd6 merged commit 69fd53c into 8.19 Jul 15, 2026
201 of 204 checks passed
@efd6 efd6 deleted the mergify/bp/8.19/pr-51950 branch July 15, 2026 09:40
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 Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant