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

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

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

belimawr
Copy link
Contributor

@belimawr belimawr commented Jan 2, 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

@belimawr belimawr added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jan 2, 2025
@belimawr belimawr self-assigned this Jan 2, 2025
@belimawr belimawr requested a review from a team as a code owner January 2, 2025 16:15
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 2, 2025
Copy link
Contributor

mergify bot commented Jan 2, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @belimawr? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Jan 2, 2025

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Jan 2, 2025
Copy link
Member

@mauri870 mauri870 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@belimawr belimawr enabled auto-merge (squash) January 2, 2025 16:52
@belimawr
Copy link
Contributor Author

belimawr commented Jan 2, 2025

It's a very small change, I've enabled auto merge

@belimawr belimawr requested review from a team as code owners January 3, 2025 04:43
@belimawr belimawr changed the title Fix Otel API change Fix Otel API change and update system test golden files to 2025 Jan 3, 2025
@belimawr belimawr disabled auto-merge January 3, 2025 04:44
@belimawr belimawr enabled auto-merge (squash) January 3, 2025 04:44
@jlind23 jlind23 disabled auto-merge January 3, 2025 07:31
@jlind23 jlind23 merged commit 1430cfd into elastic:main Jan 3, 2025
21 checks passed
@jlind23
Copy link
Collaborator

jlind23 commented Jan 3, 2025

Force merging this to unblock build on main.

mergify bot pushed a commit that referenced this pull request Jan 3, 2025
* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@belimawr belimawr deleted the fix-otel-API branch January 3, 2025 14:01
@mauri870
Copy link
Member

mauri870 commented Jan 3, 2025

@jlind23 I have a backport PR for 8.17 that is failing because of the test files, should we backport this fix to 8.16, 8.17 and 7.17 as well?

jlind23 added a commit that referenced this pull request Jan 3, 2025
…den files to 2025 (#42203)

* Fix Otel API change and update system test golden files to 2025 (#42199)

* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go

* Update receiver_test.go

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Julien Lind <[email protected]>
@belimawr
Copy link
Contributor Author

belimawr commented Jan 3, 2025

@jlind23 I have a backport PR for 8.17 that is failing because of the test files, should we backport this fix to 8.16, 8.17 and 7.17 as well?

AFAIK 8.16 is not an active branch any more, but 8.17 and 7.17 makes sense to backport as well. I'll add the labels.

@belimawr belimawr added backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.17 Automated backport with mergify labels Jan 3, 2025
mergify bot pushed a commit that referenced this pull request Jan 3, 2025
* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
#	x-pack/filebeat/module/cisco/asa/test/non-canonical.log-expected.json
mergify bot pushed a commit that referenced this pull request Jan 3, 2025
* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mauri870 mauri870 added the backport-8.16 Automated backport with mergify label Jan 6, 2025
mergify bot pushed a commit that referenced this pull request Jan 6, 2025
* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mauri870
Copy link
Member

mauri870 commented Jan 6, 2025

Had to backport to 8.16 as well since I have a PR for this branch #42195.

mauri870 added a commit that referenced this pull request Jan 6, 2025
…lden files to 2025 (#42214)

* Fix Otel API change and update system test golden files to 2025 (#42199)

* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
#	x-pack/filebeat/module/cisco/asa/test/non-canonical.log-expected.json

* fix conflicts, remove receiver_test.go

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
mauri870 added a commit that referenced this pull request Jan 6, 2025
…lden files to 2025 (#42215)

* Fix Otel API change and update system test golden files to 2025 (#42199)

* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go

* remove benchmark code not backported to 8.17

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
mauri870 added a commit that referenced this pull request Jan 6, 2025
…lden files to 2025 (#42217)

* Fix Otel API change and update system test golden files to 2025 (#42199)

* Fix Otel API change

* Update test files with new date/year

(cherry picked from commit 1430cfd)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go

* remove benchmark code not backported to 8.16

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify 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