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.16](backport #42199) Fix Otel API change and update system test golden files to 2025 #42217

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 6, 2025

Proposed commit message

Fix Otel API change and update system test golden files to 2025

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
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

## Disruptive User Impact
## Author's Checklist

How to test this PR locally

For the OTel change

cd x-pack/filebeat/fbreceiver
go test ./...

For the system tests:

cd x-pack/filebeat
mage PythonIntegTest

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


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

* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mergify mergify bot added the backport label Jan 6, 2025
@mergify mergify bot requested a review from a team as a code owner January 6, 2025 10:56
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 6, 2025
@mergify mergify bot requested review from a team as code owners January 6, 2025 10:56
Copy link
Contributor Author

mergify bot commented Jan 6, 2025

Cherry-pick of 1430cfd has failed:

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

You are currently cherry-picking commit 1430cfda7.
  (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:   x-pack/filebeat/module/cisco/asa/test/additional_messages.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/non-canonical.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/288_auto_clear_users_history_start.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/289_auto_clear_users_history_end.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/310_monitor_dr_replication_start.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/311_monitor_dr_replication_end.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/357_monitor_fw_rules_start.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/358_monitor_fw_rules_end.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/479_security_warning_the_signature_hash_algorithm_of_the_vault_certificate_is_sha1.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/59_clear_safe_history.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/88_set_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/legacysyslog.log-expected.json
	modified:   x-pack/filebeat/module/microsoft/m365_defender/test/m365_defender-test.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/mysqlenterprise/audit/test/mysql_audit_test.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/fbreceiver/receiver_test.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 requested review from rdner and faec and removed request for a team January 6, 2025 10:56
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 6, 2025
@mauri870 mauri870 self-requested a review January 6, 2025 10:59
@mauri870 mauri870 added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Jan 6, 2025
@elasticmachine
Copy link
Collaborator

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

@mauri870 mauri870 enabled auto-merge (squash) January 6, 2025 12:06
@mauri870 mauri870 merged commit 393ed97 into 8.16 Jan 6, 2025
21 checks passed
@mauri870 mauri870 deleted the mergify/bp/8.16/pr-42199 branch January 6, 2025 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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.

4 participants