Skip to content

Introduce removeIf method to StatefulMetric #1339

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 24 commits into from
May 16, 2025
Merged

Introduce removeIf method to StatefulMetric #1339

merged 24 commits into from
May 16, 2025

Conversation

dao-jun
Copy link
Contributor

@dao-jun dao-jun commented Apr 30, 2025

Introduce removeIf method to StatefulMetric that it could help users to clear DataPoints.

@zeitlinger
Copy link
Member

what is your (real) use case where this would help?

@dao-jun
Copy link
Contributor Author

dao-jun commented May 5, 2025 •
edited
Loading

what is your (real) use case where this would help?

@zeitlinger
Our case is in message system(Kafka on Pulsar, support Kafka protocol on Apache Pulsar and to provide a message system that separates storage and computation).

We need to expose consumer group level metrics. Consumer groups hosted by a topic-partition via hash algorithm, the metrics just like kafka_consumergroup_current_offset(group = x, topic = y, partition = z)

The topic-partition can be unloaded by loadbalancer and transfer to another broker, so when we observed the topic-partition being unloaded, we have to remove all the metric children which their consumergroup hosted by the topic-partition. To avoid the broker exports the metrics which the groups are not hosted by this broker and reduce the TSDB pressure.

In one word, we need a method and it can iter the metric children, so we can remove the metric children with specified labels more efficiently.

@zeitlinger
Copy link
Member

what is your (real) use case where this would help?

@zeitlinger Our case is in message system(Kafka on Pulsar, support Kafka protocol on Apache Pulsar and to provide a message system that separates storage and computation).

We need to expose consumer group level metrics. Consumer groups hosted by a topic-partition via hash algorithm, the metrics just like kafka_consumergroup_current_offset(group = x, topic = y, partition = z)

The topic-partition can be unloaded by loadbalancer and transfer to another broker, so when we observed the topic-partition being unloaded, we have to remove all the metric children which their consumergroup hosted by the topic-partition. To avoid the broker exports the metrics which the groups are not hosted by this broker and reduce the TSDB pressure.

In one word, we need a method and it can iter the metric children, so we can remove the metric children with specified labels more efficiently.

Thanks for the explanation - makes sense now!

The tests are still failing.

@dao-jun dao-jun force-pushed the dev/add_removeIf branch from a2cb398 to 4021a0f Compare May 15, 2025 16:41
dependabot bot and others added 23 commits May 16, 2025 00:47
@dependabot @dao-jun
Bump org.testcontainers:junit-jupiter from 1.20.6 to 1.21.0 (promethe…
85d327c 
…us#1333)

Bumps
[org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java)
from 1.20.6 to 1.21.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/testcontainers/testcontainers-java/releases">org.testcontainers:junit-jupiter's
releases</a>.</em></p>
<blockquote>
<h2>1.21.0</h2>
<h1>What's Changed</h1>
<ul>
<li>Fix typo in LGTM container method (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10189">#10189</a>)
<a href="https://github.com/jaydeluca"><code>@​jaydeluca</code></a></li>
<li>Pass <code>start</code> command required in Solr 10 (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10174">#10174</a>)
<a href="https://github.com/epugh"><code>@​epugh</code></a></li>
<li>[solr] Replace &quot;create_core&quot; with &quot;create&quot;
command (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10172">#10172</a>)
<a href="https://github.com/epugh"><code>@​epugh</code></a></li>
<li>Update docs version to ${GITHUB_REF##*/} (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10063">#10063</a>)
<a
href="https://github.com/github-actions"><code>@​github-actions</code></a></li>
<li>Update testcontainers version to ${GITHUB_REF##*/} (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10062">#10062</a>)
<a
href="https://github.com/github-actions"><code>@​github-actions</code></a></li>
</ul>
<h2>⚠️ Breaking API changes</h2>
<ul>
<li>Remove spock-core from spock module (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10069">#10069</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
<li>Uses <code>clickhouse/clickhouse-server</code> as Docker Image in
ClickHouseProvider (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/8738">#8738</a>)
<a
href="https://github.com/linghengqian"><code>@​linghengqian</code></a></li>
</ul>
<h2>🚀 Features &amp; Enhancements</h2>
<ul>
<li>Expose Tempo in LgtmContainer (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10192">#10192</a>)
<a href="https://github.com/jaydeluca"><code>@​jaydeluca</code></a></li>
<li>Allow spock tests to be skipped when Docker is unavailable (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10180">#10180</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
<li>Support new chromadb api version (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10170">#10170</a>)
<a
href="https://github.com/dev-jonghoonpark"><code>@​dev-jonghoonpark</code></a></li>
<li>Add default database name to MongoDB Atlas (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10034">#10034</a>)
<a href="https://github.com/blancqua"><code>@​blancqua</code></a></li>
<li>[servicebus] Skip waiting for sql to be ready (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10092">#10092</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
<li>Support additional flags in FirestoreEmulatorContainer (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10067">#10067</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
</ul>
<h2>☠️ Deprecations</h2>
<ul>
<li>Deprecate getUserPass and add getPassword (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10064">#10064</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
</ul>
<h2>🐛 Bug Fixes</h2>
<ul>
<li>Fix connection leak in JdbcDatabaseDelegate (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/9662">#9662</a>)
<a href="https://github.com/froque"><code>@​froque</code></a></li>
<li>Allow configuring the AlwaysPullPolicy (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10188">#10188</a>)
<a
href="https://github.com/sebastian-steiner"><code>@​sebastian-steiner</code></a></li>
</ul>
<h2>📖 Documentation</h2>
<ul>
<li>Add DockerModelRunnerContainer to core (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10183">#10183</a>)
<a href="https://github.com/kiview"><code>@​kiview</code></a></li>
<li>Allow configuring the AlwaysPullPolicy (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10188">#10188</a>)
<a
href="https://github.com/sebastian-steiner"><code>@​sebastian-steiner</code></a></li>
<li>Fix Apache Solr link (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10171">#10171</a>)
<a href="https://github.com/epugh"><code>@​epugh</code></a></li>
<li>Remove incubator note from Solr docs (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10173">#10173</a>)
<a href="https://github.com/epugh"><code>@​epugh</code></a></li>
<li>Remove linked-container (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10065">#10065</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
</ul>
<h2>🧹 Housekeeping</h2>
<ul>
<li>Add SFTP host key check example (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10127">#10127</a>)
<a
href="https://github.com/julianladisch"><code>@​julianladisch</code></a></li>
<li>Remove linked-container (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10065">#10065</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
</ul>
<h2>📦 Dependency updates</h2>
<ul>
<li>Update Gradle Wrapper from undefined to 8.13 (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10033">#10033</a>)
<a
href="https://github.com/github-actions"><code>@​github-actions</code></a></li>
<li>Update docker-java version to 3.4.2 (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10071">#10071</a>)
<a
href="https://github.com/eddumelendez"><code>@​eddumelendez</code></a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/8d954b5f64ccb01798c0e0e8d43bd3e034d36f46"><code>8d954b5</code></a>
Fix connection leak in JdbcDatabaseDelegate (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/9662">#9662</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/705d59b7042c2a7a8e69a2c1584c513d1dd0eba4"><code>705d59b</code></a>
Expose Tempo in LgtmContainer (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10192">#10192</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/3d5e7ff5ffe498408d7c1ee11a807e9d8d048276"><code>3d5e7ff</code></a>
Polish DockerModelRunnerContainer</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/4e8c421fa3e270598a425be4a8f999923bb5b7ac"><code>4e8c421</code></a>
Add DockerModelRunnerContainer to core (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10183">#10183</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/73e063746ac3b958eced6988005a8e8997dadbe6"><code>73e0637</code></a>
Allow configuring the AlwaysPullPolicy (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10188">#10188</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/57b340201007d327b878dda5c2302a274612301f"><code>57b3402</code></a>
Update Gradle Wrapper from undefined to 8.13 (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10033">#10033</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/d6ff41c7dc7cd8573337830a1a2f1642c62be377"><code>d6ff41c</code></a>
Fix ImageNameSubstitutionTest</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/910e7f5d9e8476f8b0d39ac2b7faded3648e9746"><code>910e7f5</code></a>
Fix typo in LGTM container method (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10189">#10189</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/e730674537dfa297a60311a7c13b953b8b82a67d"><code>e730674</code></a>
Allow spock tests to be skipped when Docker is unavailable (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10180">#10180</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-java/commit/80ae5d7b1b7abca38657d037a3bba91c0f3e9250"><code>80ae5d7</code></a>
Pass start command required in Solr 10 (<a
href="https://redirect.github.com/testcontainers/testcontainers-java/issues/10174">#10174</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/testcontainers/testcontainers-java/compare/1.20.6...1.21.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.testcontainers:junit-jupiter&package-manager=maven&previous-version=1.20.6&new-version=1.21.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@dependabot @dao-jun
Bump org.springframework.boot:spring-boot-starter-parent from 3.4.4 t…
df8ddbf 
…o 3.4.5 (prometheus#1336)

Bumps
[org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot)
from 3.4.4 to 3.4.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/spring-projects/spring-boot/releases">org.springframework.boot:spring-boot-starter-parent's
releases</a>.</em></p>
<blockquote>
<h2>v3.4.5</h2>
<h2>:lady_beetle: Bug Fixes</h2>
<ul>
<li>Spring Boot with native image container image build fails on podman
due to directory permissions <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45256">#45256</a></li>
<li>Neo4jReactiveDataAutoConfiguration assumes that certain beans are
available <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45235">#45235</a></li>
<li>Wrong jOOQ exception translator with empty db name <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45219">#45219</a></li>
<li>MessageSourceMessageInterpolator does not replace a parameter when
the message matches its code <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45213">#45213</a></li>
<li>IntegrationMbeanExporter is not eligible for getting processed by
all BeanPostProcessors warnings are shown when using JMX <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45194">#45194</a></li>
<li>OAuth2AuthorizationServerJwtAutoConfiguration uses
<code>@ConditionalOnClass</code> incorrectly <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45178">#45178</a></li>
<li>MongoDB's dependency management is missing Kotlin coroutine driver
modules <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45159">#45159</a></li>
<li>ImagePlatform can cause &quot;OS must not be empty&quot;
IllegalArgumentException <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45153">#45153</a></li>
<li>TypeUtils does not handle generics with identical names in different
positions <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45039">#45039</a></li>
<li>HttpClient5 5.4.3 breaks local Docker transport <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45028">#45028</a></li>
<li>spring.datasource.hikari.data-source-class-name cannot be used as a
driver class name is always required and Hikari does not accept both <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45002">#45002</a></li>
<li>Post-processing to apply custom JdbcConnectionDetails triggers an
NPE in Hikari if the JDBC URL is for an unknown driver <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44998">#44998</a></li>
<li>DataSourceBuilder triggers an NPE in Hikari when trying to build a
DataSource with a JDBC URL for an unknown driver <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44995">#44995</a></li>
<li>SSL config does not watch for symlink file changes <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44887">#44887</a></li>
<li>EmbeddedLdapAutoConfiguration should not rely on PreDestroy <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44874">#44874</a></li>
<li>DataSourceTransactionManagerAutoConfiguration should run after
DataSourceAutoConfiguration <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44819">#44819</a></li>
<li>JsonValueWriter can throw StackOverflowError on deeply nested items
<a
href="https://redirect.github.com/spring-projects/spring-boot/pull/44627">#44627</a></li>
<li>In a reactive web app, SslBundle can no longer open store file
locations without using a 'file:' prefix <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/44535">#44535</a></li>
<li>Logging a Path object using structured logging throws
StackOverflowError <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/44507">#44507</a></li>
</ul>
<h2>:notebook_with_decorative_cover: Documentation</h2>
<ul>
<li>Make <code>@component</code> a javadoc link <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45258">#45258</a></li>
<li>Fix documentation links to buildpacks.io <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45241">#45241</a></li>
<li>Clarify the use of multiple profile expressions with
&quot;spring.config.activate.on-profile&quot; <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45224">#45224</a></li>
<li>Show the use of token properties in authorization server clients
configuration example <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45176">#45176</a></li>
<li>Add details of the purpose of the metrics endpoint <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45047">#45047</a></li>
<li>Escape the asterisk in spring-application.adoc <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45033">#45033</a></li>
<li>Add reference to Styra (OPA) Spring Boot SDK <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44976">#44976</a></li>
<li>Update CDS documentation to cover AOTCache <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44970">#44970</a></li>
<li>WebFlux security documentation incorrectly links to servlet classes
<a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44966">#44966</a></li>
<li>Replace mentions of deprecated MockBean annotation <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/44947">#44947</a></li>
<li>TaskExecution documentation should describe what happens when
multiple Executor beans are present <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44908">#44908</a></li>
<li>Documentation lists coordinates for some dependencies that are not
actually managed <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44879">#44879</a></li>
<li>Polish javadoc of SpringProfileAction <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/44826">#44826</a></li>
</ul>
<h2>:hammer: Dependency Upgrades</h2>
<ul>
<li>Upgrade to AspectJ 1.9.24 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45184">#45184</a></li>
<li>Upgrade to Couchbase Client 3.7.9 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45072">#45072</a></li>
<li>Upgrade to Hibernate 6.6.13.Final <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45073">#45073</a></li>
<li>Upgrade to HttpClient5 5.4.3 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45074">#45074</a></li>
<li>Upgrade to HttpCore5 5.3.4 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45075">#45075</a></li>
<li>Upgrade to Jaybird 5.0.7.java11 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45076">#45076</a></li>
<li>Upgrade to Jetty 12.0.19 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45077">#45077</a></li>
<li>Upgrade to jOOQ 3.19.22 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45078">#45078</a></li>
<li>Upgrade to Lombok 1.18.38 <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/45079">#45079</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/b882c29bdf607d5d4db910f7fd0161143a1329c7"><code>b882c29</code></a>
Release v3.4.5</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/918066f39ae72de5a6e1bae78c841396e049e5b6"><code>918066f</code></a>
Merge branch '3.3.x' into 3.4.x</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/ab0c332d9995963d22c202706564be58ff724622"><code>ab0c332</code></a>
Next development version (v3.3.12-SNAPSHOT)</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/71acf939ace320fbfa35ce48577ba534469dfc90"><code>71acf93</code></a>
Merge branch '3.3.x' into 3.4.x</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/d2eaac6b60d117c3d10939866c70fce6b945eefd"><code>d2eaac6</code></a>
Revert &quot;Upgrade to Netty 4.1.120.Final&quot;</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/d24a38f0f890ef70a07be8236bb9717527f50ba5"><code>d24a38f</code></a>
Merge branch '3.3.x' into 3.4.x</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/933572ad5e7da2e47d8efc168a86c8cf6105b062"><code>933572a</code></a>
Upgrade to Netty 4.1.120.Final</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/016b3de968b9b9a6319f7bc58abfb1df007bbc4b"><code>016b3de</code></a>
Upgrade to Netty 4.1.120.Final</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/46a709a8503c096e2514c8cd17b1a7e7e715e7b2"><code>46a709a</code></a>
Merge branch '3.3.x' into 3.4.x</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/55f67c9a522647039fd3294dee5cb83f4888160a"><code>55f67c9</code></a>
Fix potential null problem in actuator</li>
<li>Additional commits viewable in <a
href="https://github.com/spring-projects/spring-boot/compare/v3.4.4...v3.4.5">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.springframework.boot:spring-boot-starter-parent&package-manager=maven&previous-version=3.4.4&new-version=3.4.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@benjaminp @dao-jun
Eagerly reject null label values (prometheus#1335)
41418c6 
Scraping generally doesn't support null label values and can throw NPEs
at various points. It's easiest to debug such problems at the point null
is introduced.

Signed-off-by: Benjamin Peterson <[email protected]>

Signed-off-by: Benjamin Peterson <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
add Zizmor (prometheus#1337)
2122007 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dao-jun
Add removeIf method to Meters
f00a878 
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
fix gh pages, add super linter (prometheus#1338)
d4c84ba 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
add release.yml (prometheus#1341)
8019b63 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
Fix (prometheus#1342)
cd55b36 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
fix lint (prometheus#1343)
f81c726 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
Fix release (prometheus#1344)
d114861 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dependabot @dao-jun
Bump jetty-server.version from 12.0.19 to 12.0.20 (prometheus#1345)
fd0c402 
Bumps `jetty-server.version` from 12.0.19 to 12.0.20.
Updates `org.eclipse.jetty:jetty-server` from 12.0.19 to 12.0.20

Updates `org.eclipse.jetty.ee10:jetty-ee10-servlet` from 12.0.19 to
12.0.20

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@dependabot @dao-jun
Bump jdx/mise-action from 2.2.1 to 2.2.2 (prometheus#1348)
06a76d2 
Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 2.2.1
to 2.2.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/jdx/mise-action/releases">jdx/mise-action's
releases</a>.</em></p>
<blockquote>
<h2>v2.2.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Fix alpine container installation by <a
href="https://github.com/vic1707"><code>@​vic1707</code></a> in <a
href="https://redirect.github.com/jdx/mise-action/pull/189">jdx/mise-action#189</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/vic1707"><code>@​vic1707</code></a> made
their first contribution in <a
href="https://redirect.github.com/jdx/mise-action/pull/189">jdx/mise-action#189</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/jdx/mise-action/compare/v2.2.1...v2.2.2">https://github.com/jdx/mise-action/compare/v2.2.1...v2.2.2</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/jdx/mise-action/blob/main/CHANGELOG.md">jdx/mise-action's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<hr />
<h2><a
href="https://github.com/jdx/mise-action/compare/v2.2.1..v2.2.2">2.2.2</a>
- 2025-05-12</h2>
<h3>🔍 Other Changes</h3>
<ul>
<li>Fix alpine container installation (<a
href="https://redirect.github.com/jdx/mise-action/issues/189">#189</a>)
by <a href="https://github.com/vic1707"><code>@​vic1707</code></a> in <a
href="https://redirect.github.com/jdx/mise-action/pull/189">#189</a></li>
</ul>
<h3>📚 Documentation</h3>
<ul>
<li>hide version commits in CHANGELOG by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/570a9c6467a0d2735b79d8a719a75229adc179e6">570a9c6</a></li>
<li>hide version commits in CHANGELOG by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/d20b46e041ee9e28e7b67d713f4df93a72358b54">d20b46e</a></li>
</ul>
<h3>⚙️ Miscellaneous Tasks</h3>
<ul>
<li>updated deps by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/69bf3f1a1ff387ad74d841595f9c5f9e4d8816be">69bf3f1</a></li>
</ul>
<h3>New Contributors</h3>
<ul>
<li><a href="https://github.com/vic1707"><code>@​vic1707</code></a> made
their first contribution in <a
href="https://redirect.github.com/jdx/mise-action/pull/189">#189</a></li>
</ul>
<hr />
<h2><a
href="https://github.com/jdx/mise-action/compare/v2.2.0..v2.2.1">2.2.1</a>
- 2025-04-23</h2>
<h3>🐛 Bug Fixes</h3>
<ul>
<li>show message when saving cache by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/4a07a7ced07f3f5ba2bcafcfe1954eef43fda3c0">4a07a7c</a></li>
</ul>
<hr />
<h2><a
href="https://github.com/jdx/mise-action/compare/v2.1.11..v2.2.0">2.2.0</a>
- 2025-04-23</h2>
<h3>🚀 Features</h3>
<ul>
<li>run mise ls (<a
href="https://redirect.github.com/jdx/mise-action/issues/163">#163</a>)
by <a href="https://github.com/scop"><code>@​scop</code></a> in <a
href="https://redirect.github.com/jdx/mise-action/pull/163">#163</a></li>
</ul>
<h3>🐛 Bug Fixes</h3>
<ul>
<li>save cache when build fails by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/81d53cf96809b887a4903446d5466da5e25ffe37">81d53cf</a></li>
</ul>
<h3>📚 Documentation</h3>
<ul>
<li>restore estranged comment for tool_versions (<a
href="https://redirect.github.com/jdx/mise-action/issues/164">#164</a>)
by <a href="https://github.com/mfilej"><code>@​mfilej</code></a> in <a
href="https://redirect.github.com/jdx/mise-action/pull/164">#164</a></li>
</ul>
<h3>⚙️ Miscellaneous Tasks</h3>
<ul>
<li>updated deps by <a
href="https://github.com/jdx"><code>@​jdx</code></a> in <a
href="https://github.com/jdx/mise-action/commit/ff329b72aca0adb59abbbf545f488bac2a11bda9">ff329b7</a></li>
<li>renovate by <a href="https://github.com/jdx"><code>@​jdx</code></a>
in <a
href="https://github.com/jdx/mise-action/commit/83232dd5706c1ad3d58a22ac8b0e9852c80eb748">83232dd</a></li>
</ul>
<h3>New Contributors</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/jdx/mise-action/commit/c94f0bf9e520b150e34c017db785461f7e71c5fb"><code>c94f0bf</code></a>
2.2.2</li>
<li><a
href="https://github.com/jdx/mise-action/commit/69bf3f1a1ff387ad74d841595f9c5f9e4d8816be"><code>69bf3f1</code></a>
chore: updated deps</li>
<li><a
href="https://github.com/jdx/mise-action/commit/923c9f44ed241a2b8a11050bdd71e1aba934b8d3"><code>923c9f4</code></a>
Fix alpine container installation (<a
href="https://redirect.github.com/jdx/mise-action/issues/189">#189</a>)</li>
<li><a
href="https://github.com/jdx/mise-action/commit/d20b46e041ee9e28e7b67d713f4df93a72358b54"><code>d20b46e</code></a>
docs: hide version commits in CHANGELOG</li>
<li><a
href="https://github.com/jdx/mise-action/commit/570a9c6467a0d2735b79d8a719a75229adc179e6"><code>570a9c6</code></a>
docs: hide version commits in CHANGELOG</li>
<li>See full diff in <a
href="https://github.com/jdx/mise-action/compare/7a111ead46986ccad89a74ad013ba2a7c08c9e67...c94f0bf9e520b150e34c017db785461f7e71c5fb">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=jdx/mise-action&package-manager=github_actions&previous-version=2.2.1&new-version=2.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@izeye @dao-jun
Fix broken link to "Exclude protobuf exposition format" section (prom…
3f33085 
…etheus#1347)

This PR fixes a broken link to the "Exclude protobuf exposition format"
section in the `quickstart.md`.

Signed-off-by: Johnny Lim <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dao-jun
Fix tests
1aac666 
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
add Zizmor (prometheus#1337)
57b116e 
Signed-off-by: Gregor Zeitlinger <[email protected]>
@zeitlinger @dao-jun
fix gh pages, add super linter (prometheus#1338)
63fdb1f 
Signed-off-by: Gregor Zeitlinger <[email protected]>
@prombot @zeitlinger @dao-jun
Synchronize common files from prometheus/prometheus (prometheus#1340)
5d85738 
Propagating changes from prometheus/prometheus default branch.

---------

Signed-off-by: prombot <[email protected]>
Signed-off-by: Gregor Zeitlinger <[email protected]>
Co-authored-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dependabot @dao-jun
Bump jetty-server.version from 12.0.20 to 12.0.21 (prometheus#1349)
a6135c4 
Bumps `jetty-server.version` from 12.0.20 to 12.0.21.
Updates `org.eclipse.jetty:jetty-server` from 12.0.20 to 12.0.21

Updates `org.eclipse.jetty.ee10:jetty-ee10-servlet` from 12.0.20 to
12.0.21

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@dependabot @dao-jun
Bump org.apache.tomcat.embed:tomcat-embed-core from 11.0.6 to 11.0.7 (p…
75d86fc 
…rometheus#1350)

Bumps org.apache.tomcat.embed:tomcat-embed-core from 11.0.6 to 11.0.7.

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.tomcat.embed:tomcat-embed-core&package-manager=maven&previous-version=11.0.6&new-version=11.0.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
cleanup gh actions (prometheus#1351)
90839ad 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
Fix gh pages (prometheus#1355)
886c309 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@zeitlinger @dao-jun
Fix gh pages (prometheus#1356)
5ad5b94 
Signed-off-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dependabot @zeitlinger @dao-jun
Bump com.google.protobuf:protobuf-java from 4.30.2 to 4.31.0 (prometh…
07d50f2 
…eus#1357)

Bumps
[com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf)
from 4.30.2 to 4.31.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/3d4adad5c4c4e6a6f9f038769b8c90716065b0e4"><code>3d4adad</code></a>
Updating version.json and repo version numbers to: 31.0</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/0fad924f7859e4cf72f82420a1341f41bc0d3fa1"><code>0fad924</code></a>
Merge pull request <a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/21743">#21743</a>
from shaod2/31-cp</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/aa5410dd95b9bceeca78e308481a46032ae79cd9"><code>aa5410d</code></a>
Remove fast-path check for non-clang compilers in MessageCreator.</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/0cf5489ca0f42df903ba1abd1f5f0a75aa95f045"><code>0cf5489</code></a>
Fix silent failure of <code>rb_test</code> rules to run test (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/21733">#21733</a>)</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/d39063184a826bd53bc7b78734a39db9f93c8342"><code>d390631</code></a>
Add missing include.</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/01b42bbd549c8f30ef9a27cd4964a7ae2632955a"><code>01b42bb</code></a>
Cherry-pick Rust fix to 31.x (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/21617">#21617</a>)</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/ac2bbecc4ff65935a69c9226fa13fc62a6ad8e6f"><code>ac2bbec</code></a>
Merge pull request <a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/21546">#21546</a>
from protocolbuffers/31.x-202504301807</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/ca59567ff2522d5b7e56dec0b3a0f94208213dc9"><code>ca59567</code></a>
Updating version.json and repo version numbers to: 31.0-dev</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/4f81598aa4786662f8f7f383e0aa5b3388aad717"><code>4f81598</code></a>
Updating version.json and repo version numbers to: 31.0-rc2</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/1fb0d06596e2680bd4c066ded79782730090ab05"><code>1fb0d06</code></a>
Cherry pick import option for protoc (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/21489">#21489</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/protocolbuffers/protobuf/compare/v4.30.2...v4.31.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.protobuf:protobuf-java&package-manager=maven&previous-version=4.30.2&new-version=4.31.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Gregor Zeitlinger <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gregor Zeitlinger <[email protected]>
Signed-off-by: dao-jun <[email protected]>
@dao-jun dao-jun force-pushed the dev/add_removeIf branch from 1f3a81a to 07d50f2 Compare May 15, 2025 16:49
@dao-jun
Copy link
Contributor Author

dao-jun commented May 15, 2025

@zeitlinger I've fixed the DCO check, PTAL

@zeitlinger zeitlinger enabled auto-merge (squash) May 16, 2025 09:14
@zeitlinger zeitlinger merged commit 647f7cc into prometheus:main May 16, 2025
7 checks passed
@dao-jun dao-jun deleted the dev/add_removeIf branch May 16, 2025 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dao-jun @zeitlinger @benjaminp @izeye @prombot