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

Update prometheus dependencies to be in-sync with OTel #40955

Merged
merged 3 commits into from
Sep 23, 2024

Conversation

blakerouse
Copy link
Contributor

Proposed commit message

Update github.com/prometheus/* dependencies to be inline with OTel.

With the soon to be addition of OTel dependencies in beats we need these dependencies to be inline.

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

None

@blakerouse blakerouse added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 23, 2024
@blakerouse blakerouse self-assigned this Sep 23, 2024
@blakerouse blakerouse requested review from a team as code owners September 23, 2024 18:54
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-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 Sep 23, 2024
@blakerouse blakerouse changed the title Update prometheus dependencies to be in-sync with OTEL Update prometheus dependencies to be in-sync with OTel Sep 23, 2024
@blakerouse blakerouse added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 23, 2024
Copy link
Contributor

mergify bot commented Sep 23, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @blakerouse? 🙏.
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 Sep 23, 2024

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.

@blakerouse blakerouse requested a review from a team as a code owner September 23, 2024 19:09
@blakerouse blakerouse enabled auto-merge (squash) September 23, 2024 20:26
@leehinman
Copy link
Contributor

leehinman commented Sep 23, 2024

/test

@blakerouse blakerouse merged commit 4380b9d into elastic:main Sep 23, 2024
124 checks passed
mergify bot pushed a commit that referenced this pull request Sep 23, 2024
@blakerouse blakerouse deleted the update-prometheus-deps branch September 23, 2024 23:27
blakerouse added a commit that referenced this pull request Sep 24, 2024
(cherry picked from commit 4380b9d)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants