Skip to content

improve: use SetupMetricsOptions instead of SetupMetrics #46313

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Oct 2, 2025
Merged

improve: use SetupMetricsOptions instead of SetupMetrics #46313

merged 4 commits into from
Oct 2, 2025

Conversation

nodece
Copy link
Contributor

@nodece nodece commented Aug 29, 2025

Proposed commit message

The problem is that SetupMetrics in elastic-agent-system-metrics is conditionally compiled and only available when the build tags (darwin && cgo) || (freebsd && cgo) || linux || windows are satisfied. If you build on Darwin without cgo, it won't be compiled, hence the undefined symbol.

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.

@nodece nodece requested a review from a team as a code owner August 29, 2025 13:55
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 29, 2025
@cla-checker-service CLA Checker Service
Copy link

cla-checker-service bot commented Aug 29, 2025 •
edited
Loading

💚 CLA has been signed

@github-actions GitHub Actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

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

@mergify mergify bot assigned nodece Aug 29, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 29, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @nodece? 🙏.
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
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Aug 29, 2025
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 29, 2025
@pierrehilbert
Copy link
Collaborator

Hey @nodece
Thanks for contributing.
Could you please sign our CLA?

@nodece
Copy link
Contributor Author

nodece commented Aug 29, 2025

Hey @nodece Thanks for contributing. Could you please sign our CLA?

Done. Could you check this?

@pierrehilbert
Copy link
Collaborator

This is now correctly signed, thanks.
Someone from my team will soon review your PR.

@nodece nodece force-pushed the remove-SetupMetrics-usage branch 2 times, most recently from dda9349 to ac187c6 Compare September 18, 2025 07:13
@nodece
Copy link
Contributor Author

nodece commented Sep 18, 2025

Hi @VihasMakwana, the issues flagged by golang-lint have been fixed. Could you please rerun the CI?

@nodece
Copy link
Contributor Author

nodece commented Sep 19, 2025

@VihasMakwana @AndersonQ CI has been passed.

@AndersonQ
Copy link
Member

/buildkite test this

@nodece nodece force-pushed the remove-SetupMetrics-usage branch from 3eab784 to 2c5c95c Compare September 28, 2025 03:06
@nodece
Copy link
Contributor Author

nodece commented Sep 28, 2025

Rebase codebase

kruskall
kruskall requested changes Sep 29, 2025
View reviewed changes
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 29, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b remove-SetupMetrics-usage upstream/remove-SetupMetrics-usage
git merge upstream/main
git push upstream remove-SetupMetrics-usage

@nodece nodece force-pushed the remove-SetupMetrics-usage branch from 2c5c95c to 2b0ee1d Compare September 30, 2025 06:50
@nodece nodece requested a review from kruskall September 30, 2025 07:06
AndersonQ
AndersonQ requested changes Sep 30, 2025
View reviewed changes
@nodece nodece requested a review from AndersonQ September 30, 2025 07:09
@AndersonQ
Copy link
Member

/test

@AndersonQ
Copy link
Member

/test

@AndersonQ
Copy link
Member

/test

@AndersonQ AndersonQ added backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Oct 1, 2025
@AndersonQ
Copy link
Member

@kruskall could you re-review?

@AndersonQ AndersonQ merged commit 2d5086e into elastic:main Oct 2, 2025
212 checks passed
mergify bot pushed a commit that referenced this pull request Oct 2, 2025
@nodece @mergify
[libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313)
238f533 
---------

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 2d5086e)

# Conflicts:
#	libbeat/cmd/instance/beat.go
@mergify mergify bot mentioned this pull request Oct 2, 2025
Open
6 tasks
mergify bot pushed a commit that referenced this pull request Oct 2, 2025
@nodece @mergify
[libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313)
014564d 
---------

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 2d5086e)

# Conflicts:
#	libbeat/cmd/instance/beat.go
@mergify mergify bot mentioned this pull request Oct 2, 2025
Open
6 tasks
mergify bot pushed a commit that referenced this pull request Oct 2, 2025
@nodece @mergify
[libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313)
73ea23e 
---------

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 2d5086e)

# Conflicts:
#	libbeat/cmd/instance/beat.go
@mergify mergify bot mentioned this pull request Oct 2, 2025
Open
6 tasks
mergify bot pushed a commit that referenced this pull request Oct 2, 2025
@nodece @AndersonQ @mergify
[libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313)
b8ce4c4 
---------

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 2d5086e)
@mergify mergify bot mentioned this pull request Oct 2, 2025
Open
6 tasks
@nodece nodece deleted the remove-SetupMetrics-usage branch October 2, 2025 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndersonQ AndersonQ AndersonQ approved these changes

@kruskall kruskall kruskall approved these changes

@VihasMakwana VihasMakwana VihasMakwana approved these changes

@khushijain21 khushijain21 Awaiting requested review from khushijain21 khushijain21 is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@nodece nodece

Labels
backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch backport-9.1 Automated backport to the 9.1 branch backport-9.2 Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nodece @elasticmachine @pierrehilbert @AndersonQ @kruskall @VihasMakwana