Skip to content

Upgrade to jetty12 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
austb wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Upgrade to jetty12 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e7e719
Update project dependency to trapperkeeper-webserver-jetty12
austb Dec 27, 2025
9587c2a
Update test files to use jetty12-service
austb Dec 27, 2025
8c79d14
Update example bootstrap configuration for Jetty 12
austb Dec 27, 2025
24d4ff5
Update example documentation references
austb Dec 27, 2025
7feb7df
Update jolokia.clj for Jakarta servlet API
austb Dec 27, 2025
6d57239
Upgrade Jolokia from 1.7.0 to 2.1.0 for Jakarta servlet support
austb Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/ring_app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

This example demonstrates how to incorporate the trapperkeeper-metrics
service into a simple Ring app. This is based loosely upon the
[ring_app example] (https://github.com/puppetlabs/trapperkeeper-webserver-jetty10/tree/master/examples/ring_app)
in the trapperkeeper-webserver-jetty10 project. See that example for more
information on the use of the `jetty10-service` and the Jetty web server
[ring_app example] (https://github.com/puppetlabs/trapperkeeper-webserver-jetty12/tree/master/examples/ring_app)
in the trapperkeeper-webserver-jetty12 project. See that example for more
information on the use of the `jetty12-service` and the Jetty web server
integration with Ring.

All code needed to execute this example is located in `./src/examples/ring_app`.
Expand Down Expand Up @@ -74,13 +74,13 @@ this:
~~~~
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-service
puppetlabs.trapperkeeper.services.webserver.jetty10-service/jetty10-service
puppetlabs.trapperkeeper.services.webserver.jetty12-service/jetty12-service
puppetlabs.trapperkeeper.services.webrouting.webrouting-service/webrouting-service
examples.ring-app.ring-app/count-service
~~~~

This configuration indicates that the metrics services, `WebserverService` and
`WebroutingService` from the `trapperkeeper-webserver-jetty10` project, and the
`WebroutingService` from the `trapperkeeper-webserver-jetty12` project, and the
count service, defined in the `ring_app.clj` file, are to be loaded.

### The `ring-example.conf` configuration file
Expand Down
2 changes: 1 addition & 1 deletion examples/ring_app/bootstrap.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-service
puppetlabs.trapperkeeper.services.webserver.jetty10-service/jetty10-service
puppetlabs.trapperkeeper.services.webserver.jetty12-service/jetty12-service
puppetlabs.trapperkeeper.services.webrouting.webrouting-service/webrouting-service
examples.ring-app.ring-app/count-service
16 changes: 10 additions & 6 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,19 @@
[org.bouncycastle/bcpkix-fips "1.0.8"]
[org.bouncycastle/bc-fips "1.0.2.6"]
[org.bouncycastle/bctls-fips "1.0.19"]
[org.jolokia/jolokia-core "1.7.2"]
[org.jolokia/jolokia-server-core "2.1.0"]
[org.jolokia/jolokia-service-jmx "2.1.0"]
[org.jolokia/jolokia-service-serializer "2.1.0"]
[org.openvoxproject/comidi "1.1.2"]
[org.openvoxproject/http-client "2.2.3"]
[org.openvoxproject/i18n ~i18n-version]
[org.openvoxproject/kitchensink "3.5.5"]
[org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
[org.openvoxproject/ring-middleware "2.1.4"]
[org.openvoxproject/trapperkeeper "4.3.2"]
[org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
[org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT"]
[org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT" :classifier "test"]
[org.openvoxproject/trapperkeeper-authorization "2.1.6"]
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.4"]
[org.openvoxproject/trapperkeeper-webserver-jetty12 "1.0.0-SNAPSHOT"]
[org.slf4j/slf4j-api "2.0.17"]
[prismatic/schema "1.4.1"]
[ring/ring-codec "1.3.0"]
Expand All @@ -49,7 +51,9 @@
[cheshire]
[io.dropwizard.metrics/metrics-core]
[io.dropwizard.metrics/metrics-graphite]
[org.jolokia/jolokia-core]
[org.jolokia/jolokia-server-core]
[org.jolokia/jolokia-service-jmx]
[org.jolokia/jolokia-service-serializer]
[org.openvoxproject/comidi]
[org.openvoxproject/i18n]
[org.openvoxproject/kitchensink]
Expand All @@ -73,7 +77,7 @@
:profiles {:defaults {:dependencies [[org.openvoxproject/http-client]
[org.openvoxproject/kitchensink :classifier "test"]
[org.openvoxproject/trapperkeeper :classifier "test"]
[org.openvoxproject/trapperkeeper-webserver-jetty10]]}
[org.openvoxproject/trapperkeeper-webserver-jetty12]]}
:dev-dependencies {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
:dev [:defaults :dev-dependencies]
:fips-dependencies {:dependencies [[org.bouncycastle/bcpkix-fips]
Expand Down
13 changes: 7 additions & 6 deletions src/clj/puppetlabs/trapperkeeper/services/metrics/jolokia.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"Clojure helpers for constructing and configuring Jolokia servlets."
(:require [clojure.tools.logging :as log]
[clojure.walk :as walk]
[ring.util.servlet :as ring-servlet]
[ring.util.jakarta.servlet :as ring-servlet]
[schema.core :as schema])
(:import [javax.servlet.http HttpServletRequest]
[org.jolokia.config ConfigKey]
[org.jolokia.util LogHandler]
[org.jolokia.http AgentServlet]))
(:import [jakarta.servlet.http HttpServletRequest]
[org.jolokia.server.core.config ConfigKey]
[org.jolokia.server.core.service.api LogHandler]
[org.jolokia.server.core.http AgentServlet]))


(def config-mapping
Expand Down Expand Up @@ -71,7 +71,8 @@
LogHandler
(debug [this message] (log/debug message))
(info [this message] (log/info message))
(error [this message throwable] (log/error throwable message))))
(error [this message throwable] (log/error throwable message))
(isDebug [this] (log/enabled? :debug))))

(defn create-servlet
"Builds a Jolokia Servlet that uses Clojure logging."
Expand Down
12 changes: 6 additions & 6 deletions test/puppetlabs/trapperkeeper/services/metrics/metrics_service_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[puppetlabs.trapperkeeper.services.protocols.metrics :as metrics-protocol]
[schema.test :as schema-test]
[puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]
[puppetlabs.trapperkeeper.services.webserver.jetty12-service :as jetty12-service]
[puppetlabs.trapperkeeper.testutils.bootstrap :refer [with-app-with-config]]
[puppetlabs.trapperkeeper.testutils.logging :refer [with-test-logging] :as logging]
[puppetlabs.trapperkeeper.app :as app]
Expand Down Expand Up @@ -44,7 +44,7 @@
(ks/absolute-path "./dev-resources/puppetlabs/trapperkeeper/services/metrics/metrics_service_test"))

(def services
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
metrics-service
metrics-webservice])
Expand Down Expand Up @@ -240,7 +240,7 @@
(with-test-logging
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
metrics-service
metrics-webservice]
Expand All @@ -253,7 +253,7 @@
(let [config (assoc-in metrics-service-config [:metrics :metrics-webservice :jolokia :enabled] false)]
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
metrics-service
metrics-webservice]
Expand All @@ -269,7 +269,7 @@
(str "file://" test-resources-dir "/jolokia-access-permissive.xml"))]
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
metrics-service
metrics-webservice]
Expand All @@ -292,7 +292,7 @@
{:enabled false}}}}))]
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
metrics-service
metrics-webservice]
Expand Down
Loading