You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2023/03/02 17:35:35 UTC
[solr] branch branch_9x updated: Update io.prometheus:* to v0.16.0 (#1419)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 6c75a2df773 Update io.prometheus:* to v0.16.0 (#1419)
6c75a2df773 is described below
commit 6c75a2df773389f52d67090386db3f4b1e51ad33
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Thu Mar 2 18:34:10 2023 +0100
Update io.prometheus:* to v0.16.0 (#1419)
Co-authored-by: Jan Høydahl <ja...@users.noreply.github.com>
(cherry picked from commit 8111586a936ebf325a56121dbea0913437ac8c87)
---
solr/licenses/simpleclient-0.16.0.jar.sha1 | 1 +
solr/licenses/simpleclient-0.2.0.jar.sha1 | 1 -
solr/licenses/simpleclient_common-0.16.0.jar.sha1 | 1 +
solr/licenses/simpleclient_common-0.2.0.jar.sha1 | 1 -
solr/licenses/simpleclient_httpserver-0.16.0.jar.sha1 | 1 +
solr/licenses/simpleclient_httpserver-0.2.0.jar.sha1 | 1 -
solr/prometheus-exporter/build.gradle | 12 ++++++++++--
.../prometheus/exporter/SolrExporterIntegrationTest.java | 4 ++--
versions.lock | 6 +++---
versions.props | 2 +-
10 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/solr/licenses/simpleclient-0.16.0.jar.sha1 b/solr/licenses/simpleclient-0.16.0.jar.sha1
new file mode 100644
index 00000000000..837c12a3bef
--- /dev/null
+++ b/solr/licenses/simpleclient-0.16.0.jar.sha1
@@ -0,0 +1 @@
+28b0eaf7c500c506976da8d0fc9cad6c278e8d87
diff --git a/solr/licenses/simpleclient-0.2.0.jar.sha1 b/solr/licenses/simpleclient-0.2.0.jar.sha1
deleted file mode 100644
index ce8b16fb377..00000000000
--- a/solr/licenses/simpleclient-0.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be8de6a5a01f25074be3b27a8db4448c9cce0168
diff --git a/solr/licenses/simpleclient_common-0.16.0.jar.sha1 b/solr/licenses/simpleclient_common-0.16.0.jar.sha1
new file mode 100644
index 00000000000..4b9f4251f45
--- /dev/null
+++ b/solr/licenses/simpleclient_common-0.16.0.jar.sha1
@@ -0,0 +1 @@
+a09a8c790a20309b942a9fdbfe77da22407096e6
diff --git a/solr/licenses/simpleclient_common-0.2.0.jar.sha1 b/solr/licenses/simpleclient_common-0.2.0.jar.sha1
deleted file mode 100644
index 1e1c2e94733..00000000000
--- a/solr/licenses/simpleclient_common-0.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-42d513358b26ae44137c620fa517d37b5e707ae1
diff --git a/solr/licenses/simpleclient_httpserver-0.16.0.jar.sha1 b/solr/licenses/simpleclient_httpserver-0.16.0.jar.sha1
new file mode 100644
index 00000000000..c4a863ea39b
--- /dev/null
+++ b/solr/licenses/simpleclient_httpserver-0.16.0.jar.sha1
@@ -0,0 +1 @@
+2c23f53ca22d7d8885fc4522ddcadcfe7f01a783
diff --git a/solr/licenses/simpleclient_httpserver-0.2.0.jar.sha1 b/solr/licenses/simpleclient_httpserver-0.2.0.jar.sha1
deleted file mode 100644
index 7d188b52e3f..00000000000
--- a/solr/licenses/simpleclient_httpserver-0.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f644860c08c787821c8c7ce78c408cea187fe1a3
diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradle
index 843932dbc73..a64fa08147d 100644
--- a/solr/prometheus-exporter/build.gradle
+++ b/solr/prometheus-exporter/build.gradle
@@ -28,8 +28,16 @@ dependencies {
exclude group: "org.apache.yetus", module: "audience-annotations"
})
- implementation ('io.prometheus:simpleclient')
- implementation ('io.prometheus:simpleclient_httpserver')
+ implementation ('io.prometheus:simpleclient', {
+ exclude group: "io.prometheus", module: "simpleclient_tracer_common"
+ exclude group: "io.prometheus", module: "simpleclient_tracer_otel"
+ exclude group: "io.prometheus", module: "simpleclient_tracer_otel_agent"
+ })
+ implementation ('io.prometheus:simpleclient_httpserver', {
+ exclude group: "io.prometheus", module: "simpleclient_tracer_common"
+ exclude group: "io.prometheus", module: "simpleclient_tracer_otel"
+ exclude group: "io.prometheus", module: "simpleclient_tracer_otel_agent"
+ })
implementation ('net.thisptr:jackson-jq', {
exclude group: "org.jruby.joni", module: "joni"
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
index f4965b54ef9..4620a08eae1 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
@@ -57,8 +57,8 @@ public class SolrExporterIntegrationTest extends SolrExporterTestBase {
assertTrue(durationHistogram.get("solr_exporter_duration_seconds_count") > 0);
assertTrue(durationHistogram.get("solr_exporter_duration_seconds_sum") > 0);
- // 17 = (15 buckets in the histogram) + (count metric) + (sum metric)
- assertEquals(17, durationHistogram.size());
+ // 18 = (15 buckets in the histogram) + (count metric) + (sum metric) + (created metric)
+ assertEquals(18, durationHistogram.size());
}
@Test
diff --git a/versions.lock b/versions.lock
index c828a95d741..da319e8fcf3 100644
--- a/versions.lock
+++ b/versions.lock
@@ -146,9 +146,9 @@ io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd)
io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b)
io.perfmark:perfmark-api:0.26.0 (3 constraints: 1f210916)
-io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
-io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
-io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
+io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
+io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
+io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
io.swagger.core.v3:swagger-annotations:2.2.8 (1 constraints: 0e050336)
jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe)
diff --git a/versions.props b/versions.props
index 4d39ff6ddea..d800048b532 100644
--- a/versions.props
+++ b/versions.props
@@ -25,7 +25,7 @@ io.jaegertracing:*=1.8.1
io.netty:*=4.1.89.Final
io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
io.opentracing:*=0.33.0
-io.prometheus:*=0.2.0
+io.prometheus:*=0.16.0
io.swagger.core.v3:*=2.2.8
jakarta.ws.rs:jakarta.ws.rs-api=2.1.6
joda-time:joda-time=2.12.2