Bump dependency versions (#899)

Signed-off-by: Fabian Stäber <[email protected]>
prometheus · Nov 12, 2023 · edaa65e · edaa65e
1 parent dd31ee6
commit edaa65e
Show file tree

Hide file tree

Showing 28 changed files with 134 additions and 44 deletions.
diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>10.1.11</version>
+            <version>10.1.15</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml
@@ -0,0 +1,12 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+        <rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
+            <ignoreVersions>
+                <!-- ignore milestone releases -->
+                <ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>10.1.11</version>
+            <version>10.1.15</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml
@@ -0,0 +1,12 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+        <rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
+            <ignoreVersions>
+                <!-- ignore milestone releases -->
+                <ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>10.1.11</version>
+            <version>10.1.15</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/example-exporter-servlet-tomcat/version-rules.xml b/examples/example-exporter-servlet-tomcat/version-rules.xml
@@ -0,0 +1,12 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+        <rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
+            <ignoreVersions>
+                <!-- ignore milestone releases -->
+                <ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/examples/example-simpleclient-bridge/version-rules.xml b/examples/example-simpleclient-bridge/version-rules.xml
@@ -0,0 +1,12 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+        <rule groupId="io.prometheus" artifactId="simpleclient" comparisonMethod="maven">
+            <ignoreVersions>
+                <!-- ignore alpha and beta releases -->
+                <ignoreVersion type="regex">.*(alpha|beta)-[0-9]</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>11.0.15</version>
+            <version>11.0.18</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>11.0.15</version>
+            <version>11.0.18</version>
         </dependency>
     </dependencies>
 

diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>10.1.11</version>
+            <version>10.1.15</version>
         </dependency>
     </dependencies>
 

diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml
@@ -0,0 +1,12 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+        <rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
+            <ignoreVersions>
+                <!-- ignore milestone releases -->
+                <ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/integration-tests/it-exporter/it-exporter-test/pom.xml b/integration-tests/it-exporter/it-exporter-test/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.15.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/integration-tests/it-exporter/it-exporter-test/version-rules.xml b/integration-tests/it-exporter/it-exporter-test/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/integration-tests/it-exporter/version-rules.xml b/integration-tests/it-exporter/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -55,7 +55,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers</artifactId>
-                <version>1.17.2</version>
+                <version>1.19.1</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

diff --git a/integration-tests/version-rules.xml b/integration-tests/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/prometheus-metrics-exporter-common/version-rules.xml b/prometheus-metrics-exporter-common/version-rules.xml
@@ -2,11 +2,5 @@
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <rules>
-        <rule groupId="org.eclipse.jetty" comparisonMethod="maven">
-            <ignoreVersions>
-                <!-- pin to version 8 -->
-                <ignoreVersion type="regex">[^8].*</ignoreVersion>
-            </ignoreVersions>
-        </rule>
     </rules>
 </ruleset>
diff --git a/prometheus-metrics-exporter-httpserver/version-rules.xml b/prometheus-metrics-exporter-httpserver/version-rules.xml
@@ -2,11 +2,5 @@
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <rules>
-        <rule groupId="org.eclipse.jetty" comparisonMethod="maven">
-            <ignoreVersions>
-                <!-- pin to version 8 -->
-                <ignoreVersion type="regex">[^8].*</ignoreVersion>
-            </ignoreVersions>
-        </rule>
     </rules>
 </ruleset>
diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>3.2.0</version>
+            <version>3.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-proto</artifactId>
-            <version>0.17.1</version>
+            <version>1.7.1-alpha</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -134,13 +134,13 @@
                     <artifactItem>
                         <groupId>io.opentelemetry</groupId>
                         <artifactId>opentelemetry-api</artifactId>
-                        <version>1.29.0</version>
+                        <version>${otel.version}</version>
                         <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
                     </artifactItem>
                     <artifactItem>
                         <groupId>io.opentelemetry</groupId>
                         <artifactId>opentelemetry-context</artifactId>
-                        <version>1.29.0</version>
+                        <version>${otel.version}</version>
                         <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
                     </artifactItem>
                 </artifactItems>

diff --git a/...pentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java b/...pentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java
@@ -9,9 +9,9 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
-import io.opentelemetry.proto.metrics.v1.DoubleDataPoint;
 import io.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics;
 import io.opentelemetry.proto.metrics.v1.Metric;
+import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
 import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
@@ -23,7 +23,13 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.ok;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
 
@@ -122,8 +128,8 @@ private static ValueMatcher<Request> getExemplarCountMatcher(int expectedCount)
                 for (ResourceMetrics resourceMetrics : exportMetricsServiceRequest.getResourceMetricsList()) {
                     for (InstrumentationLibraryMetrics instrumentationLibraryMetrics : resourceMetrics.getInstrumentationLibraryMetricsList()) {
                         for (Metric metric : instrumentationLibraryMetrics.getMetricsList()) {
-                            for (DoubleDataPoint doubleDataPoint : metric.getDoubleSum().getDataPointsList()) {
-                                if (doubleDataPoint.getExemplarsCount() == expectedCount) {
+                            for (NumberDataPoint numberDataPoint : metric.getSum().getDataPointsList()) {
+                                if (numberDataPoint.getExemplarsCount() == expectedCount) {
                                     return MatchResult.exactMatch();
                                 }
                             }

diff --git a/prometheus-metrics-exporter-opentelemetry/version-rules.xml b/prometheus-metrics-exporter-opentelemetry/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml b/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml
@@ -2,11 +2,5 @@
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <rules>
-        <rule groupId="org.eclipse.jetty" comparisonMethod="maven">
-            <ignoreVersions>
-                <!-- pin to version 8 -->
-                <ignoreVersion type="regex">[^8].*</ignoreVersion>
-            </ignoreVersions>
-        </rule>
     </rules>
 </ruleset>
diff --git a/prometheus-metrics-instrumentation-jvm/pom.xml b/prometheus-metrics-instrumentation-jvm/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
+            <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/prometheus-metrics-instrumentation-jvm/version-rules.xml b/prometheus-metrics-instrumentation-jvm/version-rules.xml
@@ -2,11 +2,5 @@
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <rules>
-        <rule groupId="org.eclipse.jetty" comparisonMethod="maven">
-            <ignoreVersions>
-                <!-- pin to version 9 -->
-                <ignoreVersion type="regex">[^9].*</ignoreVersion>
-            </ignoreVersions>
-        </rule>
     </rules>
 </ruleset>
diff --git a/...eus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/version-rules.xml b/...eus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-protobuf/version-rules.xml b/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-protobuf/version-rules.xml
@@ -0,0 +1,6 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+    <rules>
+    </rules>
+</ruleset>
diff --git a/prometheus-metrics-simpleclient-bridge/version-rules.xml b/prometheus-metrics-simpleclient-bridge/version-rules.xml
@@ -2,10 +2,10 @@
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <rules>
-        <rule groupId="org.eclipse.jetty" comparisonMethod="maven">
+        <rule groupId="io.prometheus" comparisonMethod="maven">
             <ignoreVersions>
-                <!-- pin to version 9 -->
-                <ignoreVersion type="regex">[^9].*</ignoreVersion>
+                <!-- ignore alpha and beta releases -->
+                <ignoreVersion type="regex">.*(alpha|beta)-[0-9]</ignoreVersion>
             </ignoreVersions>
         </rule>
     </rules>