diff --git a/changelog/unreleased/solr-18060.yml b/changelog/unreleased/solr-18060.yml new file mode 100644 index 000000000000..fded826deeae --- /dev/null +++ b/changelog/unreleased/solr-18060.yml @@ -0,0 +1,9 @@ +# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc +title: SOLR-18060 CrossDC Consumer - add Prometheus metrics +type: changed +authors: + - name: Andrzej Bialecki + - nick: ab +links: + - name: SOLR-18060 + url: https://issues.apache.org/jira/browse/SOLR-18060 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9616523957d..c452c1fa0c42 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -189,6 +189,7 @@ owasp-dependencycheck = "12.1.3" # @keep for version alignment perfmark = "0.27.0" prometheus-metrics = "1.1.0" +prometheus-metrics14 = "1.4.3" prometheus-simpleclient = "0.16.0" quicktheories = "0.26" semver4j = "6.0.0" @@ -500,6 +501,11 @@ ow2-asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "ow2-asm" } perfmark-api = { module = "io.perfmark:perfmark-api", version.ref = "perfmark" } prometheus-metrics-expositionformats = { module = "io.prometheus:prometheus-metrics-exposition-formats", version.ref = "prometheus-metrics" } prometheus-metrics-model = { module = "io.prometheus:prometheus-metrics-model", version.ref = "prometheus-metrics" } +prometheus-metrics14-core = { module = "io.prometheus:prometheus-metrics-core", version.ref = "prometheus-metrics14" } +prometheus-metrics14-exporter-servlet-jakarta = { module = "io.prometheus:prometheus-metrics-exporter-servlet-jakarta", version.ref = "prometheus-metrics14" } +prometheus-metrics14-instrumentation-dropwizard = { module = "io.prometheus:prometheus-metrics-instrumentation-dropwizard", version.ref = "prometheus-metrics14" } +prometheus-metrics14-instrumentation-dropwizard5 = { module = "io.prometheus:prometheus-metrics-instrumentation-dropwizard5", version.ref = "prometheus-metrics14" } +prometheus-metrics14-model = { module = "io.prometheus:prometheus-metrics-model", version.ref = "prometheus-metrics14" } prometheus-simpleclient = { module = "io.prometheus:simpleclient", version.ref = "prometheus-simpleclient" } prometheus-simpleclient-httpserver = { module = "io.prometheus:simpleclient_httpserver", version.ref = "prometheus-simpleclient" } quicktheories-quicktheories = { module = "org.quicktheories:quicktheories", version.ref = "quicktheories" } diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index c9ce8ccb5977..7574bede05aa 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -69,8 +69,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClassp io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath io.swagger.core.v3:swagger-core-jakarta:2.2.22=swaggerBuild diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 57b7730a427e..39a62dbb22dc 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -64,8 +64,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index cdaddfa4a3c2..7a0432518ff7 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -71,8 +71,9 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=compileClasspath,jarValidation io.opentelemetry:opentelemetry-sdk-testing:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=permitUnusedDeclared diff --git a/solr/cross-dc-manager/build.gradle b/solr/cross-dc-manager/build.gradle index f037f8b85f96..1e8ce1f0b3c6 100644 --- a/solr/cross-dc-manager/build.gradle +++ b/solr/cross-dc-manager/build.gradle @@ -30,6 +30,20 @@ dependencies { implementation libs.dropwizard.metrics.core implementation libs.dropwizard.metrics.servlets + implementation libs.prometheus.metrics14.model + implementation libs.prometheus.metrics14.exporter.servlet.jakarta + implementation (libs.prometheus.metrics14.instrumentation.dropwizard, { + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-common" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-initializer" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-otel" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-otel-agent" + }) + implementation (libs.prometheus.metrics14.instrumentation.dropwizard5, { + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-common" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-initializer" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-otel" + exclude group: "io.prometheus", module: "prometheus-metrics-tracer-otel-agent" + }) implementation libs.eclipse.jetty.server implementation libs.eclipse.jetty.ee10.servlet implementation libs.slf4j.api @@ -48,6 +62,7 @@ dependencies { testImplementation project(':solr:test-framework') testImplementation libs.apache.lucene.testframework testImplementation libs.carrotsearch.randomizedtesting.runner + testImplementation libs.commonsio.commonsio testImplementation libs.junit.junit // The explicit dependency on bytebuddy is required for Java 25 support // Once Mockito upgrades its dependency on ByteBuddy to 1.16.1, we should diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 0525d371c693..71b3de89eb6b 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -82,8 +82,16 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-core:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-exporter-common:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-exposition-formats:1.1.0=solrPlatformLibs +io.prometheus:prometheus-metrics-exposition-formats:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-exposition-textformats:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-instrumentation-dropwizard5:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-instrumentation-dropwizard:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java index 7e4219f49226..854ed0454d48 100644 --- a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java +++ b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java @@ -20,11 +20,18 @@ import static org.apache.solr.crossdc.common.KafkaCrossDcConf.TOPIC_NAME; import static org.apache.solr.crossdc.common.KafkaCrossDcConf.ZK_CONNECT_STRING; +import com.codahale.metrics.MetricFilter; import com.codahale.metrics.SharedMetricRegistries; import io.dropwizard.metrics.servlets.MetricsServlet; import io.dropwizard.metrics.servlets.ThreadDumpServlet; +import io.prometheus.metrics.exporter.servlet.jakarta.PrometheusMetricsServlet; +import io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports; +import io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper; +import io.prometheus.metrics.instrumentation.dropwizard5.labels.MapperConfig; +import io.prometheus.metrics.model.registry.PrometheusRegistry; import java.lang.invoke.MethodHandles; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -98,11 +105,23 @@ public void start(Map properties) { ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); context.setContextPath("/"); server.setHandler(context); + context.addServlet(ThreadDumpServlet.class, "/threads/*"); - context.addServlet(MetricsServlet.class, "/metrics/*"); + + MapperConfig mapperConfig = new MapperConfig("*.*", "crossdc_consumer_${0}_${1}", Map.of()); + CustomLabelMapper customLabelMapper = new CustomLabelMapper(List.of(mapperConfig)); + DropwizardExports dropwizardExports = + new DropwizardExports( + SharedMetricRegistries.getOrCreate(METRICS_REGISTRY), + MetricFilter.ALL, + customLabelMapper); + PrometheusRegistry.defaultRegistry.register(dropwizardExports); + context.addServlet(PrometheusMetricsServlet.class, "/metrics/prometheus/*"); + + context.addServlet(MetricsServlet.class, "/metrics/json/*"); context.setAttribute( - "com.codahale.metrics.servlets.MetricsServlet.registry", - SharedMetricRegistries.getOrCreate(METRICS_REGISTRY)); + MetricsServlet.METRICS_REGISTRY, SharedMetricRegistries.getOrCreate(METRICS_REGISTRY)); + for (ServletMapping mapping : context.getServletHandler().getServletMappings()) { if (log.isInfoEnabled()) { log.info(" - {}", mapping.getPathSpecs()[0]); diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java index 3770884b372a..56285798b824 100644 --- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java +++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java @@ -18,13 +18,14 @@ import static org.apache.solr.crossdc.common.KafkaCrossDcConf.DEFAULT_MAX_REQUEST_SIZE; import static org.apache.solr.crossdc.common.KafkaCrossDcConf.INDEX_UNMIRRORABLE_DOCS; -import static org.apache.solr.crossdc.common.KafkaCrossDcConf.PORT; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; +import java.io.InputStream; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -32,6 +33,7 @@ import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; +import org.apache.commons.io.IOUtils; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -40,15 +42,20 @@ import org.apache.lucene.tests.util.QuickPatchThreadsFilter; import org.apache.solr.SolrIgnoredThreadsFilter; import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.impl.CloudSolrClient; +import org.apache.solr.client.solrj.jetty.HttpJettySolrClient; import org.apache.solr.client.solrj.request.CollectionAdminRequest; +import org.apache.solr.client.solrj.request.GenericSolrRequest; import org.apache.solr.client.solrj.request.SolrQuery; import org.apache.solr.client.solrj.request.UpdateRequest; +import org.apache.solr.client.solrj.response.InputStreamResponseParser; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.cloud.MiniSolrCloudCluster; import org.apache.solr.cloud.SolrCloudTestCase; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.util.ExecutorUtil; +import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.ObjectReleaseTracker; import org.apache.solr.common.util.SolrNamedThreadFactory; import org.apache.solr.crossdc.common.KafkaCrossDcConf; @@ -61,6 +68,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.noggit.ObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,7 +109,7 @@ public void beforeSolrAndKafkaIntegrationTest() throws Exception { uceh = Thread.getDefaultUncaughtExceptionHandler(); Thread.setDefaultUncaughtExceptionHandler( (t, e) -> log.error("Uncaught exception in thread {}", t, e)); - System.setProperty(PORT, "-1"); + // System.setProperty(PORT, "-1"); consumer = new Consumer(); Properties config = new Properties(); @@ -175,6 +183,51 @@ public void afterSolrAndKafkaIntegrationTest() throws Exception { Thread.setDefaultUncaughtExceptionHandler(uceh); } + @Test + @SuppressWarnings({"unchecked"}) + public void testMetrics() throws Exception { + CloudSolrClient client = solrCluster1.getSolrClient(); + SolrInputDocument doc = new SolrInputDocument(); + doc.addField("id", String.valueOf(new Date().getTime())); + doc.addField("text", "some test"); + + client.add(COLLECTION, doc); + + client.commit(COLLECTION); + + System.out.println("Sent producer record"); + + assertCluster2EventuallyHasDocs(COLLECTION, "*:*", 1); + + String baseUrl = "http://localhost:" + KafkaCrossDcConf.DEFAULT_PORT; + HttpJettySolrClient httpJettySolrClient = + new HttpJettySolrClient.Builder(baseUrl).useHttp1_1(true).build(); + try { + // first try the JSON format + GenericSolrRequest req = new GenericSolrRequest(SolrRequest.METHOD.GET, "/metrics/json"); + req.setResponseParser(new InputStreamResponseParser("test/plain")); + NamedList rsp = httpJettySolrClient.request(req); + String content = + IOUtils.toString( + (InputStream) rsp.get(InputStreamResponseParser.STREAM_KEY), StandardCharsets.UTF_8); + Map map = (Map) ObjectBuilder.fromJSON(content); + assertTrue(map.containsKey("counters")); + assertFalse(((Map) map.get("counters")).isEmpty()); + + // then try the prometheus format + req = new GenericSolrRequest(SolrRequest.METHOD.GET, "/metrics/prometheus"); + req.setResponseParser(new InputStreamResponseParser("test/plain")); + rsp = httpJettySolrClient.request(req); + content = + IOUtils.toString( + (InputStream) rsp.get(InputStreamResponseParser.STREAM_KEY), StandardCharsets.UTF_8); + assertTrue(content.contains("UPDATE")); + } finally { + httpJettySolrClient.close(); + client.close(); + } + } + public void testFullCloudToCloud() throws Exception { CloudSolrClient client = solrCluster1.getSolrClient(COLLECTION); SolrInputDocument doc = new SolrInputDocument(); diff --git a/solr/licenses/prometheus-metrics-LICENSE-ASL.txt b/solr/licenses/prometheus-metrics-LICENSE-ASL.txt new file mode 100644 index 000000000000..f49a4e16e68b --- /dev/null +++ b/solr/licenses/prometheus-metrics-LICENSE-ASL.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/solr/licenses/prometheus-metrics-NOTICE.txt b/solr/licenses/prometheus-metrics-NOTICE.txt new file mode 100644 index 000000000000..cbd3cd95befd --- /dev/null +++ b/solr/licenses/prometheus-metrics-NOTICE.txt @@ -0,0 +1,11 @@ +Prometheus instrumentation library for JVM applications +Copyright 2012-2015 The Prometheus Authors + +This product includes software developed at +Boxever Ltd. (http://www.boxever.com/). + +This product includes software developed at +SoundCloud Ltd. (http://soundcloud.com/). + +This product includes software developed as part of the +Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). \ No newline at end of file diff --git a/solr/licenses/prometheus-metrics-config-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-config-1.4.3.jar.sha1 new file mode 100644 index 000000000000..fc3f58556d15 --- /dev/null +++ b/solr/licenses/prometheus-metrics-config-1.4.3.jar.sha1 @@ -0,0 +1 @@ +785bf741491702f0e755a6a5c9c58a8127db0683 diff --git a/solr/licenses/prometheus-metrics-core-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-core-1.4.3.jar.sha1 new file mode 100644 index 000000000000..4b465005fddb --- /dev/null +++ b/solr/licenses/prometheus-metrics-core-1.4.3.jar.sha1 @@ -0,0 +1 @@ +1f00dc12e0bef05dff593a9abd7a4d626b675b0b diff --git a/solr/licenses/prometheus-metrics-exporter-common-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-exporter-common-1.4.3.jar.sha1 new file mode 100644 index 000000000000..aa1acc26a9a1 --- /dev/null +++ b/solr/licenses/prometheus-metrics-exporter-common-1.4.3.jar.sha1 @@ -0,0 +1 @@ +c755822f54e4d71d3a4e20b1e81de17031908980 diff --git a/solr/licenses/prometheus-metrics-exporter-servlet-jakarta-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-exporter-servlet-jakarta-1.4.3.jar.sha1 new file mode 100644 index 000000000000..18f92f8603a9 --- /dev/null +++ b/solr/licenses/prometheus-metrics-exporter-servlet-jakarta-1.4.3.jar.sha1 @@ -0,0 +1 @@ +5dcd93cb51907d455401ce6abb677ac290482d49 diff --git a/solr/licenses/prometheus-metrics-exposition-formats-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-exposition-formats-1.4.3.jar.sha1 new file mode 100644 index 000000000000..faf33af51e7e --- /dev/null +++ b/solr/licenses/prometheus-metrics-exposition-formats-1.4.3.jar.sha1 @@ -0,0 +1 @@ +14eeb4e0a6a366d6b7562e4457e2a863b837b5bd diff --git a/solr/licenses/prometheus-metrics-exposition-textformats-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-exposition-textformats-1.4.3.jar.sha1 new file mode 100644 index 000000000000..0cd653b08009 --- /dev/null +++ b/solr/licenses/prometheus-metrics-exposition-textformats-1.4.3.jar.sha1 @@ -0,0 +1 @@ +3a4f58da44fdb1a26bbda60cf38930db62f2f887 diff --git a/solr/licenses/prometheus-metrics-instrumentation-dropwizard-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-instrumentation-dropwizard-1.4.3.jar.sha1 new file mode 100644 index 000000000000..c49f54dc907d --- /dev/null +++ b/solr/licenses/prometheus-metrics-instrumentation-dropwizard-1.4.3.jar.sha1 @@ -0,0 +1 @@ +b73710d3d066ae8b8b03f016156a6ae423607f29 diff --git a/solr/licenses/prometheus-metrics-instrumentation-dropwizard5-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-instrumentation-dropwizard5-1.4.3.jar.sha1 new file mode 100644 index 000000000000..15dc151c7e02 --- /dev/null +++ b/solr/licenses/prometheus-metrics-instrumentation-dropwizard5-1.4.3.jar.sha1 @@ -0,0 +1 @@ +7077d226d52b3de8269d1f1fa76ad9a2801605fc diff --git a/solr/licenses/prometheus-metrics-model-1.1.0.jar.sha1 b/solr/licenses/prometheus-metrics-model-1.1.0.jar.sha1 deleted file mode 100644 index 6cac482dd0ce..000000000000 --- a/solr/licenses/prometheus-metrics-model-1.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a6093076e5b526aff26611e6c4f0eb4518211b3 diff --git a/solr/licenses/prometheus-metrics-model-1.4.3.jar.sha1 b/solr/licenses/prometheus-metrics-model-1.4.3.jar.sha1 new file mode 100644 index 000000000000..1171e238d9f2 --- /dev/null +++ b/solr/licenses/prometheus-metrics-model-1.4.3.jar.sha1 @@ -0,0 +1 @@ +b18da634ccdc033468c0a17e56996de09b4e6b36 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index dbe29ed75bec..6a517c02c2a0 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -66,8 +66,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=apiHelper,jarValidation,runtime io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index b24313a58e91..3c3bc80ccc40 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -64,8 +64,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 1e5e47bfdce9..c71ce2dd1ef8 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -65,8 +65,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=apiHelper,jarValidation,runtime io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index f5acba5c1d92..4ec44c0a3968 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -66,8 +66,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 6d2d54df0c69..eb490c9d0c46 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -67,8 +67,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index d06f7741d3bb..c105d6934674 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -115,8 +115,9 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,jarValidation,runtim io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 3e42f2adf0fc..55d699d2b8c5 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -78,8 +78,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 3977ee35d6cb..797f0ffbce0f 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -65,8 +65,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index 219a3da07577..43c5edfa96f4 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -79,8 +79,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 27d3b90b3e61..994dbb40e3b7 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -64,8 +64,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 3ab5d6b9260b..45a53678fd19 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -97,8 +97,9 @@ io.opentelemetry:opentelemetry-sdk-testing:1.56.0=jarValidation,testCompileClass io.opentelemetry:opentelemetry-sdk-trace:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 27fa7ef3dc5b..9c219036e51c 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -81,8 +81,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=apiHelper,jarValidation,runtime io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 84b57b5c5953..129556b410a6 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -64,8 +64,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index b092272424c7..35e07fd0fd95 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -67,8 +67,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index d49fadae7cc0..c4ed13b2602e 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -60,8 +60,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath, io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,solrCore +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,runtimeClasspath,solrCore io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,solrCore -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,solrCore +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,runtimeClasspath,solrCore io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,solrCore io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=jarValidation,runtimeClasspath,solrCore jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index 55a4e28fe79c..a9aa863e8fbc 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -64,8 +64,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index fc80ed6687e3..a58353ff6fdb 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -74,8 +74,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClassp io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index d5935f4fe836..10347970865f 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -79,8 +79,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClassp io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 2af80f358a8f..62b4cf483938 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -80,8 +80,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClassp io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=jarValidation,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=jarValidation,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 65e9066649f1..1a109433cf8f 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -67,8 +67,9 @@ io.opentelemetry:opentelemetry-sdk-logs:1.56.0=permitUnusedDeclared io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-config:1.4.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.4.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 8c42398a2403..273f954fbc30 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -60,8 +60,9 @@ io.opentelemetry:opentelemetry-sdk-common:1.56.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk-trace:1.56.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk:1.56.0=permitUnusedDeclared,solrCore +io.prometheus:prometheus-metrics-config:1.4.3=permitUnusedDeclared,solrCore io.prometheus:prometheus-metrics-exposition-formats:1.1.0=permitUnusedDeclared,solrCore -io.prometheus:prometheus-metrics-model:1.1.0=permitUnusedDeclared,solrCore +io.prometheus:prometheus-metrics-model:1.4.3=permitUnusedDeclared,solrCore io.sgr:s2-geometry-library-java:1.0.0=permitUnusedDeclared,solrCore io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=permitUnusedDeclared,solrCore jakarta.annotation:jakarta.annotation-api:2.1.1=permitUnusedDeclared,solrCore