From 34dc48e98ed2d8a2de543e5dbf9af804766f8d5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 11:02:23 +0000 Subject: [PATCH 1/2] fix(deps): update dependency org.apache.tomcat.embed:tomcat-embed-core to v11.0.25 --- .../example-greeting-service/pom.xml | 2 +- .../example-hello-world-app/pom.xml | 2 +- examples/example-exporter-servlet-tomcat/pom.xml | 2 +- .../it-exporter/it-exporter-servlet-tomcat-sample/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 index 578178661..4b7d5484b 100644 --- a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml @@ -45,7 +45,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.24 + 11.0.25 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 index 5022bc327..d1f01b17f 100644 --- a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml @@ -45,7 +45,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.24 + 11.0.25 diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml index 197676b31..c7a2b1e4d 100644 --- a/examples/example-exporter-servlet-tomcat/pom.xml +++ b/examples/example-exporter-servlet-tomcat/pom.xml @@ -44,7 +44,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.24 + 11.0.25 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 index 1d56f2bb8..7e9d9ab7d 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml @@ -33,7 +33,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.24 + 11.0.25 From 11ec49d2726bd1c8fcc4b002636fb0fe55b38e2c Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 19 Aug 2026 11:03:39 +0000 Subject: [PATCH 2/2] fix: replace deprecated Tomcat servlet mapping API Signed-off-by: Gregor Zeitlinger --- .../metrics/examples/otel/exemplars/greeting/Main.java | 4 ++-- .../prometheus/metrics/examples/otel/exemplars/app/Main.java | 4 ++-- .../io/prometheus/metrics/examples/tomcat_servlet/Main.java | 4 ++-- .../exporter/servlet/tomcat/ExporterServletTomcatSample.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java index 99ba1084c..ed47d3787 100644 --- a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java +++ b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java @@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException { Context ctx = tomcat.addContext("", new File(".").getAbsolutePath()); Tomcat.addServlet(ctx, "hello", new GreetingServlet()); - ctx.addServletMappingDecoded("/*", "hello"); + ctx.addServletMapping("/*", "hello"); Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet()); - ctx.addServletMappingDecoded("/metrics", "metrics"); + ctx.addServletMapping("/metrics", "metrics"); tomcat.getConnector(); tomcat.start(); diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java index 25ea8a1c6..b3e83cb7d 100644 --- a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java +++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java @@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException { Context ctx = tomcat.addContext("", new File(".").getAbsolutePath()); Tomcat.addServlet(ctx, "hello", new HelloWorldServlet()); - ctx.addServletMappingDecoded("/*", "hello"); + ctx.addServletMapping("/*", "hello"); Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet()); - ctx.addServletMappingDecoded("/metrics", "metrics"); + ctx.addServletMapping("/metrics", "metrics"); tomcat.getConnector(); tomcat.start(); diff --git a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java index 81bc2ac19..2348cea9d 100644 --- a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java +++ b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java @@ -24,10 +24,10 @@ public static void main(String[] args) throws LifecycleException, IOException { Context ctx = tomcat.addContext("", new File(".").getAbsolutePath()); Tomcat.addServlet(ctx, "hello", new HelloWorldServlet()); - ctx.addServletMappingDecoded("/*", "hello"); + ctx.addServletMapping("/*", "hello"); Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet()); - ctx.addServletMappingDecoded("/metrics", "metrics"); + ctx.addServletMapping("/metrics", "metrics"); tomcat.getConnector(); tomcat.start(); diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java index fa470b306..3cfd603c0 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java +++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java @@ -78,7 +78,7 @@ private static void run(Mode mode, int port) throws IOException, LifecycleExcept tomcat.setBaseDir(tmpDir.toFile().getAbsolutePath()); Context ctx = tomcat.addContext("", new File(".").getAbsolutePath()); Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet()); - ctx.addServletMappingDecoded("/metrics", "metrics"); + ctx.addServletMapping("/metrics", "metrics"); tomcat.getConnector(); tomcat.start();