Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2025

Proposed commit message

v2.Context.StatusReporter can be nil when Filebeat runs standalone. The direct access to this field is replaced in Filestream by the UpdateStatus method. A deprecation notice is added is added to the StatusReporter field.

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
## Author's Checklist

How to test this PR locally

1. Create a log file

docker run -it --rm mingrammer/flog -n 50 > /tmp/flog.ndjson

2. Run Filebeat with the following configuration

filebeat.yml

filebeat.inputs:
  - type: filestream
    id: filestream-input-id
    paths:
      - /tmp/flog.log
    processors:
      - add_fields:
          INVALID_CONFIG_KEY: true
          fields:
            labels:
              foo: bar

logging:
  to_stderr: true

output.discard:
  enabled: true

It should not panic

## Related issues
## Use cases
## Screenshots
## Logs


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

v2.Context.StatusReporter can be nil when Filebeat runs
standalone. The direct access to this field is replaced in Filestream
by the UpdateStatus method. A deprecation notice is added is added to
the StatusReporter field.

(cherry picked from commit 72314a0)

# Conflicts:
#	filebeat/input/filestream/internal/input-logfile/harvester.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 12, 2025
@mergify mergify bot requested a review from a team as a code owner December 12, 2025 23:40
@mergify mergify bot removed the request for review from a team December 12, 2025 23:40
@mergify mergify bot requested review from faec and leehinman December 12, 2025 23:40
@mergify
Copy link
Contributor Author

mergify bot commented Dec 12, 2025

Cherry-pick of 72314a0 has failed:

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

You are currently cherry-picking commit 72314a046.
  (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:   filebeat/input/v2/input.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/input/filestream/internal/input-logfile/harvester.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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 12, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

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

@github-actions github-actions bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Dec 12, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 12, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Dec 15, 2025

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

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 Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants