From 1471f6fd0878671602e55cb0c91663ceafe41eee Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 15:44:50 +0000 Subject: [PATCH 01/75] build(webui): update submodule to 1d1d686 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 318389e2d..1d1d68644 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 318389e2d81e0b24a455e9836c6951f14f60c9e4 +Subproject commit 1d1d68644e8fe913418917da0d5188eadb7fd640 From 39ab51c15369f0e3954c594e4ad4ea2e1e7e2ad8 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 18:06:33 +0000 Subject: [PATCH 02/75] build(webui): update submodule to 57b7976 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 1d1d68644..57b797636 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 1d1d68644e8fe913418917da0d5188eadb7fd640 +Subproject commit 57b797636613e38876203e0d8f828e0571f55f7f From 13e180f323baffa58852cd60a545fc6b7bc19bbb Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 18:13:16 +0000 Subject: [PATCH 03/75] build(webui): update submodule to 551fc32 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 57b797636..551fc320d 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 57b797636613e38876203e0d8f828e0571f55f7f +Subproject commit 551fc320d698a2f91ce946c05bd42eae1d1c8602 From ae003f014e0351e3aa2001593904a6ab722a9fa8 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 18:27:16 +0000 Subject: [PATCH 04/75] build(webui): update submodule to 3925a53 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 551fc320d..3925a534f 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 551fc320d698a2f91ce946c05bd42eae1d1c8602 +Subproject commit 3925a534f758a6d4a33324089442ddbc59337e8d From 2e6d34e75a82a63cba0302767dbf91191c9a6419 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 18:33:25 +0000 Subject: [PATCH 05/75] build(webui): update submodule to 199e0b6 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 3925a534f..199e0b65b 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 3925a534f758a6d4a33324089442ddbc59337e8d +Subproject commit 199e0b65bc01bef63ec1d12ce9e87455282a4a1b From a506e6492d2d26fb83671f07cd1ad607c1e73b96 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 19:05:08 +0000 Subject: [PATCH 06/75] build(webui): update submodule to d9dac62 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 199e0b65b..d9dac6235 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 199e0b65bc01bef63ec1d12ce9e87455282a4a1b +Subproject commit d9dac6235e5da55f3d8a6fdb4fe9bc971910056a From 2b984d178c3405f959f5f41f79a819f540069c89 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 16 Sep 2024 20:14:08 +0000 Subject: [PATCH 07/75] build(webui): update submodule to bf9d953 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index d9dac6235..bf9d95307 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit d9dac6235e5da55f3d8a6fdb4fe9bc971910056a +Subproject commit bf9d953078146ee3e66d3e52cfa1ce64f03dcd86 From 1debdcd9a14496ddacd2d644dffcaa141e6d9eb0 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 14:11:24 +0000 Subject: [PATCH 08/75] build(webui): update submodule to 8689c6f --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index bf9d95307..8689c6f38 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit bf9d953078146ee3e66d3e52cfa1ce64f03dcd86 +Subproject commit 8689c6f381f7a3ae045055c1f3d114b42843dcc6 From b8517d34bda9e30ff5cd771e61fcbd2f46b631aa Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 14:32:19 +0000 Subject: [PATCH 09/75] build(webui): update submodule to 8c13ede --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 8689c6f38..8c13ede48 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 8689c6f381f7a3ae045055c1f3d114b42843dcc6 +Subproject commit 8c13ede480805dea3f46a262020fd36ea9d33301 From 7f2a36434017d4bb44958f95b2da76cf2d637094 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 14:42:35 +0000 Subject: [PATCH 10/75] build(webui): update submodule to 1122bdd --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 8c13ede48..1122bdd00 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 8c13ede480805dea3f46a262020fd36ea9d33301 +Subproject commit 1122bdd0057550d41b9812ff91e844a796cda9ce From f255854f240bb441eaadfcb90d7fed009b94dfec Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 14:53:02 +0000 Subject: [PATCH 11/75] build(webui): update submodule to e0d0008 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 1122bdd00..e0d000886 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 1122bdd0057550d41b9812ff91e844a796cda9ce +Subproject commit e0d000886a980dc7470adf224f66d6bf6eb5a1e1 From 33767b36d01139c9dd6aa639bfed481b8a5bdbc4 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 15:36:05 +0000 Subject: [PATCH 12/75] build(webui): update submodule to 9db10b5 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index e0d000886..9db10b52e 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit e0d000886a980dc7470adf224f66d6bf6eb5a1e1 +Subproject commit 9db10b52e63b229217d1790320c4b94cae2eb4b1 From 38a8d5c62c5a1b36fec1b6c8d934cd5fba28527c Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 15:42:58 +0000 Subject: [PATCH 13/75] build(webui): update submodule to 7faff94 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 9db10b52e..7faff9466 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 9db10b52e63b229217d1790320c4b94cae2eb4b1 +Subproject commit 7faff9466255bbedf9d9c7407628b8a7c30736f6 From ae315f68c44e1d66655ab8be4be74239e44ddb93 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 15:49:04 +0000 Subject: [PATCH 14/75] build(webui): update submodule to e8ec48d --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 7faff9466..e8ec48d35 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 7faff9466255bbedf9d9c7407628b8a7c30736f6 +Subproject commit e8ec48d356bd763542fd37403643b42d9151fa57 From cb405f4990455e6e81761fa8c2a2b186d1ee6301 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 17:24:41 +0000 Subject: [PATCH 15/75] build(webui): update submodule to a54c3d0 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index e8ec48d35..a54c3d0cd 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit e8ec48d356bd763542fd37403643b42d9151fa57 +Subproject commit a54c3d0cdd8388bb20c66e7952b08f6abccd57c1 From b2caf821a417ff9a7a3afa011967db304937fa4c Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 17 Sep 2024 17:34:35 +0000 Subject: [PATCH 16/75] build(webui): update submodule to 21e724f --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index a54c3d0cd..21e724ff8 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit a54c3d0cdd8388bb20c66e7952b08f6abccd57c1 +Subproject commit 21e724ff8d0e9d0bc94ac13842152c22eb41fc07 From 50e13f9d41307ea21052fac009910d099e1cdc9e Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 13:55:46 +0000 Subject: [PATCH 17/75] build(webui): update submodule to bbb99e1 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 21e724ff8..bbb99e153 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 21e724ff8d0e9d0bc94ac13842152c22eb41fc07 +Subproject commit bbb99e153cb16b90a47ecd87e6b46641b71c63b7 From 125442f54bb681ca676d26e3ecc22ac21d510710 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 14:10:12 +0000 Subject: [PATCH 18/75] build(webui): update submodule to 06caa6f --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index bbb99e153..06caa6f69 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit bbb99e153cb16b90a47ecd87e6b46641b71c63b7 +Subproject commit 06caa6f6918c6decd8346f12d4666ed19f572250 From 2c8aa988f70eca9e260f43afb9e411972166d265 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 14:51:53 +0000 Subject: [PATCH 19/75] build(webui): update submodule to 03fbd6f --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 06caa6f69..03fbd6f92 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 06caa6f6918c6decd8346f12d4666ed19f572250 +Subproject commit 03fbd6f92ae483a2171459a556e274511a906c83 From 3ae2ea0e2d40bfdddfb58f1ac6a649292523ca32 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 14:58:18 +0000 Subject: [PATCH 20/75] build(webui): update submodule to 3adf57a --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 03fbd6f92..3adf57a35 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 03fbd6f92ae483a2171459a556e274511a906c83 +Subproject commit 3adf57a35f386c9d5a007a082d315aee3cfff7ab From bc6a80db53c0708a85df5b6a862b7cb795e8829b Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 15:11:22 +0000 Subject: [PATCH 21/75] build(webui): update submodule to 7465331 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 3adf57a35..7465331f8 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 3adf57a35f386c9d5a007a082d315aee3cfff7ab +Subproject commit 7465331f80d27ac30df01756cbc03c35d99d221e From af86711347dbba0f9bf735568782b3d1865289b3 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 15:19:33 +0000 Subject: [PATCH 22/75] build(webui): update submodule to 60f6b2e --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 7465331f8..60f6b2e7a 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 7465331f80d27ac30df01756cbc03c35d99d221e +Subproject commit 60f6b2e7aae3674a6f19c71b5e0f75dfa92537ba From 41b7dbb41907b470e1c42b34dd7a7afcd738bd6b Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 15:44:17 +0000 Subject: [PATCH 23/75] build(webui): update submodule to 9ca6e25 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 60f6b2e7a..9ca6e252d 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 60f6b2e7aae3674a6f19c71b5e0f75dfa92537ba +Subproject commit 9ca6e252dae2e25906f393dbb27e16e0812ed3e2 From 2645b4646ef755ea5f60d5f22c9ad27600168ad8 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 17:39:20 +0000 Subject: [PATCH 24/75] build(webui): update submodule to c3fd084 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 9ca6e252d..c3fd08417 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 9ca6e252dae2e25906f393dbb27e16e0812ed3e2 +Subproject commit c3fd08417929f39397a88cad1d5200736aed33bf From 4fa944ca37a2d59cf28d11d3f8cfc378312a447f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 18:04:54 +0000 Subject: [PATCH 25/75] build(webui): update submodule to c08fb6f --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index c3fd08417..c08fb6f80 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit c3fd08417929f39397a88cad1d5200736aed33bf +Subproject commit c08fb6f8070905de0a74c964c9bed44d71a0d4c0 From 4f73483685e60065d51eed4c30b819e26256ff72 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 18:29:55 +0000 Subject: [PATCH 26/75] build(webui): update submodule to a5b77a6 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index c08fb6f80..a5b77a64a 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit c08fb6f8070905de0a74c964c9bed44d71a0d4c0 +Subproject commit a5b77a64ad96a12527a9e2d77c862769d19b1c31 From e0b3aab4a901728eed4c4500b0249a4193e99268 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 18:54:07 +0000 Subject: [PATCH 27/75] build(webui): update submodule to 9378c69 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index a5b77a64a..9378c6943 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit a5b77a64ad96a12527a9e2d77c862769d19b1c31 +Subproject commit 9378c69431a0abb660368128f387ec9fe6e08e23 From bfab6ec0f6117b4f0971a678373381635412879a Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 19:15:33 +0000 Subject: [PATCH 28/75] build(webui): update submodule to 064f927 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 9378c6943..064f92728 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 9378c69431a0abb660368128f387ec9fe6e08e23 +Subproject commit 064f92728370cbdb8130a4b72a48e4390e5d679d From 93b10765738b914f5f6be90626b71c3c6410e24b Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 19:40:32 +0000 Subject: [PATCH 29/75] build(webui): update submodule to 2642dff --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 064f92728..2642dff90 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 064f92728370cbdb8130a4b72a48e4390e5d679d +Subproject commit 2642dff9079a0fdf7cf68ff25859d46d0279676f From ad9670c72bc17eef587fbd6faf7f9d79fb4a0f27 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 20:01:22 +0000 Subject: [PATCH 30/75] build(webui): update submodule to f443bbc --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 2642dff90..f443bbcc5 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 2642dff9079a0fdf7cf68ff25859d46d0279676f +Subproject commit f443bbcc500351b10b840e813314e90d524a362b From ef44151d2ab2e4a34121594991be32d7624ee95f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 20:05:14 +0000 Subject: [PATCH 31/75] build(webui): update submodule to 2e33c69 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index f443bbcc5..2e33c6929 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit f443bbcc500351b10b840e813314e90d524a362b +Subproject commit 2e33c692930a2ccd896c29a9eaeb722cdcd81bee From 466c9d5803ec7408dec9b85c987e320402be0627 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 20:24:25 +0000 Subject: [PATCH 32/75] build(webui): update submodule to d505e5d --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 2e33c6929..d505e5dba 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 2e33c692930a2ccd896c29a9eaeb722cdcd81bee +Subproject commit d505e5dba60374463f4354b9f7c2da8b8d044151 From 040f9f937a9ef4e52dd21e068332a724d91d38ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:53:19 -0400 Subject: [PATCH 33/75] build(deps): bump com.nimbusds:nimbus-jose-jwt from 9.40 to 9.41.1 (#648) Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.40 to 9.41.1. - [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt) - [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.41.1..9.40) --- updated-dependencies: - dependency-name: com.nimbusds:nimbus-jose-jwt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c6a1a6ba..3f03d132c 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.8.0 0.4.4 3.25.2 - 9.40 + 9.41.1 1.20.1 quarkus-bom io.quarkus.platform From 78473547b0ceca4cd30a4145d642968ea4fc2a4f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 20:57:43 +0000 Subject: [PATCH 34/75] build(webui): update submodule to b079e0a --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index d505e5dba..b079e0a67 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit d505e5dba60374463f4354b9f7c2da8b8d044151 +Subproject commit b079e0a67a7c8fb6c0705fb44965824d72c6496d From ebc5938fda994945adf1dcbfb3be4649ff3e992a Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 21:14:50 +0000 Subject: [PATCH 35/75] build(webui): update submodule to 8694b2d --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index b079e0a67..8694b2db7 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit b079e0a67a7c8fb6c0705fb44965824d72c6496d +Subproject commit 8694b2db7e06c80714be78e86f48390128b08973 From d25722528f4ba6f0679cbc3a3749fdce89b87954 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 21:54:39 +0000 Subject: [PATCH 36/75] build(webui): update submodule to d919491 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 8694b2db7..d91949108 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 8694b2db7e06c80714be78e86f48390128b08973 +Subproject commit d9194910821d95ca89edfd7d5c2475785ff90b4d From 0e6d83458aee730e0ecb697a212061de5d5568ea Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Wed, 18 Sep 2024 22:19:23 +0000 Subject: [PATCH 37/75] build(webui): update submodule to f8b4934 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index d91949108..f8b4934ea 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit d9194910821d95ca89edfd7d5c2475785ff90b4d +Subproject commit f8b4934ea78153600755613e3883dd221b8ca3e2 From 533f6eca42b8a45fc8f37bb7fa0c843680ab5579 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 14:26:27 +0000 Subject: [PATCH 38/75] build(webui): update submodule to 6e0e8eb --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index f8b4934ea..6e0e8eb97 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit f8b4934ea78153600755613e3883dd221b8ca3e2 +Subproject commit 6e0e8eb9742ba988767ffc5fbe40c99bde7b9bdf From bd863cc3a61297d94d27b93d021c3b5ea878c010 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 14:48:09 +0000 Subject: [PATCH 39/75] build(webui): update submodule to ab77fd3 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 6e0e8eb97..ab77fd3a6 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 6e0e8eb9742ba988767ffc5fbe40c99bde7b9bdf +Subproject commit ab77fd3a6776668845f4c5cbf477aff12acbad27 From 891198328ee7fd54996aaa4d00d7374ec48da5b7 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 15:10:05 +0000 Subject: [PATCH 40/75] build(webui): update submodule to 8b491cb --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index ab77fd3a6..8b491cbd9 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit ab77fd3a6776668845f4c5cbf477aff12acbad27 +Subproject commit 8b491cbd9c5c699f8a1e9c2b21d1b138cd0c9444 From 7263801db13d4e43f474bdc4f020c1b31f91c04b Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 15:25:41 +0000 Subject: [PATCH 41/75] build(webui): update submodule to fb1bb44 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 8b491cbd9..fb1bb44b3 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 8b491cbd9c5c699f8a1e9c2b21d1b138cd0c9444 +Subproject commit fb1bb44b37867bf961c0264e1373bdad88b5d8cd From 6767926d797e4dfb6c957c32d680419d026ef72f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 15:36:34 +0000 Subject: [PATCH 42/75] build(webui): update submodule to ad38212 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index fb1bb44b3..ad382126b 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit fb1bb44b37867bf961c0264e1373bdad88b5d8cd +Subproject commit ad382126bddf8f7048181f248194b7336938730d From 34ce330aa4dbc0bf3db0ac7c7d44ec2fafbbe900 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 15:50:01 +0000 Subject: [PATCH 43/75] build(webui): update submodule to 3c6da1b --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index ad382126b..3c6da1bf3 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit ad382126bddf8f7048181f248194b7336938730d +Subproject commit 3c6da1bf31b046a2195ac2924040f213da92b409 From c7eb827a82b914a1e63c53e079848b7dd39a903f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 15:52:00 +0000 Subject: [PATCH 44/75] build(webui): update submodule to 651ac46 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 3c6da1bf3..651ac4626 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 3c6da1bf31b046a2195ac2924040f213da92b409 +Subproject commit 651ac4626fae47e5df888aa4d48067dcbf5c31c0 From f8cbbd1bce6266d91dbbdd38e8c124a2516960d3 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 16:06:46 +0000 Subject: [PATCH 45/75] build(webui): update submodule to b46d398 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 651ac4626..b46d398aa 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 651ac4626fae47e5df888aa4d48067dcbf5c31c0 +Subproject commit b46d398aac0902da81f9c82dd16f521cdeb0dce3 From 58013666d78bf8efe1c5bd74079c919562eef081 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 16:22:14 +0000 Subject: [PATCH 46/75] build(webui): update submodule to b779324 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index b46d398aa..b779324aa 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit b46d398aac0902da81f9c82dd16f521cdeb0dce3 +Subproject commit b779324aa2b5a96287cca90dda2d599ce93793a7 From d5c1e398fb679645a5cd86a0fe078cafc6bfad9f Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 17:40:34 +0000 Subject: [PATCH 47/75] build(webui): update submodule to 1c81d59 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index b779324aa..1c81d59d2 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit b779324aa2b5a96287cca90dda2d599ce93793a7 +Subproject commit 1c81d59d280f0827191ef8d33fbfd6e7e1794ee5 From 6e0b067432b54e2bd33f10235f60cb752f3e8452 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 17:52:20 +0000 Subject: [PATCH 48/75] build(webui): update submodule to 4be1e61 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 1c81d59d2..4be1e6142 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 1c81d59d280f0827191ef8d33fbfd6e7e1794ee5 +Subproject commit 4be1e61429fa1e381d1e78175b78196acd25931b From 98a9d53519ceeef8eced0fd924b66d3a824b8340 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 19 Sep 2024 18:02:53 +0000 Subject: [PATCH 49/75] build(webui): update submodule to e3388c5 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 4be1e6142..e3388c51e 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 4be1e61429fa1e381d1e78175b78196acd25931b +Subproject commit e3388c51e1eb3c29fa195389805fc27e0ef02b2a From 17def592fe38249dab3d46809f8e59e76d2a72f8 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 13:58:46 +0000 Subject: [PATCH 50/75] build(webui): update submodule to 6aa3d35 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index e3388c51e..6aa3d3590 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit e3388c51e1eb3c29fa195389805fc27e0ef02b2a +Subproject commit 6aa3d3590268e28ef9f067d8fa09e47a232656b1 From 179b44c429a23404a5a42f4c89834492fc8f1119 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 14:33:15 +0000 Subject: [PATCH 51/75] build(webui): update submodule to bad277d --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 6aa3d3590..bad277d0f 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 6aa3d3590268e28ef9f067d8fa09e47a232656b1 +Subproject commit bad277d0f3a3b18b10c1967b2b9f615725517904 From 43446df04de1c2f8ed0fd79b4b990e4897535327 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 14:45:45 +0000 Subject: [PATCH 52/75] build(webui): update submodule to 2e66157 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index bad277d0f..2e6615782 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit bad277d0f3a3b18b10c1967b2b9f615725517904 +Subproject commit 2e66157825f40b35f1e97e737af819eca9900987 From 5038e7b68980cdfe4b3ea16eb1ed6f916bfee746 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 14:57:46 +0000 Subject: [PATCH 53/75] build(webui): update submodule to c57a342 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 2e6615782..c57a34223 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 2e66157825f40b35f1e97e737af819eca9900987 +Subproject commit c57a3422375adcb610bc5197cfa1bd4c5a6acef2 From 92fc49266a3bb6c694f2a938d613ce97ad78f161 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 15:25:30 +0000 Subject: [PATCH 54/75] build(webui): update submodule to 7949404 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index c57a34223..794940465 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit c57a3422375adcb610bc5197cfa1bd4c5a6acef2 +Subproject commit 794940465d1249aa292f9c8c905dab6d9596b60f From a6aa4ad05fe7fd6301399df1347defcc7efee721 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 15:34:51 +0000 Subject: [PATCH 55/75] build(webui): update submodule to b8393e4 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 794940465..b8393e44e 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 794940465d1249aa292f9c8c905dab6d9596b60f +Subproject commit b8393e44ebf6adc90160eb96faa9e20a2c0cfcef From d1a0bcdd3f1cde2b711b3cd87f05dfd7bd505911 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 15:36:58 +0000 Subject: [PATCH 56/75] build(webui): update submodule to 4588f44 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index b8393e44e..4588f44ce 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit b8393e44ebf6adc90160eb96faa9e20a2c0cfcef +Subproject commit 4588f44cee05a619d0e78dd4295d4c101c5ed318 From bd7e1a5d0f2f5a164bc222d7098561a1864db88b Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 15:41:05 +0000 Subject: [PATCH 57/75] build(webui): update submodule to 2f9377e --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 4588f44ce..2f9377e65 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 4588f44cee05a619d0e78dd4295d4c101c5ed318 +Subproject commit 2f9377e6572fade88f80dcc5ae417e4021826864 From ef30827208085809210316d16ae7df5cf6a6d309 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 15:54:09 +0000 Subject: [PATCH 58/75] build(webui): update submodule to 073580a --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 2f9377e65..073580a90 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 2f9377e6572fade88f80dcc5ae417e4021826864 +Subproject commit 073580a9053f2949f8f7c52d348d8fefe8ac7e54 From efaa4f7ac0558ee114492dba96e6dbca5f90f533 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 16:39:17 +0000 Subject: [PATCH 59/75] build(webui): update submodule to a158a3d --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 073580a90..a158a3d66 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 073580a9053f2949f8f7c52d348d8fefe8ac7e54 +Subproject commit a158a3d664e526b4ac914bae866e13f93eb06abc From 85b43f9781d927debe0bcc909225cbd17f482c02 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Fri, 20 Sep 2024 16:49:16 +0000 Subject: [PATCH 60/75] build(webui): update submodule to 64450b2 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index a158a3d66..64450b2b3 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit a158a3d664e526b4ac914bae866e13f93eb06abc +Subproject commit 64450b2b31855efa4a0a994c2667852e6e3af3c4 From bd540cd55fd6f0fc59a18b23fd4ccc1917b2e656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:29:28 -0400 Subject: [PATCH 61/75] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.3 to 4.8.6.4 (#663) build(deps): bump com.github.spotbugs:spotbugs-maven-plugin Bumps [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.8.6.3 to 4.8.6.4. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.6.3...spotbugs-maven-plugin-4.8.6.4) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f03d132c..97ed2499b 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.7.1 4.8.6 - 4.8.6.3 + 4.8.6.4 2.43.0 1.23.0 4.5 From 194519ede4ef62ef3941888f0c1424bce4284624 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 23 Sep 2024 14:26:23 +0000 Subject: [PATCH 62/75] build(webui): update submodule to 60d029e --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 64450b2b3..60d029ebc 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 64450b2b31855efa4a0a994c2667852e6e3af3c4 +Subproject commit 60d029ebcf21b6cb3d61ff5da074bbcabeaa2545 From f62296472436a081930aa5e5b0c1cd87d98e5ac8 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Tue, 24 Sep 2024 10:03:51 -0400 Subject: [PATCH 63/75] test(smoketest): add WildFly test applications (#660) --- compose/sample_apps/wildfly-23.yml | 59 ++++++++++++++++++++++++++++++ compose/sample_apps/wildfly-28.yml | 59 ++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 compose/sample_apps/wildfly-23.yml create mode 100644 compose/sample_apps/wildfly-28.yml diff --git a/compose/sample_apps/wildfly-23.yml b/compose/sample_apps/wildfly-23.yml new file mode 100644 index 000000000..c8988717b --- /dev/null +++ b/compose/sample_apps/wildfly-23.yml @@ -0,0 +1,59 @@ +version: "3" +services: + wildfly-23: + depends_on: + cryostat: + condition: service_healthy + image: ${WILDFLY_23_TEST_IMAGE:-quay.io/redhat-java-monitoring/wildfly-23-cryostat-agent:latest} + hostname: wildfly-23 + ports: + - "9600" + environment: + MODULE_OPTS: -javaagent:/opt/cryostat/cryostat-agent.jar + CRYOSTAT_AGENT_APP_NAME: wildfly-23 + CRYOSTAT_AGENT_WEBSERVER_HOST: wildfly-23 + CRYOSTAT_AGENT_WEBSERVER_PORT: 9600 + CRYOSTAT_AGENT_CALLBACK: http://wildfly-23:9600/ + CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/ + CRYOSTAT_AGENT_BASEURI_RANGE: public + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUST_ALL: "true" + CRYOSTAT_AGENT_WEBCLIENT_TLS_VERIFY_HOSTNAME: "false" + CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic + CRYOSTAT_AGENT_AUTHORIZATION_VALUE: user:pass + CRYOSTAT_AGENT_API_WRITES_ENABLED: "true" + CRYOSTAT_AGENT_HARVESTER_TEMPLATE: Profiling + CRYOSTAT_AGENT_HARVESTER_PERIOD_MS: 300000 + CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3 + CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000 + CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)" + + # when loaded by WildFly MODULE_OPTS, these configurations' default values aren't found + CRYOSTAT_AGENT_WEBCLIENT_TLS_VERSION: TLSv1.2 + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_TYPE: JKS + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_PASS_CHARSET: utf-8 + CRYOSTAT_AGENT_WEBCLIENT_CONNECT_TIMEOUT_MS: 1000 + CRYOSTAT_AGENT_WEBCLIENT_RESPONSE_TIMEOUT_MS: 1000 + CRYOSTAT_AGENT_WEBCLIENT_RESPONSE_RETRY_COUNT: 3 + CRYOSTAT_AGENT_WEBSERVER_TLS_VERSION: TLSv1.2 + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_PASS: + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_PASS_CHARSET: utf-8 + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_TYPE: PKCS12 + CRYOSTAT_AGENT_WEBSERVER_TLS_CERT_ALIAS: serverCert + CRYOSTAT_AGENT_WEBSERVER_TLS_CERT_TYPE: X.509 + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_USER: user + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_PASS_HASH_FUNCTION: SHA-256 + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_PASS_LENGTH: 24 + + CRYOSTAT_AGENT_EXIT_SIGNALS: INT,TERM + CRYOSTAT_AGENT_REGISTRATION_RETRY_MS: 5000 + CRYOSTAT_AGENT_REGISTRATION_CHECK_MS: 60000 + CRYOSTAT_AGENT_REGISTRATION_JMX_IGNORE: "false" + CRYOSTAT_AGENT_REGISTRATION_JMX_USE_CALLBACK_HOST: "true" + CRYOSTAT_AGENT_EXIT_DEREGISTRATION_TIMEOUT_MS: 3000 + + CRYOSTAT_AGENT_HARVESTER_UPLOAD_TIMEOUT_MS: 30000 + CRYOSTAT_AGENT_HARVESTER_MAX_AGE_MS: 0 + CRYOSTAT_AGENT_HARVESTER_MAX_SIZE_B: 0 + + CRYOSTAT_AGENT_SMART_TRIGGER_DEFINITIONS: + CRYOSTAT_AGENT_SMART_TRIGGER_EVALUATION_PERIOD_MS: 1000 diff --git a/compose/sample_apps/wildfly-28.yml b/compose/sample_apps/wildfly-28.yml new file mode 100644 index 000000000..7f236a0b4 --- /dev/null +++ b/compose/sample_apps/wildfly-28.yml @@ -0,0 +1,59 @@ +version: "3" +services: + wildfly-28: + depends_on: + cryostat: + condition: service_healthy + image: ${WILDFLY_28_TEST_IMAGE:-quay.io/redhat-java-monitoring/wildfly-28-cryostat-agent:latest} + hostname: wildfly-28 + ports: + - "9601" + environment: + MODULE_OPTS: -javaagent:/opt/cryostat/cryostat-agent.jar + CRYOSTAT_AGENT_APP_NAME: wildfly-28 + CRYOSTAT_AGENT_WEBSERVER_HOST: wildfly-28 + CRYOSTAT_AGENT_WEBSERVER_PORT: 9601 + CRYOSTAT_AGENT_CALLBACK: http://wildfly-28:9601/ + CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/ + CRYOSTAT_AGENT_BASEURI_RANGE: public + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUST_ALL: "true" + CRYOSTAT_AGENT_WEBCLIENT_TLS_VERIFY_HOSTNAME: "false" + CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic + CRYOSTAT_AGENT_AUTHORIZATION_VALUE: user:pass + CRYOSTAT_AGENT_API_WRITES_ENABLED: "true" + CRYOSTAT_AGENT_HARVESTER_TEMPLATE: Profiling + CRYOSTAT_AGENT_HARVESTER_PERIOD_MS: 300000 + CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3 + CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000 + CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)" + + # when loaded by WildFly MODULE_OPTS, these configurations' default values aren't found + CRYOSTAT_AGENT_WEBCLIENT_TLS_VERSION: TLSv1.2 + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_TYPE: JKS + CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_PASS_CHARSET: utf-8 + CRYOSTAT_AGENT_WEBCLIENT_CONNECT_TIMEOUT_MS: 1000 + CRYOSTAT_AGENT_WEBCLIENT_RESPONSE_TIMEOUT_MS: 1000 + CRYOSTAT_AGENT_WEBCLIENT_RESPONSE_RETRY_COUNT: 3 + CRYOSTAT_AGENT_WEBSERVER_TLS_VERSION: TLSv1.2 + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_PASS: + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_PASS_CHARSET: utf-8 + CRYOSTAT_AGENT_WEBSERVER_TLS_KEYSTORE_TYPE: PKCS12 + CRYOSTAT_AGENT_WEBSERVER_TLS_CERT_ALIAS: serverCert + CRYOSTAT_AGENT_WEBSERVER_TLS_CERT_TYPE: X.509 + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_USER: user + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_PASS_HASH_FUNCTION: SHA-256 + CRYOSTAT_AGENT_WEBSERVER_CREDENTIALS_PASS_LENGTH: 24 + + CRYOSTAT_AGENT_EXIT_SIGNALS: INT,TERM + CRYOSTAT_AGENT_REGISTRATION_RETRY_MS: 5000 + CRYOSTAT_AGENT_REGISTRATION_CHECK_MS: 60000 + CRYOSTAT_AGENT_REGISTRATION_JMX_IGNORE: "false" + CRYOSTAT_AGENT_REGISTRATION_JMX_USE_CALLBACK_HOST: "true" + CRYOSTAT_AGENT_EXIT_DEREGISTRATION_TIMEOUT_MS: 3000 + + CRYOSTAT_AGENT_HARVESTER_UPLOAD_TIMEOUT_MS: 30000 + CRYOSTAT_AGENT_HARVESTER_MAX_AGE_MS: 0 + CRYOSTAT_AGENT_HARVESTER_MAX_SIZE_B: 0 + + CRYOSTAT_AGENT_SMART_TRIGGER_DEFINITIONS: + CRYOSTAT_AGENT_SMART_TRIGGER_EVALUATION_PERIOD_MS: 1000 From 616e1934cf247c9b8f70c9f633f06b33bf99d547 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 24 Sep 2024 14:29:25 +0000 Subject: [PATCH 64/75] build(webui): update submodule to 75fa66b --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 60d029ebc..75fa66bad 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 60d029ebcf21b6cb3d61ff5da074bbcabeaa2545 +Subproject commit 75fa66bad0ef2425a50d0b70adef2ee93c5139e8 From 1c18480358fc72a3aa712598842b85dbb2f3d67e Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 24 Sep 2024 14:43:04 +0000 Subject: [PATCH 65/75] build(webui): update submodule to cc9b787 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 75fa66bad..cc9b787fb 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 75fa66bad0ef2425a50d0b70adef2ee93c5139e8 +Subproject commit cc9b787fbd2ee0570e4da7fd8654ed6f2d6d420e From 9a6ae757533cdad2e9f25d160126743359391cbf Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Tue, 24 Sep 2024 14:55:08 +0000 Subject: [PATCH 66/75] build(webui): update submodule to 5f0501a --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index cc9b787fb..5f0501a75 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit cc9b787fbd2ee0570e4da7fd8654ed6f2d6d420e +Subproject commit 5f0501a754c46c8a95fd2342d344c064df38f094 From 37e644602d9fe41cbe1ccbde4f0195a8f4152fa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:22:08 -0400 Subject: [PATCH 67/75] build(deps): bump com.mycila:license-maven-plugin from 4.5 to 4.6 (#668) Bumps [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin) from 4.5 to 4.6. - [Release notes](https://github.com/mathieucarbou/license-maven-plugin/releases) - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.5...license-maven-plugin-4.6) --- updated-dependencies: - dependency-name: com.mycila:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97ed2499b..1b9a57459 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 4.8.6.4 2.43.0 1.23.0 - 4.5 + 4.6 3.5.0 2 3.5.0 From c815e1a42cb1f5be1a5b461798b6bce129b78fd1 Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Thu, 26 Sep 2024 13:23:46 +0000 Subject: [PATCH 68/75] build(webui): update submodule to a7b9b52 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index 5f0501a75..a7b9b52c1 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 5f0501a754c46c8a95fd2342d344c064df38f094 +Subproject commit a7b9b52c15afc0eafc730a276ec152ac4117f784 From 2e86562f071da275828b1137c36db4bb2ab83807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:05:07 -0400 Subject: [PATCH 69/75] build(deps): bump ubi8/openjdk-17-runtime from 1.20-3.1724181070 to 1.20-3.1727147550 in /src/main/docker (#669) build(deps): bump ubi8/openjdk-17-runtime in /src/main/docker Bumps ubi8/openjdk-17-runtime from 1.20-3.1724181070 to 1.20-3.1727147550. --- updated-dependencies: - dependency-name: ubi8/openjdk-17-runtime dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/main/docker/Dockerfile.jvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 1851cd10d..55db03660 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-3.1724181070 +FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-3.1727147550 ENV LANGUAGE='en_US:en' From 739a65fb656e58914fdd21f3e907a486b909bc72 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 30 Sep 2024 11:41:28 -0400 Subject: [PATCH 70/75] build(deps): update Quarkus to 3.8 LTS (#609) * build(deps): update Quarkus to 3.8 LTS * add hibernate format mapper override * remove no longer necessary lazy init * disable openapi management / swagger UI unless in dev mode * remove duplicate healthcheck override * reduce healthcheck start periods * correct healthcheck URL * use authproxy image which contains wget for healthcheck * correct healthchecks for vertx agent test applications --- compose/auth_proxy.yml | 12 +--- compose/cryostat-grafana.yml | 2 +- compose/cryostat.yml | 14 +++-- compose/db.yml | 2 +- compose/jfr-datasource.yml | 4 +- compose/sample_apps/vertx-cryostat-agent.yml | 6 +- pom.xml | 24 +++---- schema/openapi.yaml | 17 +++-- .../HibernateFormatMapperCustomization.java | 46 ++++++++++++++ .../io/cryostat/credentials/Credentials.java | 3 - .../credentials/CredentialsFinder.java | 3 - .../discovery/ContainerDiscovery.java | 9 +-- .../cryostat/discovery/CustomDiscovery.java | 4 +- .../java/io/cryostat/discovery/Discovery.java | 62 +++++++++++-------- .../io/cryostat/discovery/DiscoveryNode.java | 9 ++- .../io/cryostat/discovery/JDPDiscovery.java | 9 +-- .../cryostat/discovery/KubeApiDiscovery.java | 19 +++--- .../expressions/MatchExpressionEvaluator.java | 2 - .../io/cryostat/graphql/ActiveRecordings.java | 12 ---- .../cryostat/graphql/ArchivedRecordings.java | 3 - .../io/cryostat/graphql/EnvironmentNodes.java | 2 - .../java/io/cryostat/graphql/RootNode.java | 3 - .../java/io/cryostat/graphql/TargetNodes.java | 11 ---- .../RecordingOptionsBuilderFactory.java | 2 - .../java/io/cryostat/rules/RuleService.java | 10 +-- .../io/cryostat/targets/AgentConnection.java | 3 - .../io/cryostat/targets/AgentJFRService.java | 12 ---- src/main/java/io/cryostat/targets/Target.java | 24 ++++--- src/main/resources/application-dev.properties | 3 + src/main/resources/application.properties | 2 + src/test/java/itest/GraphQLTest.java | 26 ++++---- 31 files changed, 176 insertions(+), 184 deletions(-) create mode 100644 src/main/java/io/cryostat/HibernateFormatMapperCustomization.java diff --git a/compose/auth_proxy.yml b/compose/auth_proxy.yml index 2e182cda1..a6913e17b 100644 --- a/compose/auth_proxy.yml +++ b/compose/auth_proxy.yml @@ -12,12 +12,6 @@ services: QUARKUS_HTTP_PROXY_ENABLE_FORWARDED_PREFIX: "true" QUARKUS_HTTP_ACCESS_LOG_PATTERN: long QUARKUS_HTTP_ACCESS_LOG_ENABLED: "true" - healthcheck: - test: curl --fail http://cryostat:8181/health/liveness || exit 1 - interval: 10s - retries: 3 - start_period: 30s - timeout: 5s auth: # the proxy does not actually depend on cryostat being up, but we use this # to ensure that when the smoketest tries to open the auth login page in a @@ -31,7 +25,7 @@ services: limits: cpus: "0.1" memory: 32m - image: ${OAUTH2_PROXY_IMAGE:-quay.io/oauth2-proxy/oauth2-proxy:latest} + image: ${OAUTH2_PROXY_IMAGE:-quay.io/oauth2-proxy/oauth2-proxy:latest-alpine} command: - --alpha-config=/tmp/auth_proxy_alpha_config.yml volumes: @@ -49,10 +43,10 @@ services: CRYOSTAT_PROXY_PORT: ${CRYOSTAT_PROXY_PORT} restart: unless-stopped healthcheck: - test: wget -q --spider ${CRYOSTAT_PROXY_PROTOCOL}://localhost:${CRYOSTAT_PROXY_PORT}/ping || exit 1 + test: wget --no-check-certificate -q --spider ${CRYOSTAT_PROXY_PROTOCOL}://localhost:${CRYOSTAT_PROXY_PORT}/ping || exit 1 interval: 10s retries: 3 - start_period: 30s + start_period: 10s timeout: 5s volumes: diff --git a/compose/cryostat-grafana.yml b/compose/cryostat-grafana.yml index 3c030bc38..37d376180 100644 --- a/compose/cryostat-grafana.yml +++ b/compose/cryostat-grafana.yml @@ -26,5 +26,5 @@ services: test: curl --fail http://localhost:3000/ || exit 1 retries: 3 interval: 30s - start_period: 30s + start_period: 10s timeout: 1s diff --git a/compose/cryostat.yml b/compose/cryostat.yml index 63f15ebdb..6e269b8ce 100644 --- a/compose/cryostat.yml +++ b/compose/cryostat.yml @@ -36,12 +36,14 @@ services: -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false restart: unless-stopped - healthcheck: - test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1 - interval: 10s - retries: 3 - start_period: 30s - timeout: 5s + # FIXME reenable this check. Somehow after upgrading to Quarkus 3.8, this check fails with 'connection refused', + # but the container comes up successfully without it and shelling into the container later to run curl succeeds + # healthcheck: + # test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1 + # interval: 10s + # retries: 3 + # start_period: 30s + # timeout: 5s volumes: jmxtls_cfg: diff --git a/compose/db.yml b/compose/db.yml index b23fe2b73..02e015fdb 100644 --- a/compose/db.yml +++ b/compose/db.yml @@ -27,7 +27,7 @@ services: test: pg_isready -U cryostat -d cryostat || exit 1 interval: 10s retries: 3 - start_period: 30s + start_period: 10s timeout: 5s volumes: diff --git a/compose/jfr-datasource.yml b/compose/jfr-datasource.yml index 3136b1148..cc190cf08 100644 --- a/compose/jfr-datasource.yml +++ b/compose/jfr-datasource.yml @@ -29,8 +29,8 @@ services: -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false healthcheck: - test: curl --fail ${CRYOSTAT_PROXY_PROTOCOL}://localhost:${CRYOSTAT_PROXY_PORT}/ || exit 1 + test: curl --fail http://localhost:8080/ || exit 1 retries: 3 interval: 30s - start_period: 30s + start_period: 10s timeout: 1s diff --git a/compose/sample_apps/vertx-cryostat-agent.yml b/compose/sample_apps/vertx-cryostat-agent.yml index 501198a8b..cdcdf6179 100644 --- a/compose/sample_apps/vertx-cryostat-agent.yml +++ b/compose/sample_apps/vertx-cryostat-agent.yml @@ -63,7 +63,7 @@ services: - "8911" restart: always healthcheck: - test: curl --fail http://localhost:8081 || exit 1 + test: curl --fail http://localhost:8082 || exit 1 interval: 10s retries: 3 start_period: 30s @@ -102,7 +102,7 @@ services: - "8912" restart: always healthcheck: - test: curl --fail http://localhost:8081 || exit 1 + test: curl --fail http://localhost:8083 || exit 1 interval: 10s retries: 3 start_period: 30s @@ -126,7 +126,7 @@ services: - "8084:8084" restart: always healthcheck: - test: curl --fail http://localhost:8081 || exit 1 + test: curl --fail http://localhost:8084 || exit 1 interval: 10s retries: 3 start_period: 30s diff --git a/pom.xml b/pom.xml index 1b9a57459..6946340b0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,11 +35,8 @@ 4.0.0-SNAPSHOT 9.0.0 - 1.16.1 2.16.1 4.4 - 5.2.1 - 3.14.0 1.8.0 0.4.4 3.25.2 @@ -47,9 +44,8 @@ 1.20.1 quarkus-bom io.quarkus.platform - 3.2.12.Final - 2.2.5 - 4.1.108.Final + 3.8.6 + 2.3.10 3.6.0 3.4.1 3.7.1 @@ -60,19 +56,12 @@ 1.23.0 4.6 3.5.0 - 2 + 0 3.5.0 ${surefire.rerunFailingTestsCount} - - io.netty - netty-bom - ${io.netty.version} - pom - import - ${quarkus.platform.group-id} ${quarkus.platform.artifact-id} @@ -161,6 +150,10 @@ io.quarkus quarkus-vertx + + io.quarkus + quarkus-netty + io.quarkus quarkus-smallrye-openapi @@ -225,12 +218,10 @@ org.apache.commons commons-lang3 - ${org.apache.commons.lang3.version} commons-codec commons-codec - ${org.apache.commons.codec.version} commons-io @@ -566,7 +557,6 @@ io.netty netty-transport-native-epoll - ${io.netty.version} ${io.netty.netty-transport-native-epoll.classifier} ${io.netty.netty-transport-native-epoll.scope} diff --git a/schema/openapi.yaml b/schema/openapi.yaml index 27a342de4..d8b24ed8c 100644 --- a/schema/openapi.yaml +++ b/schema/openapi.yaml @@ -85,6 +85,7 @@ components: DiscoveryPlugin: properties: builtin: + readOnly: true type: boolean callback: format: uri @@ -296,6 +297,7 @@ components: Target: properties: agent: + readOnly: true type: boolean alias: pattern: \S @@ -347,11 +349,6 @@ components: meta: $ref: '#/components/schemas/Meta' type: object - securitySchemes: - SecurityScheme: - description: Authentication - scheme: basic - type: http info: contact: email: cryostat-development@googlegroups.com @@ -913,7 +910,7 @@ paths: type: string requestBody: content: - application/json: + text/plain: schema: type: string responses: @@ -1906,7 +1903,7 @@ paths: responses: "200": content: - application/json: + text/plain: schema: type: string description: OK @@ -2393,13 +2390,13 @@ paths: type: integer requestBody: content: - application/json: + text/plain: schema: type: string responses: "200": content: - application/json: + text/plain: schema: type: string description: OK @@ -2429,7 +2426,7 @@ paths: responses: "200": content: - application/json: + text/plain: schema: type: string description: OK diff --git a/src/main/java/io/cryostat/HibernateFormatMapperCustomization.java b/src/main/java/io/cryostat/HibernateFormatMapperCustomization.java new file mode 100644 index 000000000..dd390869d --- /dev/null +++ b/src/main/java/io/cryostat/HibernateFormatMapperCustomization.java @@ -0,0 +1,46 @@ +/* + * Copyright The Cryostat Authors. + * + * 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. + */ +package io.cryostat; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.quarkus.hibernate.orm.JsonFormat; +import io.quarkus.hibernate.orm.PersistenceUnitExtension; +import org.hibernate.type.descriptor.WrapperOptions; +import org.hibernate.type.descriptor.java.JavaType; +import org.hibernate.type.format.FormatMapper; +import org.hibernate.type.format.jackson.JacksonJsonFormatMapper; + +@JsonFormat +@PersistenceUnitExtension +/** + * @see https://github.com/quarkusio/quarkus/issues/42596 + */ +public class HibernateFormatMapperCustomization implements FormatMapper { + + private final JacksonJsonFormatMapper delegate = + new JacksonJsonFormatMapper(new ObjectMapper().findAndRegisterModules()); + + @Override + public T fromString( + CharSequence charSequence, JavaType javaType, WrapperOptions wrapperOptions) { + return delegate.fromString(charSequence, javaType, wrapperOptions); + } + + @Override + public String toString(T value, JavaType javaType, WrapperOptions wrapperOptions) { + return delegate.toString(value, javaType, wrapperOptions); + } +} diff --git a/src/main/java/io/cryostat/credentials/Credentials.java b/src/main/java/io/cryostat/credentials/Credentials.java index 7f840be92..4d81ab6d4 100644 --- a/src/main/java/io/cryostat/credentials/Credentials.java +++ b/src/main/java/io/cryostat/credentials/Credentials.java @@ -25,7 +25,6 @@ import io.cryostat.expressions.MatchExpression; import io.cryostat.expressions.MatchExpression.TargetMatcher; -import io.smallrye.common.annotation.Blocking; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.transaction.Transactional; @@ -113,7 +112,6 @@ static Map notificationResult(Credential credential) throws Scri return result; } - @Blocking static Map safeResult(Credential credential, TargetMatcher matcher) throws ScriptException { Map result = new HashMap<>(); @@ -124,7 +122,6 @@ static Map safeResult(Credential credential, TargetMatcher match return result; } - @Blocking static Map safeMatchedResult(Credential credential, TargetMatcher matcher) throws ScriptException { Map result = new HashMap<>(); diff --git a/src/main/java/io/cryostat/credentials/CredentialsFinder.java b/src/main/java/io/cryostat/credentials/CredentialsFinder.java index a8f1bda00..52239c820 100644 --- a/src/main/java/io/cryostat/credentials/CredentialsFinder.java +++ b/src/main/java/io/cryostat/credentials/CredentialsFinder.java @@ -24,7 +24,6 @@ import io.cryostat.targets.Target.TargetDiscovery; import io.quarkus.vertx.ConsumeEvent; -import io.smallrye.common.annotation.Blocking; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.collections4.BidiMap; @@ -52,7 +51,6 @@ void onMessage(TargetDiscovery event) { } } - @Blocking public Optional getCredentialsForTarget(Target target) { return Optional.ofNullable( cache.computeIfAbsent( @@ -73,7 +71,6 @@ public Optional getCredentialsForTarget(Target target) { .orElse(null))); } - @Blocking public Optional getCredentialsForConnectUrl(URI connectUrl) { return Target.find("connectUrl", connectUrl) .singleResultOptional() diff --git a/src/main/java/io/cryostat/discovery/ContainerDiscovery.java b/src/main/java/io/cryostat/discovery/ContainerDiscovery.java index 0fdc154bf..fb9b5e2b7 100644 --- a/src/main/java/io/cryostat/discovery/ContainerDiscovery.java +++ b/src/main/java/io/cryostat/discovery/ContainerDiscovery.java @@ -187,7 +187,6 @@ public abstract class ContainerDiscovery { protected long timerId; - @Transactional void onStart(@Observes StartupEvent evt) { if (!enabled()) { return; @@ -201,7 +200,6 @@ void onStart(@Observes StartupEvent evt) { } logger.debugv("Starting {0} client", getRealm()); - queryContainers(); this.timerId = vertx.setPeriodic(pollPeriod.toMillis(), unused -> queryContainers()); } @@ -266,10 +264,9 @@ private Target toTarget(ContainerSpec desc) { target.connectUrl = connectUrl; target.alias = Optional.ofNullable(desc.Names.get(0)).orElse(desc.Id); target.labels = desc.Labels; - target.annotations = new Annotations(); - target.annotations - .cryostat() - .putAll( + target.annotations = + new Annotations( + null, Map.of( "REALM", // AnnotationKey.REALM, getRealm(), diff --git a/src/main/java/io/cryostat/discovery/CustomDiscovery.java b/src/main/java/io/cryostat/discovery/CustomDiscovery.java index 460b331a5..09d37d612 100644 --- a/src/main/java/io/cryostat/discovery/CustomDiscovery.java +++ b/src/main/java/io/cryostat/discovery/CustomDiscovery.java @@ -200,9 +200,7 @@ Response doV2Create( credential.ifPresent(c -> c.persist()); target.activeRecordings = new ArrayList<>(); - target.labels = Map.of(); - target.annotations = new Annotations(); - target.annotations.cryostat().putAll(Map.of("REALM", REALM)); + target.annotations = new Annotations(null, Map.of("REALM", REALM)); DiscoveryNode node = DiscoveryNode.target(target, BaseNodeType.JVM); target.discoveryNode = node; diff --git a/src/main/java/io/cryostat/discovery/Discovery.java b/src/main/java/io/cryostat/discovery/Discovery.java index 1eb867def..e45a28705 100644 --- a/src/main/java/io/cryostat/discovery/Discovery.java +++ b/src/main/java/io/cryostat/discovery/Discovery.java @@ -42,6 +42,7 @@ import com.nimbusds.jose.JOSEException; import com.nimbusds.jwt.proc.BadJWTException; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import io.quarkus.narayana.jta.QuarkusTransaction; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; import io.vertx.core.json.JsonObject; @@ -106,33 +107,42 @@ public class Discovery { @Inject Scheduler scheduler; @Inject URIUtil uriUtil; - @Transactional void onStart(@Observes StartupEvent evt) { - DiscoveryPlugin.findAll().list().stream() - .filter(p -> !p.builtin) - .forEach( - plugin -> { - var dataMap = new JobDataMap(); - dataMap.put(PLUGIN_ID_MAP_KEY, plugin.id); - dataMap.put(REFRESH_MAP_KEY, true); - JobDetail jobDetail = - JobBuilder.newJob(RefreshPluginJob.class) - .withIdentity(plugin.id.toString(), JOB_STARTUP) - .usingJobData(dataMap) - .build(); - var trigger = - TriggerBuilder.newTrigger() - .usingJobData(jobDetail.getJobDataMap()) - .startNow() - .withSchedule( - SimpleScheduleBuilder.simpleSchedule() - .withRepeatCount(0)) - .build(); - try { - scheduler.scheduleJob(jobDetail, trigger); - } catch (SchedulerException e) { - logger.warn("Failed to schedule plugin prune job", e); - } + QuarkusTransaction.requiringNew() + .run( + () -> { + DiscoveryPlugin.findAll().list().stream() + .filter(p -> !p.builtin) + .forEach( + plugin -> { + var dataMap = new JobDataMap(); + dataMap.put(PLUGIN_ID_MAP_KEY, plugin.id); + dataMap.put(REFRESH_MAP_KEY, true); + JobDetail jobDetail = + JobBuilder.newJob(RefreshPluginJob.class) + .withIdentity( + plugin.id.toString(), + JOB_STARTUP) + .usingJobData(dataMap) + .build(); + var trigger = + TriggerBuilder.newTrigger() + .usingJobData( + jobDetail.getJobDataMap()) + .startNow() + .withSchedule( + SimpleScheduleBuilder + .simpleSchedule() + .withRepeatCount(0)) + .build(); + try { + scheduler.scheduleJob(jobDetail, trigger); + } catch (SchedulerException e) { + logger.warn( + "Failed to schedule plugin prune job", + e); + } + }); }); } diff --git a/src/main/java/io/cryostat/discovery/DiscoveryNode.java b/src/main/java/io/cryostat/discovery/DiscoveryNode.java index 164292e25..3446ad51b 100644 --- a/src/main/java/io/cryostat/discovery/DiscoveryNode.java +++ b/src/main/java/io/cryostat/discovery/DiscoveryNode.java @@ -196,7 +196,14 @@ static class Listener { @Inject EventBus bus; @PrePersist - void prePersist(DiscoveryNode node) {} + void prePersist(DiscoveryNode node) { + if (node.children == null) { + node.children = new ArrayList<>(); + } + if (node.labels == null) { + node.labels = new HashMap<>(); + } + } @PostPersist void postPersist(DiscoveryNode node) {} diff --git a/src/main/java/io/cryostat/discovery/JDPDiscovery.java b/src/main/java/io/cryostat/discovery/JDPDiscovery.java index 2bc0a77d5..c448734ac 100644 --- a/src/main/java/io/cryostat/discovery/JDPDiscovery.java +++ b/src/main/java/io/cryostat/discovery/JDPDiscovery.java @@ -65,7 +65,6 @@ static JvmDiscoveryClient produceJvmDiscoveryClient() { @ConfigProperty(name = "cryostat.discovery.jdp.enabled") boolean enabled; - @Transactional void onStart(@Observes StartupEvent evt) { if (!enabled) { return; @@ -118,11 +117,9 @@ void handleJdpEvent(JvmDiscoveryEvent evt) { target.activeRecordings = new ArrayList<>(); target.connectUrl = connectUrl; target.alias = evt.getJvmDescriptor().getMainClass(); - target.labels = Map.of(); - target.annotations = new Annotations(); - target.annotations - .cryostat() - .putAll( + target.annotations = + new Annotations( + null, Map.of( "REALM", // AnnotationKey.REALM, REALM, diff --git a/src/main/java/io/cryostat/discovery/KubeApiDiscovery.java b/src/main/java/io/cryostat/discovery/KubeApiDiscovery.java index bed1a0cef..e9ccd2abe 100644 --- a/src/main/java/io/cryostat/discovery/KubeApiDiscovery.java +++ b/src/main/java/io/cryostat/discovery/KubeApiDiscovery.java @@ -129,7 +129,6 @@ protected HashMap> initialize() // Priority is set higher than default 0 such that onStart is called first before onAfterStart // This ensures realm node is persisted before initializing informers - @Transactional void onStart(@Observes @Priority(1) StartupEvent evt) { if (!enabled()) { return; @@ -143,7 +142,6 @@ void onStart(@Observes @Priority(1) StartupEvent evt) { logger.debugv("Starting {0} client", REALM); } - @Transactional void onAfterStart(@Observes StartupEvent evt) { if (!enabled() || !available()) { return; @@ -468,12 +466,13 @@ private Pair queryForNode( newNode.nodeType = nodeType.getKind(); newNode.children = new ArrayList<>(); newNode.target = null; - newNode.labels = + Map labels = kubeObj != null ? kubeObj.getMetadata().getLabels() : new HashMap<>(); // Add namespace to label to retrieve node later - newNode.labels.put(DISCOVERY_NAMESPACE_LABEL_KEY, namespace); + labels.put(DISCOVERY_NAMESPACE_LABEL_KEY, namespace); + newNode.labels = labels; return newNode; }); return Pair.of(kubeObj, node); @@ -614,14 +613,10 @@ public Target toTarget() { target.activeRecordings = new ArrayList<>(); target.connectUrl = connectUrl; target.alias = objRef.getName(); - target.labels = obj != null ? obj.getMetadata().getLabels() : new HashMap<>(); - target.annotations = new Annotations(); - target.annotations - .platform() - .putAll(obj != null ? obj.getMetadata().getAnnotations() : Map.of()); - target.annotations - .cryostat() - .putAll( + target.labels = (obj != null ? obj.getMetadata().getLabels() : new HashMap<>()); + target.annotations = + new Annotations( + obj != null ? obj.getMetadata().getAnnotations() : Map.of(), Map.of( "REALM", REALM, diff --git a/src/main/java/io/cryostat/expressions/MatchExpressionEvaluator.java b/src/main/java/io/cryostat/expressions/MatchExpressionEvaluator.java index c1acb8ae9..3053baee8 100644 --- a/src/main/java/io/cryostat/expressions/MatchExpressionEvaluator.java +++ b/src/main/java/io/cryostat/expressions/MatchExpressionEvaluator.java @@ -33,7 +33,6 @@ import io.quarkus.cache.CacheResult; import io.quarkus.cache.CompositeCacheKey; import io.quarkus.vertx.ConsumeEvent; -import io.smallrye.common.annotation.Blocking; import jakarta.annotation.Nullable; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -77,7 +76,6 @@ void onMessage(ExpressionEvent event) { } @Transactional - @Blocking @ConsumeEvent(value = Target.TARGET_JVM_DISCOVERY, blocking = true) void onMessage(TargetDiscovery event) { var target = Target.find("id", event.serviceRef().id).singleResultOptional(); diff --git a/src/main/java/io/cryostat/graphql/ActiveRecordings.java b/src/main/java/io/cryostat/graphql/ActiveRecordings.java index 0bb85bd7e..4bd7a0bf6 100644 --- a/src/main/java/io/cryostat/graphql/ActiveRecordings.java +++ b/src/main/java/io/cryostat/graphql/ActiveRecordings.java @@ -42,7 +42,6 @@ import io.cryostat.targets.Target; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.smallrye.common.annotation.Blocking; import io.smallrye.graphql.api.Nullable; import jakarta.inject.Inject; import jakarta.transaction.Transactional; @@ -64,7 +63,6 @@ public class ActiveRecordings { @ConfigProperty(name = ConfigProperties.CONNECTIONS_FAILED_TIMEOUT) Duration timeout; - @Blocking @Transactional @Mutation @Description( @@ -106,7 +104,6 @@ public List createRecording( return recordings; } - @Blocking @Transactional @Mutation @Description( @@ -138,7 +135,6 @@ public List archiveRecording( return archives; } - @Blocking @Transactional @Mutation @Description( @@ -169,7 +165,6 @@ public List stopRecording( return list; } - @Blocking @Transactional @Mutation @Description( @@ -199,7 +194,6 @@ public List deleteRecording( return list; } - @Blocking @Transactional @Mutation @Description( @@ -222,7 +216,6 @@ public List createSnapshot(@NonNull DiscoveryNodeFilter nodes) return snapshots; } - @Blocking @Transactional @Description("Start a new Flight Recording on the specified Target") public ActiveRecording doStartRecording( @@ -245,7 +238,6 @@ public ActiveRecording doStartRecording( .atMost(timeout); } - @Blocking @Transactional @Description("Create a new Flight Recorder Snapshot on the specified Target") public ActiveRecording doSnapshot(@Source Target target) { @@ -253,7 +245,6 @@ public ActiveRecording doSnapshot(@Source Target target) { return recordingHelper.createSnapshot(fTarget).await().atMost(timeout); } - @Blocking @Transactional @Description("Stop the specified Flight Recording") public ActiveRecording doStop(@Source ActiveRecording recording) throws Exception { @@ -261,7 +252,6 @@ public ActiveRecording doStop(@Source ActiveRecording recording) throws Exceptio return recordingHelper.stopRecording(ar).await().atMost(timeout); } - @Blocking @Transactional @Description("Delete the specified Flight Recording") public ActiveRecording doDelete(@Source ActiveRecording recording) { @@ -269,7 +259,6 @@ public ActiveRecording doDelete(@Source ActiveRecording recording) { return recordingHelper.deleteRecording(ar).await().atMost(timeout); } - @Blocking @Description("Archive the specified Flight Recording") public ArchivedRecording doArchive(@Source ActiveRecording recording) throws Exception { var ar = ActiveRecording.find("id", recording.id).singleResult(); @@ -317,7 +306,6 @@ public RecordingOptions asOptions() { } } - @Blocking @Transactional @Description("Updates the metadata labels for an existing Flight Recording.") public ActiveRecording doPutMetadata( diff --git a/src/main/java/io/cryostat/graphql/ArchivedRecordings.java b/src/main/java/io/cryostat/graphql/ArchivedRecordings.java index 171b355de..941dcfc64 100644 --- a/src/main/java/io/cryostat/graphql/ArchivedRecordings.java +++ b/src/main/java/io/cryostat/graphql/ArchivedRecordings.java @@ -29,7 +29,6 @@ import io.cryostat.recordings.Recordings.Metadata; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.smallrye.common.annotation.Blocking; import io.smallrye.graphql.api.Nullable; import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; @@ -42,7 +41,6 @@ public class ArchivedRecordings { @Inject RecordingHelper recordingHelper; - @Blocking @Query("archivedRecordings") public TargetNodes.ArchivedRecordings listArchivedRecordings(ArchivedRecordingsFilter filter) { var r = new TargetNodes.ArchivedRecordings(); @@ -78,7 +76,6 @@ public ArchivedRecording doDelete(@Source ArchivedRecording recording) { return recording; } - @Blocking @NonNull public ArchivedRecording doPutMetadata( @Source ArchivedRecording recording, MetadataLabels metadataInput) { diff --git a/src/main/java/io/cryostat/graphql/EnvironmentNodes.java b/src/main/java/io/cryostat/graphql/EnvironmentNodes.java index c5615312a..d70859989 100644 --- a/src/main/java/io/cryostat/graphql/EnvironmentNodes.java +++ b/src/main/java/io/cryostat/graphql/EnvironmentNodes.java @@ -20,7 +20,6 @@ import io.cryostat.discovery.DiscoveryNode; import io.cryostat.graphql.RootNode.DiscoveryNodeFilter; -import io.smallrye.common.annotation.Blocking; import io.smallrye.graphql.api.Nullable; import org.eclipse.microprofile.graphql.Description; import org.eclipse.microprofile.graphql.GraphQLApi; @@ -29,7 +28,6 @@ @GraphQLApi public class EnvironmentNodes { - @Blocking @Query("environmentNodes") @Description("Get all environment nodes in the discovery tree with optional filtering") public List environmentNodes(@Nullable DiscoveryNodeFilter filter) { diff --git a/src/main/java/io/cryostat/graphql/RootNode.java b/src/main/java/io/cryostat/graphql/RootNode.java index 4af6eefa8..670bbb99f 100644 --- a/src/main/java/io/cryostat/graphql/RootNode.java +++ b/src/main/java/io/cryostat/graphql/RootNode.java @@ -24,7 +24,6 @@ import io.cryostat.graphql.matchers.LabelSelectorMatcher; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.smallrye.common.annotation.Blocking; import io.smallrye.graphql.api.Nullable; import org.eclipse.microprofile.graphql.Description; import org.eclipse.microprofile.graphql.GraphQLApi; @@ -34,14 +33,12 @@ @GraphQLApi public class RootNode { - @Blocking @Query("rootNode") @Description("Get the root target discovery node") public DiscoveryNode getRootNode() { return DiscoveryNode.getUniverse(); } - @Blocking @Description( "Get target nodes that are descendants of this node. That is, get the set of leaf nodes" + " from anywhere below this node's subtree.") diff --git a/src/main/java/io/cryostat/graphql/TargetNodes.java b/src/main/java/io/cryostat/graphql/TargetNodes.java index f2f0e3dbc..afe9eb9f8 100644 --- a/src/main/java/io/cryostat/graphql/TargetNodes.java +++ b/src/main/java/io/cryostat/graphql/TargetNodes.java @@ -33,7 +33,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import graphql.schema.DataFetchingEnvironment; -import io.smallrye.common.annotation.Blocking; import io.smallrye.graphql.api.Context; import io.smallrye.graphql.api.Nullable; import jakarta.inject.Inject; @@ -51,7 +50,6 @@ public class TargetNodes { @Inject RecordingHelper recordingHelper; @Inject TargetConnectionManager connectionManager; - @Blocking @Query("targetNodes") @Description("Get the Target discovery nodes, i.e. the leaf nodes of the discovery tree") public List getTargetNodes(DiscoveryNodeFilter filter) { @@ -69,12 +67,6 @@ public List getTargetNodes(DiscoveryNodeFilter filter) { .toList(); } - // private static Predicate distinctWith(Function fn) { - // Set observed = ConcurrentHashMap.newKeySet(); - // return t -> observed.add(fn.apply(t)); - // } - - @Blocking @Transactional public ActiveRecordings activeRecordings( @Source Target target, @Nullable ActiveRecordingsFilter filter) { @@ -90,7 +82,6 @@ public ActiveRecordings activeRecordings( return recordings; } - @Blocking public ArchivedRecordings archivedRecordings( @Source Target target, @Nullable ArchivedRecordingsFilter filter) { var fTarget = Target.getTargetById(target.id); @@ -105,7 +96,6 @@ public ArchivedRecordings archivedRecordings( return recordings; } - @Blocking @Transactional @Description("Get the active and archived recordings belonging to this target") public Recordings recordings(@Source Target target, Context context) { @@ -133,7 +123,6 @@ public Recordings recordings(@Source Target target, Context context) { return recordings; } - @Blocking @Description("Get live MBean metrics snapshot from the specified Target") public MBeanMetrics mbeanMetrics(@Source Target target) { var fTarget = Target.getTargetById(target.id); diff --git a/src/main/java/io/cryostat/recordings/RecordingOptionsBuilderFactory.java b/src/main/java/io/cryostat/recordings/RecordingOptionsBuilderFactory.java index 9b0dde250..ad77024e9 100644 --- a/src/main/java/io/cryostat/recordings/RecordingOptionsBuilderFactory.java +++ b/src/main/java/io/cryostat/recordings/RecordingOptionsBuilderFactory.java @@ -21,7 +21,6 @@ import io.cryostat.targets.Target; import io.cryostat.targets.TargetConnectionManager; -import io.smallrye.common.annotation.Blocking; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -31,7 +30,6 @@ public class RecordingOptionsBuilderFactory { @Inject RecordingOptionsCustomizerFactory customizerFactory; @Inject TargetConnectionManager connectionManager; - @Blocking public RecordingOptionsBuilder create(Target target) throws QuantityConversionException { return connectionManager.executeConnectedTask( target, diff --git a/src/main/java/io/cryostat/rules/RuleService.java b/src/main/java/io/cryostat/rules/RuleService.java index 5859766ca..164c53cdb 100644 --- a/src/main/java/io/cryostat/rules/RuleService.java +++ b/src/main/java/io/cryostat/rules/RuleService.java @@ -42,7 +42,6 @@ import io.quarkus.narayana.jta.QuarkusTransaction; import io.quarkus.runtime.StartupEvent; import io.quarkus.vertx.ConsumeEvent; -import io.smallrye.common.annotation.Blocking; import io.smallrye.mutiny.infrastructure.Infrastructure; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; @@ -77,11 +76,14 @@ public class RuleService { private final List jobs = new CopyOnWriteArrayList<>(); - @Transactional - @Blocking void onStart(@Observes StartupEvent ev) { logger.trace("RuleService started"); - Rule.streamAll().filter(r -> r.enabled).forEach(this::applyRuleToMatchingTargets); + QuarkusTransaction.joiningExisting() + .run( + () -> + Rule.streamAll() + .filter(r -> r.enabled) + .forEach(this::applyRuleToMatchingTargets)); } @ConsumeEvent(value = Target.TARGET_JVM_DISCOVERY, blocking = true) diff --git a/src/main/java/io/cryostat/targets/AgentConnection.java b/src/main/java/io/cryostat/targets/AgentConnection.java index 658b93a5f..522c6ed82 100644 --- a/src/main/java/io/cryostat/targets/AgentConnection.java +++ b/src/main/java/io/cryostat/targets/AgentConnection.java @@ -38,7 +38,6 @@ import io.cryostat.libcryostat.net.MBeanMetrics; import io.cryostat.libcryostat.sys.Clock; -import io.smallrye.common.annotation.Blocking; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.jboss.logging.Logger; @@ -57,7 +56,6 @@ class AgentConnection implements JFRConnection { @Override public void close() throws Exception {} - @Blocking @Override public void connect() throws ConnectionException { if (!client.ping().await().atMost(client.getTimeout())) { @@ -129,7 +127,6 @@ public boolean isConnected() { return true; } - @Blocking @Override public MBeanMetrics getMBeanMetrics() throws ConnectionException, diff --git a/src/main/java/io/cryostat/targets/AgentJFRService.java b/src/main/java/io/cryostat/targets/AgentJFRService.java index c96cf8330..c120df6cd 100644 --- a/src/main/java/io/cryostat/targets/AgentJFRService.java +++ b/src/main/java/io/cryostat/targets/AgentJFRService.java @@ -51,7 +51,6 @@ import io.cryostat.libcryostat.templates.Template; import io.cryostat.libcryostat.templates.TemplateType; -import io.smallrye.common.annotation.Blocking; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.buffer.Buffer; import org.jboss.logging.Logger; @@ -82,7 +81,6 @@ public String getVersion() { return "agent"; // TODO } - @Blocking @Override public void close(IRecordingDescriptor descriptor) throws FlightRecorderException { client.deleteRecording(descriptor.getId()).await().atMost(client.getTimeout()); @@ -93,7 +91,6 @@ public void enable() throws FlightRecorderException { throw new UnimplementedException(); } - @Blocking @Override public Collection getAvailableEventTypes() throws FlightRecorderException { @@ -106,13 +103,11 @@ public Map> getAvailableRecordingOptions() return KnownRecordingOptions.DESCRIPTORS_BY_KEY_V2; } - @Blocking @Override public List getAvailableRecordings() throws FlightRecorderException { return client.activeRecordings().await().atMost(client.getTimeout()); } - @Blocking @Override public IConstrainedMap getCurrentEventTypeSettings() throws FlightRecorderException { @@ -138,13 +133,11 @@ public IConstrainedMap getRecordingOptions(IRecordingDescriptor descript return new DefaultValueMap<>(Map.of()); } - @Blocking @Override public List getServerTemplates() throws FlightRecorderException { return client.eventTemplates().await().atMost(client.getTimeout()); } - @Blocking @Override public IRecordingDescriptor getSnapshotRecording() throws FlightRecorderException { return client.startSnapshot().await().atMost(client.getTimeout()); @@ -161,7 +154,6 @@ public boolean isEnabled() { return true; } - @Blocking @Override public InputStream openStream(IRecordingDescriptor descriptor, boolean removeOnClose) throws FlightRecorderException { @@ -194,7 +186,6 @@ public IRecordingDescriptor start( throw new UnimplementedException(); } - @Blocking @Override public void stop(IRecordingDescriptor descriptor) throws FlightRecorderException { client.stopRecording(descriptor.getId()).await().atMost(client.getTimeout()); @@ -207,7 +198,6 @@ public void updateEventOptions( throw new UnimplementedException(); } - @Blocking @Override public void updateRecordingOptions( IRecordingDescriptor descriptor, IConstrainedMap newSettings) @@ -217,7 +207,6 @@ public void updateRecordingOptions( .atMost(client.getTimeout()); } - @Blocking @Override public IRecordingDescriptor start(IConstrainedMap recordingOptions, String template) throws FlightRecorderException, @@ -256,7 +245,6 @@ public IRecordingDescriptor start(IConstrainedMap recordingOptions, Stri return client.startRecording(req).await().atMost(client.getTimeout()); } - @Blocking @Override public IRecordingDescriptor start(IConstrainedMap recordingOptions, Template template) throws io.cryostat.core.FlightRecorderException, diff --git a/src/main/java/io/cryostat/targets/Target.java b/src/main/java/io/cryostat/targets/Target.java index f24f9af7c..9bc733033 100644 --- a/src/main/java/io/cryostat/targets/Target.java +++ b/src/main/java/io/cryostat/targets/Target.java @@ -21,6 +21,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -46,7 +47,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.quarkus.hibernate.orm.panache.PanacheEntity; import io.quarkus.vertx.ConsumeEvent; -import io.smallrye.common.annotation.Blocking; import io.vertx.mutiny.core.eventbus.EventBus; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -170,14 +170,13 @@ public static record Annotations(Map platform, Map(), new HashMap<>()); + this(null, null); } public Map merged() { - Map merged = new HashMap<>(); - cryostat().entrySet().forEach((e) -> merged.put(e.getKey(), e.getValue())); - merged.putAll(platform()); - return merged; + Map merged = new HashMap<>(cryostat); + merged.putAll(platform); + return Collections.unmodifiableMap(merged); } } @@ -322,7 +321,6 @@ void onMessage(TargetDiscovery event) { @ConsumeEvent(value = Credential.CREDENTIALS_STORED, blocking = true) @Transactional - @Blocking void updateCredential(Credential credential) { Target.stream("#Target.unconnected") .forEach( @@ -341,7 +339,6 @@ void updateCredential(Credential credential) { }); } - @Blocking @PrePersist void prePersist(Target target) { if (StringUtils.isBlank(target.alias)) { @@ -352,6 +349,16 @@ void prePersist(Target target) { target.alias = encodedAlias; } + if (target.labels == null) { + target.labels = new HashMap<>(); + } + if (target.annotations == null) { + target.annotations = new Annotations(); + } + if (target.activeRecordings == null) { + target.activeRecordings = new ArrayList<>(); + } + try { if (StringUtils.isBlank(target.jvmId)) { updateTargetJvmId(target, null); @@ -361,7 +368,6 @@ void prePersist(Target target) { } } - @Blocking private void updateTargetJvmId(Target t, Credential credential) { try { t.jvmId = diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 986f4fcd1..a25c41070 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,6 +1,9 @@ quarkus.http.host=localhost quarkus.smallrye-openapi.info-title=Cryostat API (development) +quarkus.swagger-ui.enable=true +quarkus.smallrye-openapi.enable=true +quarkus.smallrye-openapi.management.enabled=true quarkus.http.cors=true # quarkus.http.cors.origins=http://localhost:9000,http://0.0.0.0:9000 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index aeddd9cf3..17cff2fd0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -62,6 +62,8 @@ quarkus.http.limits.max-body-size=1G quarkus.vertx.prefer-native-transport=true quarkus.smallrye-openapi.path=/api +quarkus.swagger-ui.enable=false +quarkus.smallrye-openapi.management.enabled=false quarkus.smallrye-openapi.info-title=Cryostat API quarkus.smallrye-openapi.info-version=${quarkus.application.version} quarkus.smallrye-openapi.info-description=Cloud-Native JDK Flight Recorder diff --git a/src/test/java/itest/GraphQLTest.java b/src/test/java/itest/GraphQLTest.java index c6e5a5e28..a4f39be8a 100644 --- a/src/test/java/itest/GraphQLTest.java +++ b/src/test/java/itest/GraphQLTest.java @@ -70,6 +70,8 @@ class GraphQLTest extends StandardSelfTest { private final ExecutorService worker = ForkJoinPool.commonPool(); + static final long DELAY = 5_000L; + static final String TEST_RECORDING_NAME = "archivedRecording"; @Test @@ -227,7 +229,7 @@ void testStartRecordingMutationOnSpecificTarget() throws Exception { } }); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient @@ -284,7 +286,7 @@ void testStartRecordingMutationOnSpecificTarget() throws Exception { @Test @Order(4) void testArchiveMutation() throws Exception { - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName = "test"; JsonObject notificationRecording = createRecording(recordingName); Assertions.assertEquals("test", notificationRecording.getString("name")); @@ -326,7 +328,7 @@ void testArchiveMutation() throws Exception { @Test @Order(5) void testActiveRecordingMetadataMutation() throws Exception { - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName = "test"; JsonObject notificationRecording = createRecording(recordingName); Assertions.assertEquals(recordingName, notificationRecording.getString("name")); @@ -394,7 +396,7 @@ void testActiveRecordingMetadataMutation() throws Exception { @Test @Order(6) void testArchivedRecordingMetadataMutation() throws Exception { - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName = "test"; // Create a Recording JsonObject notificationRecording = createRecording(recordingName); @@ -491,7 +493,7 @@ void testArchivedRecordingMetadataMutation() throws Exception { @Order(7) void testDeleteMutation() throws Exception { // this will delete all Active and Archived recordings that match the filter input. - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName = "test"; // Create a Recording JsonObject notificationRecording = createRecording(recordingName); @@ -653,7 +655,7 @@ void testQueryForSpecificTargetsByNames() throws Exception { @Test @Order(10) public void testQueryForFilteredActiveRecordingsByNames() throws Exception { - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName1 = "test"; // Create a Recording 1 name (test) JsonObject notificationRecording = createRecording(recordingName1); @@ -687,7 +689,7 @@ public void testQueryForFilteredActiveRecordingsByNames() throws Exception { } }); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient @@ -773,7 +775,7 @@ public void shouldReturnArchivedRecordingsFilteredByNames() throws Exception { Assertions.assertTrue(listResp.isEmpty()); // Create a new recording - Thread.sleep(5000); + Thread.sleep(DELAY); String recordingName = "test"; JsonObject notificationRecording = createRecording(recordingName); Assertions.assertEquals(recordingName, notificationRecording.getString("name")); @@ -2720,7 +2722,7 @@ private JsonObject createRecording(String name) throws Exception { } }); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient @@ -2760,7 +2762,7 @@ private JsonObject stopRecording() throws Exception { } }); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient @@ -2819,7 +2821,7 @@ private JsonObject restartRecording(String name, String replace) throws Exceptio } }); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient @@ -2845,7 +2847,7 @@ private JsonObject restartRecordingWithError(String name, String replace) throws + " template: \"Profiling\", templateType: \"TARGET\", replace: \"%s\"" + " }) { name state } } } }", name, replace)); - Thread.sleep(5000); + Thread.sleep(DELAY); HttpResponse resp = webClient .extensions() From bcbdf922ff29e6a060047728fd89ed6d2c679e35 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 30 Sep 2024 11:56:12 -0400 Subject: [PATCH 71/75] chore(jdk): upgrade to JDK21 (#651) --- .github/workflows/ci-code-analysis.yml | 2 +- .github/workflows/pr-ci.yaml | 4 ++-- .github/workflows/push-ci.yaml | 2 +- README.md | 2 +- pom.xml | 4 ++-- src/main/docker/Dockerfile.jvm | 2 +- src/main/docker/include/truststore-setup.bash | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-code-analysis.yml b/.github/workflows/ci-code-analysis.yml index d6b8ac38a..8036fc62a 100644 --- a/.github/workflows/ci-code-analysis.yml +++ b/.github/workflows/ci-code-analysis.yml @@ -37,7 +37,7 @@ jobs: step: restore - uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Run spotbugs run: mvn -B -U compile spotbugs:check diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml index 822d497c8..61554e0d7 100644 --- a/.github/workflows/pr-ci.yaml +++ b/.github/workflows/pr-ci.yaml @@ -110,7 +110,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - run: git submodule init && git submodule update @@ -192,7 +192,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - run: git submodule init && git submodule update diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml index e0b832f38..0d6ae8c58 100644 --- a/.github/workflows/push-ci.yaml +++ b/.github/workflows/push-ci.yaml @@ -63,7 +63,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - run: git submodule init && git submodule update diff --git a/README.md b/README.md index ecfaef71e..05d9d9819 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ We welcome and appreciate any contributions from our community. Please visit our Build requirements: - git -- JDK 17+ +- JDK 21+ - Maven v3+ - [Quarkus CLI](https://quarkus.io/guides/cli-tooling) v3.4.1+ (Recommended) - [Podman](https://podman.io/docs/installation) 4.7+ diff --git a/pom.xml b/pom.xml index 6946340b0..184160f83 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ ${cryostat.imageVersionLower} - 17 + 21 ${java.version} ${java.version} ${java.version} @@ -318,7 +318,7 @@ - -Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false + -Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=filename=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 55db03660..207be2112 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-3.1727147550 +FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20-2.1727147592 ENV LANGUAGE='en_US:en' diff --git a/src/main/docker/include/truststore-setup.bash b/src/main/docker/include/truststore-setup.bash index ab4d80cfa..57f964ec1 100755 --- a/src/main/docker/include/truststore-setup.bash +++ b/src/main/docker/include/truststore-setup.bash @@ -15,7 +15,7 @@ cd "$CONF_DIR" keytool -importkeystore \ -noprompt \ -storetype PKCS12 \ - -srckeystore /usr/lib/jvm/jre-17-openjdk/lib/security/cacerts \ + -srckeystore /usr/lib/jvm/jre-openjdk/lib/security/cacerts \ -srcstorepass changeit \ -destkeystore "$SSL_TRUSTSTORE" \ -deststorepass "$SSL_TRUSTSTORE_PASS" From c59211f22ac53ef9d2f454b03dbee7976726f4e5 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 30 Sep 2024 14:55:29 -0400 Subject: [PATCH 72/75] build(deps): update to Quarkus 3.15 LTS (#671) --- pom.xml | 21 +++++++++---------- schema/schema.graphql | 2 +- .../io/cryostat/graphql/RecordingLinks.java | 13 ------------ .../java/io/cryostat/graphql/TargetNodes.java | 8 +++++-- .../io/cryostat/recordings/Recordings.java | 11 ++++++++-- 5 files changed, 26 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 184160f83..db6bc89fa 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,8 @@ 1.20.1 quarkus-bom io.quarkus.platform - 3.8.6 - 2.3.10 + 3.15.1 + 2.4.9 3.6.0 3.4.1 3.7.1 @@ -144,7 +144,7 @@ io.quarkus - quarkus-resteasy-reactive-jackson + quarkus-rest-jackson io.quarkus @@ -181,7 +181,7 @@ io.quarkus - quarkus-rest-client-reactive-jackson + quarkus-rest-client-jackson io.quarkus @@ -219,6 +219,10 @@ org.apache.commons commons-lang3 + + org.flywaydb + flyway-database-postgresql + commons-codec commons-codec @@ -226,7 +230,6 @@ commons-io commons-io - ${org.apache.commons.io.version} org.apache.commons @@ -329,11 +332,6 @@ -parameters - - io.quarkus - quarkus-panache-common - ${quarkus.platform.version} - @@ -501,7 +499,8 @@ false - native + true + false diff --git a/schema/schema.graphql b/schema/schema.graphql index a3b06cc12..f471cf40e 100644 --- a/schema/schema.graphql +++ b/schema/schema.graphql @@ -212,7 +212,7 @@ type Target { } type ThreadMetrics { - allThreadIds: [BigInteger] + allThreadIds: [BigInteger!] currentThreadCpuTime: BigInteger! currentThreadCpuTimeSupported: Boolean! currentThreadUserTime: BigInteger! diff --git a/src/main/java/io/cryostat/graphql/RecordingLinks.java b/src/main/java/io/cryostat/graphql/RecordingLinks.java index fbc732d55..d6e1684e3 100644 --- a/src/main/java/io/cryostat/graphql/RecordingLinks.java +++ b/src/main/java/io/cryostat/graphql/RecordingLinks.java @@ -17,7 +17,6 @@ import io.cryostat.recordings.ActiveRecording; import io.cryostat.recordings.RecordingHelper; -import io.cryostat.recordings.Recordings.ArchivedRecording; import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.Description; @@ -40,16 +39,4 @@ public String downloadUrl(@Source ActiveRecording recording) { public String reportUrl(@Source ActiveRecording recording) { return recordingHelper.reportUrl(recording); } - - @Description("URL for GET request to retrieve the JFR binary file content of this recording") - public String downloadUrl(@Source ArchivedRecording recording) { - return recording.downloadUrl(); - } - - @Description( - "URL for GET request to retrieve a JSON formatted Automated Analysis Report of this" - + " recording") - public String reportUrl(@Source ArchivedRecording recording) { - return recording.reportUrl(); - } } diff --git a/src/main/java/io/cryostat/graphql/TargetNodes.java b/src/main/java/io/cryostat/graphql/TargetNodes.java index afe9eb9f8..4808eb99e 100644 --- a/src/main/java/io/cryostat/graphql/TargetNodes.java +++ b/src/main/java/io/cryostat/graphql/TargetNodes.java @@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.microprofile.graphql.Description; import org.eclipse.microprofile.graphql.GraphQLApi; +import org.eclipse.microprofile.graphql.Ignore; import org.eclipse.microprofile.graphql.NonNull; import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; @@ -131,8 +132,11 @@ public MBeanMetrics mbeanMetrics(@Source Target target) { @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") public static class Recordings { - public @NonNull ActiveRecordings active = new ActiveRecordings(); - public @NonNull ArchivedRecordings archived = new ArchivedRecordings(); + // @Ignore these two from the GraphQL schema generation because we override the definition + // in the ArchivedRecordings and ActiveRecordings classes so that we can apply input + // filtering, and those accessor overrides conflict with the schema generator + public @NonNull @Ignore ActiveRecordings active = new ActiveRecordings(); + public @NonNull @Ignore ArchivedRecordings archived = new ArchivedRecordings(); } @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java index bcd408129..e19a0f149 100644 --- a/src/main/java/io/cryostat/recordings/Recordings.java +++ b/src/main/java/io/cryostat/recordings/Recordings.java @@ -85,6 +85,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.graphql.Description; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.RestPath; @@ -1119,8 +1120,14 @@ public record LinkedRecordingDescriptor( public record ArchivedRecording( String jvmId, String name, - String downloadUrl, - String reportUrl, + @Description( + "URL for GET request to retrieve the JFR binary file content of this" + + " recording") + String downloadUrl, + @Description( + "URL for GET request to retrieve a JSON formatted Automated Analysis" + + " Report of this recording") + String reportUrl, Metadata metadata, long size, long archivedTime) { From 111e5503399c1af648f6841a7aa9dd6b7ada28ac Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 30 Sep 2024 14:58:34 -0400 Subject: [PATCH 73/75] test(smoketest): correct startup JFR flags (#672) --- compose/cryostat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/cryostat.yml b/compose/cryostat.yml index 6e269b8ce..aca539c61 100644 --- a/compose/cryostat.yml +++ b/compose/cryostat.yml @@ -25,8 +25,8 @@ services: CRYOSTAT_DISCOVERY_DOCKER_ENABLED: ${CRYOSTAT_DISCOVERY_DOCKER_ENABLED:-true} JAVA_OPTS_APPEND: >- -XX:+FlightRecorder - -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m - -XX:StartFlightRecording=name=startup,settings=profile,disk=true,duration=30s + -XX:StartFlightRecording=filename=/tmp/,name=onstart,settings=default,disk=true,maxage=5m + -XX:StartFlightRecording=filename=/tmp/,name=startup,settings=profile,disk=true,duration=30s -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 From e6d2d35e2acc478516af29d0f36535f96d58c2bc Mon Sep 17 00:00:00 2001 From: Cryostat CI Date: Mon, 30 Sep 2024 20:11:28 +0000 Subject: [PATCH 74/75] build(webui): update submodule to f3c4dd8 --- src/main/webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webui b/src/main/webui index a7b9b52c1..f3c4dd826 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit a7b9b52c15afc0eafc730a276ec152ac4117f784 +Subproject commit f3c4dd82672751dab3780c3858cf389983f8d83b From c629674cc05cde6c28eceabbc1b68504654e8867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:55:37 -0400 Subject: [PATCH 75/75] build(deps): bump org.testcontainers:testcontainers-bom from 1.20.1 to 1.20.2 (#673) build(deps): bump org.testcontainers:testcontainers-bom Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.20.1 to 1.20.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.1...1.20.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db6bc89fa..2fdb894f9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 0.4.4 3.25.2 9.41.1 - 1.20.1 + 1.20.2 quarkus-bom io.quarkus.platform 3.15.1