From 436f1a4f7e56c844b80c262e42e11042cab12afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:49:40 -0500 Subject: [PATCH] build(deps): bump io.cryostat:cryostat-core from 2.28.0 to 2.29.0 (#1880) * build(deps): bump io.cryostat:cryostat-core from 2.28.0 to 2.29.0 Bumps [io.cryostat:cryostat-core](https://github.com/cryostatio/cryostat-core) from 2.28.0 to 2.29.0. - [Release notes](https://github.com/cryostatio/cryostat-core/releases) - [Commits](https://github.com/cryostatio/cryostat-core/compare/v2.28.0...v2.29.0) --- updated-dependencies: - dependency-name: io.cryostat:cryostat-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fixup! build(deps): bump io.cryostat:cryostat-core from 2.28.0 to 2.29.0 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Azores --- pom.xml | 2 +- .../java/io/cryostat/ApplicationVersion.java | 11 ++- src/main/java/io/cryostat/Cryostat.java | 9 +-- src/main/java/io/cryostat/MainModule.java | 34 ++++----- .../java/io/cryostat/VerticleDeployer.java | 9 ++- .../configuration/ConfigurationModule.java | 16 ++--- .../configuration/CredentialsManager.java | 13 ++-- .../configuration/StoredCredentialsDao.java | 5 +- .../discovery/AbstractNodeTypeAdapter.java | 8 +-- .../cryostat/discovery/BuiltInDiscovery.java | 13 ++-- .../cryostat/discovery/DiscoveryModule.java | 20 +++--- .../cryostat/discovery/DiscoveryStorage.java | 15 ++-- .../io/cryostat/discovery/PluginInfoDao.java | 9 ++- .../cryostat/messaging/MessagingModule.java | 19 ++--- .../cryostat/messaging/MessagingServer.java | 16 +++-- .../java/io/cryostat/messaging/WsClient.java | 10 +-- .../io/cryostat/net/AbstractAuthManager.java | 11 ++- .../java/io/cryostat/net/AgentClient.java | 24 +++---- .../java/io/cryostat/net/AgentConnection.java | 13 ++-- .../java/io/cryostat/net/AgentJFRService.java | 18 ++--- .../io/cryostat/net/BasicAuthManager.java | 6 +- src/main/java/io/cryostat/net/HttpServer.java | 9 ++- .../java/io/cryostat/net/NetworkModule.java | 39 ++++------- .../java/io/cryostat/net/NoopAuthManager.java | 5 -- .../io/cryostat/net/SslConfiguration.java | 13 ++-- .../cryostat/net/TargetConnectionManager.java | 13 ++-- .../net/openshift/OpenShiftAuthManager.java | 24 +++---- .../net/openshift/OpenShiftNetworkModule.java | 7 +- .../AbstractReportGeneratorService.java | 11 +-- .../reports/ActiveRecordingReportCache.java | 11 ++- .../reports/ArchivedRecordingReportCache.java | 18 ++--- .../net/reports/RemoteReportGenerator.java | 6 +- .../cryostat/net/reports/ReportsModule.java | 28 +++----- .../reports/SubprocessReportGenerator.java | 33 ++++----- .../net/security/jwt/AssetJwtHelper.java | 4 +- .../net/security/jwt/DiscoveryJwtHelper.java | 4 +- .../cryostat/net/security/jwt/JwtModule.java | 14 ++-- .../java/io/cryostat/net/web/WebModule.java | 10 +-- .../java/io/cryostat/net/web/WebServer.java | 7 +- .../AbstractAuthenticatedRequestHandler.java | 8 +-- .../beta/ArchivedDirectoriesGetHandler.java | 6 +- .../beta/CredentialTestPostBodyHandler.java | 6 +- .../beta/MatchExpressionsPostBodyHandler.java | 6 +- .../RecordingGetFromPathWithJwtHandler.java | 6 +- .../api/beta/RecordingGetWithJwtHandler.java | 6 +- ...ecordingMetadataLabelsPostBodyHandler.java | 5 +- ...MetadataLabelsPostFromPathBodyHandler.java | 5 +- .../beta/RecordingsFromIdPostBodyHandler.java | 6 +- .../api/beta/RecordingsFromIdPostHandler.java | 12 ++-- .../beta/ReportGetFromPathWithJwtHandler.java | 6 +- .../api/beta/ReportGetWithJwtHandler.java | 6 +- ...ecordingMetadataLabelsPostBodyHandler.java | 5 +- .../net/web/http/api/v1/AuthPostHandler.java | 5 +- .../http/api/v1/RecordingDeleteHandler.java | 6 +- .../web/http/api/v1/RecordingGetHandler.java | 6 +- .../api/v1/RecordingUploadPostHandler.java | 6 +- .../web/http/api/v1/RecordingsGetHandler.java | 6 +- .../api/v1/RecordingsPostBodyHandler.java | 6 +- .../http/api/v1/RecordingsPostHandler.java | 12 ++-- .../net/web/http/api/v1/ReportGetHandler.java | 6 +- .../http/api/v1/TargetEventsGetHandler.java | 6 +- .../api/v1/TargetRecordingDeleteHandler.java | 6 +- .../api/v1/TargetRecordingGetHandler.java | 6 +- .../v1/TargetRecordingOptionsGetHandler.java | 6 +- ...argetRecordingOptionsPatchBodyHandler.java | 5 +- .../TargetRecordingOptionsPatchHandler.java | 6 +- .../v1/TargetRecordingPatchBodyHandler.java | 6 +- .../api/v1/TargetRecordingPatchHandler.java | 6 +- .../v1/TargetRecordingUploadPostHandler.java | 6 +- .../api/v1/TargetRecordingsGetHandler.java | 6 +- .../v1/TargetRecordingsPostBodyHandler.java | 6 +- .../api/v1/TargetRecordingsPostHandler.java | 6 +- .../http/api/v1/TargetReportGetHandler.java | 8 +-- .../api/v1/TargetSnapshotPostHandler.java | 6 +- .../http/api/v1/TargetTemplateGetHandler.java | 6 +- .../api/v1/TargetTemplatesGetHandler.java | 6 +- .../web/http/api/v1/TargetsGetHandler.java | 6 +- .../http/api/v1/TemplateDeleteHandler.java | 6 +- .../http/api/v1/TemplatesPostBodyHandler.java | 6 +- .../web/http/api/v1/TemplatesPostHandler.java | 8 +-- .../v2/AbstractAssetJwtConsumingHandler.java | 11 ++- .../AbstractDiscoveryJwtConsumingHandler.java | 13 ++-- .../http/api/v2/AuthTokenPostBodyHandler.java | 6 +- .../web/http/api/v2/AuthTokenPostHandler.java | 4 +- .../api/v2/CertificatePostBodyHandler.java | 6 +- .../http/api/v2/CredentialsGetHandler.java | 4 +- .../api/v2/CredentialsPostBodyHandler.java | 6 +- .../v2/DiscoveryDeregistrationHandler.java | 6 +- .../http/api/v2/DiscoveryPostBodyHandler.java | 3 +- .../web/http/api/v2/DiscoveryPostHandler.java | 6 +- .../v2/DiscoveryRegistrationBodyHandler.java | 6 +- .../v2/DiscoveryRegistrationCheckHandler.java | 6 +- .../api/v2/DiscoveryRegistrationHandler.java | 6 +- .../http/api/v2/MBeanMetricsGetHandler.java | 6 +- .../api/v2/ProbeTemplateDeleteHandler.java | 4 -- .../v2/ProbeTemplateUploadBodyHandler.java | 6 +- .../api/v2/ProbeTemplateUploadHandler.java | 13 ++-- .../web/http/api/v2/RecordingGetHandler.java | 6 +- .../net/web/http/api/v2/ReportGetHandler.java | 6 +- .../web/http/api/v2/RequestParameters.java | 7 +- .../web/http/api/v2/RuleDeleteHandler.java | 11 ++- .../net/web/http/api/v2/RuleGetHandler.java | 6 +- .../web/http/api/v2/RulePatchBodyHandler.java | 5 +- .../net/web/http/api/v2/RulePatchHandler.java | 11 ++- .../net/web/http/api/v2/RulesGetHandler.java | 6 +- .../web/http/api/v2/RulesPostBodyHandler.java | 5 +- .../net/web/http/api/v2/RulesPostHandler.java | 6 +- .../api/v2/TargetCredentialsGetHandler.java | 3 +- .../v2/TargetCredentialsPostBodyHandler.java | 6 +- .../api/v2/TargetCredentialsPostHandler.java | 6 +- .../http/api/v2/TargetProbeDeleteHandler.java | 4 -- .../http/api/v2/TargetProbePostHandler.java | 9 ++- .../api/v2/TargetRecordingGetHandler.java | 9 ++- .../http/api/v2/TargetReportGetHandler.java | 6 +- .../http/api/v2/TargetTemplateGetHandler.java | 6 +- .../http/api/v2/TargetsPostBodyHandler.java | 5 +- .../web/http/api/v2/TargetsPostHandler.java | 6 +- .../graph/AllArchivedRecordingsFetcher.java | 9 ++- .../web/http/api/v2/graph/GraphModule.java | 17 ++--- .../http/api/v2/graph/GraphQLGetHandler.java | 5 +- .../api/v2/graph/GraphQLPostBodyHandler.java | 5 +- .../http/api/v2/graph/GraphQLPostHandler.java | 8 +-- .../api/v2/graph/MBeanMetricsFetcher.java | 13 ++-- .../http/api/v2/graph/RecordingsFetcher.java | 13 ++-- .../web/http/generic/CorsEnablingHandler.java | 14 ++-- .../web/http/generic/CorsOptionsHandler.java | 9 +-- .../web/http/generic/HealthGetHandler.java | 17 ++--- .../io/cryostat/platform/PlatformModule.java | 7 +- .../CustomTargetPlatformStrategy.java | 10 ++- .../internal/DefaultPlatformClient.java | 14 ++-- .../internal/DefaultPlatformStrategy.java | 11 ++- .../internal/DockerPlatformClient.java | 11 ++- .../internal/DockerPlatformStrategy.java | 17 ++--- .../internal/KubeApiPlatformClient.java | 15 ++-- .../internal/KubeApiPlatformStrategy.java | 15 ++-- .../internal/OpenShiftPlatformStrategy.java | 6 +- .../internal/PlatformStrategyModule.java | 43 ++++-------- .../internal/PodmanPlatformClient.java | 13 ++-- .../internal/PodmanPlatformStrategy.java | 18 ++--- .../io/cryostat/recordings/JvmIdHelper.java | 9 ++- .../recordings/RecordingArchiveHelper.java | 19 +++-- .../recordings/RecordingMetadataManager.java | 34 ++++----- .../recordings/RecordingTargetHelper.java | 11 ++- .../cryostat/recordings/RecordingsModule.java | 21 ++---- .../io/cryostat/rules/MatchExpressionDao.java | 5 +- .../rules/MatchExpressionEvaluator.java | 9 ++- .../rules/MatchExpressionManager.java | 11 ++- .../io/cryostat/rules/PeriodicArchiver.java | 11 ++- .../rules/PeriodicArchiverFactory.java | 14 +--- .../java/io/cryostat/rules/RuleProcessor.java | 25 ++++--- .../java/io/cryostat/rules/RuleRegistry.java | 17 +++-- .../java/io/cryostat/rules/RulesModule.java | 30 ++++---- .../java/io/cryostat/storage/AbstractDao.java | 12 ++-- .../util/GsonJmxServiceUrlAdapter.java | 12 ++-- .../java/io/cryostat/util/JavaProcess.java | 8 ++- .../configuration/CredentialsManagerTest.java | 7 +- .../discovery/DiscoveryStorageTest.java | 7 +- .../messaging/MessagingServerTest.java | 14 +--- .../io/cryostat/net/BasicAuthManagerTest.java | 69 +------------------ .../io/cryostat/net/SslConfigurationTest.java | 6 +- .../net/TargetConnectionManagerTest.java | 14 ++-- .../openshift/OpenShiftAuthManagerTest.java | 60 +--------------- .../ActiveRecordingReportCacheTest.java | 10 +-- .../ArchivedRecordingReportCacheTest.java | 4 +- .../SubprocessReportGeneratorTest.java | 4 +- .../io/cryostat/net/web/WebServerTest.java | 16 +---- ...stractAuthenticatedRequestHandlerTest.java | 47 ++++--------- .../ArchivedDirectoriesGetHandlerTest.java | 6 +- .../beta/CredentialTestPostHandlerTest.java | 4 +- .../MatchExpressionDeleteHandlerTest.java | 4 +- .../beta/MatchExpressionGetHandlerTest.java | 4 +- .../beta/MatchExpressionsGetHandlerTest.java | 4 +- .../beta/MatchExpressionsPostHandlerTest.java | 4 +- .../api/beta/ProbeTemplateGetHandlerTest.java | 4 +- ...ecordingGetFromPathWithJwtHandlerTest.java | 10 +-- .../beta/RecordingGetWithJwtHandlerTest.java | 4 +- .../beta/RecordingsFromIdPostHandlerTest.java | 7 +- .../ReportGetFromPathWithJwtHandlerTest.java | 5 +- .../api/beta/ReportGetWithJwtHandlerTest.java | 11 +-- .../web/http/api/v1/AuthPostHandlerTest.java | 4 +- .../v1/GrafanaDashboardUrlGetHandlerTest.java | 4 +- .../GrafanaDatasourceUrlGetHandlerTest.java | 4 +- .../v1/NotificationsUrlGetHandlerTest.java | 7 +- .../api/v1/RecordingDeleteHandlerTest.java | 6 +- .../http/api/v1/RecordingGetHandlerTest.java | 5 +- .../v1/RecordingUploadPostHandlerTest.java | 10 +-- .../http/api/v1/RecordingsGetHandlerTest.java | 7 +- .../api/v1/RecordingsPostHandlerTest.java | 7 +- .../web/http/api/v1/ReportGetHandlerTest.java | 5 +- .../api/v1/TargetEventsGetHandlerTest.java | 7 +- .../v1/TargetRecordingDeleteHandlerTest.java | 5 +- .../api/v1/TargetRecordingGetHandlerTest.java | 5 +- .../TargetRecordingOptionsGetHandlerTest.java | 7 +- ...argetRecordingOptionsPatchHandlerTest.java | 5 +- .../v1/TargetRecordingPatchHandlerTest.java | 4 +- .../TargetRecordingUploadPostHandlerTest.java | 11 +-- .../v1/TargetRecordingsGetHandlerTest.java | 7 +- .../v1/TargetRecordingsPostHandlerTest.java | 7 +- .../api/v1/TargetReportGetHandlerTest.java | 5 +- .../api/v1/TargetSnapshotPostHandlerTest.java | 5 +- .../api/v1/TargetTemplateGetHandlerTest.java | 5 +- .../api/v1/TargetTemplatesGetHandlerTest.java | 7 +- .../http/api/v1/TargetsGetHandlerTest.java | 6 +- .../api/v1/TemplateDeleteHandlerTest.java | 4 +- .../http/api/v1/TemplatesPostHandlerTest.java | 4 +- .../AbstractAssetJwtConsumingHandlerTest.java | 25 ++----- ...tractDiscoveryJwtConsumingHandlerTest.java | 16 ++--- .../api/v2/AbstractV2RequestHandlerTest.java | 4 +- .../web/http/api/v2/ApiGetHandlerTest.java | 4 +- .../web/http/api/v2/AuthPostHandlerTest.java | 4 +- .../http/api/v2/AuthTokenPostHandlerTest.java | 7 +- .../api/v2/CertificatePostHandlerTest.java | 4 +- .../api/v2/CredentialDeleteHandlerTest.java | 4 +- .../http/api/v2/CredentialGetHandlerTest.java | 4 +- .../api/v2/CredentialsGetHandlerTest.java | 6 +- .../api/v2/CredentialsPostHandlerTest.java | 4 +- .../DiscoveryDeregistrationHandlerTest.java | 6 +- .../http/api/v2/DiscoveryGetHandlerTest.java | 4 +- .../http/api/v2/DiscoveryPostHandlerTest.java | 6 +- .../v2/DiscoveryRegistrationHandlerTest.java | 7 +- .../http/api/v2/LogoutPostHandlerTest.java | 4 +- .../api/v2/MBeanMetricsGetHandlerTest.java | 4 +- .../v2/ProbeTemplateDeleteHandlerTest.java | 12 +--- .../v2/ProbeTemplateUploadHandlerTest.java | 12 +--- .../http/api/v2/RecordingGetHandlerTest.java | 5 +- .../web/http/api/v2/ReportGetHandlerTest.java | 5 +- .../http/api/v2/RuleDeleteHandlerTest.java | 8 +-- .../web/http/api/v2/RuleGetHandlerTest.java | 6 +- .../web/http/api/v2/RulePatchHandlerTest.java | 7 +- .../web/http/api/v2/RulesGetHandlerTest.java | 6 +- .../web/http/api/v2/RulesPostHandlerTest.java | 11 +-- .../TargetCredentialsDeleteHandlerTest.java | 4 +- .../v2/TargetCredentialsGetHandlerTest.java | 6 +- .../v2/TargetCredentialsPostHandlerTest.java | 6 +- .../http/api/v2/TargetDeleteHandlerTest.java | 4 +- .../api/v2/TargetEventsGetHandlerTest.java | 4 +- .../api/v2/TargetProbeDeleteHandlerTest.java | 5 +- .../api/v2/TargetProbePostHandlerTest.java | 5 +- .../api/v2/TargetProbesGetHandlerTest.java | 4 +- .../api/v2/TargetRecordingGetHandlerTest.java | 5 +- ...getRecordingOptionsListGetHandlerTest.java | 4 +- .../api/v2/TargetReportGetHandlerTest.java | 4 +- .../api/v2/TargetSnapshotPostHandlerTest.java | 4 +- .../api/v2/TargetTemplateGetHandlerTest.java | 9 +-- .../http/api/v2/TargetsPostHandlerTest.java | 7 +- .../AllArchivedRecordingsFetcherTest.java | 4 +- .../api/v2/graph/GraphQLGetHandlerTest.java | 4 +- .../api/v2/graph/GraphQLPostHandlerTest.java | 4 +- .../api/v2/graph/RecordingsFetcherTest.java | 5 +- .../http/generic/CorsEnablingHandlerTest.java | 4 +- .../http/generic/CorsOptionsHandlerTest.java | 4 +- .../http/generic/HealthGetHandlerTest.java | 6 +- .../internal/DefaultPlatformClientTest.java | 4 +- .../internal/KubeApiPlatformClientTest.java | 16 +---- .../RecordingArchiveHelperTest.java | 3 - .../RecordingMetadataManagerTest.java | 7 +- .../recordings/RecordingTargetHelperTest.java | 5 +- .../rules/MatchExpressionEvaluatorTest.java | 5 +- .../rules/MatchExpressionManagerTest.java | 7 +- .../cryostat/rules/PeriodicArchiverTest.java | 5 +- .../io/cryostat/rules/RuleProcessorTest.java | 12 +--- .../io/cryostat/rules/RuleRegistryTest.java | 11 ++- src/test/java/itest/CredentialsIT.java | 3 +- src/test/java/itest/CredentialsV2_2IT.java | 3 +- .../itest/FileSystemArchivedRequestsIT.java | 3 +- src/test/java/itest/GraphQLIT.java | 3 +- .../InterleavedExternalTargetRequestsIT.java | 3 +- src/test/java/itest/RecordingMetadataIT.java | 3 +- .../java/itest/util/http/JvmIdWebRequest.java | 3 +- 269 files changed, 800 insertions(+), 1636 deletions(-) diff --git a/pom.xml b/pom.xml index 43addee1a0..f2d09217b3 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 2.47 ${com.google.dagger.version} - 2.28.0 + 2.29.0 15.4 3.13.0 diff --git a/src/main/java/io/cryostat/ApplicationVersion.java b/src/main/java/io/cryostat/ApplicationVersion.java index b6585de04b..74174da579 100644 --- a/src/main/java/io/cryostat/ApplicationVersion.java +++ b/src/main/java/io/cryostat/ApplicationVersion.java @@ -19,17 +19,14 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import io.cryostat.core.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ApplicationVersion { private static final String RESOURCE_LOCATION = "/io/cryostat/version"; private volatile String version; - private final Logger logger; - - ApplicationVersion(Logger logger) { - this.logger = logger; - } + private final Logger logger = LoggerFactory.getLogger(getClass()); public synchronized String getVersionString() { if (version == null) { @@ -49,7 +46,7 @@ public synchronized String getVersionString() { RESOURCE_LOCATION))) .trim(); } catch (Exception e) { - logger.error(e); + logger.error("Version retrieval exception", e); version = "unknown"; } } diff --git a/src/main/java/io/cryostat/Cryostat.java b/src/main/java/io/cryostat/Cryostat.java index a27d4f393e..ea04a60490 100644 --- a/src/main/java/io/cryostat/Cryostat.java +++ b/src/main/java/io/cryostat/Cryostat.java @@ -24,7 +24,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.CryostatCore; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.MessagingServer; @@ -39,12 +38,14 @@ import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; import io.vertx.core.Vertx; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class Cryostat extends AbstractVerticle { private final Environment environment = new Environment(); private final Client client; - private final Logger logger = Logger.INSTANCE; + private final Logger logger = LoggerFactory.getLogger(getClass()); private Cryostat(Client client) { this.client = client; @@ -58,7 +59,7 @@ public void start(Promise future) { client.credentialsManager().migrate(); client.ruleRegistry().loadRules(); } catch (Exception e) { - logger.error(e); + logger.error("Startup exception", e); future.fail(e); return; } @@ -113,7 +114,7 @@ private void shutdown(Throwable cause) { if (!(cause instanceof Exception)) { cause = new RuntimeException(cause); } - logger.error((Exception) cause); + logger.error("Shutdown exception", (Exception) cause); } logger.info("{} shutting down...", instanceName()); client.vertx().close().onComplete(n -> logger.info("Shutdown complete")); diff --git a/src/main/java/io/cryostat/MainModule.java b/src/main/java/io/cryostat/MainModule.java index 705f1cbe6c..14cbf392e6 100644 --- a/src/main/java/io/cryostat/MainModule.java +++ b/src/main/java/io/cryostat/MainModule.java @@ -31,7 +31,6 @@ import io.cryostat.configuration.ConfigurationModule; import io.cryostat.configuration.Variables; import io.cryostat.core.agent.ProbeTemplate; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.tui.ClientWriter; import io.cryostat.discovery.DiscoveryModule; @@ -61,6 +60,8 @@ import dagger.Provides; import io.vertx.core.Vertx; import org.apache.commons.codec.binary.Base32; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Module( includes = { @@ -81,16 +82,12 @@ public abstract class MainModule { public static final String CONF_DIR = "CONF_DIR"; public static final String UUID_FROM_STRING = "UUID_FROM_STRING"; - @Provides - @Singleton - static ApplicationVersion provideApplicationVersion(Logger logger) { - return new ApplicationVersion(logger); - } + private static final Logger logger = LoggerFactory.getLogger(MainModule.class); @Provides @Singleton - static Logger provideLogger() { - return Logger.INSTANCE; + static ApplicationVersion provideApplicationVersion() { + return new ApplicationVersion(); } @Provides @@ -102,7 +99,8 @@ static Base32 provideBase32() { @Singleton // FIXME remove this outdated ClientWriter abstraction and simply replace with an injected // Logger at all ClientWriter injection sites - static ClientWriter provideClientWriter(Logger logger) { + static ClientWriter provideClientWriter() { + Logger logger = LoggerFactory.getLogger(ClientWriter.class); return new ClientWriter() { @Override public void print(String s) { @@ -111,14 +109,14 @@ public void print(String s) { @Override public void println(Exception e) { - logger.warn(e); + logger.warn("Write exception", e); } }; } // testing-only when extra adapters aren't needed - public static Gson provideGson(Logger logger) { - return provideGson(Set.of(), Set.of(), logger); + public static Gson provideGson() { + return provideGson(Set.of(), Set.of()); } // public since this is useful to use directly in tests @@ -126,14 +124,12 @@ public static Gson provideGson(Logger logger) { @Singleton public static Gson provideGson( Set> extraAdapters, - Set> deserializers, - Logger logger) { + Set> deserializers) { GsonBuilder builder = new GsonBuilder() .serializeNulls() .disableHtmlEscaping() - .registerTypeAdapter( - JMXServiceURL.class, new GsonJmxServiceUrlAdapter(logger)) + .registerTypeAdapter(JMXServiceURL.class, new GsonJmxServiceUrlAdapter()) .registerTypeAdapter(HttpMimeType.class, new HttpMimeTypeAdapter()) .registerTypeHierarchyAdapter(Path.class, new PathTypeAdapter()) .registerTypeAdapter(Rule.class, new RuleDeserializer()) @@ -151,7 +147,7 @@ JMXServiceURL.class, new GsonJmxServiceUrlAdapter(logger)) @Provides @Singleton @Named(RECORDINGS_PATH) - static Path provideSavedRecordingsPath(Logger logger, Environment env) { + static Path provideSavedRecordingsPath(Environment env) { String archivePath = env.getEnv(Variables.ARCHIVE_PATH, "/flightrecordings"); logger.info("Local save path for flight recordings set as {}", archivePath); return Paths.get(archivePath); @@ -180,7 +176,7 @@ public static int provideVertxPoolSize(Environment env) { @Provides @Singleton public static VerticleDeployer provideVerticleDeployer( - Vertx vertx, @Named(Variables.VERTX_POOL_SIZE) int poolSize, Logger logger) { - return new VerticleDeployer(vertx, poolSize, logger); + Vertx vertx, @Named(Variables.VERTX_POOL_SIZE) int poolSize) { + return new VerticleDeployer(vertx, poolSize); } } diff --git a/src/main/java/io/cryostat/VerticleDeployer.java b/src/main/java/io/cryostat/VerticleDeployer.java index fc5a55d6bc..e67b10c381 100644 --- a/src/main/java/io/cryostat/VerticleDeployer.java +++ b/src/main/java/io/cryostat/VerticleDeployer.java @@ -15,27 +15,26 @@ */ package io.cryostat; -import io.cryostat.core.log.Logger; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.vertx.core.DeploymentOptions; import io.vertx.core.Future; import io.vertx.core.Verticle; import io.vertx.core.Vertx; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class VerticleDeployer { private final Vertx vertx; private final int poolSize; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @SuppressFBWarnings( value = "EI_EXPOSE_REP2", justification = "vertx is externally mutable and that's fine") - public VerticleDeployer(Vertx vertx, int poolSize, Logger logger) { + public VerticleDeployer(Vertx vertx, int poolSize) { this.vertx = vertx; this.poolSize = poolSize; - this.logger = logger; } public Future deploy(Verticle verticle, boolean worker) { diff --git a/src/main/java/io/cryostat/configuration/ConfigurationModule.java b/src/main/java/io/cryostat/configuration/ConfigurationModule.java index f8849c1a0b..f63309ade8 100644 --- a/src/main/java/io/cryostat/configuration/ConfigurationModule.java +++ b/src/main/java/io/cryostat/configuration/ConfigurationModule.java @@ -22,7 +22,6 @@ import javax.inject.Singleton; import javax.persistence.EntityManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.discovery.DiscoveryStorage; @@ -33,16 +32,19 @@ import dagger.Lazy; import dagger.Module; import dagger.Provides; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Module public abstract class ConfigurationModule { public static final String CONFIGURATION_PATH = "CONFIGURATION_PATH"; public static final String CREDENTIALS_SUBDIRECTORY = "credentials"; + private static final Logger logger = LoggerFactory.getLogger(ConfigurationModule.class); @Provides @Singleton @Named(CONFIGURATION_PATH) - static Path provideConfigurationPath(Logger logger, Environment env) { + static Path provideConfigurationPath(Environment env) { String path = env.getEnv(Variables.CONFIG_PATH, "/opt/cryostat.d/conf.d"); logger.info(String.format("Local config path set as %s", path)); return Paths.get(path); @@ -57,8 +59,7 @@ static CredentialsManager provideCredentialsManager( DiscoveryStorage discovery, StoredCredentialsDao dao, FileSystem fs, - Gson gson, - Logger logger) { + Gson gson) { Path credentialsDir = confDir.resolve(CREDENTIALS_SUBDIRECTORY); return new CredentialsManager( credentialsDir, @@ -67,13 +68,12 @@ static CredentialsManager provideCredentialsManager( discovery, dao, fs, - gson, - logger); + gson); } @Provides @Singleton - static StoredCredentialsDao provideStoredCredentialsDao(EntityManager em, Logger logger) { - return new StoredCredentialsDao(em, logger); + static StoredCredentialsDao provideStoredCredentialsDao(EntityManager em) { + return new StoredCredentialsDao(em); } } diff --git a/src/main/java/io/cryostat/configuration/CredentialsManager.java b/src/main/java/io/cryostat/configuration/CredentialsManager.java index 572059f366..47e97c1084 100644 --- a/src/main/java/io/cryostat/configuration/CredentialsManager.java +++ b/src/main/java/io/cryostat/configuration/CredentialsManager.java @@ -32,7 +32,6 @@ import javax.script.ScriptException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.sys.FileSystem; import io.cryostat.platform.PlatformClient; @@ -49,6 +48,8 @@ import dagger.Lazy; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CredentialsManager extends AbstractEventEmitter { @@ -60,7 +61,7 @@ public class CredentialsManager private final StoredCredentialsDao dao; private final FileSystem fs; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); CredentialsManager( Path credentialsDir, @@ -69,8 +70,7 @@ public class CredentialsManager PlatformClient platformClient, StoredCredentialsDao dao, FileSystem fs, - Gson gson, - Logger logger) { + Gson gson) { this.credentialsDir = credentialsDir; this.matchExpressionValidator = matchExpressionValidator; this.matchExpressionEvaluator = matchExpressionEvaluator; @@ -78,7 +78,6 @@ public class CredentialsManager this.dao = dao; this.fs = fs; this.gson = gson; - this.logger = logger; } // TODO remove after 2.2 release @@ -126,7 +125,7 @@ public void migrate() throws Exception { } } } catch (IOException | IllegalStateException e) { - logger.warn(e); + logger.warn("Migration exception", e); continue; } } @@ -231,7 +230,7 @@ public Set resolveMatchingTargets(String matchExpression) { matchedTargets.add(target); } } catch (ScriptException e) { - logger.error(e); + logger.error("Script execution exception", e); break; } } diff --git a/src/main/java/io/cryostat/configuration/StoredCredentialsDao.java b/src/main/java/io/cryostat/configuration/StoredCredentialsDao.java index f69ef07849..bb876d6240 100644 --- a/src/main/java/io/cryostat/configuration/StoredCredentialsDao.java +++ b/src/main/java/io/cryostat/configuration/StoredCredentialsDao.java @@ -17,11 +17,10 @@ import javax.persistence.EntityManager; -import io.cryostat.core.log.Logger; import io.cryostat.storage.AbstractDao; class StoredCredentialsDao extends AbstractDao { - StoredCredentialsDao(EntityManager em, Logger logger) { - super(StoredCredentials.class, em, logger); + StoredCredentialsDao(EntityManager em) { + super(StoredCredentials.class, em); } } diff --git a/src/main/java/io/cryostat/discovery/AbstractNodeTypeAdapter.java b/src/main/java/io/cryostat/discovery/AbstractNodeTypeAdapter.java index 32a935fa26..a0a8d444b9 100644 --- a/src/main/java/io/cryostat/discovery/AbstractNodeTypeAdapter.java +++ b/src/main/java/io/cryostat/discovery/AbstractNodeTypeAdapter.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import io.cryostat.platform.ServiceRef.AnnotationKey; import io.cryostat.platform.discovery.AbstractNode; @@ -39,17 +38,18 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import dagger.Lazy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AbstractNodeTypeAdapter extends PluggableTypeAdapter { private final Lazy>> adapters; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); public AbstractNodeTypeAdapter( - Class klazz, Lazy>> adapters, Logger logger) { + Class klazz, Lazy>> adapters) { super(klazz); this.adapters = adapters; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/discovery/BuiltInDiscovery.java b/src/main/java/io/cryostat/discovery/BuiltInDiscovery.java index 0dae091ff2..89e2440ed3 100644 --- a/src/main/java/io/cryostat/discovery/BuiltInDiscovery.java +++ b/src/main/java/io/cryostat/discovery/BuiltInDiscovery.java @@ -22,7 +22,6 @@ import java.util.UUID; import java.util.function.Consumer; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.platform.PlatformClient; import io.cryostat.platform.TargetDiscoveryEvent; @@ -31,6 +30,8 @@ import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BuiltInDiscovery extends AbstractVerticle implements Consumer { @@ -41,19 +42,17 @@ public class BuiltInDiscovery extends AbstractVerticle implements Consumer> unselectedStrategies; private final Set enabledClients = new HashSet<>(); private final NotificationFactory notificationFactory; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); BuiltInDiscovery( DiscoveryStorage storage, Set> selectedStrategies, Set> unselectedStrategies, - NotificationFactory notificationFactory, - Logger logger) { + NotificationFactory notificationFactory) { this.storage = storage; this.selectedStrategies = selectedStrategies; this.unselectedStrategies = unselectedStrategies; this.notificationFactory = notificationFactory; - this.logger = logger; } @Override @@ -119,7 +118,7 @@ public void start(Promise start) { platform.load(promise); enabledClients.add(platform); } catch (Exception e) { - logger.warn(e); + logger.warn("Platform start exception", e); } }); start.tryComplete(); @@ -133,7 +132,7 @@ public void stop() { try { it.next().stop(); } catch (Exception e) { - logger.error(e); + logger.error("Platform stop exception", e); } it.remove(); } diff --git a/src/main/java/io/cryostat/discovery/DiscoveryModule.java b/src/main/java/io/cryostat/discovery/DiscoveryModule.java index dfc6289cf8..5545597ede 100644 --- a/src/main/java/io/cryostat/discovery/DiscoveryModule.java +++ b/src/main/java/io/cryostat/discovery/DiscoveryModule.java @@ -26,7 +26,6 @@ import io.cryostat.VerticleDeployer; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import io.cryostat.core.sys.Environment; import io.cryostat.messaging.notifications.NotificationFactory; @@ -62,8 +61,8 @@ static Duration provideDiscoveryPingDuration(Environment env) { @Provides @Singleton - static PluginInfoDao providePluginInfoDao(EntityManager em, Gson gson, Logger logger) { - return new PluginInfoDao(em, gson, logger); + static PluginInfoDao providePluginInfoDao(EntityManager em, Gson gson) { + return new PluginInfoDao(em, gson); } @Provides @@ -78,8 +77,7 @@ static DiscoveryStorage provideDiscoveryStorage( Lazy matchExpressionEvaluator, Gson gson, WebClient http, - Clock clock, - Logger logger) { + Clock clock) { return new DiscoveryStorage( deployer, Executors.newSingleThreadScheduledExecutor(), @@ -92,8 +90,7 @@ static DiscoveryStorage provideDiscoveryStorage( matchExpressionEvaluator, gson, http, - clock, - logger); + clock); } @Provides @@ -104,16 +101,15 @@ static BuiltInDiscovery provideBuiltInDiscovery( Set> selectedStrategies, @Named(PlatformModule.UNSELECTED_PLATFORMS) Set> unselectedStrategies, - NotificationFactory notificationFactory, - Logger logger) { + NotificationFactory notificationFactory) { return new BuiltInDiscovery( - storage, selectedStrategies, unselectedStrategies, notificationFactory, logger); + storage, selectedStrategies, unselectedStrategies, notificationFactory); } @Provides @IntoSet static PluggableTypeAdapter provideBaseNodeTypeAdapter( - Lazy>> adapters, Logger logger) { - return new AbstractNodeTypeAdapter(AbstractNode.class, adapters, logger); + Lazy>> adapters) { + return new AbstractNodeTypeAdapter(AbstractNode.class, adapters); } } diff --git a/src/main/java/io/cryostat/discovery/DiscoveryStorage.java b/src/main/java/io/cryostat/discovery/DiscoveryStorage.java index 9ad0d7628d..039c9b1bc8 100644 --- a/src/main/java/io/cryostat/discovery/DiscoveryStorage.java +++ b/src/main/java/io/cryostat/discovery/DiscoveryStorage.java @@ -40,7 +40,6 @@ import io.cryostat.VerticleDeployer; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.StoredCredentials; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import io.cryostat.core.sys.Clock; import io.cryostat.platform.ServiceRef; @@ -66,6 +65,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DiscoveryStorage extends AbstractPlatformClientVerticle { @@ -82,7 +83,7 @@ public class DiscoveryStorage extends AbstractPlatformClientVerticle { private final Gson gson; private final Clock clock; private final WebClient http; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private ScheduledFuture pluginPruneTask; private ScheduledFuture targetRetryTask; @@ -103,8 +104,7 @@ public class DiscoveryStorage extends AbstractPlatformClientVerticle { Lazy matchExpressionEvaluator, Gson gson, WebClient http, - Clock clock, - Logger logger) { + Clock clock) { this.deployer = deployer; this.scheduler = scheduler; this.executor = executor; @@ -117,7 +117,6 @@ public class DiscoveryStorage extends AbstractPlatformClientVerticle { this.gson = gson; this.http = http; this.clock = clock; - this.logger = logger; } @Override @@ -174,7 +173,7 @@ public void start(Promise future) throws Exception { target); return credentialsApply && testJvmId(target); } catch (ScriptException e) { - logger.error(e); + logger.error("Target test exception", e); return false; } }); @@ -244,7 +243,7 @@ private boolean testJvmId(ServiceRef serviceRef) { return StringUtils.isNotBlank(id); } catch (JvmIdGetException e) { logger.trace("Retain null jvmId for target [{}]", serviceRef.getServiceUri()); - logger.trace(e); + logger.trace("JVM ID exception", e); return false; } } @@ -438,7 +437,7 @@ private List modifyChildrenWithJvmIds( child = new TargetNode(child.getNodeType(), ref, child.getLabels()); } catch (Exception e) { logger.info("Update node [{}] with null jvmId", child.getName()); - logger.info(e); + logger.info("JVM ID exception", e); ConnectionAttemptRecord attemptRecord = new ConnectionAttemptRecord(); attemptRecord.firstAttemptTimestamp = clock.now().getEpochSecond(); attemptRecord.lastAttemptTimestamp = attemptRecord.firstAttemptTimestamp; diff --git a/src/main/java/io/cryostat/discovery/PluginInfoDao.java b/src/main/java/io/cryostat/discovery/PluginInfoDao.java index 5e586f585a..c9ae654316 100644 --- a/src/main/java/io/cryostat/discovery/PluginInfoDao.java +++ b/src/main/java/io/cryostat/discovery/PluginInfoDao.java @@ -29,7 +29,6 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import io.cryostat.core.log.Logger; import io.cryostat.platform.discovery.AbstractNode; import io.cryostat.platform.discovery.EnvironmentNode; import io.cryostat.storage.AbstractDao; @@ -40,8 +39,8 @@ class PluginInfoDao extends AbstractDao { private final Gson gson; - PluginInfoDao(EntityManager em, Gson gson, Logger logger) { - super(PluginInfo.class, em, logger); + PluginInfoDao(EntityManager em, Gson gson) { + super(PluginInfo.class, em); this.gson = gson; } @@ -89,7 +88,7 @@ public final PluginInfo update(UUID id, EnvironmentNode subtree) { if (transaction != null) { transaction.rollback(); } - logger.error(e); + logger.error("Update exception", e); throw e; } } @@ -124,7 +123,7 @@ public final PluginInfo update(UUID id, Collection child if (transaction != null) { transaction.rollback(); } - logger.error(e); + logger.error("Update exception", e); throw e; } } diff --git a/src/main/java/io/cryostat/messaging/MessagingModule.java b/src/main/java/io/cryostat/messaging/MessagingModule.java index bfd8c8bf4f..4e0086c865 100644 --- a/src/main/java/io/cryostat/messaging/MessagingModule.java +++ b/src/main/java/io/cryostat/messaging/MessagingModule.java @@ -19,7 +19,6 @@ import javax.inject.Singleton; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import io.cryostat.core.sys.Environment; import io.cryostat.messaging.notifications.NotificationFactory; @@ -34,6 +33,8 @@ import dagger.Provides; import dagger.multibindings.IntoSet; import io.vertx.core.Vertx; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Module( includes = { @@ -42,6 +43,7 @@ public abstract class MessagingModule { static final String WS_MAX_CONNECTIONS = "WS_MAX_CONNECTIONS"; + private static final Logger logger = LoggerFactory.getLogger(MessagingModule.class); @Provides @Singleton @@ -53,18 +55,9 @@ static MessagingServer provideWebSocketMessagingServer( NotificationFactory notificationFactory, @Named(WS_MAX_CONNECTIONS) int maxConnections, Clock clock, - Logger logger, Gson gson) { return new MessagingServer( - vertx, - server, - env, - authManager, - notificationFactory, - maxConnections, - clock, - logger, - gson); + vertx, server, env, authManager, notificationFactory, maxConnections, clock, gson); } @Binds @@ -73,7 +66,7 @@ static MessagingServer provideWebSocketMessagingServer( @Provides @Named(WS_MAX_CONNECTIONS) - static int provideWebSocketMaxConnections(Environment env, Logger logger) { + static int provideWebSocketMaxConnections(Environment env) { try { int count = Integer.parseInt( @@ -87,7 +80,7 @@ static int provideWebSocketMaxConnections(Environment env, Logger logger) { } return count; } catch (NumberFormatException nfe) { - logger.warn(nfe); + logger.warn("Max WS connections exception", nfe); return Integer.MAX_VALUE; } } diff --git a/src/main/java/io/cryostat/messaging/MessagingServer.java b/src/main/java/io/cryostat/messaging/MessagingServer.java index 050ad757e0..e395b4f272 100644 --- a/src/main/java/io/cryostat/messaging/MessagingServer.java +++ b/src/main/java/io/cryostat/messaging/MessagingServer.java @@ -28,7 +28,6 @@ import javax.inject.Named; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import io.cryostat.core.sys.Environment; import io.cryostat.messaging.notifications.Notification; @@ -44,6 +43,8 @@ import io.vertx.core.AbstractVerticle; import io.vertx.core.Vertx; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MessagingServer extends AbstractVerticle implements AutoCloseable, NotificationListener { @@ -54,7 +55,7 @@ public class MessagingServer extends AbstractVerticle private final NotificationFactory notificationFactory; private final Clock clock; private final int maxConnections; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Gson gson; private long prunerTaskId; @@ -68,7 +69,6 @@ public class MessagingServer extends AbstractVerticle NotificationFactory notificationFactory, @Named(MessagingModule.WS_MAX_CONNECTIONS) int maxConnections, Clock clock, - Logger logger, Gson gson) { this.vertx = vertx; this.connections = new HashSet<>(); @@ -77,7 +77,6 @@ public class MessagingServer extends AbstractVerticle this.notificationFactory = notificationFactory; this.maxConnections = maxConnections; this.clock = clock; - this.logger = logger; this.gson = gson; this.pingTasks = new ConcurrentHashMap<>(); } @@ -112,7 +111,7 @@ public void start() throws SocketException, UnknownHostException { } logger.info("Connected remote client {}", remoteAddress); - WsClient wsc = new WsClient(this.logger, sws, clock); + WsClient wsc = new WsClient(sws, clock); sws.closeHandler((unused) -> removeConnection(wsc)); sws.textMessageHandler( msg -> { @@ -148,6 +147,7 @@ public void start() throws SocketException, UnknownHostException { result.cause(), AuthenticationErrorException.class)) { logger.info( + "Authentication exception", (AuthenticationErrorException) result.cause()); logger.info( @@ -162,7 +162,9 @@ public void start() throws SocketException, UnknownHostException { (short) 1002, "Invalid auth subprotocol"); } else { - logger.info(new IOException(result.cause())); + logger.info( + "I/O exception", + new IOException(result.cause())); sws.close( (short) 1011, String.format( @@ -264,7 +266,7 @@ private void pruneConnections() { } } } catch (Exception e) { - logger.error(e); + logger.error("Connection prune exception", e); } } diff --git a/src/main/java/io/cryostat/messaging/WsClient.java b/src/main/java/io/cryostat/messaging/WsClient.java index 33b3064281..49f3a6737f 100644 --- a/src/main/java/io/cryostat/messaging/WsClient.java +++ b/src/main/java/io/cryostat/messaging/WsClient.java @@ -15,7 +15,6 @@ */ package io.cryostat.messaging; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -26,16 +25,17 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class WsClient implements AutoCloseable { private final ServerWebSocket sws; private final long connectionTime; private volatile boolean isAccepted; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); - WsClient(Logger logger, ServerWebSocket sws, Clock clock) { - this.logger = logger; + WsClient(ServerWebSocket sws, Clock clock) { this.sws = sws; this.connectionTime = clock.getMonotonicTime(); } @@ -66,7 +66,7 @@ void writeMessage(String message) { this.sws.writeTextMessage(message); } catch (Exception e) { - logger.warn(e); + logger.warn("Message write exception", e); evt.setExceptionThrown(true); } finally { diff --git a/src/main/java/io/cryostat/net/AbstractAuthManager.java b/src/main/java/io/cryostat/net/AbstractAuthManager.java index cd644ac0c9..4c7deb62d8 100644 --- a/src/main/java/io/cryostat/net/AbstractAuthManager.java +++ b/src/main/java/io/cryostat/net/AbstractAuthManager.java @@ -19,15 +19,12 @@ import java.util.function.Function; import java.util.function.Supplier; -import io.cryostat.core.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractAuthManager implements AuthManager { - protected final Logger logger; - - protected AbstractAuthManager(Logger logger) { - this.logger = logger; - } + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Override public AuthenticatedAction doAuthenticated( @@ -57,7 +54,7 @@ public void execute() { this.onFailure.run(); } } catch (Exception e) { - logger.warn(e); + logger.warn("Execution exception", e); this.onFailure.run(); } } diff --git a/src/main/java/io/cryostat/net/AgentClient.java b/src/main/java/io/cryostat/net/AgentClient.java index 11a035d405..1a86f5be36 100644 --- a/src/main/java/io/cryostat/net/AgentClient.java +++ b/src/main/java/io/cryostat/net/AgentClient.java @@ -41,7 +41,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.net.MBeanMetrics; import io.cryostat.core.serialization.SerializableRecordingDescriptor; @@ -64,6 +63,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.http.auth.InvalidCredentialsException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AgentClient { public static final String NULL_CREDENTIALS = "No credentials found for agent"; @@ -74,7 +75,7 @@ public class AgentClient { private final WebClient webClient; private final CredentialsManager credentialsManager; private final URI agentUri; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); AgentClient( ExecutorService executor, @@ -82,15 +83,13 @@ public class AgentClient { long httpTimeout, WebClient webClient, CredentialsManager credentialsManager, - URI agentUri, - Logger logger) { + URI agentUri) { this.executor = executor; this.gson = gson; this.httpTimeout = httpTimeout; this.webClient = webClient; this.credentialsManager = credentialsManager; this.agentUri = agentUri; - this.logger = logger; } URI getUri() { @@ -337,7 +336,9 @@ Future> eventSettings() { } catch ( QuantityConversionException qce) { - logger.warn(qce); + logger.warn( + "Event settings exception", + qce); } }); }); @@ -390,7 +391,7 @@ private Future> invoke( credentials.getUsername(), credentials.getPassword())); } catch (ScriptException | InvalidCredentialsException e) { - logger.error(e); + logger.error("Authentication exception", e); throw new IllegalStateException(e); } @@ -407,7 +408,7 @@ private Future> invoke( .get(); } } catch (InterruptedException | ExecutionException e) { - logger.error(e); + logger.error("Remote request invocation exception", e); throw new RuntimeException(e); } }, @@ -425,26 +426,23 @@ static class Factory { private final long httpTimeout; private final WebClient webClient; private final CredentialsManager credentialsManager; - private final Logger logger; Factory( ExecutorService executor, Gson gson, long httpTimeout, WebClient webClient, - CredentialsManager credentialsManager, - Logger logger) { + CredentialsManager credentialsManager) { this.executor = executor; this.gson = gson; this.httpTimeout = httpTimeout; this.webClient = webClient; this.credentialsManager = credentialsManager; - this.logger = logger; } AgentClient create(URI agentUri) { return new AgentClient( - executor, gson, httpTimeout, webClient, credentialsManager, agentUri, logger); + executor, gson, httpTimeout, webClient, credentialsManager, agentUri); } } diff --git a/src/main/java/io/cryostat/net/AgentConnection.java b/src/main/java/io/cryostat/net/AgentConnection.java index 263297b139..3f8e81a3f1 100644 --- a/src/main/java/io/cryostat/net/AgentConnection.java +++ b/src/main/java/io/cryostat/net/AgentConnection.java @@ -30,7 +30,6 @@ import org.openjdk.jmc.rjmx.ServiceNotAvailableException; import io.cryostat.core.JvmIdentifier; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.IDException; import io.cryostat.core.net.JFRConnection; @@ -48,13 +47,11 @@ public class AgentConnection implements JFRConnection { private final AgentClient client; private final FileSystem fs; private final Environment env; - private final Logger logger; - AgentConnection(AgentClient client, FileSystem fs, Environment env, Logger logger) { + AgentConnection(AgentClient client, FileSystem fs, Environment env) { this.client = client; this.fs = fs; this.env = env; - this.logger = logger; } @Override @@ -120,7 +117,7 @@ public int getPort() { @Override public CryostatFlightRecorderService getService() throws ConnectionException, IOException, ServiceNotAvailableException { - return new AgentJFRService(client, (MergedTemplateService) getTemplateService(), logger); + return new AgentJFRService(client, (MergedTemplateService) getTemplateService()); } @Override @@ -151,17 +148,15 @@ public static class Factory { private final AgentClient.Factory clientFactory; private final FileSystem fs; private final Environment env; - private final Logger logger; - Factory(AgentClient.Factory clientFactory, FileSystem fs, Environment env, Logger logger) { + Factory(AgentClient.Factory clientFactory, FileSystem fs, Environment env) { this.clientFactory = clientFactory; this.fs = fs; this.env = env; - this.logger = logger; } AgentConnection createConnection(URI agentUri) { - return new AgentConnection(clientFactory.create(agentUri), fs, env, logger); + return new AgentConnection(clientFactory.create(agentUri), fs, env); } } } diff --git a/src/main/java/io/cryostat/net/AgentJFRService.java b/src/main/java/io/cryostat/net/AgentJFRService.java index 78a9e452dc..77c76a258f 100644 --- a/src/main/java/io/cryostat/net/AgentJFRService.java +++ b/src/main/java/io/cryostat/net/AgentJFRService.java @@ -47,7 +47,6 @@ import io.cryostat.core.EventOptionsBuilder.EventOptionException; import io.cryostat.core.EventOptionsBuilder.EventTypeException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.templates.MergedTemplateService; import io.cryostat.core.templates.Template; @@ -56,17 +55,18 @@ import io.vertx.core.Future; import io.vertx.core.buffer.Buffer; import org.jsoup.nodes.Document; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class AgentJFRService implements CryostatFlightRecorderService { private final AgentClient client; private final MergedTemplateService templateService; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); - AgentJFRService(AgentClient client, MergedTemplateService templateService, Logger logger) { + AgentJFRService(AgentClient client, MergedTemplateService templateService) { this.client = client; this.templateService = templateService; - this.logger = logger; } @Override @@ -107,7 +107,7 @@ public Collection getAvailableEventTypes() try { return client.eventTypes().toCompletionStage().toCompletableFuture().get(); } catch (ExecutionException | InterruptedException e) { - logger.warn(e); + logger.warn("Event type exception", e); return List.of(); } } @@ -123,7 +123,7 @@ public List getAvailableRecordings() throws FlightRecorder try { return client.activeRecordings().toCompletionStage().toCompletableFuture().get(); } catch (ExecutionException | InterruptedException e) { - logger.warn(e); + logger.warn("Available recordings exception", e); return List.of(); } } @@ -136,7 +136,7 @@ public IConstrainedMap getCurrentEventTypeSettings() client.eventSettings().toCompletionStage().toCompletableFuture().get()) .orElse(new DefaultValueMap<>(Map.of())); } catch (ExecutionException | InterruptedException e) { - logger.warn(e); + logger.warn("Event type settings exception", e); return new DefaultValueMap<>(Map.of()); } } @@ -167,7 +167,7 @@ public List getServerTemplates() throws FlightRecorderException { try { return client.eventTemplates().toCompletionStage().toCompletableFuture().get(); } catch (ExecutionException | InterruptedException e) { - logger.warn(e); + logger.warn("Server templates exception", e); return List.of(); } } @@ -201,7 +201,7 @@ public InputStream openStream(IRecordingDescriptor descriptor, boolean removeOnC Buffer b = f.toCompletionStage().toCompletableFuture().get(); return new BufferedInputStream(new ByteArrayInputStream(b.getBytes())); } catch (ExecutionException | InterruptedException e) { - logger.warn(e); + logger.warn("JFR stream exception", e); throw new FlightRecorderException("Failed to open remote recording stream", e); } } diff --git a/src/main/java/io/cryostat/net/BasicAuthManager.java b/src/main/java/io/cryostat/net/BasicAuthManager.java index c3c5fe46f1..1002949d60 100644 --- a/src/main/java/io/cryostat/net/BasicAuthManager.java +++ b/src/main/java/io/cryostat/net/BasicAuthManager.java @@ -30,7 +30,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.security.ResourceAction; @@ -48,8 +47,7 @@ class BasicAuthManager extends AbstractAuthManager { private volatile boolean configLoaded = false; // TODO salted hashes - BasicAuthManager(Logger logger, FileSystem fs, Path confDir) { - super(logger); + BasicAuthManager(FileSystem fs, Path confDir) { this.fs = fs; this.confDir = confDir; this.users = new Properties(); @@ -197,7 +195,7 @@ synchronized void loadConfig() { users.load(br); this.configLoaded = true; } catch (IOException e) { - logger.error(e); + logger.error("Config load exception", e); } } } diff --git a/src/main/java/io/cryostat/net/HttpServer.java b/src/main/java/io/cryostat/net/HttpServer.java index dc4ce7fdc9..f70f74f964 100644 --- a/src/main/java/io/cryostat/net/HttpServer.java +++ b/src/main/java/io/cryostat/net/HttpServer.java @@ -20,8 +20,6 @@ import java.util.HashSet; import java.util.Set; -import io.cryostat.core.log.Logger; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.vertx.core.AbstractVerticle; import io.vertx.core.Handler; @@ -30,13 +28,15 @@ import io.vertx.core.http.HttpServerOptions; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.ServerWebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpServer extends AbstractVerticle { private final NetworkConfiguration netConf; private final SslConfiguration sslConf; private final Set shutdownListeners; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Vertx vertx; private final HandlerDelegate requestHandlerDelegate = @@ -47,12 +47,11 @@ public class HttpServer extends AbstractVerticle { private final io.vertx.core.http.HttpServer server; private volatile boolean isAlive; - HttpServer(Vertx vertx, NetworkConfiguration netConf, SslConfiguration sslConf, Logger logger) { + HttpServer(Vertx vertx, NetworkConfiguration netConf, SslConfiguration sslConf) { this.vertx = vertx; this.netConf = netConf; this.sslConf = sslConf; this.shutdownListeners = new HashSet<>(); - this.logger = logger; this.server = vertx.createHttpServer( sslConf.applyToHttpServerOptions( diff --git a/src/main/java/io/cryostat/net/NetworkModule.java b/src/main/java/io/cryostat/net/NetworkModule.java index 6218fa3db9..0a121e307c 100644 --- a/src/main/java/io/cryostat/net/NetworkModule.java +++ b/src/main/java/io/cryostat/net/NetworkModule.java @@ -27,7 +27,6 @@ import io.cryostat.configuration.ConfigurationModule; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -63,8 +62,8 @@ public abstract class NetworkModule { @Provides @Singleton static HttpServer provideHttpServer( - Vertx vertx, NetworkConfiguration netConf, SslConfiguration sslConf, Logger logger) { - return new HttpServer(vertx, netConf, sslConf, logger); + Vertx vertx, NetworkConfiguration netConf, SslConfiguration sslConf) { + return new HttpServer(vertx, netConf, sslConf); } @Provides @@ -96,8 +95,8 @@ static Duration provideMaxTargetTTL(Environment env) { @Provides @Singleton static AgentConnection.Factory provideAgentConnectionFactory( - AgentClient.Factory clientFactory, FileSystem fs, Environment env, Logger logger) { - return new AgentConnection.Factory(clientFactory, fs, env, logger); + AgentClient.Factory clientFactory, FileSystem fs, Environment env) { + return new AgentConnection.Factory(clientFactory, fs, env); } @Provides @@ -106,15 +105,9 @@ static AgentClient.Factory provideAgentClientFactory( Gson gson, @Named(HttpModule.HTTP_REQUEST_TIMEOUT_SECONDS) long httpTimeout, WebClient webClient, - CredentialsManager credentialsManager, - Logger logger) { + CredentialsManager credentialsManager) { return new AgentClient.Factory( - Executors.newCachedThreadPool(), - gson, - httpTimeout, - webClient, - credentialsManager, - logger); + Executors.newCachedThreadPool(), gson, httpTimeout, webClient, credentialsManager); } @Provides @@ -125,8 +118,7 @@ static TargetConnectionManager provideTargetConnectionManager( DiscoveryStorage storage, @Named(Variables.TARGET_CACHE_TTL) Duration maxTargetTtl, @Named(Variables.TARGET_MAX_CONCURRENT_CONNECTIONS) int maxTargetConnections, - @Named(Variables.JMX_CONNECTION_TIMEOUT) long connectionTimeoutSeconds, - Logger logger) { + @Named(Variables.JMX_CONNECTION_TIMEOUT) long connectionTimeoutSeconds) { return new TargetConnectionManager( connectionToolkit, agentConnectionFactory, @@ -135,8 +127,7 @@ static TargetConnectionManager provideTargetConnectionManager( Scheduler.systemScheduler(), maxTargetTtl, maxTargetConnections, - connectionTimeoutSeconds, - logger); + connectionTimeoutSeconds); } @Provides @@ -178,9 +169,9 @@ static WebClient provideWebClient(Vertx vertx, NetworkConfiguration netConf) { @Provides @Singleton - static SslConfiguration provideSslConfiguration(Environment env, FileSystem fs, Logger logger) { + static SslConfiguration provideSslConfiguration(Environment env, FileSystem fs) { try { - return new SslConfiguration(env, fs, logger); + return new SslConfiguration(env, fs); } catch (SslConfiguration.SslConfigurationException e) { throw new RuntimeException(e); // @Provides methods may only throw unchecked exceptions } @@ -188,8 +179,8 @@ static SslConfiguration provideSslConfiguration(Environment env, FileSystem fs, @Provides @Singleton - static NoopAuthManager provideNoopAuthManager(Logger logger, FileSystem fs) { - return new NoopAuthManager(logger); + static NoopAuthManager provideNoopAuthManager(FileSystem fs) { + return new NoopAuthManager(); } @Binds @@ -199,10 +190,8 @@ static NoopAuthManager provideNoopAuthManager(Logger logger, FileSystem fs) { @Provides @Singleton static BasicAuthManager provideBasicAuthManager( - Logger logger, - FileSystem fs, - @Named(ConfigurationModule.CONFIGURATION_PATH) Path confDir) { - return new BasicAuthManager(logger, fs, confDir); + FileSystem fs, @Named(ConfigurationModule.CONFIGURATION_PATH) Path confDir) { + return new BasicAuthManager(fs, confDir); } @Binds diff --git a/src/main/java/io/cryostat/net/NoopAuthManager.java b/src/main/java/io/cryostat/net/NoopAuthManager.java index 073f4d249a..7420b2f348 100644 --- a/src/main/java/io/cryostat/net/NoopAuthManager.java +++ b/src/main/java/io/cryostat/net/NoopAuthManager.java @@ -21,15 +21,10 @@ import java.util.concurrent.Future; import java.util.function.Supplier; -import io.cryostat.core.log.Logger; import io.cryostat.net.security.ResourceAction; public class NoopAuthManager extends AbstractAuthManager { - public NoopAuthManager(Logger logger) { - super(logger); - } - @Override public AuthenticationScheme getScheme() { return AuthenticationScheme.NONE; diff --git a/src/main/java/io/cryostat/net/SslConfiguration.java b/src/main/java/io/cryostat/net/SslConfiguration.java index d7c5cb32da..5f3813dbaf 100644 --- a/src/main/java/io/cryostat/net/SslConfiguration.java +++ b/src/main/java/io/cryostat/net/SslConfiguration.java @@ -18,7 +18,6 @@ import java.nio.file.Path; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -27,19 +26,19 @@ import io.vertx.core.net.PemKeyCertOptions; import io.vertx.core.net.PfxOptions; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SslConfiguration { private final Environment env; private final FileSystem fs; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final SslConfigurationStrategy strategy; - SslConfiguration(Environment env, FileSystem fs, Logger logger) - throws SslConfigurationException { + SslConfiguration(Environment env, FileSystem fs) throws SslConfigurationException { this.env = env; this.fs = fs; - this.logger = logger; if ("true".equals(env.getEnv(Variables.DISABLE_SSL))) { strategy = new NoSslStrategy(); @@ -93,11 +92,9 @@ public class SslConfiguration { } // Test-only constructor - SslConfiguration( - Environment env, FileSystem fs, Logger logger, SslConfigurationStrategy strategy) { + SslConfiguration(Environment env, FileSystem fs, SslConfigurationStrategy strategy) { this.env = env; this.fs = fs; - this.logger = logger; this.strategy = strategy; } diff --git a/src/main/java/io/cryostat/net/TargetConnectionManager.java b/src/main/java/io/cryostat/net/TargetConnectionManager.java index 2edb0dc089..3d58b6d380 100644 --- a/src/main/java/io/cryostat/net/TargetConnectionManager.java +++ b/src/main/java/io/cryostat/net/TargetConnectionManager.java @@ -34,7 +34,6 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.net.JFRConnectionToolkit; @@ -52,6 +51,8 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TargetConnectionManager { @@ -62,7 +63,7 @@ public class TargetConnectionManager { private final Lazy agentConnectionFactory; private final Executor executor; private final long connectionTimeoutSeconds; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final AsyncLoadingCache connections; private final Map targetLocks; @@ -76,13 +77,11 @@ public class TargetConnectionManager { Scheduler scheduler, Duration ttl, int maxTargetConnections, - long connectionTimeoutSeconds, - Logger logger) { + long connectionTimeoutSeconds) { this.jfrConnectionToolkit = jfrConnectionToolkit; this.agentConnectionFactory = agentConnectionFactory; this.executor = executor; this.connectionTimeoutSeconds = connectionTimeoutSeconds; - this.logger = logger; this.targetLocks = new ConcurrentHashMap<>(); if (maxTargetConnections > 0) { @@ -134,7 +133,7 @@ public CompletableFuture executeConnectedTaskAsync( try { return task.execute(conn); } catch (Exception e) { - logger.error(e); + logger.error("Execution exception", e); throw new CompletionException(e); } }, @@ -197,7 +196,7 @@ private void closeConnection( } } } catch (Exception e) { - logger.error(e); + logger.error("Connection closure exception", e); } finally { if (semaphore.isPresent()) { semaphore.get().release(); diff --git a/src/main/java/io/cryostat/net/openshift/OpenShiftAuthManager.java b/src/main/java/io/cryostat/net/openshift/OpenShiftAuthManager.java index e962e28534..dafdc4f5a8 100644 --- a/src/main/java/io/cryostat/net/openshift/OpenShiftAuthManager.java +++ b/src/main/java/io/cryostat/net/openshift/OpenShiftAuthManager.java @@ -41,7 +41,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.AbstractAuthManager; import io.cryostat.net.AuthenticationErrorException; @@ -115,9 +114,7 @@ public class OpenShiftAuthManager extends AbstractAuthManager { ClassPropertiesLoader classPropertiesLoader, Gson gson, Executor cacheExecutor, - Scheduler cacheScheduler, - Logger logger) { - super(logger); + Scheduler cacheScheduler) { this.env = env; this.namespace = namespace; this.serviceAccountClient = serviceAccountClient; @@ -133,17 +130,16 @@ public class OpenShiftAuthManager extends AbstractAuthManager { .removalListener((k, v, cause) -> v.close()); this.userClients = cacheBuilder.build(clientProvider::apply); - this.resourceMap = processResourceMapping(classPropertiesLoader, logger); + this.resourceMap = processResourceMapping(classPropertiesLoader); } - static Map> processResourceMapping( - ClassPropertiesLoader loader, Logger logger) { + Map> processResourceMapping(ClassPropertiesLoader loader) { Map> resourceMap = new HashMap<>(); Map props; try { props = loader.loadAsMap(OpenShiftAuthManager.class); } catch (IOException ioe) { - logger.error(ioe); + logger.error("Configuration properties load exception", ioe); return Collections.unmodifiableMap(resourceMap); } props.entrySet() @@ -159,7 +155,7 @@ static Map> processResourceMapping( .collect(Collectors.toSet()); resourceMap.put(type, values); } catch (IllegalArgumentException iae) { - logger.error(iae); + logger.error("Configuration properties processing exception", iae); } }); return Collections.unmodifiableMap(resourceMap); @@ -248,11 +244,11 @@ public Future validateToken( return CompletableFuture.completedFuture(true); } catch (KubernetesClientException | ExecutionException e) { userClients.invalidate(token); - logger.info(e); + logger.info("Kubernetes exception", e); return CompletableFuture.failedFuture(e); } catch (Exception e) { userClients.invalidate(token); - logger.error(e); + logger.error("Token validation exception", e); return CompletableFuture.failedFuture(e); } } @@ -384,7 +380,7 @@ private void deleteToken(String token) throws TokenNotFoundException { sc.getField(), sc.getReason(), sc.getMessage())) .toList(); if (!causes.isEmpty()) { - logger.warn(new TokenNotFoundException(causes)); + logger.warn("Token not found", new TokenNotFoundException(causes)); } } @@ -417,10 +413,10 @@ private Future performTokenReview(String token) { } return CompletableFuture.completedFuture(status); } catch (KubernetesClientException e) { - logger.info(e); + logger.info("Kubernetes exception", e); return CompletableFuture.failedFuture(e); } catch (Exception e) { - logger.error(e); + logger.error("Token review exception", e); return CompletableFuture.failedFuture(e); } } diff --git a/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java b/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java index 1d05c56e4e..8c511cdc29 100644 --- a/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java +++ b/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java @@ -24,7 +24,6 @@ import javax.inject.Named; import javax.inject.Singleton; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; @@ -104,8 +103,7 @@ static OpenShiftAuthManager provideOpenShiftAuthManager( Lazy serviceAccountClient, @Named(TOKENED_CLIENT) Function clientProvider, ClassPropertiesLoader classPropertiesLoader, - Gson gson, - Logger logger) { + Gson gson) { return new OpenShiftAuthManager( env, namespace, @@ -114,8 +112,7 @@ static OpenShiftAuthManager provideOpenShiftAuthManager( classPropertiesLoader, gson, ForkJoinPool.commonPool(), - Scheduler.systemScheduler(), - logger); + Scheduler.systemScheduler()); } @Binds diff --git a/src/main/java/io/cryostat/net/reports/AbstractReportGeneratorService.java b/src/main/java/io/cryostat/net/reports/AbstractReportGeneratorService.java index c97335a6aa..e7ee6c874e 100644 --- a/src/main/java/io/cryostat/net/reports/AbstractReportGeneratorService.java +++ b/src/main/java/io/cryostat/net/reports/AbstractReportGeneratorService.java @@ -26,26 +26,27 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.TargetConnectionManager; import io.cryostat.recordings.RecordingNotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + abstract class AbstractReportGeneratorService implements ReportGeneratorService { static final int READ_BUFFER_SIZE = 64 * 1024; // 64 KB protected final TargetConnectionManager targetConnectionManager; protected final FileSystem fs; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); protected AbstractReportGeneratorService( - TargetConnectionManager targetConnectionManager, FileSystem fs, Logger logger) { + TargetConnectionManager targetConnectionManager, FileSystem fs) { this.targetConnectionManager = targetConnectionManager; this.fs = fs; - this.logger = logger; } @Override @@ -63,7 +64,7 @@ public final CompletableFuture exec( try { fs.deleteIfExists(recording); } catch (IOException e) { - logger.warn(e); + logger.warn("Deletion exception", e); } }); } diff --git a/src/main/java/io/cryostat/net/reports/ActiveRecordingReportCache.java b/src/main/java/io/cryostat/net/reports/ActiveRecordingReportCache.java index b75a2abba5..805b0addcc 100644 --- a/src/main/java/io/cryostat/net/reports/ActiveRecordingReportCache.java +++ b/src/main/java/io/cryostat/net/reports/ActiveRecordingReportCache.java @@ -29,7 +29,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; import io.cryostat.messaging.notifications.Notification; @@ -41,6 +40,8 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class ActiveRecordingReportCache implements NotificationListener> { protected final Provider reportGeneratorServiceProvider; @@ -51,7 +52,7 @@ class ActiveRecordingReportCache implements NotificationListener reportGeneratorServiceProvider; protected final RecordingArchiveHelper recordingArchiveHelper; protected final long generationTimeoutSeconds; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); ArchivedRecordingReportCache( FileSystem fs, Provider reportGeneratorServiceProvider, RecordingArchiveHelper recordingArchiveHelper, - @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { + @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { this.fs = fs; this.reportGeneratorServiceProvider = reportGeneratorServiceProvider; this.recordingArchiveHelper = recordingArchiveHelper; this.generationTimeoutSeconds = generationTimeoutSeconds; - this.logger = logger; } Future getFromPath(String subdirectoryName, String recordingName, String filter) { @@ -75,12 +75,12 @@ Future getFromPath(String subdirectoryName, String recordingName, String f .get(generationTimeoutSeconds, TimeUnit.SECONDS); f.complete(saveFile); } catch (Exception e) { - logger.error(e); + logger.error("Read exception", e); f.completeExceptionally(e); try { fs.deleteIfExists(dest); } catch (IOException ioe) { - logger.warn(ioe); + logger.warn("Delete exception", ioe); } } return f; @@ -113,12 +113,12 @@ Future get(String sourceTarget, String recordingName, String filter) { .get(generationTimeoutSeconds, TimeUnit.SECONDS); f.complete(saveFile); } catch (Exception e) { - logger.error(e); + logger.error("Read exception", e); f.completeExceptionally(e); try { fs.deleteIfExists(dest); } catch (IOException ioe) { - logger.warn(ioe); + logger.warn("Delete exception", ioe); } } return f; diff --git a/src/main/java/io/cryostat/net/reports/RemoteReportGenerator.java b/src/main/java/io/cryostat/net/reports/RemoteReportGenerator.java index ae3426073a..3cb6dd319d 100644 --- a/src/main/java/io/cryostat/net/reports/RemoteReportGenerator.java +++ b/src/main/java/io/cryostat/net/reports/RemoteReportGenerator.java @@ -22,7 +22,6 @@ import javax.inject.Named; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.TargetConnectionManager; @@ -48,9 +47,8 @@ class RemoteReportGenerator extends AbstractReportGeneratorService { Vertx vertx, WebClient http, Environment env, - @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { - super(targetConnectionManager, fs, logger); + @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { + super(targetConnectionManager, fs); this.vertx = vertx; this.http = http; this.env = env; diff --git a/src/main/java/io/cryostat/net/reports/ReportsModule.java b/src/main/java/io/cryostat/net/reports/ReportsModule.java index c6980e4e9d..80004b1bdd 100644 --- a/src/main/java/io/cryostat/net/reports/ReportsModule.java +++ b/src/main/java/io/cryostat/net/reports/ReportsModule.java @@ -20,7 +20,6 @@ import javax.inject.Singleton; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationListener; @@ -73,16 +72,14 @@ static ActiveRecordingReportCache provideActiveRecordingReportCache( TargetConnectionManager targetConnectionManager, @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, @Named(ACTIVE_REPORT_CACHE_EXPIRY_SECONDS) long cacheExpirySeconds, - @Named(ACTIVE_REPORT_CACHE_REFRESH_SECONDS) long cacheRefreshSeconds, - Logger logger) { + @Named(ACTIVE_REPORT_CACHE_REFRESH_SECONDS) long cacheRefreshSeconds) { return new ActiveRecordingReportCache( reportGeneratorServiceProvider, fs, targetConnectionManager, generationTimeoutSeconds, cacheExpirySeconds, - cacheRefreshSeconds, - logger); + cacheRefreshSeconds); } @Binds @@ -95,14 +92,12 @@ static ArchivedRecordingReportCache provideArchivedRecordingReportCache( FileSystem fs, Provider reportGeneratorServiceProvider, RecordingArchiveHelper recordingArchiveHelper, - @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { + @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { return new ArchivedRecordingReportCache( fs, reportGeneratorServiceProvider, recordingArchiveHelper, - generationTimeoutSeconds, - logger); + generationTimeoutSeconds); } @Provides @@ -128,10 +123,9 @@ static RemoteReportGenerator provideRemoteReportGenerator( Vertx vertx, WebClient http, Environment env, - @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { + @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { return new RemoteReportGenerator( - targetConnectionManager, fs, vertx, http, env, generationTimeoutSeconds, logger); + targetConnectionManager, fs, vertx, http, env, generationTimeoutSeconds); } @Provides @@ -140,15 +134,9 @@ static SubprocessReportGenerator provideSubprocessReportGenerator( FileSystem fs, TargetConnectionManager targetConnectionManager, Provider javaProcessBuilder, - @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { + @Named(REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { return new SubprocessReportGenerator( - env, - fs, - targetConnectionManager, - javaProcessBuilder, - generationTimeoutSeconds, - logger); + env, fs, targetConnectionManager, javaProcessBuilder, generationTimeoutSeconds); } @Provides diff --git a/src/main/java/io/cryostat/net/reports/SubprocessReportGenerator.java b/src/main/java/io/cryostat/net/reports/SubprocessReportGenerator.java index f1d3cb8a8f..d8df13c88f 100644 --- a/src/main/java/io/cryostat/net/reports/SubprocessReportGenerator.java +++ b/src/main/java/io/cryostat/net/reports/SubprocessReportGenerator.java @@ -39,7 +39,6 @@ import io.cryostat.configuration.Variables; import io.cryostat.core.CryostatCore; -import io.cryostat.core.log.Logger; import io.cryostat.core.reports.InterruptibleReportGenerator; import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult; import io.cryostat.core.sys.Environment; @@ -51,6 +50,8 @@ import com.google.gson.Gson; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SubprocessReportGenerator extends AbstractReportGeneratorService { @@ -58,14 +59,15 @@ public class SubprocessReportGenerator extends AbstractReportGeneratorService { private final Provider javaProcessBuilderProvider; private final long generationTimeoutSeconds; + private static final Logger logger = LoggerFactory.getLogger(SubprocessReportGenerator.class); + SubprocessReportGenerator( Environment env, FileSystem fs, TargetConnectionManager targetConnectionManager, Provider javaProcessBuilderProvider, - @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { - super(targetConnectionManager, fs, logger); + @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { + super(targetConnectionManager, fs); this.env = env; this.javaProcessBuilderProvider = javaProcessBuilderProvider; this.generationTimeoutSeconds = generationTimeoutSeconds; @@ -122,14 +124,14 @@ public synchronized CompletableFuture exec(Path recording, Path saveFile, throw new SubprocessReportGenerationException(status); } } catch (InterruptedException e) { - logger.error(e); + logger.error("Report generation exception", e); throw new CompletionException( new SubprocessReportGenerationException(ExitStatus.TERMINATED)); } catch (IOException | ReportGenerationException | RecordingNotFoundException | IllegalThreadStateException e) { - logger.error(e); + logger.error("Report generation exception", e); throw new CompletionException(e); } finally { if (proc != null) { @@ -163,15 +165,14 @@ private List createProcessArgs(Path recording, Path saveFile, String fil public static void main(String[] args) { long startTime = System.nanoTime(); - Logger.INSTANCE.info(SubprocessReportGenerator.class.getName() + " starting"); + logger.info("starting"); Runtime.getRuntime() .addShutdownHook( new Thread( () -> { long elapsedTime = System.nanoTime() - startTime; - Logger.INSTANCE.info( - "{} shutting down after {}ms", - SubprocessReportGenerator.class.getName(), + logger.info( + "shutting down after {}ms", TimeUnit.NANOSECONDS.toMillis(elapsedTime)); })); @@ -184,15 +185,11 @@ public static void main(String[] args) { // +1000 to ensure we're killed first if memory runs out Path selfProc = fs.pathOf("/proc/self"); if (fs.isDirectory(selfProc)) { - Logger.INSTANCE.info( - SubprocessReportGenerator.class.getName() - + " adjusting subprocess OOM score"); + logger.info("adjusting subprocess OOM score"); Path oomScoreAdj = selfProc.resolve("oom_score_adj"); fs.writeString(oomScoreAdj, "1000"); } else { - Logger.INSTANCE.info( - SubprocessReportGenerator.class.getName() - + "/proc/self does not exist; ignoring OOM score adjustment"); + logger.info("/proc/self does not exist; ignoring OOM score adjustment"); } } catch (Exception e) { e.printStackTrace(); @@ -207,7 +204,7 @@ public static void main(String[] args) { String filter = args[2]; try { - Logger.INSTANCE.info(SubprocessReportGenerator.class.getName() + " processing report"); + logger.info("processing report"); Map evalMapResult = generateEvalMapFromFile(recording, filter); fs.writeString( saveFile, @@ -234,7 +231,7 @@ static Map generateEvalMapFromFile(Path recording, Strin throws Exception { Pair, FileSystem> hPair = generateHelper(recording, filter); try (InputStream stream = hPair.getRight().newInputStream(recording)) { - return new InterruptibleReportGenerator(ForkJoinPool.commonPool(), Logger.INSTANCE) + return new InterruptibleReportGenerator(ForkJoinPool.commonPool()) .generateEvalMapInterruptibly(stream, hPair.getLeft()) .get(); } catch (IOException ioe) { diff --git a/src/main/java/io/cryostat/net/security/jwt/AssetJwtHelper.java b/src/main/java/io/cryostat/net/security/jwt/AssetJwtHelper.java index 6afadb6af7..700ca6722f 100644 --- a/src/main/java/io/cryostat/net/security/jwt/AssetJwtHelper.java +++ b/src/main/java/io/cryostat/net/security/jwt/AssetJwtHelper.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.WebServer; import com.nimbusds.jose.EncryptionMethod; @@ -65,8 +64,7 @@ public class AssetJwtHelper { JWSVerifier verifier, JWEEncrypter encrypter, JWEDecrypter decrypter, - boolean subjectRequired, - Logger logger) { + boolean subjectRequired) { this.webServer = webServer; this.signer = signer; this.verifier = verifier; diff --git a/src/main/java/io/cryostat/net/security/jwt/DiscoveryJwtHelper.java b/src/main/java/io/cryostat/net/security/jwt/DiscoveryJwtHelper.java index 34057a47e3..a66fa4ee28 100644 --- a/src/main/java/io/cryostat/net/security/jwt/DiscoveryJwtHelper.java +++ b/src/main/java/io/cryostat/net/security/jwt/DiscoveryJwtHelper.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Set; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.WebServer; import com.nimbusds.jose.EncryptionMethod; @@ -70,8 +69,7 @@ public class DiscoveryJwtHelper { JWSVerifier verifier, JWEEncrypter encrypter, JWEDecrypter decrypter, - Duration discoveryPingPeriod, - Logger logger) { + Duration discoveryPingPeriod) { this.webServer = webServer; this.signer = signer; this.verifier = verifier; diff --git a/src/main/java/io/cryostat/net/security/jwt/JwtModule.java b/src/main/java/io/cryostat/net/security/jwt/JwtModule.java index 0af85e001a..7529d1f8e3 100644 --- a/src/main/java/io/cryostat/net/security/jwt/JwtModule.java +++ b/src/main/java/io/cryostat/net/security/jwt/JwtModule.java @@ -22,7 +22,6 @@ import javax.inject.Named; import javax.inject.Singleton; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.discovery.DiscoveryModule; import io.cryostat.net.AuthManager; @@ -52,8 +51,7 @@ static AssetJwtHelper provideAssetJwtFactory( JWSVerifier verifier, JWEEncrypter encrypter, JWEDecrypter decrypter, - AuthManager auth, - Logger logger) { + AuthManager auth) { try { return new AssetJwtHelper( webServer, @@ -61,8 +59,7 @@ static AssetJwtHelper provideAssetJwtFactory( verifier, encrypter, decrypter, - !AuthenticationScheme.NONE.equals(auth.getScheme()), - logger); + !AuthenticationScheme.NONE.equals(auth.getScheme())); } catch (Exception e) { throw new RuntimeException(e); } @@ -77,11 +74,10 @@ static DiscoveryJwtHelper provideDiscoveryJwtFactory( JWEEncrypter encrypter, JWEDecrypter decrypter, AuthManager auth, - @Named(DiscoveryModule.DISCOVERY_PING_DURATION) Duration discoveryPingPeriod, - Logger logger) { + @Named(DiscoveryModule.DISCOVERY_PING_DURATION) Duration discoveryPingPeriod) { try { return new DiscoveryJwtHelper( - webServer, signer, verifier, encrypter, decrypter, discoveryPingPeriod, logger); + webServer, signer, verifier, encrypter, decrypter, discoveryPingPeriod); } catch (Exception e) { throw new RuntimeException(e); } @@ -121,7 +117,7 @@ static JWSVerifier provideJwsVerifier(SecretKey key) { @Provides @Singleton - static JWEEncrypter provideJweEncrypter(Environment env, SecretKey key, Logger logger) { + static JWEEncrypter provideJweEncrypter(Environment env, SecretKey key) { try { return new DirectEncrypter(key); } catch (Exception e) { diff --git a/src/main/java/io/cryostat/net/web/WebModule.java b/src/main/java/io/cryostat/net/web/WebModule.java index b39f06484d..d66af995fc 100644 --- a/src/main/java/io/cryostat/net/web/WebModule.java +++ b/src/main/java/io/cryostat/net/web/WebModule.java @@ -23,7 +23,6 @@ import javax.inject.Singleton; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; import io.cryostat.net.HttpServer; @@ -46,16 +45,9 @@ static WebServer provideWebServer( Set requestHandlers, Gson gson, AuthManager authManager, - Logger logger, @Named(MainModule.RECORDINGS_PATH) Path archivedRecordingsPath) { return new WebServer( - httpServer, - netConf, - requestHandlers, - gson, - authManager, - logger, - archivedRecordingsPath); + httpServer, netConf, requestHandlers, gson, authManager, archivedRecordingsPath); } @Provides diff --git a/src/main/java/io/cryostat/net/web/WebServer.java b/src/main/java/io/cryostat/net/web/WebServer.java index 04e9fb070f..4897ee70cb 100644 --- a/src/main/java/io/cryostat/net/web/WebServer.java +++ b/src/main/java/io/cryostat/net/web/WebServer.java @@ -36,7 +36,6 @@ import org.openjdk.jmc.rjmx.services.jfr.FlightRecorderException; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; import io.cryostat.net.HttpServer; @@ -64,6 +63,8 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.http.impl.EnglishReasonPhraseCatalog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebServer extends AbstractVerticle { @@ -77,7 +78,7 @@ public class WebServer extends AbstractVerticle { private final Path recordingsPath; private final Gson gson; private final AuthManager auth; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); WebServer( HttpServer server, @@ -85,7 +86,6 @@ public class WebServer extends AbstractVerticle { Set requestHandlers, Gson gson, AuthManager auth, - Logger logger, @Named(MainModule.RECORDINGS_PATH) Path recordingsPath) { this.server = server; this.netConf = netConf; @@ -94,7 +94,6 @@ public class WebServer extends AbstractVerticle { this.recordingsPath = recordingsPath; this.gson = gson; this.auth = auth; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandler.java b/src/main/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandler.java index c268c3842f..59c5b33b70 100644 --- a/src/main/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandler.java +++ b/src/main/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandler.java @@ -32,7 +32,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.FlightRecorderException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.net.AuthManager; import io.cryostat.net.AuthenticationErrorException; @@ -47,6 +46,8 @@ import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.handler.HttpException; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractAuthenticatedRequestHandler implements RequestHandler { @@ -57,13 +58,12 @@ public abstract class AbstractAuthenticatedRequestHandler implements RequestHand protected final AuthManager auth; protected final CredentialsManager credentialsManager; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); protected AbstractAuthenticatedRequestHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { + AuthManager auth, CredentialsManager credentialsManager) { this.auth = auth; this.credentialsManager = credentialsManager; - this.logger = logger; } public abstract void handleAuthenticated(RoutingContext ctx) throws Exception; diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandler.java index 33bf5152c6..b68633cb0d 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -48,9 +47,8 @@ class ArchivedDirectoriesGetHandler extends AbstractAuthenticatedRequestHandler AuthManager auth, CredentialsManager credentialsManager, RecordingArchiveHelper recordingArchiveHelper, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.recordingArchiveHelper = recordingArchiveHelper; this.gson = gson; } diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/CredentialTestPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/CredentialTestPostBodyHandler.java index 86857b830d..24eed36c88 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/CredentialTestPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/CredentialTestPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ public class CredentialTestPostBodyHandler extends AbstractAuthenticatedRequestH static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - CredentialTestPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + CredentialTestPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostBodyHandler.java index 1434d5787b..a3eca0192b 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ public class MatchExpressionsPostBodyHandler extends AbstractAuthenticatedReques static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - MatchExpressionsPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + MatchExpressionsPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandler.java index 8639e1c27a..19ff6f9593 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -57,9 +56,8 @@ public class RecordingGetFromPathWithJwtHandler extends AbstractAssetJwtConsumin AssetJwtHelper jwtFactory, Lazy webServer, JvmIdHelper jvmIdHelper, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager, jwtFactory, webServer); this.jvmIdHelper = jvmIdHelper; this.recordingArchiveHelper = recordingArchiveHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandler.java index d0b8080c22..6099ac3643 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -54,9 +53,8 @@ class RecordingGetWithJwtHandler extends AbstractAssetJwtConsumingHandler { CredentialsManager credentialsManager, AssetJwtHelper jwtFactory, Lazy webServer, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager, jwtFactory, webServer); this.recordingArchiveHelper = recordingArchiveHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostBodyHandler.java index c68c13439c..c38c0087fa 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -36,8 +35,8 @@ class RecordingMetadataLabelsPostBodyHandler extends AbstractAuthenticatedReques @Inject RecordingMetadataLabelsPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostFromPathBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostFromPathBodyHandler.java index 05caccfd22..802d1ac634 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostFromPathBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingMetadataLabelsPostFromPathBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -36,8 +35,8 @@ class RecordingMetadataLabelsPostFromPathBodyHandler extends AbstractAuthenticat @Inject RecordingMetadataLabelsPostFromPathBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostBodyHandler.java index 48e81f9a3d..867889b271 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostBodyHandler.java @@ -24,7 +24,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -46,9 +45,8 @@ public class RecordingsFromIdPostBodyHandler extends AbstractAuthenticatedReques AuthManager auth, CredentialsManager credentialsManager, @Named(MainModule.RECORDINGS_PATH) Path recordingsPath, - FileSystem fs, - Logger logger) { - super(auth, credentialsManager, logger); + FileSystem fs) { + super(auth, credentialsManager); Path fileUploads = recordingsPath.resolve(RecordingArchiveHelper.TEMP_UPLOADS_SUBDIRECTORY); this.bodyHandler = BodyHandler.create(true) diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandler.java index 87dd745a31..9157405a68 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandler.java @@ -35,7 +35,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -65,7 +64,6 @@ public class RecordingsFromIdPostHandler extends AbstractAuthenticatedRequestHan static final String PATH = "recordings/:jvmId"; private final Gson gson; - private final Logger logger; private final FileSystem fs; private final JvmIdHelper idHelper; @@ -90,9 +88,8 @@ public class RecordingsFromIdPostHandler extends AbstractAuthenticatedRequestHan RecordingMetadataManager recordingMetadataManager, @Named(MainModule.RECORDINGS_PATH) Path savedRecordingsPath, @Named(Variables.PUSH_MAX_FILES_ENV) int globalMaxFiles, - Provider webServer, - Logger logger) { - super(auth, credentialsManager, logger); + Provider webServer) { + super(auth, credentialsManager); this.fs = fs; this.idHelper = idHelper; this.notificationFactory = notificationFactory; @@ -102,7 +99,6 @@ public class RecordingsFromIdPostHandler extends AbstractAuthenticatedRequestHan this.globalMaxFiles = globalMaxFiles; this.webServer = webServer; this.gson = gson; - this.logger = logger; } @Override @@ -268,7 +264,7 @@ public void handleAuthenticated(RoutingContext ctx) throws Exception { } catch (InterruptedException | ExecutionException | IOException e) { - logger.error(e); + logger.error("Upload prune exception", e); throw new ApiException(500, e); } @@ -299,7 +295,7 @@ public void handleAuthenticated(RoutingContext ctx) throws Exception { | UnknownHostException | SocketException | JvmIdGetException e) { - logger.error(e); + logger.error("Recording metadata exception", e); throw new ApiException(500, e); } diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandler.java index a6e8ca5a13..e6c3f318ee 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandler.java @@ -27,7 +27,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.reports.ReportsModule; @@ -67,9 +66,8 @@ class ReportGetFromPathWithJwtHandler extends AbstractAssetJwtConsumingHandler { JvmIdHelper jvmIdHelper, ReportService reportService, RecordingArchiveHelper recordingArchiveHelper, - @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { + super(auth, credentialsManager, jwtFactory, webServer); this.jvmIdHelper = jvmIdHelper; this.reportService = reportService; this.generationTimeoutSeconds = generationTimeoutSeconds; diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandler.java index 526f9067f6..a9bc654be4 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandler.java @@ -27,7 +27,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.reports.ReportsModule; @@ -65,9 +64,8 @@ class ReportGetWithJwtHandler extends AbstractAssetJwtConsumingHandler { Lazy webServer, ReportService reportService, RecordingArchiveHelper recordingArchiveHelper, - @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) long generationTimeoutSeconds) { + super(auth, credentialsManager, jwtFactory, webServer); this.reportService = reportService; this.recordingArchiveHelper = recordingArchiveHelper; this.generationTimeoutSeconds = generationTimeoutSeconds; diff --git a/src/main/java/io/cryostat/net/web/http/api/beta/TargetRecordingMetadataLabelsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/beta/TargetRecordingMetadataLabelsPostBodyHandler.java index 3773ba3131..7a78af913f 100644 --- a/src/main/java/io/cryostat/net/web/http/api/beta/TargetRecordingMetadataLabelsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/beta/TargetRecordingMetadataLabelsPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -36,8 +35,8 @@ class TargetRecordingMetadataLabelsPostBodyHandler extends AbstractAuthenticated @Inject TargetRecordingMetadataLabelsPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/AuthPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/AuthPostHandler.java index a0af0b5714..2707424699 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/AuthPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/AuthPostHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.WebServer; @@ -33,8 +32,8 @@ class AuthPostHandler extends AbstractAuthenticatedRequestHandler { @Inject - AuthPostHandler(AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthPostHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandler.java index f2f6e6fd2e..ffb5062313 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.DeprecatedApi; @@ -47,9 +46,8 @@ public class RecordingDeleteHandler extends AbstractAuthenticatedRequestHandler RecordingDeleteHandler( AuthManager auth, CredentialsManager credentialsManager, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager); this.recordingArchiveHelper = recordingArchiveHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingGetHandler.java index 24af982f70..30d95d5198 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingGetHandler.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.DeprecatedApi; @@ -50,9 +49,8 @@ class RecordingGetHandler extends AbstractAuthenticatedRequestHandler { RecordingGetHandler( AuthManager auth, CredentialsManager credentialsManager, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager); this.recordingArchiveHelper = recordingArchiveHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandler.java index 9352d0cacc..1cdf95c02e 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandler.java @@ -30,7 +30,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -70,9 +69,8 @@ class RecordingUploadPostHandler extends AbstractAuthenticatedRequestHandler { Environment env, @Named(HttpModule.HTTP_REQUEST_TIMEOUT_SECONDS) long httpTimeoutSeconds, WebClient webClient, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager); this.env = env; this.httpTimeoutSeconds = httpTimeoutSeconds; this.webClient = webClient; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandler.java index 2adcd64ce6..ef5f78cbfd 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -48,9 +47,8 @@ class RecordingsGetHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, RecordingArchiveHelper recordingArchiveHelper, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.recordingArchiveHelper = recordingArchiveHelper; this.gson = gson; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostBodyHandler.java index 05a7a62f78..c99285984f 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostBodyHandler.java @@ -24,7 +24,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -46,9 +45,8 @@ class RecordingsPostBodyHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, @Named(MainModule.RECORDINGS_PATH) Path recordingsPath, - FileSystem fs, - Logger logger) { - super(auth, credentialsManager, logger); + FileSystem fs) { + super(auth, credentialsManager); Path fileUploads = recordingsPath.resolve(RecordingArchiveHelper.TEMP_UPLOADS_SUBDIRECTORY); this.bodyHandler = BodyHandler.create(fileUploads.toAbsolutePath().toString()); } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandler.java index e4a54db70a..3ff8023674 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandler.java @@ -34,7 +34,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -67,7 +66,6 @@ class RecordingsPostHandler extends AbstractAuthenticatedRequestHandler { private final Provider webServer; private final RecordingArchiveHelper recordingArchiveHelper; private final RecordingMetadataManager recordingMetadataManager; - private final Logger logger; private static final String NOTIFICATION_CATEGORY = "ArchivedRecordingCreated"; @@ -81,9 +79,8 @@ class RecordingsPostHandler extends AbstractAuthenticatedRequestHandler { NotificationFactory notificationFactory, Provider webServer, RecordingArchiveHelper recordingArchiveHelper, - RecordingMetadataManager recordingMetadataManager, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingMetadataManager recordingMetadataManager) { + super(auth, credentialsManager); this.fs = fs; this.savedRecordingsPath = savedRecordingsPath; this.gson = gson; @@ -91,7 +88,6 @@ class RecordingsPostHandler extends AbstractAuthenticatedRequestHandler { this.webServer = webServer; this.recordingArchiveHelper = recordingArchiveHelper; this.recordingMetadataManager = recordingMetadataManager; - this.logger = logger; } @Override @@ -228,7 +224,7 @@ public void handleAuthenticated(RoutingContext ctx) throws Exception { } catch (InterruptedException | ExecutionException | IOException e) { - logger.error(e); + logger.error("Metadata set exception", e); ctx.fail(new HttpException(500, e)); return; } @@ -265,7 +261,7 @@ public void handleAuthenticated(RoutingContext ctx) throws Exception { } catch (URISyntaxException | UnknownHostException | SocketException e) { - logger.error(e); + logger.error("Recording metadata exception", e); ctx.fail(new HttpException(500, e)); return; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/ReportGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/ReportGetHandler.java index 272dbe8682..64bc50b273 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/ReportGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/ReportGetHandler.java @@ -27,7 +27,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportGenerationException; import io.cryostat.net.reports.ReportService; @@ -59,9 +58,8 @@ class ReportGetHandler extends AbstractAuthenticatedRequestHandler { CredentialsManager credentialsManager, ReportService reportService, @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) - long reportGenerationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, logger); + long reportGenerationTimeoutSeconds) { + super(auth, credentialsManager); this.reportService = reportService; this.reportGenerationTimeoutSeconds = reportGenerationTimeoutSeconds; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandler.java index d9e79adf08..1b440b233a 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandler.java @@ -26,7 +26,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IEventTypeInfo; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.jmc.serialization.SerializableEventTypeInfo; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -50,9 +49,8 @@ class TargetEventsGetHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, TargetConnectionManager connectionManager, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.connectionManager = connectionManager; this.gson = gson; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandler.java index 756f9fe578..b989864f37 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.security.ResourceAction; @@ -44,9 +43,8 @@ class TargetRecordingDeleteHandler extends AbstractAuthenticatedRequestHandler { TargetRecordingDeleteHandler( AuthManager auth, CredentialsManager credentialsManager, - RecordingTargetHelper recordingTargetHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingTargetHelper recordingTargetHelper) { + super(auth, credentialsManager); this.recordingTargetHelper = recordingTargetHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandler.java index 9535b67548..83bbf8138f 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandler.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.HttpServer; @@ -57,9 +56,8 @@ class TargetRecordingGetHandler extends AbstractAuthenticatedRequestHandler { CredentialsManager credentialsManager, TargetConnectionManager targetConnectionManager, HttpServer httpServer, - RecordingTargetHelper recordingTargetHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingTargetHelper recordingTargetHelper) { + super(auth, credentialsManager); this.targetConnectionManager = targetConnectionManager; this.recordingTargetHelper = recordingTargetHelper; this.vertx = httpServer.getVertx(); diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandler.java index f9c3591339..3c75fc8c34 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandler.java @@ -29,7 +29,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; import io.cryostat.net.security.ResourceAction; @@ -56,9 +55,8 @@ class TargetRecordingOptionsGetHandler extends AbstractAuthenticatedRequestHandl CredentialsManager credentialsManager, TargetConnectionManager connectionManager, RecordingOptionsBuilderFactory recordingOptionsBuilderFactory, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.connectionManager = connectionManager; this.recordingOptionsBuilderFactory = recordingOptionsBuilderFactory; this.gson = gson; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchBodyHandler.java index 6ea3626458..ca3765e481 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchBodyHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -38,8 +37,8 @@ class TargetRecordingOptionsPatchBodyHandler extends AbstractAuthenticatedReques @Inject TargetRecordingOptionsPatchBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandler.java index 068fc0dc5c..8338279341 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandler.java @@ -30,7 +30,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.RecordingOptionsCustomizer; import io.cryostat.core.RecordingOptionsCustomizer.OptionKey; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; import io.cryostat.net.security.ResourceAction; @@ -62,9 +61,8 @@ class TargetRecordingOptionsPatchHandler extends AbstractAuthenticatedRequestHan RecordingOptionsCustomizer customizer, TargetConnectionManager connectionManager, RecordingOptionsBuilderFactory recordingOptionsBuilderFactory, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.customizer = customizer; this.connectionManager = connectionManager; this.recordingOptionsBuilderFactory = recordingOptionsBuilderFactory; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchBodyHandler.java index 04db7ee534..cb9cdc14e7 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchBodyHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -37,9 +36,8 @@ class TargetRecordingPatchBodyHandler extends AbstractAuthenticatedRequestHandle static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - TargetRecordingPatchBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + TargetRecordingPatchBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandler.java index cf21b429d2..bf47be48ec 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -45,9 +44,8 @@ public class TargetRecordingPatchHandler extends AbstractAuthenticatedRequestHan AuthManager auth, CredentialsManager credentialsManager, TargetRecordingPatchSave patchSave, - TargetRecordingPatchStop patchStop, - Logger logger) { - super(auth, credentialsManager, logger); + TargetRecordingPatchStop patchStop) { + super(auth, credentialsManager); this.patchSave = patchSave; this.patchStop = patchStop; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandler.java index d44224b5c2..6d51167467 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandler.java @@ -32,7 +32,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -72,9 +71,8 @@ class TargetRecordingUploadPostHandler extends AbstractAuthenticatedRequestHandl TargetConnectionManager targetConnectionManager, @Named(HttpModule.HTTP_REQUEST_TIMEOUT_SECONDS) long httpTimeoutSeconds, WebClient webClient, - FileSystem fs, - Logger logger) { - super(auth, credentialsManager, logger); + FileSystem fs) { + super(auth, credentialsManager); this.env = env; this.targetConnectionManager = targetConnectionManager; this.httpTimeoutSeconds = httpTimeoutSeconds; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandler.java index c88447b114..12e3364bce 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandler.java @@ -26,7 +26,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -56,9 +55,8 @@ class TargetRecordingsGetHandler extends AbstractAuthenticatedRequestHandler { TargetConnectionManager connectionManager, Provider webServerProvider, RecordingMetadataManager recordingMetadataManager, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.connectionManager = connectionManager; this.webServerProvider = webServerProvider; this.recordingMetadataManager = recordingMetadataManager; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostBodyHandler.java index 4199838135..fafb854b6c 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostBodyHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -37,9 +36,8 @@ class TargetRecordingsPostBodyHandler extends AbstractAuthenticatedRequestHandle private final BodyHandler bodyHandler; @Inject - TargetRecordingsPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + TargetRecordingsPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); this.bodyHandler = BodyHandler.create(true).setHandleFileUploads(false); } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandler.java index c90b4cc316..7ac784afa7 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandler.java @@ -31,7 +31,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.TemplateType; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; @@ -79,9 +78,8 @@ public class TargetRecordingsPostHandler extends AbstractAuthenticatedRequestHan RecordingOptionsBuilderFactory recordingOptionsBuilderFactory, Provider webServerProvider, RecordingMetadataManager recordingMetadataManager, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.targetConnectionManager = targetConnectionManager; this.recordingTargetHelper = recordingTargetHelper; this.recordingOptionsBuilderFactory = recordingOptionsBuilderFactory; diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandler.java index cb37b3784d..8c1d3d53bd 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandler.java @@ -26,7 +26,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.reports.ReportsModule; @@ -47,7 +46,6 @@ class TargetReportGetHandler extends AbstractAuthenticatedRequestHandler { protected final ReportService reportService; protected final long reportGenerationTimeoutSeconds; - protected final Logger logger; @Inject TargetReportGetHandler( @@ -55,12 +53,10 @@ class TargetReportGetHandler extends AbstractAuthenticatedRequestHandler { CredentialsManager credentialsManager, ReportService reportService, @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) - long reportGenerationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, logger); + long reportGenerationTimeoutSeconds) { + super(auth, credentialsManager); this.reportService = reportService; this.reportGenerationTimeoutSeconds = reportGenerationTimeoutSeconds; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandler.java index 00a80a9f95..3c005b3336 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -47,9 +46,8 @@ class TargetSnapshotPostHandler extends AbstractAuthenticatedRequestHandler { TargetSnapshotPostHandler( AuthManager auth, CredentialsManager credentialsManager, - RecordingTargetHelper recordingTargetHelper, - Logger logger) { - super(auth, credentialsManager, logger); + RecordingTargetHelper recordingTargetHelper) { + super(auth, credentialsManager); this.recordingTargetHelper = recordingTargetHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandler.java index 28de070e58..275b86c88c 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.templates.TemplateType; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -44,9 +43,8 @@ class TargetTemplateGetHandler extends AbstractAuthenticatedRequestHandler { TargetTemplateGetHandler( AuthManager auth, CredentialsManager credentialsManager, - TargetConnectionManager targetConnectionManager, - Logger logger) { - super(auth, credentialsManager, logger); + TargetConnectionManager targetConnectionManager) { + super(auth, credentialsManager); this.targetConnectionManager = targetConnectionManager; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandler.java index d992280c61..dd42699b40 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.templates.Template; import io.cryostat.core.templates.TemplateType; import io.cryostat.net.AuthManager; @@ -57,9 +56,8 @@ class TargetTemplatesGetHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, TargetConnectionManager connectionManager, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.connectionManager = connectionManager; this.gson = gson; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TargetsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TargetsGetHandler.java index b6cd811591..41be0ee8a3 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TargetsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TargetsGetHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -45,9 +44,8 @@ class TargetsGetHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, DiscoveryStorage storage, - Gson gson, - Logger logger) { - super(auth, credentialsManager, logger); + Gson gson) { + super(auth, credentialsManager); this.storage = storage; this.gson = gson; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandler.java index a95afeb969..4759c354e0 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandler.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.templates.LocalStorageTemplateService; import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException; import io.cryostat.core.templates.Template; @@ -50,9 +49,8 @@ class TemplateDeleteHandler extends AbstractAuthenticatedRequestHandler { AuthManager auth, CredentialsManager credentialsManager, LocalStorageTemplateService templateService, - NotificationFactory notificationFactory, - Logger logger) { - super(auth, credentialsManager, logger); + NotificationFactory notificationFactory) { + super(auth, credentialsManager); this.templateService = templateService; this.notificationFactory = notificationFactory; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostBodyHandler.java index aef8631224..f0b14916b2 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostBodyHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -37,9 +36,8 @@ class TemplatesPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - TemplatesPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + TemplatesPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandler.java index a6523a66d2..b738667183 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandler.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.core.templates.LocalStorageTemplateService; import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException; @@ -49,7 +48,6 @@ class TemplatesPostHandler extends AbstractAuthenticatedRequestHandler { private final LocalStorageTemplateService templateService; private final FileSystem fs; - private final Logger logger; private final NotificationFactory notificationFactory; private static final String NOTIFICATION_CATEGORY = "TemplateUploaded"; @@ -59,13 +57,11 @@ class TemplatesPostHandler extends AbstractAuthenticatedRequestHandler { CredentialsManager credentialsManager, LocalStorageTemplateService templateService, FileSystem fs, - NotificationFactory notificationFactory, - Logger logger) { - super(auth, credentialsManager, logger); + NotificationFactory notificationFactory) { + super(auth, credentialsManager); this.notificationFactory = notificationFactory; this.templateService = templateService; this.fs = fs; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandler.java index 2a4a0ed12e..9ceb47fcd5 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandler.java @@ -31,7 +31,6 @@ import javax.script.ScriptException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -46,6 +45,8 @@ import dagger.Lazy; import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.handler.HttpException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractAssetJwtConsumingHandler implements RequestHandler { @@ -53,19 +54,17 @@ public abstract class AbstractAssetJwtConsumingHandler implements RequestHandler protected final CredentialsManager credentialsManager; protected final AssetJwtHelper jwt; protected final Lazy webServer; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); protected AbstractAssetJwtConsumingHandler( AuthManager auth, CredentialsManager credentialsManager, AssetJwtHelper jwt, - Lazy webServer, - Logger logger) { + Lazy webServer) { this.auth = auth; this.credentialsManager = credentialsManager; this.jwt = jwt; this.webServer = webServer; - this.logger = logger; } public abstract void handleWithValidJwt(RoutingContext ctx, JWT jwt) throws Exception; @@ -154,7 +153,7 @@ protected ConnectionDescriptor getConnectionDescriptorFromJwt(RoutingContext ctx try { credentials = credentialsManager.getCredentialsByTargetId(targetId); } catch (ScriptException e) { - logger.error(e); + logger.error("Credentials get exception", e); } } else { String c; diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandler.java index 367e9563e5..4410530301 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandler.java @@ -29,7 +29,6 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.discovery.PluginInfo; import io.cryostat.net.AuthManager; @@ -51,6 +50,8 @@ import io.vertx.core.http.HttpServerRequest; import io.vertx.ext.web.RoutingContext; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract class AbstractDiscoveryJwtConsumingHandler implements RequestHandler { @@ -61,21 +62,19 @@ abstract class AbstractDiscoveryJwtConsumingHandler implements RequestHandler protected final DiscoveryJwtHelper jwt; protected final Lazy webServer; protected final Function uuidFromString; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); protected AbstractDiscoveryJwtConsumingHandler( DiscoveryStorage storage, AuthManager auth, DiscoveryJwtHelper jwt, Lazy webServer, - Function uuidFromString, - Logger logger) { + Function uuidFromString) { this.storage = storage; this.auth = auth; this.jwt = jwt; this.webServer = webServer; this.uuidFromString = uuidFromString; - this.logger = logger; } abstract void handleWithValidJwt(RoutingContext ctx, JWT jwt) throws Exception; @@ -178,14 +177,14 @@ static URI getResourceUri(URL baseUrl, String pluginId) throws URISyntaxExceptio return baseUrl.toURI().resolve("/api/v2.2/discovery/" + pluginId); } - static InetAddress tryResolveAddress(InetAddress addr, String host) { + InetAddress tryResolveAddress(InetAddress addr, String host) { if (StringUtils.isBlank(host)) { return addr; } try { return InetAddress.getByName(host); } catch (UnknownHostException e) { - Logger.INSTANCE.error(e); + logger.error("Address resolution exception", e); } return addr; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostBodyHandler.java index 1fe8d47894..b9fe75c712 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ class AuthTokenPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - AuthTokenPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthTokenPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandler.java index 2e8530530b..aa971b2780 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandler.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -52,8 +51,7 @@ class AuthTokenPostHandler extends AbstractV2RequestHandler> CredentialsManager credentialsManager, Gson gson, AssetJwtHelper jwt, - Lazy webServer, - Logger logger) { + Lazy webServer) { super(auth, credentialsManager, gson); this.jwt = jwt; this.webServer = webServer; diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/CertificatePostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/CertificatePostBodyHandler.java index 2ccf470ae6..6c3d456d25 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/CertificatePostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/CertificatePostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ class CertificatePostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - CertificatePostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + CertificatePostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandler.java index da8f45c09f..d382e46de0 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandler.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -39,8 +38,7 @@ class CredentialsGetHandler extends AbstractV2RequestHandler> { @Inject - CredentialsGetHandler( - AuthManager auth, CredentialsManager credentialsManager, Gson gson, Logger logger) { + CredentialsGetHandler(AuthManager auth, CredentialsManager credentialsManager, Gson gson) { super(auth, credentialsManager, gson); } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsPostBodyHandler.java index 364ed4ac16..fbf247d8cd 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/CredentialsPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ class CredentialsPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - CredentialsPostBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + CredentialsPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandler.java index 58141e5654..bc2e7e9289 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandler.java @@ -24,7 +24,6 @@ import javax.inject.Named; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.discovery.DiscoveryStorage.NotFoundException; import io.cryostat.net.AuthManager; @@ -52,9 +51,8 @@ class DiscoveryDeregistrationHandler extends AbstractDiscoveryJwtConsumingHandle Lazy webServer, DiscoveryStorage storage, @Named(MainModule.UUID_FROM_STRING) Function uuidFromString, - Gson gson, - Logger logger) { - super(storage, auth, jwtFactory, webServer, uuidFromString, logger); + Gson gson) { + super(storage, auth, jwtFactory, webServer, uuidFromString); this.storage = storage; this.uuidFromString = uuidFromString; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostBodyHandler.java index 4c0249108a..d1fcf04fba 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostBodyHandler.java @@ -19,7 +19,6 @@ import javax.inject.Inject; -import io.cryostat.core.log.Logger; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.RequestHandler; import io.cryostat.net.web.http.api.ApiVersion; @@ -33,7 +32,7 @@ class DiscoveryPostBodyHandler implements RequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - DiscoveryPostBodyHandler(Logger logger) {} + DiscoveryPostBodyHandler() {} @Override public ApiVersion apiVersion() { diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandler.java index cfa5af098d..e81f21df26 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandler.java @@ -24,7 +24,6 @@ import javax.inject.Named; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.discovery.DiscoveryStorage.NotFoundException; import io.cryostat.net.AuthManager; @@ -57,9 +56,8 @@ class DiscoveryPostHandler extends AbstractDiscoveryJwtConsumingHandler { Lazy webServer, DiscoveryStorage storage, @Named(MainModule.UUID_FROM_STRING) Function uuidFromString, - Gson gson, - Logger logger) { - super(storage, auth, jwtFactory, webServer, uuidFromString, logger); + Gson gson) { + super(storage, auth, jwtFactory, webServer, uuidFromString); this.storage = storage; this.uuidFromString = uuidFromString; this.gson = gson; diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationBodyHandler.java index deaaa5d669..02fa6a2277 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ class DiscoveryRegistrationBodyHandler extends AbstractAuthenticatedRequestHandl static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - DiscoveryRegistrationBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + DiscoveryRegistrationBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationCheckHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationCheckHandler.java index 8aee0c9fd8..394d242180 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationCheckHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationCheckHandler.java @@ -23,7 +23,6 @@ import javax.inject.Named; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -49,9 +48,8 @@ class DiscoveryRegistrationCheckHandler extends AbstractDiscoveryJwtConsumingHan DiscoveryJwtHelper jwtFactory, Lazy webServer, DiscoveryStorage storage, - @Named(MainModule.UUID_FROM_STRING) Function uuidFromString, - Logger logger) { - super(storage, auth, jwtFactory, webServer, uuidFromString, logger); + @Named(MainModule.UUID_FROM_STRING) Function uuidFromString) { + super(storage, auth, jwtFactory, webServer, uuidFromString); this.storage = storage; this.uuidFromString = uuidFromString; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandler.java index 896c771ef5..149f667b8d 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandler.java @@ -34,7 +34,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.discovery.PluginInfo; @@ -68,7 +67,6 @@ class DiscoveryRegistrationHandler extends AbstractV2RequestHandler> selectedStrategies; private final DiscoveryJwtHelper jwtFactory; private final Function uuidFromString; - private final Logger logger; @Inject DiscoveryRegistrationHandler( @@ -81,8 +79,7 @@ class DiscoveryRegistrationHandler extends AbstractV2RequestHandler> selectedStrategies, DiscoveryJwtHelper jwt, @Named(MainModule.UUID_FROM_STRING) Function uuidFromString, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.env = env; this.storage = storage; @@ -90,7 +87,6 @@ class DiscoveryRegistrationHandler extends AbstractV2RequestHandler { private final TargetConnectionManager tcm; - private final Logger logger; @Inject MBeanMetricsGetHandler( AuthManager auth, CredentialsManager credentialsManager, Gson gson, - TargetConnectionManager tcm, - Logger logger) { + TargetConnectionManager tcm) { super(auth, credentialsManager, gson); this.tcm = tcm; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandler.java index e459e582dd..75e56f75a8 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandler.java @@ -24,7 +24,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.LocalProbeTemplateService; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -39,7 +38,6 @@ class ProbeTemplateDeleteHandler extends AbstractV2RequestHandler { static final String PATH = "probes/:probetemplateName"; - private final Logger logger; private final NotificationFactory notificationFactory; private final LocalProbeTemplateService probeTemplateService; private final FileSystem fs; @@ -51,12 +49,10 @@ class ProbeTemplateDeleteHandler extends AbstractV2RequestHandler { CredentialsManager credentialsManager, NotificationFactory notificationFactory, LocalProbeTemplateService probeTemplateService, - Logger logger, FileSystem fs, Gson gson) { super(auth, credentialsManager, gson); this.notificationFactory = notificationFactory; - this.logger = logger; this.probeTemplateService = probeTemplateService; this.fs = fs; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadBodyHandler.java index 6db25f3579..2ff708882b 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,9 +34,8 @@ class ProbeTemplateUploadBodyHandler extends AbstractAuthenticatedRequestHandler static final BodyHandler BODY_HANDLER = BodyHandler.create(true); @Inject - ProbeTemplateUploadBodyHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + ProbeTemplateUploadBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandler.java index 33fd723f6a..d133901e83 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandler.java @@ -29,7 +29,6 @@ import io.cryostat.core.agent.LocalProbeTemplateService; import io.cryostat.core.agent.ProbeTemplate; import io.cryostat.core.agent.ProbeValidationException; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -40,12 +39,14 @@ import com.google.gson.Gson; import io.vertx.core.http.HttpMethod; import io.vertx.ext.web.FileUpload; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class ProbeTemplateUploadHandler extends AbstractV2RequestHandler { static final String PATH = "probes/:probetemplateName"; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final NotificationFactory notificationFactory; private final LocalProbeTemplateService probeTemplateService; private final FileSystem fs; @@ -57,12 +58,10 @@ class ProbeTemplateUploadHandler extends AbstractV2RequestHandler { CredentialsManager credentialsManager, NotificationFactory notificationFactory, LocalProbeTemplateService probeTemplateService, - Logger logger, FileSystem fs, Gson gson) { super(auth, credentialsManager, gson); this.notificationFactory = notificationFactory; - this.logger = logger; this.probeTemplateService = probeTemplateService; this.fs = fs; } @@ -131,13 +130,13 @@ public IntermediateResponse handle(RequestParameters requestParams) throws } } } catch (ProbeValidationException pve) { - logger.error(pve.getMessage()); + logger.error(pve.getMessage(), pve); throw new ApiException(400, pve.getMessage(), pve); } catch (FileAlreadyExistsException faee) { - logger.error(faee.getMessage()); + logger.error(faee.getMessage(), faee); throw new ApiException(400, faee.getMessage(), faee); } catch (Exception e) { - logger.error(e.getMessage()); + logger.error(e.getMessage(), e); throw new ApiException(500, e.getMessage(), e); } return new IntermediateResponse().body(null); diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RecordingGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RecordingGetHandler.java index 25f9b411b6..e28e17e492 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RecordingGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RecordingGetHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -53,9 +52,8 @@ class RecordingGetHandler extends AbstractAssetJwtConsumingHandler { CredentialsManager credentialsManager, AssetJwtHelper jwtFactory, Lazy webServer, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + RecordingArchiveHelper recordingArchiveHelper) { + super(auth, credentialsManager, jwtFactory, webServer); this.recordingArchiveHelper = recordingArchiveHelper; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/ReportGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/ReportGetHandler.java index 211deb2b10..7900bb80a9 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/ReportGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/ReportGetHandler.java @@ -27,7 +27,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.reports.ReportsModule; @@ -61,9 +60,8 @@ class ReportGetHandler extends AbstractAssetJwtConsumingHandler { Lazy webServer, ReportService reportService, @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) - long reportGenerationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + long reportGenerationTimeoutSeconds) { + super(auth, credentialsManager, jwtFactory, webServer); this.reportService = reportService; this.reportGenerationTimeoutSeconds = reportGenerationTimeoutSeconds; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RequestParameters.java b/src/main/java/io/cryostat/net/web/http/api/v2/RequestParameters.java index 8344f50706..9cf6cf6bc2 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RequestParameters.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RequestParameters.java @@ -23,13 +23,13 @@ import java.util.Objects; import java.util.Set; -import io.cryostat.core.log.Logger; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.vertx.core.MultiMap; import io.vertx.ext.web.FileUpload; import io.vertx.ext.web.RoutingContext; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RequestParameters { @@ -42,6 +42,7 @@ public class RequestParameters { private final MultiMap formAttributes; private final Set fileUploads; private final String body; + private static final Logger logger = LoggerFactory.getLogger(RequestParameters.class); @SuppressFBWarnings( value = "EI_EXPOSE_REP2", @@ -126,7 +127,7 @@ private static InetAddress tryResolveAddress(InetAddress addr, String host) { try { return InetAddress.getByName(host); } catch (UnknownHostException e) { - Logger.INSTANCE.error(e); + logger.error("Address resolution exception", e); } return addr; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandler.java index 2bfa9fad18..ff169d9d92 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.NotificationFactory; @@ -40,6 +39,8 @@ import com.google.gson.Gson; import io.vertx.core.Vertx; import io.vertx.core.http.HttpMethod; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class RuleDeleteHandler extends AbstractV2RequestHandler { @@ -53,7 +54,7 @@ class RuleDeleteHandler extends AbstractV2RequestHandler { private final DiscoveryStorage storage; private final CredentialsManager credentialsManager; private final NotificationFactory notificationFactory; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject RuleDeleteHandler( @@ -64,8 +65,7 @@ class RuleDeleteHandler extends AbstractV2RequestHandler { DiscoveryStorage storage, CredentialsManager credentialsManager, NotificationFactory notificationFactory, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.vertx = vertx; this.ruleRegistry = ruleRegistry; @@ -73,7 +73,6 @@ class RuleDeleteHandler extends AbstractV2RequestHandler { this.storage = storage; this.credentialsManager = credentialsManager; this.notificationFactory = notificationFactory; - this.logger = logger; } @Override @@ -159,7 +158,7 @@ private void cleanup(RequestParameters params, Rule rule) { } promise.complete(); } catch (Exception e) { - logger.error(e); + logger.error("Recording stop exception", e); promise.fail(e); } }); diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RuleGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RuleGetHandler.java index 95742146fd..6f15e8a1e1 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RuleGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RuleGetHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -38,18 +37,15 @@ class RuleGetHandler extends AbstractV2RequestHandler { static final String PATH = RulesPostHandler.PATH + "/:name"; private final RuleRegistry ruleRegistry; - private final Logger logger; @Inject RuleGetHandler( AuthManager auth, CredentialsManager credentialsManager, RuleRegistry ruleRegistry, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.ruleRegistry = ruleRegistry; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchBodyHandler.java index 562d5c34a7..aa05c1bedf 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchBodyHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -37,8 +36,8 @@ class RulePatchBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - RulePatchBodyHandler(AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + RulePatchBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchHandler.java index 2ee969d820..215c261f90 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RulePatchHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.NotificationFactory; @@ -41,6 +40,8 @@ import io.vertx.core.Vertx; import io.vertx.core.http.HttpMethod; import io.vertx.core.json.JsonObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class RulePatchHandler extends AbstractV2RequestHandler { @@ -53,7 +54,7 @@ class RulePatchHandler extends AbstractV2RequestHandler { private final DiscoveryStorage storage; private final RecordingTargetHelper recordings; private final NotificationFactory notificationFactory; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject RulePatchHandler( @@ -64,15 +65,13 @@ class RulePatchHandler extends AbstractV2RequestHandler { CredentialsManager credentialsManager, RuleRegistry ruleRegistry, NotificationFactory notificationFactory, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.vertx = vertx; this.recordings = recordings; this.ruleRegistry = ruleRegistry; this.storage = storage; this.notificationFactory = notificationFactory; - this.logger = logger; } @Override @@ -173,7 +172,7 @@ private void cleanup(RequestParameters params, Rule rule) { } promise.complete(); } catch (Exception e) { - logger.error(e); + logger.error("Recording stop exception", e); promise.fail(e); } }); diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RulesGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RulesGetHandler.java index f02cbe694e..4d554d9d67 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RulesGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RulesGetHandler.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -38,18 +37,15 @@ class RulesGetHandler extends AbstractV2RequestHandler> { static final String PATH = RulesPostHandler.PATH; private final RuleRegistry ruleRegistry; - private final Logger logger; @Inject RulesGetHandler( AuthManager auth, CredentialsManager credentialsManager, RuleRegistry ruleRegistry, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.ruleRegistry = ruleRegistry; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostBodyHandler.java index e96249cdf8..281ce7cade 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,8 +34,8 @@ class RulesPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - RulesPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + RulesPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostHandler.java index 4120626547..6502960f4e 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/RulesPostHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -47,7 +46,6 @@ class RulesPostHandler extends AbstractV2RequestHandler { private final RuleRegistry ruleRegistry; private final NotificationFactory notificationFactory; - private final Logger logger; @Inject RulesPostHandler( @@ -55,12 +53,10 @@ class RulesPostHandler extends AbstractV2RequestHandler { CredentialsManager credentialsManager, RuleRegistry ruleRegistry, NotificationFactory notificationFactory, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.ruleRegistry = ruleRegistry; this.notificationFactory = notificationFactory; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandler.java index c1a54d5fa5..4eb56b56a5 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.DeprecatedApi; @@ -43,7 +42,7 @@ class TargetCredentialsGetHandler extends AbstractV2RequestHandler { private final CredentialsManager credentialsManager; private final NotificationFactory notificationFactory; - private final Logger logger; @Inject TargetCredentialsPostHandler( AuthManager auth, CredentialsManager credentialsManager, NotificationFactory notificationFactory, - Gson gson, - Logger logger) { + Gson gson) { super(auth, credentialsManager, gson); this.credentialsManager = credentialsManager; this.notificationFactory = notificationFactory; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandler.java index c80bd039a5..2e520f8b15 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandler.java @@ -23,7 +23,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.AgentJMXHelper; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; @@ -41,7 +40,6 @@ class TargetProbeDeleteHandler extends AbstractV2RequestHandler { static final String PATH = "targets/:targetId/probes"; - private final Logger logger; private final NotificationFactory notificationFactory; private final FileSystem fs; private final TargetConnectionManager connectionManager; @@ -50,7 +48,6 @@ class TargetProbeDeleteHandler extends AbstractV2RequestHandler { @Inject TargetProbeDeleteHandler( - Logger logger, NotificationFactory notificationFactory, FileSystem fs, AuthManager auth, @@ -59,7 +56,6 @@ class TargetProbeDeleteHandler extends AbstractV2RequestHandler { Environment env, Gson gson) { super(auth, credentialsManager, gson); - this.logger = logger; this.notificationFactory = notificationFactory; this.connectionManager = connectionManager; this.env = env; diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandler.java index d6b229693a..14729d421f 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandler.java @@ -29,7 +29,6 @@ import io.cryostat.core.agent.Event; import io.cryostat.core.agent.LocalProbeTemplateService; import io.cryostat.core.agent.ProbeTemplate; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.NotificationFactory; @@ -44,6 +43,8 @@ import com.google.gson.Gson; import io.vertx.core.http.HttpMethod; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * TargetProbePostHandler will facilitate adding probes to a target and will have the following form @@ -74,7 +75,7 @@ class TargetProbePostHandler extends AbstractV2RequestHandler { static final String PATH = "targets/:targetId/probes/:probeTemplate"; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final NotificationFactory notificationFactory; private final LocalProbeTemplateService probeTemplateService; private final FileSystem fs; @@ -85,7 +86,6 @@ class TargetProbePostHandler extends AbstractV2RequestHandler { @Inject TargetProbePostHandler( - Logger logger, NotificationFactory notificationFactory, LocalProbeTemplateService service, FileSystem fs, @@ -96,7 +96,6 @@ class TargetProbePostHandler extends AbstractV2RequestHandler { Environment env, Gson gson) { super(auth, credentialsManager, gson); - this.logger = logger; this.notificationFactory = notificationFactory; this.probeTemplateService = service; this.jvmIdHelper = jvmIdHelper; @@ -165,7 +164,7 @@ public IntermediateResponse handle(RequestParameters requestParams) throws .send(); } catch (JvmIdGetException e) { logger.info("Retain null jvmId for target [{}]", targetId); - logger.info(e); + logger.info("JVM ID exception", e); } return new IntermediateResponse().body(null); }); diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandler.java index 84ca962bef..c4365773d0 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandler.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.HttpServer; @@ -57,9 +56,8 @@ class TargetRecordingGetHandler extends AbstractAssetJwtConsumingHandler { AssetJwtHelper jwtFactory, Lazy webServer, HttpServer httpServer, - TargetConnectionManager targetConnectionManager, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + TargetConnectionManager targetConnectionManager) { + super(auth, credentialsManager, jwtFactory, webServer); this.targetConnectionManager = targetConnectionManager; this.vertx = httpServer.getVertx(); } @@ -118,7 +116,8 @@ void handleRecordingDownloadRequest(RoutingContext ctx, JWT jwt, String recordin return conn.getService() .openStream(desc, false); } catch (Exception e) { - logger.error(e); + logger.error( + "JFR stream open exception", e); throw new ApiException(500, e); } }) diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandler.java index be7498dc8e..18bddbc0d9 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandler.java @@ -26,7 +26,6 @@ import javax.inject.Named; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.reports.ReportsModule; @@ -58,9 +57,8 @@ class TargetReportGetHandler extends AbstractAssetJwtConsumingHandler { Lazy webServer, ReportService reportService, @Named(ReportsModule.REPORT_GENERATION_TIMEOUT_SECONDS) - long reportGenerationTimeoutSeconds, - Logger logger) { - super(auth, credentialsManager, jwtFactory, webServer, logger); + long reportGenerationTimeoutSeconds) { + super(auth, credentialsManager, jwtFactory, webServer); this.reportService = reportService; this.reportGenerationTimeoutSeconds = reportGenerationTimeoutSeconds; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandler.java index ee9db2996d..fd97eea4bd 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandler.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.templates.TemplateType; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -47,9 +46,8 @@ class TargetTemplateGetHandler extends AbstractAssetJwtConsumingHandler { CredentialsManager credentialsManager, AssetJwtHelper jwt, Lazy webServer, - TargetConnectionManager targetConnectionManager, - Logger logger) { - super(auth, credentialsManager, jwt, webServer, logger); + TargetConnectionManager targetConnectionManager) { + super(auth, credentialsManager, jwt, webServer); this.targetConnectionManager = targetConnectionManager; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostBodyHandler.java index a0df7f28a4..356bf3f80b 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,8 +34,8 @@ class TargetsPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - TargetsPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + TargetsPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java index 83db4ecf16..f2f4edf081 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java @@ -29,7 +29,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.NotificationFactory; @@ -58,7 +57,6 @@ class TargetsPostHandler extends AbstractV2RequestHandler { private final DiscoveryStorage storage; private final JvmIdHelper jvmIdHelper; private final CustomTargetPlatformClient customTargetPlatformClient; - private final Logger logger; private final NotificationFactory notificationFactory; @Inject @@ -69,13 +67,11 @@ class TargetsPostHandler extends AbstractV2RequestHandler { DiscoveryStorage storage, JvmIdHelper jvmIdHelper, CustomTargetPlatformClient customTargetPlatformClient, - NotificationFactory notificationFactory, - Logger logger) { + NotificationFactory notificationFactory) { super(auth, credentialsManager, gson); this.storage = storage; this.jvmIdHelper = jvmIdHelper; this.customTargetPlatformClient = customTargetPlatformClient; - this.logger = logger; this.notificationFactory = notificationFactory; } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcher.java index afef742987..ea8dcfb219 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcher.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcher.java @@ -25,7 +25,6 @@ import javax.inject.Inject; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.api.v2.graph.ArchivedRecordingsFetcher.AggregateInfo; @@ -35,18 +34,18 @@ import io.cryostat.rules.ArchivedRecordingInfo; import graphql.schema.DataFetchingEnvironment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class AllArchivedRecordingsFetcher extends AbstractPermissionedDataFetcher { private final RecordingArchiveHelper archiveHelper; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject - AllArchivedRecordingsFetcher( - AuthManager auth, RecordingArchiveHelper archiveHelper, Logger logger) { + AllArchivedRecordingsFetcher(AuthManager auth, RecordingArchiveHelper archiveHelper) { super(auth); this.archiveHelper = archiveHelper; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphModule.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphModule.java index dc9424bba0..b9b736a5d0 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphModule.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphModule.java @@ -25,7 +25,6 @@ import javax.inject.Singleton; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -168,10 +167,9 @@ static RecordingsFetcher provideRecordingsFetcher( RecordingArchiveHelper archiveHelper, CredentialsManager credentialsManager, RecordingMetadataManager metadataManager, - Provider webServer, - Logger logger) { + Provider webServer) { return new RecordingsFetcher( - auth, tcm, archiveHelper, credentialsManager, metadataManager, webServer, logger); + auth, tcm, archiveHelper, credentialsManager, metadataManager, webServer); } @Binds @@ -190,8 +188,8 @@ abstract AbstractPermissionedDataFetcher bindActiveRecordingsFetcher( @Provides static AllArchivedRecordingsFetcher provideAllArchivedRecordingsFetcher( - AuthManager auth, RecordingArchiveHelper recordingArchiveHelper, Logger logger) { - return new AllArchivedRecordingsFetcher(auth, recordingArchiveHelper, logger); + AuthManager auth, RecordingArchiveHelper recordingArchiveHelper) { + return new AllArchivedRecordingsFetcher(auth, recordingArchiveHelper); } @Binds @@ -400,11 +398,8 @@ abstract AbstractPermissionedDataFetcher bindDeleteArchivedRecordingMutator( @Provides static MBeanMetricsFetcher provideMBeanMetricsFetcher( - AuthManager auth, - TargetConnectionManager tcm, - CredentialsManager credentialsManager, - Logger logger) { - return new MBeanMetricsFetcher(auth, tcm, credentialsManager, logger); + AuthManager auth, TargetConnectionManager tcm, CredentialsManager credentialsManager) { + return new MBeanMetricsFetcher(auth, tcm, credentialsManager); } @Binds diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandler.java index f76014b67b..09a7132ab6 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandler.java @@ -17,7 +17,6 @@ import javax.inject.Inject; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import graphql.GraphQL; @@ -26,8 +25,8 @@ class GraphQLGetHandler extends GraphQLPostHandler { @Inject - GraphQLGetHandler(GraphQL graph, AuthManager auth, Logger logger) { - super(graph, auth, logger); + GraphQLGetHandler(GraphQL graph, AuthManager auth) { + super(graph, auth); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostBodyHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostBodyHandler.java index 7d16e955ba..baff503bcb 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostBodyHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostBodyHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; @@ -35,8 +34,8 @@ class GraphQLPostBodyHandler extends AbstractAuthenticatedRequestHandler { static final BodyHandler BODY_HANDLER = BodyHandler.create(true).setHandleFileUploads(false); @Inject - GraphQLPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + GraphQLPostBodyHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandler.java index 5889e2f2eb..4def39b475 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandler.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandler.java @@ -20,7 +20,6 @@ import javax.inject.Inject; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.RequestHandler; @@ -33,6 +32,8 @@ import io.vertx.core.json.JsonObject; import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.handler.graphql.GraphQLHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class GraphQLPostHandler implements RequestHandler { @@ -40,13 +41,12 @@ class GraphQLPostHandler implements RequestHandler { private final GraphQLHandler handler; private final AuthManager auth; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject - GraphQLPostHandler(GraphQL graph, AuthManager auth, Logger logger) { + GraphQLPostHandler(GraphQL graph, AuthManager auth) { this.handler = GraphQLHandler.create(graph); this.auth = auth; - this.logger = logger; } @Override diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/MBeanMetricsFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/MBeanMetricsFetcher.java index f3a8d91076..a506ac73de 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/MBeanMetricsFetcher.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/MBeanMetricsFetcher.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.MBeanMetrics; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -31,23 +30,21 @@ import io.cryostat.platform.discovery.TargetNode; import graphql.schema.DataFetchingEnvironment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MBeanMetricsFetcher extends AbstractPermissionedDataFetcher { private final TargetConnectionManager tcm; private final CredentialsManager credentialsManager; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject MBeanMetricsFetcher( - AuthManager auth, - TargetConnectionManager tcm, - CredentialsManager credentialsManager, - Logger logger) { + AuthManager auth, TargetConnectionManager tcm, CredentialsManager credentialsManager) { super(auth); this.tcm = tcm; this.credentialsManager = credentialsManager; - this.logger = logger; } @Override @@ -75,7 +72,7 @@ public MBeanMetrics getAuthenticated(DataFetchingEnvironment environment) throws try { return tcm.executeConnectedTask(cd, conn -> conn.getMBeanMetrics()); } catch (Exception e) { - logger.warn(e); + logger.warn("MBean get exception", e); return null; } } diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcher.java index ee6dffd00b..bb84004e55 100644 --- a/src/main/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcher.java +++ b/src/main/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcher.java @@ -30,7 +30,6 @@ import org.openjdk.jmc.common.unit.QuantityConversionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.TargetConnectionManager; @@ -46,6 +45,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import graphql.schema.DataFetchingEnvironment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class RecordingsFetcher extends AbstractPermissionedDataFetcher { @@ -54,7 +55,7 @@ class RecordingsFetcher extends AbstractPermissionedDataFetcher { private final CredentialsManager credentialsManager; private final RecordingMetadataManager metadataManager; private final Provider webServer; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject RecordingsFetcher( @@ -63,15 +64,13 @@ class RecordingsFetcher extends AbstractPermissionedDataFetcher { RecordingArchiveHelper archiveHelper, CredentialsManager credentialsManager, RecordingMetadataManager metadataManager, - Provider webServer, - Logger logger) { + Provider webServer) { super(auth); this.targetConnectionManager = targetConnectionManager; this.archiveHelper = archiveHelper; this.credentialsManager = credentialsManager; this.metadataManager = metadataManager; this.webServer = webServer; - this.logger = logger; } @Override @@ -144,7 +143,7 @@ public Recordings getAuthenticated(DataFetchingEnvironment environment) throws E } catch (QuantityConversionException | URISyntaxException | IOException e) { - logger.error(e); + logger.error("Recordings get exception", e); return null; } }) @@ -159,7 +158,7 @@ public Recordings getAuthenticated(DataFetchingEnvironment environment) throws E } catch (ExecutionException e) { recordings.archived = List.of(); logger.warn("Couldn't get archived recordings for {}", targetId); - logger.warn(e); + logger.warn("Archived recordings get exception", e); } } diff --git a/src/main/java/io/cryostat/net/web/http/generic/CorsEnablingHandler.java b/src/main/java/io/cryostat/net/web/http/generic/CorsEnablingHandler.java index 5c8e97b549..64bdf52598 100644 --- a/src/main/java/io/cryostat/net/web/http/generic/CorsEnablingHandler.java +++ b/src/main/java/io/cryostat/net/web/http/generic/CorsEnablingHandler.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.NetworkConfiguration; import io.cryostat.net.SslConfiguration; @@ -37,6 +36,8 @@ import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.handler.CorsHandler; import org.apache.http.HttpHeaders; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class CorsEnablingHandler implements RequestHandler { protected static final String DEV_ORIGIN = "http://localhost:9000"; @@ -44,18 +45,13 @@ class CorsEnablingHandler implements RequestHandler { protected final Environment env; protected final NetworkConfiguration netConf; protected final SslConfiguration sslConf; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Inject - CorsEnablingHandler( - Environment env, - NetworkConfiguration netConf, - SslConfiguration sslConf, - Logger logger) { + CorsEnablingHandler(Environment env, NetworkConfiguration netConf, SslConfiguration sslConf) { this.env = env; this.netConf = netConf; this.sslConf = sslConf; - this.logger = logger; this.corsHandler = CorsHandler.create() .addOrigin(getWebClientOrigin()) @@ -122,7 +118,7 @@ List getSelfOrigin() { netConf.getWebServerHost(), netConf.getExternalWebServerPort())); } catch (SocketException | UnknownHostException e) { - logger.warn(e); + logger.warn("Could not determine own origin", e); return List.of(); } } diff --git a/src/main/java/io/cryostat/net/web/http/generic/CorsOptionsHandler.java b/src/main/java/io/cryostat/net/web/http/generic/CorsOptionsHandler.java index 520f8acf4f..2fa9516684 100644 --- a/src/main/java/io/cryostat/net/web/http/generic/CorsOptionsHandler.java +++ b/src/main/java/io/cryostat/net/web/http/generic/CorsOptionsHandler.java @@ -19,7 +19,6 @@ import javax.inject.Inject; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.NetworkConfiguration; import io.cryostat.net.SslConfiguration; @@ -31,12 +30,8 @@ class CorsOptionsHandler extends CorsEnablingHandler { @Inject - CorsOptionsHandler( - Environment env, - NetworkConfiguration netConf, - SslConfiguration sslConf, - Logger logger) { - super(env, netConf, sslConf, logger); + CorsOptionsHandler(Environment env, NetworkConfiguration netConf, SslConfiguration sslConf) { + super(env, netConf, sslConf); } @Override diff --git a/src/main/java/io/cryostat/net/web/http/generic/HealthGetHandler.java b/src/main/java/io/cryostat/net/web/http/generic/HealthGetHandler.java index 77ef9d0545..7b1cac17fe 100644 --- a/src/main/java/io/cryostat/net/web/http/generic/HealthGetHandler.java +++ b/src/main/java/io/cryostat/net/web/http/generic/HealthGetHandler.java @@ -26,7 +26,6 @@ import io.cryostat.ApplicationVersion; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -41,6 +40,8 @@ import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.client.HttpRequest; import io.vertx.ext.web.client.WebClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class HealthGetHandler implements RequestHandler { @@ -48,20 +49,15 @@ class HealthGetHandler implements RequestHandler { private final WebClient webClient; private final Environment env; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); @Inject HealthGetHandler( - ApplicationVersion appVersion, - WebClient webClient, - Environment env, - Gson gson, - Logger logger) { + ApplicationVersion appVersion, WebClient webClient, Environment env, Gson gson) { this.appVersion = appVersion; this.webClient = webClient; this.env = env; this.gson = gson; - this.logger = logger; } @Override @@ -131,7 +127,7 @@ private void checkUri(String envName, String path, CompletableFuture fu try { uri = new URI(this.env.getEnv(envName)); } catch (URISyntaxException e) { - logger.error(e); + logger.error("URI check exception", e); future.complete(false); return; } @@ -145,7 +141,8 @@ private void checkUri(String envName, String path, CompletableFuture fu .send( handler -> { if (handler.failed()) { - this.logger.warn(new IOException(handler.cause())); + this.logger.warn( + "Request exception", new IOException(handler.cause())); future.complete(false); return; } diff --git a/src/main/java/io/cryostat/platform/PlatformModule.java b/src/main/java/io/cryostat/platform/PlatformModule.java index 5443ec75db..b3b61d9732 100644 --- a/src/main/java/io/cryostat/platform/PlatformModule.java +++ b/src/main/java/io/cryostat/platform/PlatformModule.java @@ -29,7 +29,6 @@ import javax.inject.Singleton; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.AuthManager; import io.cryostat.platform.discovery.PlatformDiscoveryModule; @@ -39,20 +38,22 @@ import dagger.Module; import dagger.Provides; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Module(includes = {PlatformStrategyModule.class, PlatformDiscoveryModule.class}) public abstract class PlatformModule { public static final String SELECTED_PLATFORMS = "SELECTED_PLATFORMS"; public static final String UNSELECTED_PLATFORMS = "UNSELECTED_PLATFORMS"; + private static final Logger logger = LoggerFactory.getLogger(PlatformModule.class); @Provides @Singleton static AuthManager provideAuthManager( PlatformDetectionStrategy platformStrategy, Environment env, - Set authManagers, - Logger logger) { + Set authManagers) { final String authManagerClass; if (env.hasEnv(Variables.AUTH_MANAGER_ENV_VAR)) { authManagerClass = env.getEnv(Variables.AUTH_MANAGER_ENV_VAR); diff --git a/src/main/java/io/cryostat/platform/internal/CustomTargetPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/CustomTargetPlatformStrategy.java index 2e2275105a..25bedb1951 100644 --- a/src/main/java/io/cryostat/platform/internal/CustomTargetPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/CustomTargetPlatformStrategy.java @@ -15,23 +15,21 @@ */ package io.cryostat.platform.internal; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import dagger.Lazy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CustomTargetPlatformStrategy implements PlatformDetectionStrategy { - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Lazy authMgr; private final Lazy client; CustomTargetPlatformStrategy( - Logger logger, - Lazy authMgr, - Lazy client) { - this.logger = logger; + Lazy authMgr, Lazy client) { this.authMgr = authMgr; this.client = client; } diff --git a/src/main/java/io/cryostat/platform/internal/DefaultPlatformClient.java b/src/main/java/io/cryostat/platform/internal/DefaultPlatformClient.java index 40714ddd2d..76f50b504c 100644 --- a/src/main/java/io/cryostat/platform/internal/DefaultPlatformClient.java +++ b/src/main/java/io/cryostat/platform/internal/DefaultPlatformClient.java @@ -27,7 +27,6 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.DiscoveredJvmDescriptor; import io.cryostat.core.net.discovery.JvmDiscoveryClient; import io.cryostat.core.net.discovery.JvmDiscoveryClient.JvmDiscoveryEvent; @@ -41,6 +40,9 @@ import io.cryostat.platform.discovery.TargetNode; import io.cryostat.util.URIUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class DefaultPlatformClient extends AbstractPlatformClient implements Consumer { @@ -49,13 +51,11 @@ public class DefaultPlatformClient extends AbstractPlatformClient public static final NodeType NODE_TYPE = BaseNodeType.JVM; private final JvmDiscoveryClient discoveryClient; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); - DefaultPlatformClient( - Environment environment, JvmDiscoveryClient discoveryClient, Logger logger) { + DefaultPlatformClient(Environment environment, JvmDiscoveryClient discoveryClient) { super(environment); this.discoveryClient = discoveryClient; - this.logger = logger; } @Override @@ -76,7 +76,7 @@ public void accept(JvmDiscoveryEvent evt) { try { notifyAsyncTargetDiscovery(evt.getEventKind(), convert(evt.getJvmDescriptor())); } catch (MalformedURLException | URISyntaxException e) { - logger.warn(e); + logger.warn("Bad target URI exception", e); } } @@ -88,7 +88,7 @@ public List listDiscoverableServices() { try { return convert(desc); } catch (MalformedURLException | URISyntaxException e) { - logger.warn(e); + logger.warn("Target URI conversion exception", e); return null; } }) diff --git a/src/main/java/io/cryostat/platform/internal/DefaultPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/DefaultPlatformStrategy.java index 1a2ce70660..e56d241762 100644 --- a/src/main/java/io/cryostat/platform/internal/DefaultPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/DefaultPlatformStrategy.java @@ -15,29 +15,28 @@ */ package io.cryostat.platform.internal; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.JvmDiscoveryClient; import io.cryostat.core.sys.Environment; import io.cryostat.net.AuthManager; import dagger.Lazy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class DefaultPlatformStrategy implements PlatformDetectionStrategy { private final Environment environment; private final Lazy authMgr; private final Lazy discoveryClient; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); DefaultPlatformStrategy( Environment environment, Lazy authMgr, - Lazy discoveryClient, - Logger logger) { + Lazy discoveryClient) { this.environment = environment; this.authMgr = authMgr; this.discoveryClient = discoveryClient; - this.logger = logger; } @Override @@ -48,7 +47,7 @@ public boolean isAvailable() { @Override public DefaultPlatformClient getPlatformClient() { logger.info("Selected Default Platform Strategy"); - return new DefaultPlatformClient(environment, discoveryClient.get(), logger); + return new DefaultPlatformClient(environment, discoveryClient.get()); } @Override diff --git a/src/main/java/io/cryostat/platform/internal/DockerPlatformClient.java b/src/main/java/io/cryostat/platform/internal/DockerPlatformClient.java index 8d5642d3a6..89bcf26589 100644 --- a/src/main/java/io/cryostat/platform/internal/DockerPlatformClient.java +++ b/src/main/java/io/cryostat/platform/internal/DockerPlatformClient.java @@ -33,7 +33,6 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import io.cryostat.core.sys.Environment; @@ -54,6 +53,8 @@ import io.vertx.core.net.SocketAddress; import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.codec.BodyCodec; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DockerPlatformClient extends AbstractPlatformClient { @@ -68,7 +69,7 @@ public class DockerPlatformClient extends AbstractPlatformClient { private final SocketAddress dockerSocket; private final Lazy connectionToolkit; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private long timerId; private final CopyOnWriteArrayList containers = new CopyOnWriteArrayList<>(); @@ -79,15 +80,13 @@ public class DockerPlatformClient extends AbstractPlatformClient { Lazy vertx, SocketAddress dockerSocket, Lazy connectionToolkit, - Gson gson, - Logger logger) { + Gson gson) { super(environment); this.webClient = webClient; this.vertx = vertx; this.dockerSocket = dockerSocket; this.connectionToolkit = connectionToolkit; this.gson = gson; - this.logger = logger; } @Override @@ -222,7 +221,7 @@ private ServiceRef convert(ContainerSpec desc) { return serviceRef; } catch (NumberFormatException | URISyntaxException | MalformedURLException e) { containers.remove(desc); - logger.warn(e); + logger.warn("Container discovery exception", e); return null; } } diff --git a/src/main/java/io/cryostat/platform/internal/DockerPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/DockerPlatformStrategy.java index 7da49e0478..b90a73c313 100644 --- a/src/main/java/io/cryostat/platform/internal/DockerPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/DockerPlatformStrategy.java @@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -35,6 +34,8 @@ import io.vertx.core.net.SocketAddress; import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.codec.BodyCodec; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class DockerPlatformStrategy implements PlatformDetectionStrategy { @@ -46,7 +47,7 @@ class DockerPlatformStrategy implements PlatformDetectionStrategy authMgr, @@ -55,8 +56,7 @@ class DockerPlatformStrategy implements PlatformDetectionStrategy connectionToolkit, Gson gson, Environment environment, - FileSystem fs, - Logger logger) { + FileSystem fs) { this.authMgr = authMgr; this.webClient = webClient; this.vertx = vertx; @@ -64,7 +64,6 @@ class DockerPlatformStrategy implements PlatformDetectionStrategy> initialize() }; private Integer memoHash; private EnvironmentNode memoTree; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Map, Pair> discoveryNodeCache = new ConcurrentHashMap<>(); private final Map, Object> queryLocks = @@ -109,14 +110,12 @@ protected HashMap> initialize() Collection namespaces, Collection portNames, Collection portNumbers, - KubernetesClient k8sClient, - Logger logger) { + KubernetesClient k8sClient) { super(environment); this.namespaces = new HashSet<>(namespaces); this.portNames = new HashSet<>(portNames); this.portNumbers = new HashSet<>(portNumbers); this.k8sClient = k8sClient; - this.logger = logger; } @Override @@ -133,7 +132,7 @@ public List listDiscoverableServices() { try { return getAllServiceRefs(); } catch (Exception e) { - logger.warn(e); + logger.warn("Target list exeption", e); return Collections.emptyList(); } } @@ -168,7 +167,7 @@ public EnvironmentNode getDiscoveryTree() { .flatMap(endpoints -> getTargetTuples(endpoints).stream()) .forEach(tuple -> buildOwnerChain(nsNode, tuple)); } catch (Exception e) { - logger.warn(e); + logger.warn("Target ownership chain exception", e); } finally { discoveryNodeCache.clear(); queryLocks.clear(); @@ -413,7 +412,7 @@ ServiceRef toServiceRef() { addr.getTargetRef().getName())); return serviceRef; } catch (Exception e) { - logger.warn(e); + logger.warn("Target conversion exception", e); return null; } } diff --git a/src/main/java/io/cryostat/platform/internal/KubeApiPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/KubeApiPlatformStrategy.java index f0dd9cb824..063d757077 100644 --- a/src/main/java/io/cryostat/platform/internal/KubeApiPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/KubeApiPlatformStrategy.java @@ -24,7 +24,6 @@ import java.util.concurrent.ForkJoinPool; import io.cryostat.configuration.Variables; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; @@ -35,6 +34,8 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class KubeApiPlatformStrategy implements PlatformDetectionStrategy { @@ -44,11 +45,9 @@ class KubeApiPlatformStrategy implements PlatformDetectionStrategy authMgr; protected final Environment env; protected final FileSystem fs; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); - KubeApiPlatformStrategy( - Lazy authMgr, Environment env, FileSystem fs, Logger logger) { - this.logger = logger; + KubeApiPlatformStrategy(Lazy authMgr, Environment env, FileSystem fs) { this.authMgr = authMgr; this.env = env; this.fs = fs; @@ -60,7 +59,7 @@ public boolean isAvailable() { try (KubernetesClient client = createClient()) { return testAvailability(client); } catch (Exception e) { - logger.info(e); + logger.info("Target test exception", e); } return false; } @@ -80,7 +79,7 @@ public KubeApiPlatformClient getPlatformClient() { .filter(n -> !NO_PORT_NUMBER.equals(n)) .toList(); return new KubeApiPlatformClient( - env, getNamespaces(), portNames, portNumbers, createClient(), logger); + env, getNamespaces(), portNames, portNumbers, createClient()); } @Override @@ -105,7 +104,7 @@ protected String getOwnNamespace() { try { return fs.readString(Paths.get(Config.KUBERNETES_NAMESPACE_PATH)); } catch (IOException e) { - logger.trace(e); + logger.trace("Namespace read exception", e); return null; } } diff --git a/src/main/java/io/cryostat/platform/internal/OpenShiftPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/OpenShiftPlatformStrategy.java index 2848c569bc..367e0b53b3 100644 --- a/src/main/java/io/cryostat/platform/internal/OpenShiftPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/OpenShiftPlatformStrategy.java @@ -15,7 +15,6 @@ */ package io.cryostat.platform.internal; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; @@ -26,9 +25,8 @@ class OpenShiftPlatformStrategy extends KubeApiPlatformStrategy { - OpenShiftPlatformStrategy( - Lazy authMgr, Environment env, FileSystem fs, Logger logger) { - super(authMgr, env, fs, logger); + OpenShiftPlatformStrategy(Lazy authMgr, Environment env, FileSystem fs) { + super(authMgr, env, fs); } @Override diff --git a/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java b/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java index 2e375bc72d..f1bc15f6fe 100644 --- a/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java +++ b/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java @@ -20,7 +20,6 @@ import javax.inject.Named; import javax.inject.Singleton; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.net.discovery.JvmDiscoveryClient; import io.cryostat.core.sys.Environment; @@ -59,24 +58,22 @@ static CustomTargetPlatformClient provideCustomTargetPlatformClient( @Provides @Singleton static CustomTargetPlatformStrategy provideCustomTargetPlatformStrategy( - Logger logger, - Lazy noopAuthManager, - Lazy client) { - return new CustomTargetPlatformStrategy(logger, noopAuthManager, client); + Lazy noopAuthManager, Lazy client) { + return new CustomTargetPlatformStrategy(noopAuthManager, client); } @Provides @Singleton static OpenShiftPlatformStrategy provideOpenShiftPlatformStrategy( - Lazy authManager, Environment env, FileSystem fs, Logger logger) { - return new OpenShiftPlatformStrategy(authManager, env, fs, logger); + Lazy authManager, Environment env, FileSystem fs) { + return new OpenShiftPlatformStrategy(authManager, env, fs); } @Provides @Singleton static KubeApiPlatformStrategy provideKubeApiPlatformStrategy( - Lazy noopAuthManager, Environment env, FileSystem fs, Logger logger) { - return new KubeApiPlatformStrategy(noopAuthManager, env, fs, logger); + Lazy noopAuthManager, Environment env, FileSystem fs) { + return new KubeApiPlatformStrategy(noopAuthManager, env, fs); } @Provides @@ -88,17 +85,9 @@ static PodmanPlatformStrategy providePodmanPlatformStrategy( Lazy connectionToolkit, Gson gson, Environment environment, - FileSystem fs, - Logger logger) { + FileSystem fs) { return new PodmanPlatformStrategy( - noopAuthManager, - webClient, - vertx, - connectionToolkit, - gson, - environment, - fs, - logger); + noopAuthManager, webClient, vertx, connectionToolkit, gson, environment, fs); } @Provides @@ -110,25 +99,17 @@ static DockerPlatformStrategy provideDockerPlatformStrategy( Lazy connectionToolkit, Gson gson, Environment environment, - FileSystem fs, - Logger logger) { + FileSystem fs) { return new DockerPlatformStrategy( - noopAuthManager, - webClient, - vertx, - connectionToolkit, - gson, - environment, - fs, - logger); + noopAuthManager, webClient, vertx, connectionToolkit, gson, environment, fs); } @Provides @Singleton static DefaultPlatformStrategy provideDefaultPlatformStrategy( - Environment environment, Lazy noopAuthManager, Logger logger) { + Environment environment, Lazy noopAuthManager) { return new DefaultPlatformStrategy( - environment, noopAuthManager, () -> new JvmDiscoveryClient(logger), logger); + environment, noopAuthManager, () -> new JvmDiscoveryClient()); } @Provides diff --git a/src/main/java/io/cryostat/platform/internal/PodmanPlatformClient.java b/src/main/java/io/cryostat/platform/internal/PodmanPlatformClient.java index f50bb29937..5b8a1203ea 100644 --- a/src/main/java/io/cryostat/platform/internal/PodmanPlatformClient.java +++ b/src/main/java/io/cryostat/platform/internal/PodmanPlatformClient.java @@ -38,7 +38,6 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import io.cryostat.core.sys.Environment; @@ -61,6 +60,8 @@ import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.codec.BodyCodec; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PodmanPlatformClient extends AbstractPlatformClient { @@ -76,7 +77,7 @@ public class PodmanPlatformClient extends AbstractPlatformClient { private final SocketAddress podmanSocket; private final Lazy connectionToolkit; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private long timerId; private final CopyOnWriteArrayList containers = new CopyOnWriteArrayList<>(); @@ -88,8 +89,7 @@ public class PodmanPlatformClient extends AbstractPlatformClient { Lazy vertx, SocketAddress podmanSocket, Lazy connectionToolkit, - Gson gson, - Logger logger) { + Gson gson) { super(environment); this.executor = executor; this.webClient = webClient; @@ -97,7 +97,6 @@ public class PodmanPlatformClient extends AbstractPlatformClient { this.podmanSocket = podmanSocket; this.connectionToolkit = connectionToolkit; this.gson = gson; - this.logger = logger; } @Override @@ -243,7 +242,7 @@ private ServiceRef convert(ContainerSpec desc) { .Hostname; } catch (InterruptedException | TimeoutException | ExecutionException e) { containers.remove(desc); - logger.warn(e); + logger.warn("Target inspection exception", e); return null; } } @@ -270,7 +269,7 @@ private ServiceRef convert(ContainerSpec desc) { return serviceRef; } catch (NumberFormatException | URISyntaxException | MalformedURLException e) { containers.remove(desc); - logger.warn(e); + logger.warn("Target conversion exception", e); return null; } } diff --git a/src/main/java/io/cryostat/platform/internal/PodmanPlatformStrategy.java b/src/main/java/io/cryostat/platform/internal/PodmanPlatformStrategy.java index 4ccf204b53..9d85c84724 100644 --- a/src/main/java/io/cryostat/platform/internal/PodmanPlatformStrategy.java +++ b/src/main/java/io/cryostat/platform/internal/PodmanPlatformStrategy.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -37,6 +36,8 @@ import io.vertx.core.net.SocketAddress; import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.codec.BodyCodec; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class PodmanPlatformStrategy implements PlatformDetectionStrategy { @@ -47,7 +48,7 @@ class PodmanPlatformStrategy implements PlatformDetectionStrategy authMgr, @@ -56,8 +57,7 @@ class PodmanPlatformStrategy implements PlatformDetectionStrategy connectionToolkit, Gson gson, Environment environment, - FileSystem fs, - Logger logger) { + FileSystem fs) { this.authMgr = authMgr; this.webClient = webClient; this.vertx = vertx; @@ -65,7 +65,6 @@ class PodmanPlatformStrategy implements PlatformDetectionStrategy { @@ -54,7 +55,7 @@ public class JvmIdHelper extends AbstractEventEmitter ids; private final Map reverse; @@ -66,13 +67,11 @@ public class JvmIdHelper extends AbstractEventEmitter webServerProvider; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Path archivedRecordingsPath; private final Path archivedRecordingsReportPath; private final RecordingMetadataManager recordingMetadataManager; @@ -122,7 +123,6 @@ public class RecordingArchiveHelper { RecordingArchiveHelper( FileSystem fs, Provider webServerProvider, - Logger logger, @Named(MainModule.RECORDINGS_PATH) Path archivedRecordingsPath, @Named(WebModule.WEBSERVER_TEMP_DIR_PATH) Path webServerTempPath, TargetConnectionManager targetConnectionManager, @@ -135,7 +135,6 @@ public class RecordingArchiveHelper { Base32 base32) { this.fs = fs; this.webServerProvider = webServerProvider; - this.logger = logger; this.archivedRecordingsPath = archivedRecordingsPath; this.archivedRecordingsReportPath = webServerTempPath; this.targetConnectionManager = targetConnectionManager; @@ -249,9 +248,9 @@ protected void migrate(ExecutorService executor) throws Exception { } FileUtils.deleteQuietly(subdirectoryPath.toFile()); } catch (IOException e) { - logger.warn(e); + logger.warn("IO exception", e); } catch (CancellationException e) { - logger.error(e); + logger.error("Task cancellation exception", e); } return null; }); @@ -636,7 +635,7 @@ public Future> getRecordings(String targetId) { getFileSize(file), getArchivedTime(file)); } catch (IOException | URISyntaxException e) { - logger.warn(e); + logger.warn("Recording list exception", e); return null; } }) @@ -700,7 +699,7 @@ public Future> getRecordingsAndDirectories() { getFileSize(file), getArchivedTime(file)); } catch (IOException | URISyntaxException e) { - logger.warn(e); + logger.warn("Directory walk exception", e); return null; } }) @@ -756,7 +755,7 @@ public Future> getRecordings() { getFileSize(file), getArchivedTime(file)); } catch (IOException | URISyntaxException e) { - logger.warn(e); + logger.warn("Recording list exception", e); return null; } }) @@ -834,7 +833,7 @@ private Path searchSubdirectory(Path subdirectory, String recordingName) { } } } catch (IOException ioe) { - logger.error(ioe); + logger.error("Directory search exception", ioe); } return recordingPath; } diff --git a/src/main/java/io/cryostat/recordings/RecordingMetadataManager.java b/src/main/java/io/cryostat/recordings/RecordingMetadataManager.java index ccbe13d3b1..22ee8f0ae3 100644 --- a/src/main/java/io/cryostat/recordings/RecordingMetadataManager.java +++ b/src/main/java/io/cryostat/recordings/RecordingMetadataManager.java @@ -40,7 +40,6 @@ import javax.script.ScriptException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.sys.FileSystem; import io.cryostat.discovery.DiscoveryStorage; @@ -64,6 +63,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RecordingMetadataManager extends AbstractVerticle implements Consumer, EventListener { @@ -84,7 +85,7 @@ public class RecordingMetadataManager extends AbstractVerticle private final JvmIdHelper jvmIdHelper; private final Gson gson; private final Base32 base32; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final CountDownLatch migrationLatch = new CountDownLatch(1); @@ -101,8 +102,7 @@ public class RecordingMetadataManager extends AbstractVerticle NotificationFactory notificationFactory, JvmIdHelper jvmIdHelper, Gson gson, - Base32 base32, - Logger logger) { + Base32 base32) { this.executor = executor; this.recordingMetadataDir = recordingMetadataDir; this.archivedRecordingsPath = archivedRecordingsPath; @@ -116,7 +116,6 @@ public class RecordingMetadataManager extends AbstractVerticle this.jvmIdHelper = jvmIdHelper; this.gson = gson; this.base32 = base32; - this.logger = logger; } @Override @@ -248,7 +247,11 @@ public void start(Promise future) { file); } } catch (IOException ioe) { - logger.error(ioe); + logger.error( + "Metadata" + + " deserialization" + + " exception", + ioe); } }); } @@ -377,8 +380,8 @@ else if (fs.isRegularFile(subdirectory)) { logger.info("Successfully pruned all stale metadata"); } catch (Exception e) { logger.warn( - "Couldn't read archived recordings directory"); - logger.warn(e); + "Couldn't read archived recordings directory", + e); } finally { migrationLatch.countDown(); } @@ -399,7 +402,7 @@ public void accept(TargetDiscoveryEvent tde) { try { migrationLatch.await(); } catch (InterruptedException e) { - logger.error(e); + logger.error("Migration wait exception", e); } switch (tde.getEventKind()) { @@ -727,8 +730,7 @@ private void transferMetadataIfRestarted(ConnectionDescriptor cd) { fs.deleteIfExists(oldMetadataPath); } catch (Exception e) { - logger.error("Metadata could not be transferred"); - logger.error(e); + logger.error("Metadata could not be transferred", e); } } if (fs.listDirectoryChildren(oldParent).isEmpty()) { @@ -754,11 +756,11 @@ private void removeLostTargetMetadata(String jvmId) { deleteRecordingMetadataIfExists(jvmId, recordingName); } } catch (IOException e) { - logger.error(e); + logger.error("Metadata deletion exception", e); } } } catch (IOException e) { - logger.error(e); + logger.error("Metadata exception", e); } } @@ -780,7 +782,7 @@ private boolean isArchivedRecording(String recordingName) throws IOException { // java streams doesn't allow checked exceptions to propagate // can assume won't throw b/c previous calls to other io methods // were successful - logger.error(e); + logger.error("Directory list exception", e); return false; } }) @@ -788,7 +790,7 @@ private boolean isArchivedRecording(String recordingName) throws IOException { .findFirst() .orElse(false); } catch (IOException ioe) { - logger.error(ioe); + logger.error("Metadata exception", ioe); throw ioe; } } @@ -812,7 +814,7 @@ private boolean targetRecordingExists(ConnectionDescriptor cd, String recordingN logger.warn("Target unreachable {}, msg {}", cd.getTargetId(), te.getMessage()); return false; } catch (Exception e) { - logger.error(e); + logger.error("Target connection exception", e); return false; } } diff --git a/src/main/java/io/cryostat/recordings/RecordingTargetHelper.java b/src/main/java/io/cryostat/recordings/RecordingTargetHelper.java index b42479dc30..084aa6970d 100644 --- a/src/main/java/io/cryostat/recordings/RecordingTargetHelper.java +++ b/src/main/java/io/cryostat/recordings/RecordingTargetHelper.java @@ -34,7 +34,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor.RecordingState; import io.cryostat.core.EventOptionsBuilder; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.Template; import io.cryostat.core.templates.TemplateType; @@ -53,6 +52,8 @@ import io.vertx.core.Vertx; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RecordingTargetHelper { @@ -78,7 +79,7 @@ public class RecordingTargetHelper { private final RecordingOptionsBuilderFactory recordingOptionsBuilderFactory; private final ReportService reportService; private final RecordingMetadataManager recordingMetadataManager; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Map, Long> scheduledRecordingTasks; private final RecordingArchiveHelper recordingArchiveHelper; @@ -92,8 +93,7 @@ public class RecordingTargetHelper { RecordingOptionsBuilderFactory recordingOptionsBuilderFactory, ReportService reportService, RecordingMetadataManager recordingMetadataManager, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { + RecordingArchiveHelper recordingArchiveHelper) { this.vertx = vertx; this.targetConnectionManager = targetConnectionManager; this.webServer = webServer; @@ -104,7 +104,6 @@ public class RecordingTargetHelper { this.reportService = reportService; this.recordingMetadataManager = recordingMetadataManager; this.recordingArchiveHelper = recordingArchiveHelper; - this.logger = logger; this.scheduledRecordingTasks = new ConcurrentHashMap<>(); } @@ -478,7 +477,7 @@ private void issueNotification( .send(); } catch (JvmIdGetException e) { logger.info("Retain null jvmId for target [{}]", targetId); - logger.info(e); + logger.info("JVM ID exception", e); } } diff --git a/src/main/java/io/cryostat/recordings/RecordingsModule.java b/src/main/java/io/cryostat/recordings/RecordingsModule.java index c284d698fe..9f18f56c13 100644 --- a/src/main/java/io/cryostat/recordings/RecordingsModule.java +++ b/src/main/java/io/cryostat/recordings/RecordingsModule.java @@ -35,7 +35,6 @@ import io.cryostat.configuration.Variables; import io.cryostat.core.EventOptionsBuilder; import io.cryostat.core.RecordingOptionsCustomizer; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -85,8 +84,7 @@ static RecordingTargetHelper provideRecordingTargetHelper( RecordingOptionsBuilderFactory recordingOptionsBuilderFactory, ReportService reportService, RecordingMetadataManager recordingMetadataManager, - RecordingArchiveHelper recordingArchiveHelper, - Logger logger) { + RecordingArchiveHelper recordingArchiveHelper) { return new RecordingTargetHelper( vertx, targetConnectionManager, @@ -97,8 +95,7 @@ static RecordingTargetHelper provideRecordingTargetHelper( recordingOptionsBuilderFactory, reportService, recordingMetadataManager, - recordingArchiveHelper, - logger); + recordingArchiveHelper); } @Provides @@ -106,7 +103,6 @@ static RecordingTargetHelper provideRecordingTargetHelper( static RecordingArchiveHelper provideRecordingArchiveHelper( FileSystem fs, Provider webServerProvider, - Logger logger, @Named(MainModule.RECORDINGS_PATH) Path archivedRecordingsPath, @Named(WebModule.WEBSERVER_TEMP_DIR_PATH) Path archivedRecordingsReportPath, TargetConnectionManager targetConnectionManager, @@ -120,7 +116,6 @@ static RecordingArchiveHelper provideRecordingArchiveHelper( return new RecordingArchiveHelper( fs, webServerProvider, - logger, archivedRecordingsPath, archivedRecordingsReportPath, targetConnectionManager, @@ -166,8 +161,7 @@ static RecordingMetadataManager provideRecordingMetadataManager( NotificationFactory notificationFactory, JvmIdHelper jvmIdHelper, Gson gson, - Base32 base32, - Logger logger) { + Base32 base32) { try { Path metadataDir = confDir.resolve(METADATA_SUBDIRECTORY); if (!fs.isDirectory(metadataDir)) { @@ -192,8 +186,7 @@ static RecordingMetadataManager provideRecordingMetadataManager( notificationFactory, jvmIdHelper, gson, - base32, - logger); + base32); } catch (IOException e) { throw new RuntimeException(e); } @@ -206,8 +199,7 @@ static JvmIdHelper provideJvmIdHelper( @Named(Variables.JMX_CONNECTION_TIMEOUT) long connectionTimeoutSeconds, CredentialsManager credentialsManager, DiscoveryStorage storage, - Base32 base32, - Logger logger) { + Base32 base32) { return new JvmIdHelper( targetConnectionManager, credentialsManager, @@ -215,7 +207,6 @@ static JvmIdHelper provideJvmIdHelper( connectionTimeoutSeconds, Executors.newCachedThreadPool(), Scheduler.systemScheduler(), - base32, - logger); + base32); } } diff --git a/src/main/java/io/cryostat/rules/MatchExpressionDao.java b/src/main/java/io/cryostat/rules/MatchExpressionDao.java index 37e515a698..764d3c85b7 100644 --- a/src/main/java/io/cryostat/rules/MatchExpressionDao.java +++ b/src/main/java/io/cryostat/rules/MatchExpressionDao.java @@ -17,11 +17,10 @@ import javax.persistence.EntityManager; -import io.cryostat.core.log.Logger; import io.cryostat.storage.AbstractDao; class MatchExpressionDao extends AbstractDao { - MatchExpressionDao(EntityManager em, Logger logger) { - super(MatchExpression.class, em, logger); + MatchExpressionDao(EntityManager em) { + super(MatchExpression.class, em); } } diff --git a/src/main/java/io/cryostat/rules/MatchExpressionEvaluator.java b/src/main/java/io/cryostat/rules/MatchExpressionEvaluator.java index 3b1db6f823..4878e832ff 100644 --- a/src/main/java/io/cryostat/rules/MatchExpressionEvaluator.java +++ b/src/main/java/io/cryostat/rules/MatchExpressionEvaluator.java @@ -26,7 +26,6 @@ import javax.script.ScriptException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import com.github.benmanes.caffeine.cache.Caffeine; @@ -37,20 +36,20 @@ import jdk.jfr.Label; import jdk.jfr.Name; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MatchExpressionEvaluator { private final ScriptEngine scriptEngine; private final LoadingCache, Boolean> cache; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); MatchExpressionEvaluator( ScriptEngine scriptEngine, CredentialsManager credentialsManager, - RuleRegistry ruleRegistry, - Logger logger) { + RuleRegistry ruleRegistry) { this.scriptEngine = scriptEngine; - this.logger = logger; this.cache = Caffeine.newBuilder() .maximumSize(1024) // should this be configurable? diff --git a/src/main/java/io/cryostat/rules/MatchExpressionManager.java b/src/main/java/io/cryostat/rules/MatchExpressionManager.java index 0c35c8c088..e4878d8e34 100644 --- a/src/main/java/io/cryostat/rules/MatchExpressionManager.java +++ b/src/main/java/io/cryostat/rules/MatchExpressionManager.java @@ -25,7 +25,6 @@ import javax.script.ScriptException; -import io.cryostat.core.log.Logger; import io.cryostat.platform.PlatformClient; import io.cryostat.platform.ServiceRef; @@ -33,6 +32,8 @@ import dagger.Lazy; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MatchExpressionManager { private final MatchExpressionValidator matchExpressionValidator; @@ -40,21 +41,19 @@ public class MatchExpressionManager { private final PlatformClient platformClient; private final MatchExpressionDao dao; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); MatchExpressionManager( MatchExpressionValidator matchExpressionValidator, Lazy matchExpressionEvaluator, PlatformClient platformClient, MatchExpressionDao dao, - Gson gson, - Logger logger) { + Gson gson) { this.matchExpressionValidator = matchExpressionValidator; this.matchExpressionEvaluator = matchExpressionEvaluator; this.platformClient = platformClient; this.dao = dao; this.gson = gson; - this.logger = logger; } public int addMatchExpression(String matchExpression) @@ -97,7 +96,7 @@ public Set resolveMatchingTargets(String expr, Predicate matchedTargets.add(target); } } catch (ScriptException e) { - logger.error(e); + logger.error("Script exception", e); break; } } diff --git a/src/main/java/io/cryostat/rules/PeriodicArchiver.java b/src/main/java/io/cryostat/rules/PeriodicArchiver.java index 3401115f01..1847d36c1c 100644 --- a/src/main/java/io/cryostat/rules/PeriodicArchiver.java +++ b/src/main/java/io/cryostat/rules/PeriodicArchiver.java @@ -25,13 +25,14 @@ import java.util.regex.Pattern; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.web.http.AbstractAuthenticatedRequestHandler; import io.cryostat.platform.ServiceRef; import io.cryostat.recordings.RecordingArchiveHelper; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class PeriodicArchiver implements Runnable { @@ -44,7 +45,7 @@ class PeriodicArchiver implements Runnable { private final Rule rule; private final RecordingArchiveHelper recordingArchiveHelper; private final Function, Void> failureNotifier; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); private final Queue previousRecordings; @@ -53,14 +54,12 @@ class PeriodicArchiver implements Runnable { CredentialsManager credentialsManager, Rule rule, RecordingArchiveHelper recordingArchiveHelper, - Function, Void> failureNotifier, - Logger logger) { + Function, Void> failureNotifier) { this.serviceRef = serviceRef; this.credentialsManager = credentialsManager; this.recordingArchiveHelper = recordingArchiveHelper; this.rule = rule; this.failureNotifier = failureNotifier; - this.logger = logger; this.previousRecordings = new ArrayDeque<>(this.rule.getPreservedArchives()); } @@ -100,7 +99,7 @@ public void run() { performArchival(); } catch (Exception e) { - logger.error(e); + logger.error("Execution exception", e); if (AbstractAuthenticatedRequestHandler.isJmxAuthFailure(e) || AbstractAuthenticatedRequestHandler.isJmxSslFailure(e) diff --git a/src/main/java/io/cryostat/rules/PeriodicArchiverFactory.java b/src/main/java/io/cryostat/rules/PeriodicArchiverFactory.java index bed9adf551..7de1bc539c 100644 --- a/src/main/java/io/cryostat/rules/PeriodicArchiverFactory.java +++ b/src/main/java/io/cryostat/rules/PeriodicArchiverFactory.java @@ -18,7 +18,6 @@ import java.util.function.Function; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import io.cryostat.recordings.RecordingArchiveHelper; @@ -26,12 +25,6 @@ class PeriodicArchiverFactory { - private final Logger logger; - - PeriodicArchiverFactory(Logger logger) { - this.logger = logger; - } - PeriodicArchiver create( ServiceRef serviceRef, CredentialsManager credentialsManager, @@ -39,11 +32,6 @@ PeriodicArchiver create( RecordingArchiveHelper recordingArchiveHelper, Function, Void> failureNotifier) { return new PeriodicArchiver( - serviceRef, - credentialsManager, - rule, - recordingArchiveHelper, - failureNotifier, - logger); + serviceRef, credentialsManager, rule, recordingArchiveHelper, failureNotifier); } } diff --git a/src/main/java/io/cryostat/rules/RuleProcessor.java b/src/main/java/io/cryostat/rules/RuleProcessor.java index 419050ef6d..b8a44e5444 100644 --- a/src/main/java/io/cryostat/rules/RuleProcessor.java +++ b/src/main/java/io/cryostat/rules/RuleProcessor.java @@ -37,7 +37,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.CredentialsManager.CredentialsEvent; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.templates.TemplateType; import io.cryostat.net.ConnectionDescriptor; @@ -58,6 +57,8 @@ import io.vertx.core.AbstractVerticle; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RuleProcessor extends AbstractVerticle implements Consumer { @@ -71,7 +72,7 @@ public class RuleProcessor extends AbstractVerticle implements Consumer, Future> tasks; @@ -85,8 +86,7 @@ public class RuleProcessor extends AbstractVerticle implements Consumer(); this.registry.addListener(this.ruleListener()); @@ -258,7 +257,7 @@ private void activate(Rule rule, ServiceRef serviceRef) { archiveRuleRecording( new ConnectionDescriptor(serviceRef, credentials), rule); } catch (Exception e) { - logger.error(e); + logger.error("Archival exception", e); } } else { try { @@ -267,7 +266,7 @@ private void activate(Rule rule, ServiceRef serviceRef) { return; } } catch (Exception e) { - logger.error(e); + logger.error("Start exception", e); return; } @@ -299,7 +298,7 @@ private void activate(Rule rule, ServiceRef serviceRef) { tasks.put(key, task); } } catch (ScriptException e) { - logger.error(e); + logger.error("Script exception", e); } }); } @@ -327,7 +326,7 @@ private void deactivate(Rule rule, ServiceRef serviceRef) { it.remove(); task.cancel(false); } catch (Exception e) { - logger.error(e); + logger.error("Cancellation exception", e); } } } @@ -362,7 +361,7 @@ private void archiveRuleRecording(ConnectionDescriptor connectionDescriptor, Rul }) .get(); } catch (Exception e) { - logger.error(new RuleException(e)); + logger.error("Archival exception", new RuleException(e)); } } @@ -406,7 +405,7 @@ private boolean startRuleRecording(ConnectionDescriptor connectionDescriptor, Ru return future.handleAsync( (recording, throwable) -> { if (throwable != null) { - logger.error(new RuleException(throwable)); + logger.error("Start exception", new RuleException(throwable)); return false; } if (recording == null) { @@ -426,13 +425,13 @@ private boolean startRuleRecording(ConnectionDescriptor connectionDescriptor, Ru recording.getName(), new Metadata(labels)); } catch (IOException ioe) { - logger.error(ioe); + logger.error("Metadata exception", ioe); } return true; }) .get(); } catch (InterruptedException | ExecutionException e) { - logger.error(new RuleException(e)); + logger.error("Start exception", new RuleException(e)); return false; } } diff --git a/src/main/java/io/cryostat/rules/RuleRegistry.java b/src/main/java/io/cryostat/rules/RuleRegistry.java index d9e09a5174..83b68a3f5b 100644 --- a/src/main/java/io/cryostat/rules/RuleRegistry.java +++ b/src/main/java/io/cryostat/rules/RuleRegistry.java @@ -26,7 +26,6 @@ import javax.script.ScriptException; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.platform.ServiceRef; import io.cryostat.rules.RuleRegistry.RuleEvent; @@ -35,6 +34,8 @@ import com.google.gson.Gson; import dagger.Lazy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RuleRegistry extends AbstractEventEmitter { @@ -43,19 +44,17 @@ public class RuleRegistry extends AbstractEventEmitter { private final FileSystem fs; private final Set rules; private final Gson gson; - private final Logger logger; + private final Logger logger = LoggerFactory.getLogger(getClass()); RuleRegistry( Path rulesDir, Lazy matchExpressionEvaluator, FileSystem fs, - Gson gson, - Logger logger) { + Gson gson) { this.rulesDir = rulesDir; this.matchExpressionEvaluator = matchExpressionEvaluator; this.fs = fs; this.gson = gson; - this.logger = logger; this.rules = new HashSet<>(); } @@ -68,7 +67,7 @@ public void loadRules() throws IOException { try { return fs.readFile(path); } catch (IOException e) { - logger.warn(e); + logger.warn("Load exception", e); return null; } }) @@ -78,7 +77,7 @@ public void loadRules() throws IOException { try (reader) { return gson.fromJson(reader, Rule.class); } catch (IOException ioe) { - logger.error(ioe); + logger.error("JSON parse exception", ioe); return null; } }) @@ -113,11 +112,11 @@ public boolean applies(Rule rule, ServiceRef serviceRef) { try { return matchExpressionEvaluator.get().applies(rule.getMatchExpression(), serviceRef); } catch (ScriptException se) { - logger.error(se); + logger.error("Script exception", se); try { deleteRule(rule); } catch (IOException ioe) { - logger.error(ioe); + logger.error("Delete exception", ioe); } return false; } diff --git a/src/main/java/io/cryostat/rules/RulesModule.java b/src/main/java/io/cryostat/rules/RulesModule.java index 186f00c059..6133686f17 100644 --- a/src/main/java/io/cryostat/rules/RulesModule.java +++ b/src/main/java/io/cryostat/rules/RulesModule.java @@ -27,7 +27,6 @@ import io.cryostat.configuration.ConfigurationModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.TargetConnectionManager; @@ -52,14 +51,13 @@ static RuleRegistry provideRuleRegistry( @Named(ConfigurationModule.CONFIGURATION_PATH) Path confDir, Lazy matchExpressionEvaluator, FileSystem fs, - Gson gson, - Logger logger) { + Gson gson) { try { Path rulesDir = confDir.resolve(RULES_SUBDIRECTORY); if (!fs.isDirectory(rulesDir)) { Files.createDirectory(rulesDir); } - return new RuleRegistry(rulesDir, matchExpressionEvaluator, fs, gson, logger); + return new RuleRegistry(rulesDir, matchExpressionEvaluator, fs, gson); } catch (IOException e) { throw new RuntimeException(e); } @@ -67,8 +65,8 @@ static RuleRegistry provideRuleRegistry( @Provides @Singleton - static MatchExpressionDao provideMatchExpressionDao(EntityManager em, Logger logger) { - return new MatchExpressionDao(em, logger); + static MatchExpressionDao provideMatchExpressionDao(EntityManager em) { + return new MatchExpressionDao(em); } @Provides @@ -78,10 +76,9 @@ static MatchExpressionManager provideMatchExpressionManager( Lazy matchExpressionEvaluator, DiscoveryStorage discovery, MatchExpressionDao dao, - Gson gson, - Logger logger) { + Gson gson) { return new MatchExpressionManager( - matchExpressionValidator, matchExpressionEvaluator, discovery, dao, gson, logger); + matchExpressionValidator, matchExpressionEvaluator, discovery, dao, gson); } @Provides @@ -95,9 +92,8 @@ static MatchExpressionValidator provideMatchExpressionValidator() { static MatchExpressionEvaluator provideMatchExpressionEvaluator( ScriptEngine scriptEngine, CredentialsManager credentialsManager, - RuleRegistry ruleRegistry, - Logger logger) { - return new MatchExpressionEvaluator(scriptEngine, credentialsManager, ruleRegistry, logger); + RuleRegistry ruleRegistry) { + return new MatchExpressionEvaluator(scriptEngine, credentialsManager, ruleRegistry); } @Provides @@ -111,8 +107,7 @@ static RuleProcessor provideRuleProcessor( RecordingArchiveHelper recordingArchiveHelper, RecordingTargetHelper recordingTargetHelper, RecordingMetadataManager metadataManager, - PeriodicArchiverFactory periodicArchiverFactory, - Logger logger) { + PeriodicArchiverFactory periodicArchiverFactory) { return new RuleProcessor( Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors() * 2), storage, @@ -123,13 +118,12 @@ static RuleProcessor provideRuleProcessor( recordingArchiveHelper, recordingTargetHelper, metadataManager, - periodicArchiverFactory, - logger); + periodicArchiverFactory); } @Provides @Singleton - static PeriodicArchiverFactory providePeriodicArchivedFactory(Logger logger) { - return new PeriodicArchiverFactory(logger); + static PeriodicArchiverFactory providePeriodicArchivedFactory() { + return new PeriodicArchiverFactory(); } } diff --git a/src/main/java/io/cryostat/storage/AbstractDao.java b/src/main/java/io/cryostat/storage/AbstractDao.java index 668ff8c2e4..40f0262b1e 100644 --- a/src/main/java/io/cryostat/storage/AbstractDao.java +++ b/src/main/java/io/cryostat/storage/AbstractDao.java @@ -26,18 +26,18 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import io.cryostat.core.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractDao { protected final Class klazz; protected final EntityManager entityManager; - protected final Logger logger; + protected final Logger logger = LoggerFactory.getLogger(getClass()); - protected AbstractDao(Class klazz, EntityManager entityManager, Logger logger) { + protected AbstractDao(Class klazz, EntityManager entityManager) { this.klazz = klazz; this.entityManager = entityManager; - this.logger = logger; } public final T save(T t) { @@ -54,7 +54,7 @@ public final T save(T t) { if (transaction != null) { transaction.rollback(); } - logger.error(e); + logger.error("Persist exception", e); throw e; } } @@ -74,7 +74,7 @@ public final boolean delete(I id) { if (transaction != null) { transaction.rollback(); } - logger.error(e); + logger.error("Delete exception", e); return false; } } diff --git a/src/main/java/io/cryostat/util/GsonJmxServiceUrlAdapter.java b/src/main/java/io/cryostat/util/GsonJmxServiceUrlAdapter.java index e1d54a51b3..258495c9e6 100644 --- a/src/main/java/io/cryostat/util/GsonJmxServiceUrlAdapter.java +++ b/src/main/java/io/cryostat/util/GsonJmxServiceUrlAdapter.java @@ -19,19 +19,15 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; - import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class GsonJmxServiceUrlAdapter extends TypeAdapter { - private final Logger logger; - - public GsonJmxServiceUrlAdapter(Logger logger) { - this.logger = logger; - } + private final Logger logger = LoggerFactory.getLogger(getClass()); @Override public JMXServiceURL read(JsonReader reader) throws IOException { @@ -40,7 +36,7 @@ public JMXServiceURL read(JsonReader reader) throws IOException { try { jmxUrl = new JMXServiceURL(url); } catch (Exception e) { - logger.warn(e); + logger.warn("JSON read exception", e); jmxUrl = null; } return jmxUrl; diff --git a/src/main/java/io/cryostat/util/JavaProcess.java b/src/main/java/io/cryostat/util/JavaProcess.java index c97f33fb0f..21e245599e 100644 --- a/src/main/java/io/cryostat/util/JavaProcess.java +++ b/src/main/java/io/cryostat/util/JavaProcess.java @@ -22,12 +22,14 @@ import java.util.Map; import java.util.Objects; -import io.cryostat.core.log.Logger; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JavaProcess { + private static Logger logger = LoggerFactory.getLogger(JavaProcess.class); + static Process exec( Class klazz, Map env, List jvmArgs, List processArgs) throws IOException, InterruptedException { @@ -41,7 +43,7 @@ static Process exec( cmd.add(className); cmd.addAll(processArgs); - Logger.INSTANCE.trace("Forking process: " + cmd.toString()); + logger.trace("Forking process: {}", cmd.toString()); var pb = new ProcessBuilder(); pb.environment().putAll(env); return pb.command(cmd).inheritIO().start(); diff --git a/src/test/java/io/cryostat/configuration/CredentialsManagerTest.java b/src/test/java/io/cryostat/configuration/CredentialsManagerTest.java index 3553d7846e..552282caf3 100644 --- a/src/test/java/io/cryostat/configuration/CredentialsManagerTest.java +++ b/src/test/java/io/cryostat/configuration/CredentialsManagerTest.java @@ -23,7 +23,6 @@ import java.util.Set; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.sys.FileSystem; import io.cryostat.platform.PlatformClient; @@ -55,8 +54,7 @@ class CredentialsManagerTest { @Mock PlatformClient platformClient; @Mock StoredCredentialsDao dao; @Mock FileSystem fs; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); Base32 base32 = new Base32(); @BeforeEach @@ -69,8 +67,7 @@ void setup() { platformClient, dao, fs, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java b/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java index 18b3881e52..4e739b3128 100644 --- a/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java +++ b/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java @@ -34,7 +34,6 @@ import io.cryostat.MockVertx; import io.cryostat.VerticleDeployer; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import io.cryostat.core.sys.Clock; import io.cryostat.discovery.DiscoveryStorage.NotFoundException; @@ -86,9 +85,8 @@ class DiscoveryStorageTest { @Mock MatchExpressionEvaluator matchExpressionEvaluator; @Mock WebClient http; @Mock Clock clock; - @Mock Logger logger; Vertx vertx = MockVertx.vertx(); - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Singleton @Component(modules = {MainModule.class}) @@ -120,8 +118,7 @@ void setup() { () -> matchExpressionEvaluator, gson, http, - clock, - logger); + clock); this.storage.init(vertx, null); } diff --git a/src/test/java/io/cryostat/messaging/MessagingServerTest.java b/src/test/java/io/cryostat/messaging/MessagingServerTest.java index a3166a84d1..429b7b5577 100644 --- a/src/test/java/io/cryostat/messaging/MessagingServerTest.java +++ b/src/test/java/io/cryostat/messaging/MessagingServerTest.java @@ -28,7 +28,6 @@ import io.cryostat.MainModule; import io.cryostat.MockVertx; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Clock; import io.cryostat.core.sys.Environment; import io.cryostat.messaging.notifications.Notification; @@ -57,10 +56,9 @@ class MessagingServerTest { Vertx vertx; MessagingServer server; @Mock Environment env; - @Mock Logger logger; @Mock HttpServer httpServer; @Mock AuthManager authManager; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock ServerWebSocket sws; @Mock Clock clock; @Mock NotificationFactory notificationFactory; @@ -99,15 +97,7 @@ void setup() { server = new MessagingServer( - vertx, - httpServer, - env, - authManager, - notificationFactory, - 2, - clock, - logger, - gson); + vertx, httpServer, env, authManager, notificationFactory, 2, clock, gson); } @Test diff --git a/src/test/java/io/cryostat/net/BasicAuthManagerTest.java b/src/test/java/io/cryostat/net/BasicAuthManagerTest.java index fe9a97c1a5..8ff6975abb 100644 --- a/src/test/java/io/cryostat/net/BasicAuthManagerTest.java +++ b/src/test/java/io/cryostat/net/BasicAuthManagerTest.java @@ -21,7 +21,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.security.ResourceAction; @@ -36,7 +35,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.NullSource; import org.junit.jupiter.params.provider.ValueSource; -import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @@ -45,64 +43,16 @@ class BasicAuthManagerTest { BasicAuthManager mgr; - @Mock Logger logger; @Mock FileSystem fs; @Mock Path confDir; @BeforeEach void setup() { - mgr = new BasicAuthManager(logger, fs, confDir); + mgr = new BasicAuthManager(fs, confDir); } @Nested class ConfigLoadingTest { - @Test - void shouldWarnWhenPropertiesNotFound() throws Exception { - mgr.loadConfig(); - - ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor objectCaptor = ArgumentCaptor.forClass(Object.class); - Mockito.verify(logger).warn(messageCaptor.capture(), objectCaptor.capture()); - MatcherAssert.assertThat( - messageCaptor.getValue(), - Matchers.stringContainsInOrder("User properties file", "does not exist")); - } - - @Test - void shouldWarnWhenPropertiesNotFile() throws Exception { - Path mockPath = Mockito.mock(Path.class); - Mockito.when(confDir.resolve(Mockito.anyString())).thenReturn(mockPath); - Mockito.when(fs.exists(mockPath)).thenReturn(true); - Mockito.when(fs.isRegularFile(mockPath)).thenReturn(false); - - mgr.loadConfig(); - - ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor objectCaptor = ArgumentCaptor.forClass(Object.class); - Mockito.verify(logger).warn(messageCaptor.capture(), objectCaptor.capture()); - MatcherAssert.assertThat( - messageCaptor.getValue(), - Matchers.stringContainsInOrder("User properties path", "is not a file")); - } - - @Test - void shouldWarnWhenPropertiesNotReadable() throws Exception { - Path mockPath = Mockito.mock(Path.class); - Mockito.when(confDir.resolve(Mockito.anyString())).thenReturn(mockPath); - Mockito.when(fs.exists(mockPath)).thenReturn(true); - Mockito.when(fs.isRegularFile(mockPath)).thenReturn(true); - Mockito.when(fs.isReadable(mockPath)).thenReturn(false); - - mgr.loadConfig(); - - ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor objectCaptor = ArgumentCaptor.forClass(Object.class); - Mockito.verify(logger).warn(messageCaptor.capture(), objectCaptor.capture()); - MatcherAssert.assertThat( - messageCaptor.getValue(), - Matchers.stringContainsInOrder("User properties file", "is not readable")); - } - @Test void shouldLogFileReadErrors() throws Exception { Path mockPath = Mockito.mock(Path.class); @@ -114,8 +64,6 @@ void shouldLogFileReadErrors() throws Exception { Mockito.when(fs.readFile(mockPath)).thenThrow(ex); mgr.loadConfig(); - - Mockito.verify(logger).error(ex); } } @@ -142,23 +90,11 @@ void shouldReturnUserInfoWithSuppliedUsername() throws Exception { @Test void shouldFailAuthenticationWhenCredentialsMalformed() throws Exception { Assertions.assertFalse(mgr.validateToken(() -> "user", ResourceAction.NONE).get()); - ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor objectCaptor = ArgumentCaptor.forClass(Object.class); - Mockito.verify(logger).warn(messageCaptor.capture(), objectCaptor.capture()); - MatcherAssert.assertThat( - messageCaptor.getValue(), - Matchers.stringContainsInOrder("User properties file", "does not exist")); } @Test void shouldFailAuthenticationWhenNoMatchFound() throws Exception { Assertions.assertFalse(mgr.validateToken(() -> "user:pass", ResourceAction.NONE).get()); - ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor objectCaptor = ArgumentCaptor.forClass(Object.class); - Mockito.verify(logger).warn(messageCaptor.capture(), objectCaptor.capture()); - MatcherAssert.assertThat( - messageCaptor.getValue(), - Matchers.stringContainsInOrder("User properties file", "does not exist")); } @Test @@ -174,7 +110,6 @@ void shouldPassAuthenticationWhenMatchFound() throws Exception { "user:d74ff0ee8da3b9806b18c877dbf29bbde50b5bd8e4dad7a3a725000feb82e8f1")); Mockito.when(fs.readFile(mockPath)).thenReturn(props); Assertions.assertTrue(mgr.validateToken(() -> "user:pass", ResourceAction.NONE).get()); - Mockito.verifyNoInteractions(logger); } @Test @@ -193,7 +128,6 @@ void shouldHandleMultipleAuthentications() throws Exception { Assertions.assertFalse(mgr.validateToken(() -> "user:sass", ResourceAction.NONE).get()); Assertions.assertFalse( mgr.validateToken(() -> "user2:pass", ResourceAction.NONE).get()); - Mockito.verifyNoInteractions(logger); } @Test @@ -217,7 +151,6 @@ void shouldIgnoreMalformedPropertiesLines() throws Exception { Assertions.assertFalse(mgr.validateToken(() -> "foo:bar", ResourceAction.NONE).get()); Assertions.assertTrue( mgr.validateToken(() -> "admin:admin", ResourceAction.NONE).get()); - Mockito.verifyNoInteractions(logger); } } diff --git a/src/test/java/io/cryostat/net/SslConfigurationTest.java b/src/test/java/io/cryostat/net/SslConfigurationTest.java index 488b2f1818..9e73f55436 100644 --- a/src/test/java/io/cryostat/net/SslConfigurationTest.java +++ b/src/test/java/io/cryostat/net/SslConfigurationTest.java @@ -28,7 +28,6 @@ import java.nio.file.Path; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -52,14 +51,13 @@ class SslConfigurationTest { @Mock Environment env; @Mock FileSystem fs; - @Mock Logger logger; @Mock SslConfiguration.SslConfigurationStrategy strategy; SslConfiguration sslConf; @BeforeEach void setup() { - sslConf = new SslConfiguration(env, fs, logger, strategy); + sslConf = new SslConfiguration(env, fs, strategy); } @Test @@ -70,7 +68,7 @@ void shouldFallbackToPlainHttp() throws SslConfiguration.SslConfigurationExcepti when(dne.resolve(anyString())).thenReturn(dne); when(fs.exists(any(Path.class))).thenReturn(false); - sslConf = new SslConfiguration(env, fs, logger); + sslConf = new SslConfiguration(env, fs); MatcherAssert.assertThat(sslConf.enabled(), Matchers.equalTo(false)); } diff --git a/src/test/java/io/cryostat/net/TargetConnectionManagerTest.java b/src/test/java/io/cryostat/net/TargetConnectionManagerTest.java index c1171d2397..5b017e46ff 100644 --- a/src/test/java/io/cryostat/net/TargetConnectionManagerTest.java +++ b/src/test/java/io/cryostat/net/TargetConnectionManagerTest.java @@ -22,7 +22,6 @@ import javax.management.remote.JMXServiceURL; import io.cryostat.DirectExecutor; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.platform.PlatformClient; @@ -46,7 +45,6 @@ class TargetConnectionManagerTest { TargetConnectionManager mgr; - @Mock Logger logger; @Mock JFRConnectionToolkit jfrConnectionToolkit; @Mock AgentConnection.Factory agentConnectionFactory; @Mock PlatformClient platformClient; @@ -63,8 +61,7 @@ void setup() { Scheduler.disabledScheduler(), TTL, -1, - 10, - logger); + 10); } @Test @@ -157,8 +154,7 @@ void shouldCreateNewConnectionForAccessDelayedLongerThanTTL() throws Exception { Scheduler.systemScheduler(), Duration.ofNanos(1), 1, - 10, - logger); + 10); Mockito.when(jfrConnectionToolkit.connect(Mockito.any(), Mockito.any(), Mockito.any())) .thenAnswer( new Answer() { @@ -187,8 +183,7 @@ void shouldCreateNewConnectionPerTarget() throws Exception { Scheduler.disabledScheduler(), Duration.ofNanos(1), -1, - 10, - logger); + 10); Mockito.when(jfrConnectionToolkit.connect(Mockito.any(), Mockito.any(), Mockito.any())) .thenAnswer( new Answer() { @@ -226,8 +221,7 @@ void shouldConnectToAgents(String url) throws Exception { Scheduler.disabledScheduler(), Duration.ofNanos(1), -1, - 10, - logger); + 10); ConnectionDescriptor desc = new ConnectionDescriptor(url); JFRConnection conn = mgr.executeConnectedTask(desc, a -> a); MatcherAssert.assertThat(conn, Matchers.sameInstance(agentConn)); diff --git a/src/test/java/io/cryostat/net/openshift/OpenShiftAuthManagerTest.java b/src/test/java/io/cryostat/net/openshift/OpenShiftAuthManagerTest.java index cb00272a95..ea44f4b036 100644 --- a/src/test/java/io/cryostat/net/openshift/OpenShiftAuthManagerTest.java +++ b/src/test/java/io/cryostat/net/openshift/OpenShiftAuthManagerTest.java @@ -31,7 +31,6 @@ import java.util.stream.Stream; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.AuthenticationScheme; import io.cryostat.net.MissingEnvironmentVariableException; @@ -45,8 +44,6 @@ import com.github.benmanes.caffeine.cache.Scheduler; import com.google.gson.Gson; -import io.fabric8.kubernetes.api.model.StatusCause; -import io.fabric8.kubernetes.api.model.StatusDetails; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.authentication.TokenReviewBuilder; import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview; @@ -123,12 +120,11 @@ class OpenShiftAuthManagerTest { OpenShiftAuthManager mgr; @Mock Environment env; @Mock ClassPropertiesLoader classPropertiesLoader; - @Mock Logger logger; @Mock HttpClient httpClient; OpenShiftClient client; OpenShiftMockServer server; TokenProvider tokenProvider; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock CompletableFuture redirectUrl; @BeforeEach @@ -148,8 +144,7 @@ void setup() throws IOException { classPropertiesLoader, gson, Runnable::run, - Scheduler.disabledScheduler(), - logger); + Scheduler.disabledScheduler()); } @ParameterizedTest @@ -166,8 +161,7 @@ void testPropertiesResourceMapProcessing(Map map) throws IOExcep (Map>) map.get("expected"); Mockito.when(loader.loadAsMap(Mockito.any())).thenReturn(resourcesMap); - Map> result = - OpenShiftAuthManager.processResourceMapping(loader, logger); + Map> result = mgr.processResourceMapping(loader); MatcherAssert.assertThat(result, Matchers.equalTo(expected)); } @@ -528,54 +522,6 @@ void shouldReturnLogoutRedirectUrl() throws Exception { MatcherAssert.assertThat(logoutRedirectUrl, Matchers.equalTo(EXPECTED_LOGOUT_REDIRECT_URL)); } - @Test - void shouldLogWhenTokenDeletionFailsOnLogout() throws Exception { - Resource token = Mockito.mock(Resource.class); - NonNamespaceOperation> - tokens = Mockito.mock(NonNamespaceOperation.class); - - Mockito.when(client.oAuthAccessTokens()).thenReturn(tokens); - Mockito.when(tokens.withName(Mockito.anyString())).thenReturn(token); - - StatusDetails status = Mockito.mock(StatusDetails.class); - StatusCause cause = Mockito.mock(StatusCause.class); - Mockito.when(cause.getField()).thenReturn("token"); - Mockito.when(cause.getReason()).thenReturn("some reason"); - Mockito.when(cause.getMessage()).thenReturn("some message"); - Mockito.when(status.getCauses()).thenReturn(List.of(cause)); - Mockito.when(token.delete()).thenReturn(List.of(status)); - - Mockito.when(client.getHttpClient()).thenReturn(httpClient); - Mockito.when(client.getMasterUrl()).thenReturn(new URL("https://example.com")); - - HttpRequest.Builder requestBuilder = Mockito.mock(HttpRequest.Builder.class); - Mockito.when(requestBuilder.uri(Mockito.any(URI.class))).thenReturn(requestBuilder); - Mockito.when(requestBuilder.header(Mockito.anyString(), Mockito.anyString())) - .thenReturn(requestBuilder); - - HttpRequest request = Mockito.mock(HttpRequest.class); - Mockito.when(requestBuilder.build()).thenReturn(request); - Mockito.when(httpClient.newHttpRequestBuilder()).thenReturn(requestBuilder); - - HttpResponse resp = Mockito.mock(HttpResponse.class); - Mockito.when(resp.body()).thenReturn(OAUTH_METADATA); - - Mockito.when(httpClient.sendAsync(request, String.class)) - .thenReturn(CompletableFuture.completedFuture(resp)); - - Mockito.verifyNoInteractions(logger); - - mgr.logout(() -> "Bearer myToken").get(); - - ArgumentCaptor logCaptor = ArgumentCaptor.forClass(Exception.class); - Mockito.verify(logger).warn(logCaptor.capture()); - MatcherAssert.assertThat( - logCaptor.getValue().toString(), - Matchers.equalTo( - "io.cryostat.net.TokenNotFoundException: Token not found: [[token] some" - + " reason: some message]")); - } - @ParameterizedTest @EnumSource(mode = EnumSource.Mode.MATCH_ANY, names = "^([a-zA-Z]+_(RECORDING|CERTIFICATE))$") void shouldValidateExpectedPermissionsPerSecuredResource(ResourceAction resourceAction) diff --git a/src/test/java/io/cryostat/net/reports/ActiveRecordingReportCacheTest.java b/src/test/java/io/cryostat/net/reports/ActiveRecordingReportCacheTest.java index a793c8fd6c..2820f7b790 100644 --- a/src/test/java/io/cryostat/net/reports/ActiveRecordingReportCacheTest.java +++ b/src/test/java/io/cryostat/net/reports/ActiveRecordingReportCacheTest.java @@ -26,7 +26,6 @@ import javax.inject.Provider; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; @@ -55,7 +54,6 @@ class ActiveRecordingReportCacheTest { @Mock Environment env; @Mock FileSystem fs; @Mock TargetConnectionManager targetConnectionManager; - @Mock Logger logger; @Mock CompletableFuture pathFuture; @Mock Path destinationFile; @Mock JavaProcess.Builder javaProcessBuilder; @@ -67,13 +65,7 @@ class ActiveRecordingReportCacheTest { void setup() { this.cache = new ActiveRecordingReportCache( - () -> subprocessReportGenerator, - fs, - targetConnectionManager, - 30, - 30, - 30, - logger); + () -> subprocessReportGenerator, fs, targetConnectionManager, 30, 30, 30); } @Test diff --git a/src/test/java/io/cryostat/net/reports/ArchivedRecordingReportCacheTest.java b/src/test/java/io/cryostat/net/reports/ArchivedRecordingReportCacheTest.java index c510ed5cd3..e7ec60afbd 100644 --- a/src/test/java/io/cryostat/net/reports/ArchivedRecordingReportCacheTest.java +++ b/src/test/java/io/cryostat/net/reports/ArchivedRecordingReportCacheTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.recordings.RecordingArchiveHelper; import io.cryostat.recordings.RecordingNotFoundException; @@ -50,14 +49,13 @@ class ArchivedRecordingReportCacheTest { @Mock Path destinationFile; @Mock FileSystem fs; @Mock SubprocessReportGenerator subprocessReportGenerator; - @Mock Logger logger; @Mock RecordingArchiveHelper recordingArchiveHelper; @BeforeEach void setup() { this.cache = new ArchivedRecordingReportCache( - fs, () -> subprocessReportGenerator, recordingArchiveHelper, 30, logger); + fs, () -> subprocessReportGenerator, recordingArchiveHelper, 30); this.sourceTarget = "service:jmx:rmi://localhost:9091/jndi/rmi://fooHost:9091/jmxrmi"; this.recordingName = "foo"; } diff --git a/src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.java b/src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.java index 6a9a02295a..19cae5cf67 100644 --- a/src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.java +++ b/src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -50,7 +49,6 @@ class SubprocessReportGeneratorTest { @Mock FileSystem fs; @Mock TargetConnectionManager targetConnectionManager; @Mock JavaProcess.Builder javaProcessBuilder; - @Mock Logger logger; @Mock Process proc; ConnectionDescriptor connectionDescriptor; RecordingDescriptor recordingDescriptor; @@ -97,7 +95,7 @@ void setup() throws Exception { .thenReturn("200"); this.generator = new SubprocessReportGenerator( - env, fs, targetConnectionManager, () -> javaProcessBuilder, 30, logger); + env, fs, targetConnectionManager, () -> javaProcessBuilder, 30); } @Test diff --git a/src/test/java/io/cryostat/net/web/WebServerTest.java b/src/test/java/io/cryostat/net/web/WebServerTest.java index 27ac58dfd9..ba0f5c9bed 100644 --- a/src/test/java/io/cryostat/net/web/WebServerTest.java +++ b/src/test/java/io/cryostat/net/web/WebServerTest.java @@ -33,7 +33,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; import io.cryostat.net.HttpServer; @@ -57,18 +56,15 @@ class WebServerTest { @Mock HttpServer httpServer; @Mock NetworkConfiguration netConf; @Mock AuthManager authManager; - @Mock Logger logger; @Mock JFRConnection connection; @Mock IFlightRecorderService service; @Mock Path recordingsPath; @Mock io.vertx.core.Vertx vertx; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - exporter = - new WebServer( - httpServer, netConf, Set.of(), gson, authManager, logger, recordingsPath); + exporter = new WebServer(httpServer, netConf, Set.of(), gson, authManager, recordingsPath); } @Test @@ -83,13 +79,7 @@ void shouldSuccessfullyInstantiateWithDefaultServer() { assertDoesNotThrow( () -> new WebServer( - httpServer, - netConf, - Set.of(), - gson, - authManager, - logger, - recordingsPath)); + httpServer, netConf, Set.of(), gson, authManager, recordingsPath)); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java b/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java index 724175bd81..f102991931 100644 --- a/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java @@ -26,7 +26,6 @@ import org.openjdk.jmc.rjmx.ConnectionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.PermissionDeniedException; @@ -61,12 +60,11 @@ class AbstractAuthenticatedRequestHandlerTest { @Mock RoutingContext ctx; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; @Mock HttpServerResponse resp; @BeforeEach void setup() { - this.handler = new AuthenticatedHandler(auth, credentialsManager, logger); + this.handler = new AuthenticatedHandler(auth, credentialsManager); Mockito.lenient().when(ctx.response()).thenReturn(resp); Mockito.lenient() .when( @@ -165,9 +163,7 @@ void setup2() { @Test void shouldPropagateIfHandlerThrowsHttpException() { Exception expectedException = new HttpException(200); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); HttpException ex = Assertions.assertThrows(HttpException.class, () -> handler.handle(ctx)); @@ -177,9 +173,7 @@ void shouldPropagateIfHandlerThrowsHttpException() { @Test void shouldThrow500IfConnectionFails() { Exception expectedException = new ConnectionException(""); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); HttpException ex = Assertions.assertThrows(HttpException.class, () -> handler.handle(ctx)); @@ -191,9 +185,7 @@ void shouldThrow427IfConnectionFailsDueToTargetAuth() { Exception cause = new SecurityException(); Exception expectedException = new ConnectionException(""); expectedException.initCause(cause); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); Mockito.when(ctx.response()).thenReturn(resp); @@ -208,9 +200,7 @@ void shouldThrow502IfConnectionFailsDueToSslTrust() { Exception cause = new ConnectIOException("SSL trust"); Exception expectedException = new ConnectionException(""); expectedException.initCause(cause); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); HttpException ex = Assertions.assertThrows(HttpException.class, () -> handler.handle(ctx)); @@ -223,9 +213,7 @@ void shouldThrow404IfConnectionFailsDueToInvalidTarget() { Exception cause = new UnknownHostException("localhostt"); Exception expectedException = new ConnectionException(""); expectedException.initCause(cause); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); HttpException ex = Assertions.assertThrows(HttpException.class, () -> handler.handle(ctx)); @@ -236,9 +224,7 @@ void shouldThrow404IfConnectionFailsDueToInvalidTarget() { @Test void shouldThrow500IfHandlerThrowsUnexpectedly() { Exception expectedException = new NullPointerException(); - handler = - new ThrowingAuthenticatedHandler( - auth, credentialsManager, logger, expectedException); + handler = new ThrowingAuthenticatedHandler(auth, credentialsManager, expectedException); HttpException ex = Assertions.assertThrows(HttpException.class, () -> handler.handle(ctx)); @@ -255,7 +241,7 @@ class WithTargetAuth { @BeforeEach void setup3() { - handler = new ConnectionDescriptorHandler(auth, credentialsManager, logger); + handler = new ConnectionDescriptorHandler(auth, credentialsManager); Mockito.when(ctx.request()).thenReturn(req); when(req.headers()).thenReturn(headers); when(auth.validateHttpHeader(Mockito.any(), Mockito.any())) @@ -403,9 +389,8 @@ void shouldIncludeCredentialsFromAppropriateHeader() { } static class AuthenticatedHandler extends AbstractAuthenticatedRequestHandler { - AuthenticatedHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + AuthenticatedHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override @@ -436,11 +421,8 @@ static class ThrowingAuthenticatedHandler extends AuthenticatedHandler { private final Exception thrown; ThrowingAuthenticatedHandler( - AuthManager auth, - CredentialsManager credentialsManager, - Logger logger, - Exception thrown) { - super(auth, credentialsManager, logger); + AuthManager auth, CredentialsManager credentialsManager, Exception thrown) { + super(auth, credentialsManager); this.thrown = thrown; } @@ -453,9 +435,8 @@ public void handleAuthenticated(RoutingContext ctx) throws Exception { static class ConnectionDescriptorHandler extends AuthenticatedHandler { ConnectionDescriptor desc; - ConnectionDescriptorHandler( - AuthManager auth, CredentialsManager credentialsManager, Logger logger) { - super(auth, credentialsManager, logger); + ConnectionDescriptorHandler(AuthManager auth, CredentialsManager credentialsManager) { + super(auth, credentialsManager); } @Override diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandlerTest.java index a9f430f43d..48c0f06bf8 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/ArchivedDirectoriesGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.recordings.RecordingArchiveHelper; @@ -54,8 +53,7 @@ class ArchivedDirectoriesGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @@ -64,7 +62,7 @@ class ArchivedDirectoriesGetHandlerTest { void setup() { this.handler = new ArchivedDirectoriesGetHandler( - auth, credentialsManager, recordingArchiveHelper, gson, logger); + auth, credentialsManager, recordingArchiveHelper, gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/CredentialTestPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/CredentialTestPostHandlerTest.java index eb8a0266a3..f531c4740d 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/CredentialTestPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/CredentialTestPostHandlerTest.java @@ -23,7 +23,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; import io.cryostat.net.TargetConnectionManager; @@ -52,9 +51,8 @@ class CredentialTestPostHandlerTest { CredentialTestPostHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; @Mock TargetConnectionManager tcm; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionDeleteHandlerTest.java index 92d2888f98..07b046926a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionDeleteHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -55,8 +54,7 @@ class MatchExpressionDeleteHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification.Builder notificationBuilder; @Mock Notification notification; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionGetHandlerTest.java index bae2ce16a9..668224863a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionGetHandlerTest.java @@ -23,7 +23,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -54,8 +53,7 @@ class MatchExpressionGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock MatchExpressionManager expressionManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsGetHandlerTest.java index 2b953856ec..49925ae222 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsGetHandlerTest.java @@ -20,7 +20,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -48,8 +47,7 @@ class MatchExpressionsGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock MatchExpressionManager expressionManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostHandlerTest.java index c9718f8d69..dd89bc347a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/MatchExpressionsPostHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -66,8 +65,7 @@ class MatchExpressionsPostHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification.Builder notificationBuilder; @Mock Notification notification; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/ProbeTemplateGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/ProbeTemplateGetHandlerTest.java index e048034398..560d7a2997 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/ProbeTemplateGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/ProbeTemplateGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.LocalProbeTemplateService; import io.cryostat.core.agent.ProbeTemplate; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; @@ -52,10 +51,9 @@ public class ProbeTemplateGetHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalProbeTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock Environment env; @Mock ProbeTemplate template; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandlerTest.java index 3bb4bfae10..f04d494494 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetFromPathWithJwtHandlerTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -61,19 +60,12 @@ class RecordingGetFromPathWithJwtHandlerTest { @Mock WebServer webServer; @Mock JvmIdHelper jvmIdHelper; @Mock RecordingArchiveHelper archive; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new RecordingGetFromPathWithJwtHandler( - auth, - credentialsManager, - jwt, - () -> webServer, - jvmIdHelper, - archive, - logger); + auth, credentialsManager, jwt, () -> webServer, jvmIdHelper, archive); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandlerTest.java index fcde29d249..c04738d3a4 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingGetWithJwtHandlerTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -59,13 +58,12 @@ class RecordingGetWithJwtHandlerTest { @Mock AssetJwtHelper jwt; @Mock WebServer webServer; @Mock RecordingArchiveHelper archive; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new RecordingGetWithJwtHandler( - auth, credentialsManager, jwt, () -> webServer, archive, logger); + auth, credentialsManager, jwt, () -> webServer, archive); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandlerTest.java index fd6874f4d6..847e82cef5 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/RecordingsFromIdPostHandlerTest.java @@ -33,7 +33,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -93,8 +92,7 @@ class RecordingsFromIdPostHandlerTest { @Mock JvmIdHelper jvmIdHelper; @Mock RecordingArchiveHelper recordingArchiveHelper; @Mock RecordingMetadataManager recordingMetadataManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); // this is the basename file name timestamp (December 19, 2019) long expectedArchivedTime = Instant.parse("2019-12-19T21:38:34.00Z").toEpochMilli(); @@ -142,8 +140,7 @@ void setup() throws JvmIdGetException { recordingMetadataManager, recordingsPath, globalMaxFiles, - () -> webServer, - logger); + () -> webServer); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandlerTest.java index 8e5e1ccd13..a6fe2bcea3 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetFromPathWithJwtHandlerTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.security.ResourceAction; @@ -66,7 +65,6 @@ class ReportGetFromPathWithJwtHandlerTest { @Mock JvmIdHelper jvmIdHelper; @Mock ReportService reports; @Mock RecordingArchiveHelper archiveHelper; - @Mock Logger logger; @BeforeEach void setup() { @@ -79,8 +77,7 @@ void setup() { jvmIdHelper, reports, archiveHelper, - 30, - logger); + 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandlerTest.java index 5c8ebcb106..560c6268a7 100644 --- a/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/beta/ReportGetWithJwtHandlerTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.security.ResourceAction; @@ -64,20 +63,12 @@ class ReportGetWithJwtHandlerTest { @Mock WebServer webServer; @Mock ReportService reports; @Mock RecordingArchiveHelper archiveHelper; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new ReportGetWithJwtHandler( - auth, - credentialsManager, - jwt, - () -> webServer, - reports, - archiveHelper, - 30, - logger); + auth, credentialsManager, jwt, () -> webServer, reports, archiveHelper, 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/AuthPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/AuthPostHandlerTest.java index 412d56e2f3..fe1675b475 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/AuthPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/AuthPostHandlerTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.CompletableFuture; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.AuthenticationScheme; import io.cryostat.net.web.WebServer; @@ -49,11 +48,10 @@ class AuthPostHandlerTest { AuthPostHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; @BeforeEach void setup() { - this.handler = new AuthPostHandler(auth, credentialsManager, logger); + this.handler = new AuthPostHandler(auth, credentialsManager); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDashboardUrlGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDashboardUrlGetHandlerTest.java index 32dab41cb3..e359d83c70 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDashboardUrlGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDashboardUrlGetHandlerTest.java @@ -23,7 +23,6 @@ import java.util.Set; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.web.http.HttpMimeType; @@ -47,9 +46,8 @@ class GrafanaDashboardUrlGetHandlerTest { GrafanaDashboardUrlGetHandler handler; - @Mock Logger logger; @Mock Environment env; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDatasourceUrlGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDatasourceUrlGetHandlerTest.java index 289c811d90..a2d1d28052 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDatasourceUrlGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/GrafanaDatasourceUrlGetHandlerTest.java @@ -22,7 +22,6 @@ import java.util.Set; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.web.http.HttpMimeType; @@ -46,9 +45,8 @@ class GrafanaDatasourceUrlGetHandlerTest { GrafanaDatasourceUrlGetHandler handler; - @Mock Logger logger; @Mock Environment env; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/NotificationsUrlGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/NotificationsUrlGetHandlerTest.java index bde12e4970..764737fc56 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/NotificationsUrlGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/NotificationsUrlGetHandlerTest.java @@ -24,7 +24,6 @@ import java.util.Set; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.HttpServer; import io.cryostat.net.NetworkConfiguration; import io.cryostat.net.web.http.HttpMimeType; @@ -55,8 +54,7 @@ class WithoutSsl { NotificationsUrlGetHandler handler; @Mock HttpServer httpServer; @Mock NetworkConfiguration netConf; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -114,10 +112,9 @@ void shouldBubbleInternalServerErrorIfHandlerThrows() class WithSsl { NotificationsUrlGetHandler handler; - @Mock Logger logger; @Mock HttpServer httpServer; @Mock NetworkConfiguration netConf; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java index 20cc11835d..cb77f9600a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.recordings.RecordingArchiveHelper; @@ -50,16 +49,13 @@ class RecordingDeleteHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @BeforeEach void setup() { - this.handler = - new RecordingDeleteHandler( - auth, credentialsManager, recordingArchiveHelper, logger); + this.handler = new RecordingDeleteHandler(auth, credentialsManager, recordingArchiveHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingGetHandlerTest.java index 627298279e..d92b4b3292 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingGetHandlerTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -53,7 +52,6 @@ class RecordingGetHandlerTest { @Mock AuthManager authManager; @Mock CredentialsManager credentialsManager; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @@ -61,8 +59,7 @@ class RecordingGetHandlerTest { @BeforeEach void setup() { this.handler = - new RecordingGetHandler( - authManager, credentialsManager, recordingArchiveHelper, logger); + new RecordingGetHandler(authManager, credentialsManager, recordingArchiveHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java index 9c251a2ca0..68f83f3df3 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java @@ -21,7 +21,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -65,7 +64,6 @@ class RecordingUploadPostHandlerTest { @Mock Environment env; @Mock WebClient webClient; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; @Mock RoutingContext ctx; @@ -75,13 +73,7 @@ class RecordingUploadPostHandlerTest { void setup() { this.handler = new RecordingUploadPostHandler( - auth, - credentialsManager, - env, - 30, - webClient, - recordingArchiveHelper, - logger); + auth, credentialsManager, env, 30, webClient, recordingArchiveHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandlerTest.java index 878640e895..f33216e054 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.recordings.RecordingArchiveHelper; @@ -53,8 +52,7 @@ class RecordingsGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @@ -62,8 +60,7 @@ class RecordingsGetHandlerTest { @BeforeEach void setup() { this.handler = - new RecordingsGetHandler( - auth, credentialsManager, recordingArchiveHelper, gson, logger); + new RecordingsGetHandler(auth, credentialsManager, recordingArchiveHelper, gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandlerTest.java index 1f6b5c75f5..29e1981119 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingsPostHandlerTest.java @@ -31,7 +31,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -83,8 +82,7 @@ class RecordingsPostHandlerTest { @Mock Notification.Builder notificationBuilder; @Mock RecordingArchiveHelper recordingArchiveHelper; @Mock RecordingMetadataManager recordingMetadataManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); // this is the basename file name timestamp (December 19, 2019) long expectedArchivedTime = Instant.parse("2019-12-19T21:38:34.00Z").toEpochMilli(); @@ -113,8 +111,7 @@ void setup() { notificationFactory, () -> webServer, recordingArchiveHelper, - recordingMetadataManager, - logger); + recordingMetadataManager); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java index 39e776117e..a1bbcbf11a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.CompletableFuture; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.security.ResourceAction; @@ -57,12 +56,10 @@ class ReportGetHandlerTest { @Mock AuthManager authManager; @Mock CredentialsManager credentialsManager; @Mock ReportService reportService; - @Mock Logger logger; @BeforeEach void setup() { - this.handler = - new ReportGetHandler(authManager, credentialsManager, reportService, 30, logger); + this.handler = new ReportGetHandler(authManager, credentialsManager, reportService, 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandlerTest.java index 95cb5e5b8d..ffdf905115 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetEventsGetHandlerTest.java @@ -26,7 +26,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.jmc.serialization.SerializableEventTypeInfo; @@ -60,14 +59,12 @@ class TargetEventsGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock TargetConnectionManager connectionManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { this.handler = - new TargetEventsGetHandler( - auth, credentialsManager, connectionManager, gson, logger); + new TargetEventsGetHandler(auth, credentialsManager, connectionManager, gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandlerTest.java index f12a95b59d..545232b03d 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingDeleteHandlerTest.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -51,7 +50,6 @@ class TargetRecordingDeleteHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingTargetHelper recordingTargetHelper; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock RoutingContext ctx; @Mock HttpServerRequest req; @@ -60,8 +58,7 @@ class TargetRecordingDeleteHandlerTest { @BeforeEach void setup() { this.handler = - new TargetRecordingDeleteHandler( - auth, credentialsManager, recordingTargetHelper, logger); + new TargetRecordingDeleteHandler(auth, credentialsManager, recordingTargetHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java index 257a633876..d9c67387f2 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; @@ -75,7 +74,6 @@ class TargetRecordingGetHandlerTest { @Mock RecordingTargetHelper recordingTargetHelper; @Mock Optional stream; - @Mock Logger logger; @Mock JFRConnection connection; @Mock CryostatFlightRecorderService service; @@ -88,8 +86,7 @@ void setup() { credentialsManager, targetConnectionManager, httpServer, - recordingTargetHelper, - logger); + recordingTargetHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java index 9931a51408..410fe68c05 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java @@ -23,7 +23,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; @@ -63,8 +62,7 @@ class TargetRecordingOptionsGetHandlerTest { @Mock RecordingOptionsBuilder builder; @Mock IConstrainedMap recordingOptions; @Mock JFRConnection jfrConnection; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -74,8 +72,7 @@ void setup() { credentialsManager, targetConnectionManager, recordingOptionsBuilderFactory, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandlerTest.java index cabe9981b4..f2a274fdc3 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsPatchHandlerTest.java @@ -25,7 +25,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.RecordingOptionsCustomizer; import io.cryostat.core.RecordingOptionsCustomizer.OptionKey; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; @@ -68,7 +67,6 @@ class TargetRecordingOptionsPatchHandlerTest { @Mock IConstrainedMap recordingOptions; @Mock JFRConnection jfrConnection; @Mock Gson gson; - @Mock Logger logger; @BeforeEach void setup() { @@ -79,8 +77,7 @@ void setup() { customizer, connectionManager, recordingOptionsBuilderFactory, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java index 3f97ef93d3..53fa50b356 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.CompletableFuture; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.security.ResourceAction; @@ -56,13 +55,12 @@ class TargetRecordingPatchHandlerTest { @Mock HttpServerRequest req; @Mock HttpServerResponse resp; @Mock ConnectionDescriptor connectionDescriptor; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new TargetRecordingPatchHandler( - authManager, credentialsManager, patchSave, patchStop, logger); + authManager, credentialsManager, patchSave, patchStop); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java index 6c18b04a0a..caffe9a52c 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java @@ -25,7 +25,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Environment; @@ -74,7 +73,6 @@ class TargetRecordingUploadPostHandlerTest { @Mock TargetConnectionManager targetConnectionManager; @Mock WebClient webClient; @Mock FileSystem fs; - @Mock Logger logger; @Mock RoutingContext ctx; @Mock HttpServerRequest req; @@ -87,14 +85,7 @@ class TargetRecordingUploadPostHandlerTest { void setup() { this.handler = new TargetRecordingUploadPostHandler( - auth, - credentialsManager, - env, - targetConnectionManager, - 30, - webClient, - fs, - logger); + auth, credentialsManager, env, targetConnectionManager, 30, webClient, fs); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandlerTest.java index 66468f0c29..6d86adbb78 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsGetHandlerTest.java @@ -25,7 +25,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; @@ -66,8 +65,7 @@ class TargetRecordingsGetHandlerTest { @Mock TargetConnectionManager connectionManager; @Mock WebServer webServer; @Mock RecordingMetadataManager recordingMetadataManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -78,8 +76,7 @@ void setup() { connectionManager, () -> webServer, recordingMetadataManager, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java index 2580ce05ca..aab7b308ff 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java @@ -29,7 +29,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.TemplateService; @@ -78,8 +77,7 @@ class TargetRecordingsPostHandlerTest { @Mock RecordingOptionsBuilderFactory recordingOptionsBuilderFactory; @Mock WebServer webServer; @Mock RecordingMetadataManager recordingMetadataManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock JFRConnection connection; @Mock CryostatFlightRecorderService service; @@ -99,8 +97,7 @@ void setup() { recordingOptionsBuilderFactory, () -> webServer, recordingMetadataManager, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandlerTest.java index 5ea83a9bd3..b7694415eb 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandlerTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.reports.ReportService; @@ -60,13 +59,11 @@ class TargetReportGetHandlerTest { @Mock AuthManager authManager; @Mock CredentialsManager credentialsManager; @Mock ReportService reportService; - @Mock Logger logger; @BeforeEach void setup() { this.handler = - new TargetReportGetHandler( - authManager, credentialsManager, reportService, 30, logger); + new TargetReportGetHandler(authManager, credentialsManager, reportService, 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandlerTest.java index 27d69167ce..f9569ddcf2 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetSnapshotPostHandlerTest.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -50,13 +49,11 @@ class TargetSnapshotPostHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingTargetHelper recordingTargetHelper; - @Mock Logger logger; @BeforeEach void setup() { this.handler = - new TargetSnapshotPostHandler( - auth, credentialsManager, recordingTargetHelper, logger); + new TargetSnapshotPostHandler(auth, credentialsManager, recordingTargetHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandlerTest.java index 05adf738bb..f2d6de2ef6 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplateGetHandlerTest.java @@ -20,7 +20,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.FlightRecorderException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.TemplateService; import io.cryostat.core.templates.TemplateType; @@ -59,13 +58,11 @@ class TargetTemplateGetHandlerTest { @Mock TargetConnectionManager targetConnectionManager; @Mock JFRConnection conn; @Mock TemplateService templateService; - @Mock Logger logger; @BeforeEach void setup() { this.handler = - new TargetTemplateGetHandler( - auth, credentialsManager, targetConnectionManager, logger); + new TargetTemplateGetHandler(auth, credentialsManager, targetConnectionManager); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandlerTest.java index 9f14bb6c81..3823949f0a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetTemplatesGetHandlerTest.java @@ -21,7 +21,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.Template; import io.cryostat.core.templates.TemplateService; @@ -56,14 +55,12 @@ class TargetTemplatesGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock TargetConnectionManager connectionManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { this.handler = - new TargetTemplatesGetHandler( - auth, credentialsManager, connectionManager, gson, logger); + new TargetTemplatesGetHandler(auth, credentialsManager, connectionManager, gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetsGetHandlerTest.java index 91372c0c38..711cb4668e 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TargetsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TargetsGetHandlerTest.java @@ -23,7 +23,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnectionToolkit; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; @@ -56,13 +55,12 @@ class TargetsGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock DiscoveryStorage storage; - @Mock Logger logger; @Mock JFRConnectionToolkit connectionToolkit; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - this.handler = new TargetsGetHandler(auth, credentialsManager, storage, gson, logger); + this.handler = new TargetsGetHandler(auth, credentialsManager, storage, gson); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandlerTest.java index d7411353c5..7276f171a7 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TemplateDeleteHandlerTest.java @@ -23,7 +23,6 @@ import java.util.Set; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.templates.LocalStorageTemplateService; import io.cryostat.core.templates.Template; import io.cryostat.core.templates.TemplateType; @@ -55,7 +54,6 @@ class TemplateDeleteHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalStorageTemplateService templateService; @Mock NotificationFactory notificationFactory; - @Mock Logger logger; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; @@ -75,7 +73,7 @@ void setup() { lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new TemplateDeleteHandler( - auth, credentialsManager, templateService, notificationFactory, logger); + auth, credentialsManager, templateService, notificationFactory); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandlerTest.java index ace6e4a7d2..cda37cee25 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v1/TemplatesPostHandlerTest.java @@ -25,7 +25,6 @@ import java.util.Set; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.core.templates.LocalStorageTemplateService; import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException; @@ -60,7 +59,6 @@ class TemplatesPostHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalStorageTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; @@ -81,7 +79,7 @@ void setup() { lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new TemplatesPostHandler( - auth, credentialsManager, templateService, fs, notificationFactory, logger); + auth, credentialsManager, templateService, fs, notificationFactory); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandlerTest.java index 0c8355e306..1975a83577 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractAssetJwtConsumingHandlerTest.java @@ -25,7 +25,6 @@ import org.openjdk.jmc.rjmx.ConnectionException; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.PermissionDeniedException; @@ -65,7 +64,6 @@ class AbstractAssetJwtConsumingHandlerTest { @Mock CredentialsManager credentialsManager; @Mock AssetJwtHelper jwtHelper; @Mock WebServer webServer; - @Mock Logger logger; @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @@ -73,8 +71,7 @@ class AbstractAssetJwtConsumingHandlerTest { @BeforeEach void setup() { this.handler = - new JwtConsumingHandler( - auth, credentialsManager, jwtHelper, () -> webServer, logger); + new JwtConsumingHandler(auth, credentialsManager, jwtHelper, () -> webServer); Mockito.lenient().when(ctx.response()).thenReturn(resp); Mockito.lenient() .when( @@ -295,7 +292,6 @@ void shouldPropagateIfHandlerThrowsApiException() { credentialsManager, jwtHelper, () -> webServer, - logger, expectedException); ApiException ex = @@ -314,7 +310,6 @@ void shouldThrow427IfConnectionFailsDueToTargetAuth() { credentialsManager, jwtHelper, () -> webServer, - logger, expectedException); Mockito.when(ctx.response()).thenReturn(resp); @@ -336,7 +331,6 @@ void shouldThrow502IfConnectionFailsDueToSslTrust() { credentialsManager, jwtHelper, () -> webServer, - logger, expectedException); ApiException ex = @@ -358,7 +352,6 @@ void shouldThrow404IfConnectionFailsDueToInvalidTarget() { credentialsManager, jwtHelper, () -> webServer, - logger, expectedException); ApiException ex = @@ -376,7 +369,6 @@ void shouldThrow500IfHandlerThrowsUnexpectedly() { credentialsManager, jwtHelper, () -> webServer, - logger, expectedException); ApiException ex = @@ -418,7 +410,7 @@ void setup() throws Exception { handler = new ConnectionDescriptorHandler( - auth, credentialsManager, jwtHelper, () -> webServer, logger); + auth, credentialsManager, jwtHelper, () -> webServer); Mockito.when(auth.validateHttpHeader(Mockito.any(), Mockito.any())) .thenReturn(CompletableFuture.completedFuture(true)); } @@ -530,9 +522,8 @@ static class JwtConsumingHandler extends AbstractAssetJwtConsumingHandler { AuthManager auth, CredentialsManager credentialsManager, AssetJwtHelper jwtHelper, - Lazy webServer, - Logger logger) { - super(auth, credentialsManager, jwtHelper, webServer, logger); + Lazy webServer) { + super(auth, credentialsManager, jwtHelper, webServer); } @Override @@ -567,9 +558,8 @@ static class ThrowingJwtConsumingHandler extends JwtConsumingHandler { CredentialsManager credentialsManager, AssetJwtHelper jwtHelper, Lazy webServer, - Logger logger, Exception thrown) { - super(auth, credentialsManager, jwtHelper, webServer, logger); + super(auth, credentialsManager, jwtHelper, webServer); this.thrown = thrown; } @@ -586,9 +576,8 @@ static class ConnectionDescriptorHandler extends JwtConsumingHandler { AuthManager auth, CredentialsManager credentialsManager, AssetJwtHelper jwtHelper, - Lazy webServer, - Logger logger) { - super(auth, credentialsManager, jwtHelper, webServer, logger); + Lazy webServer) { + super(auth, credentialsManager, jwtHelper, webServer); } @Override diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandlerTest.java index 3c0ad88d55..324e36579b 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractDiscoveryJwtConsumingHandlerTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.discovery.PluginInfo; import io.cryostat.net.AuthManager; @@ -72,14 +71,13 @@ class AbstractDiscoveryJwtConsumingHandlerTest { @Mock AuthManager auth; @Mock DiscoveryJwtHelper jwtHelper; @Mock WebServer webServer; - @Mock Logger logger; @Mock RoutingContext ctx; @Mock HttpServerResponse resp; @BeforeEach void setup() { - this.handler = new JwtConsumingHandler(storage, auth, jwtHelper, () -> webServer, logger); + this.handler = new JwtConsumingHandler(storage, auth, jwtHelper, () -> webServer); Mockito.lenient().when(ctx.response()).thenReturn(resp); Mockito.lenient() .when( @@ -396,7 +394,7 @@ void shouldPropagateIfHandlerThrowsApiException() { Exception expectedException = new ApiException(200); handler = new ThrowingJwtConsumingHandler( - storage, auth, jwtHelper, () -> webServer, logger, expectedException); + storage, auth, jwtHelper, () -> webServer, expectedException); ApiException ex = Assertions.assertThrows(ApiException.class, () -> handler.handle(ctx)); @@ -408,7 +406,7 @@ void shouldThrow500IfHandlerThrowsUnexpectedly() { Exception expectedException = new NullPointerException(); handler = new ThrowingJwtConsumingHandler( - storage, auth, jwtHelper, () -> webServer, logger, expectedException); + storage, auth, jwtHelper, () -> webServer, expectedException); ApiException ex = Assertions.assertThrows(ApiException.class, () -> handler.handle(ctx)); @@ -421,9 +419,8 @@ static class JwtConsumingHandler extends AbstractDiscoveryJwtConsumingHandler webServer, - Logger logger) { - super(storage, auth, jwtHelper, webServer, UUID::fromString, logger); + Lazy webServer) { + super(storage, auth, jwtHelper, webServer, UUID::fromString); } @Override @@ -458,9 +455,8 @@ static class ThrowingJwtConsumingHandler extends JwtConsumingHandler { AuthManager auth, DiscoveryJwtHelper jwtHelper, Lazy webServer, - Logger logger, Exception thrown) { - super(storage, auth, jwtHelper, webServer, logger); + super(storage, auth, jwtHelper, webServer); this.thrown = thrown; } diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractV2RequestHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractV2RequestHandlerTest.java index 7a0165f541..fca050f3e4 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/AbstractV2RequestHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/AbstractV2RequestHandlerTest.java @@ -32,7 +32,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -73,8 +72,7 @@ class AbstractV2RequestHandlerTest { @Mock HttpServerResponse resp; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/ApiGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/ApiGetHandlerTest.java index 3d173c60d9..53c2063e96 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/ApiGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/ApiGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.WebServer; @@ -51,8 +50,7 @@ class ApiGetHandlerTest { Set requestHandlers; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/AuthPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/AuthPostHandlerTest.java index 42a75ed909..d9ceb54909 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/AuthPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/AuthPostHandlerTest.java @@ -20,7 +20,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.AuthenticationScheme; import io.cryostat.net.UnknownUserException; @@ -49,8 +48,7 @@ class AuthPostHandlerTest { AuthPostHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock RoutingContext ctx; @Mock RequestParameters requestParams; diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandlerTest.java index fd87b0a3df..8e5bce2978 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/AuthTokenPostHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.jwt.AssetJwtHelper; import io.cryostat.net.web.WebServer; @@ -53,14 +52,12 @@ class AuthTokenPostHandlerTest { @Mock CredentialsManager credentialsManager; @Mock AssetJwtHelper jwt; @Mock WebServer webServer; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { this.handler = - new AuthTokenPostHandler( - auth, credentialsManager, gson, jwt, () -> webServer, logger); + new AuthTokenPostHandler(auth, credentialsManager, gson, jwt, () -> webServer); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/CertificatePostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/CertificatePostHandlerTest.java index c3ca316ac9..72eaff67c4 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/CertificatePostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/CertificatePostHandlerTest.java @@ -31,7 +31,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; import io.cryostat.net.AuthManager; @@ -70,8 +69,7 @@ class CertificatePostHandlerTest { @Mock CredentialsManager credentialsManager; @Mock Environment env; @Mock FileSystem fs; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock RoutingContext ctx; @Mock FileOutputStream outStream; diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialDeleteHandlerTest.java index 986d37b82c..b40637418e 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialDeleteHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -52,8 +51,7 @@ class CredentialDeleteHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification.Builder notificationBuilder; @Mock Notification notification; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialGetHandlerTest.java index a727f1ff91..40fb3e3a84 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialGetHandlerTest.java @@ -24,7 +24,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.CredentialsManager.MatchedCredentials; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -49,8 +48,7 @@ class CredentialGetHandlerTest { CredentialGetHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandlerTest.java index d19a200a13..7b1601d27e 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -48,12 +47,11 @@ class CredentialsGetHandlerTest { CredentialsGetHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - this.handler = new CredentialsGetHandler(auth, credentialsManager, gson, logger); + this.handler = new CredentialsGetHandler(auth, credentialsManager, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsPostHandlerTest.java index 3455b8f7b1..13affd6f5c 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/CredentialsPostHandlerTest.java @@ -21,7 +21,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -59,8 +58,7 @@ class CredentialsPostHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification.Builder notificationBuilder; @Mock Notification notification; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandlerTest.java index 859512416b..d54187467a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryDeregistrationHandlerTest.java @@ -19,7 +19,6 @@ import java.util.UUID; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -59,14 +58,13 @@ class DiscoveryDeregistrationHandlerTest { @Mock DiscoveryJwtHelper jwt; @Mock WebServer webServer; @Mock DiscoveryStorage storage; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { this.handler = new DiscoveryDeregistrationHandler( - auth, jwt, () -> webServer, storage, UUID::fromString, gson, logger); + auth, jwt, () -> webServer, storage, UUID::fromString, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryGetHandlerTest.java index 0532321bcd..d4e6276dd0 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -53,8 +52,7 @@ class DiscoveryGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock DiscoveryStorage storage; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandlerTest.java index c7190c80b8..c5d1061522 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryPostHandlerTest.java @@ -21,7 +21,6 @@ import java.util.UUID; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -63,14 +62,13 @@ class DiscoveryPostHandlerTest { @Mock DiscoveryJwtHelper jwt; @Mock WebServer webServer; @Mock DiscoveryStorage storage; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { this.handler = new DiscoveryPostHandler( - auth, jwt, () -> webServer, storage, UUID::fromString, gson, logger); + auth, jwt, () -> webServer, storage, UUID::fromString, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandlerTest.java index a477ab268b..298246a28a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/DiscoveryRegistrationHandlerTest.java @@ -26,7 +26,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.net.AuthManager; @@ -65,8 +64,7 @@ class DiscoveryRegistrationHandlerTest { @Mock DiscoveryStorage storage; @Mock WebServer webServer; @Mock DiscoveryJwtHelper jwt; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -80,8 +78,7 @@ void setup() { Set.of(new AllEnvPlatformStrategy(), new FakePlatformStrategy()), jwt, UUID::fromString, - gson, - logger); + gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/LogoutPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/LogoutPostHandlerTest.java index 7a491bf004..e3f7283a23 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/LogoutPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/LogoutPostHandlerTest.java @@ -19,7 +19,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; @@ -44,8 +43,7 @@ public class LogoutPostHandlerTest { LogoutPostHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @Mock RoutingContext ctx; @Mock RequestParameters requestParams; diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/MBeanMetricsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/MBeanMetricsGetHandlerTest.java index 14731f30f1..e245901f62 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/MBeanMetricsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/MBeanMetricsGetHandlerTest.java @@ -22,7 +22,6 @@ import java.util.Set; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.net.MBeanMetrics; import io.cryostat.net.AuthManager; @@ -52,13 +51,12 @@ public class MBeanMetricsGetHandlerTest { @Mock CredentialsManager credentialsManager; @Mock Gson gson; @Mock TargetConnectionManager targetConnectionManager; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new MBeanMetricsGetHandler( - authManager, credentialsManager, gson, targetConnectionManager, logger); + authManager, credentialsManager, gson, targetConnectionManager); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandlerTest.java index 2ce0b7764a..9d928eb9a2 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateDeleteHandlerTest.java @@ -25,7 +25,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.LocalProbeTemplateService; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -55,11 +54,10 @@ public class ProbeTemplateDeleteHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalProbeTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -77,13 +75,7 @@ void setup() { lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new ProbeTemplateDeleteHandler( - auth, - credentialsManager, - notificationFactory, - templateService, - logger, - fs, - gson); + auth, credentialsManager, notificationFactory, templateService, fs, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandlerTest.java index 07493c8962..1430c1ffce 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/ProbeTemplateUploadHandlerTest.java @@ -30,7 +30,6 @@ import io.cryostat.core.agent.LocalProbeTemplateService; import io.cryostat.core.agent.ProbeTemplate; import io.cryostat.core.agent.ProbeValidationException; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -61,11 +60,10 @@ public class ProbeTemplateUploadHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalProbeTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -83,13 +81,7 @@ void setup() { lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new ProbeTemplateUploadHandler( - auth, - credentialsManager, - notificationFactory, - templateService, - logger, - fs, - gson); + auth, credentialsManager, notificationFactory, templateService, fs, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RecordingGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RecordingGetHandlerTest.java index b2f371d6b3..2026b83e3f 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RecordingGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RecordingGetHandlerTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.security.jwt.AssetJwtHelper; @@ -59,13 +58,11 @@ class RecordingGetHandlerTest { @Mock AssetJwtHelper jwt; @Mock WebServer webServer; @Mock RecordingArchiveHelper archive; - @Mock Logger logger; @BeforeEach void setup() { this.handler = - new RecordingGetHandler( - auth, credentialsManager, jwt, () -> webServer, archive, logger); + new RecordingGetHandler(auth, credentialsManager, jwt, () -> webServer, archive); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/ReportGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/ReportGetHandlerTest.java index 7a8793ceb2..3ca5c17297 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/ReportGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/ReportGetHandlerTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.reports.ReportService; import io.cryostat.net.security.ResourceAction; @@ -60,13 +59,11 @@ class ReportGetHandlerTest { @Mock AssetJwtHelper jwt; @Mock WebServer webServer; @Mock ReportService reports; - @Mock Logger logger; @BeforeEach void setup() { this.handler = - new ReportGetHandler( - auth, credentialsManager, jwt, () -> webServer, reports, 30, logger); + new ReportGetHandler(auth, credentialsManager, jwt, () -> webServer, reports, 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandlerTest.java index 72307e892c..e7334b73eb 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RuleDeleteHandlerTest.java @@ -25,7 +25,6 @@ import io.cryostat.MockVertx; import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.FlightRecorderException; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -66,8 +65,7 @@ class RuleDeleteHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -94,8 +92,7 @@ void setup() { storage, credentialsManager, notificationFactory, - gson, - logger); + gson); } @Nested @@ -229,7 +226,6 @@ void shouldRespondWith200ForCleanupFailures() throws Exception { Mockito.verify(recordingTargetHelper) .stopRecording( Mockito.any(), Mockito.eq(rule.getRecordingName()), Mockito.eq(true)); - Mockito.verify(logger).error(exception); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RuleGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RuleGetHandlerTest.java index fbc76c9660..1d2ae1a277 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RuleGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RuleGetHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -50,12 +49,11 @@ class RuleGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RuleRegistry registry; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - this.handler = new RuleGetHandler(auth, credentialsManager, registry, gson, logger); + this.handler = new RuleGetHandler(auth, credentialsManager, registry, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RulePatchHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RulePatchHandlerTest.java index afb680163b..a68c9f0f11 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RulePatchHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RulePatchHandlerTest.java @@ -24,7 +24,6 @@ import io.cryostat.MainModule; import io.cryostat.MockVertx; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -66,8 +65,7 @@ class RulePatchHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -94,8 +92,7 @@ void setup() { credentialsManager, registry, notificationFactory, - gson, - logger); + gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RulesGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RulesGetHandlerTest.java index 2906207e09..c2b66f1cc2 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RulesGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RulesGetHandlerTest.java @@ -20,7 +20,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -48,12 +47,11 @@ class RulesGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RuleRegistry registry; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - this.handler = new RulesGetHandler(auth, credentialsManager, registry, gson, logger); + this.handler = new RulesGetHandler(auth, credentialsManager, registry, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/RulesPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/RulesPostHandlerTest.java index 8c09d32aab..a9ff0201c6 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/RulesPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/RulesPostHandlerTest.java @@ -22,7 +22,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -63,8 +62,7 @@ class RulesPostHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() throws IOException { @@ -93,12 +91,7 @@ public Rule answer(InvocationOnMock invocation) throws Throwable { Mockito.lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new RulesPostHandler( - authManager, - credentialsManager, - ruleRegistry, - notificationFactory, - gson, - logger); + authManager, credentialsManager, ruleRegistry, notificationFactory, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsDeleteHandlerTest.java index 99e22f18ff..398320901a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsDeleteHandlerTest.java @@ -21,7 +21,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -51,8 +50,7 @@ class TargetCredentialsDeleteHandlerTest { @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandlerTest.java index bc797ab5ed..8fa29e3ac7 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsGetHandlerTest.java @@ -21,7 +21,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; import io.cryostat.net.AuthManager; @@ -48,11 +47,10 @@ class TargetCredentialsGetHandlerTest { AbstractV2RequestHandler> handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -71,7 +69,7 @@ void setup() { .thenReturn(notificationBuilder); Mockito.lenient().when(notificationBuilder.build()).thenReturn(notification); - this.handler = new TargetCredentialsGetHandler(auth, credentialsManager, gson, logger); + this.handler = new TargetCredentialsGetHandler(auth, credentialsManager, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsPostHandlerTest.java index 537cc5b482..f64d67d88b 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetCredentialsPostHandlerTest.java @@ -21,7 +21,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.messaging.notifications.Notification; import io.cryostat.messaging.notifications.NotificationFactory; @@ -52,11 +51,10 @@ class TargetCredentialsPostHandlerTest { AbstractV2RequestHandler handler; @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -77,7 +75,7 @@ void setup() { this.handler = new TargetCredentialsPostHandler( - auth, credentialsManager, notificationFactory, gson, logger); + auth, credentialsManager, notificationFactory, gson); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetDeleteHandlerTest.java index c32ed7b5db..61c5bcdb8b 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetDeleteHandlerTest.java @@ -25,7 +25,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.HttpMimeType; @@ -55,8 +54,7 @@ class TargetDeleteHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock CustomTargetPlatformClient customTargetPlatformClient; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetEventsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetEventsGetHandlerTest.java index 2b6b896ba0..c1174e24e8 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetEventsGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetEventsGetHandlerTest.java @@ -30,7 +30,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.jmc.serialization.SerializableEventTypeInfo; @@ -58,10 +57,9 @@ class TargetEventsGetHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock TargetConnectionManager targetConnectionManager; - @Mock Logger logger; @Mock CryostatFlightRecorderService service; @Mock JFRConnection connection; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandlerTest.java index d5239c5207..61a69ab644 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbeDeleteHandlerTest.java @@ -28,7 +28,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -61,13 +60,12 @@ public class TargetProbeDeleteHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; @Mock TargetConnectionManager targetConnectionManager; @Mock Environment env; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -85,7 +83,6 @@ void setup() { lenient().when(notificationBuilder.build()).thenReturn(notification); this.handler = new TargetProbeDeleteHandler( - logger, notificationFactory, fs, auth, diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandlerTest.java index 789ea41e1b..680b40b2c0 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbePostHandlerTest.java @@ -29,7 +29,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.LocalProbeTemplateService; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -66,7 +65,6 @@ public class TargetProbePostHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalProbeTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification notification; @Mock Notification.Builder notificationBuilder; @@ -74,7 +72,7 @@ public class TargetProbePostHandlerTest { @Mock JvmIdHelper jvmIdHelper; @Mock TargetConnectionManager targetConnectionManager; @Mock Environment env; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() throws JvmIdGetException { @@ -103,7 +101,6 @@ void setup() throws JvmIdGetException { this.handler = new TargetProbePostHandler( - logger, notificationFactory, templateService, fs, diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbesGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbesGetHandlerTest.java index a42a99ee22..4a838b7435 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbesGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetProbesGetHandlerTest.java @@ -29,7 +29,6 @@ import io.cryostat.configuration.CredentialsManager; import io.cryostat.core.agent.Event; import io.cryostat.core.agent.LocalProbeTemplateService; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Environment; import io.cryostat.core.sys.FileSystem; @@ -62,11 +61,10 @@ public class TargetProbesGetHandlerTest { @Mock CredentialsManager credentialsManager; @Mock LocalProbeTemplateService templateService; @Mock FileSystem fs; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock TargetConnectionManager targetConnectionManager; @Mock Environment env; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandlerTest.java index d6aa5b6f25..de052409d0 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingGetHandlerTest.java @@ -26,7 +26,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; @@ -78,7 +77,6 @@ class TargetRecordingGetHandlerTest { @Mock HttpServer httpServer; @Mock Vertx vertx; @Mock TargetConnectionManager targetConnectionManager; - @Mock Logger logger; @BeforeEach void setup() { @@ -90,8 +88,7 @@ void setup() { jwt, () -> webServer, httpServer, - targetConnectionManager, - logger); + targetConnectionManager); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingOptionsListGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingOptionsListGetHandlerTest.java index e60b68b1dc..4ad4729f5e 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingOptionsListGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetRecordingOptionsListGetHandlerTest.java @@ -26,7 +26,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.net.AuthManager; @@ -61,8 +60,7 @@ class TargetRecordingOptionsListGetHandlerTest { @Mock TargetConnectionManager targetConnectionManager; @Mock CryostatFlightRecorderService service; @Mock JFRConnection connection; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandlerTest.java index af3ece187d..92312fac07 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetReportGetHandlerTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.Future; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.reports.ReportService; @@ -62,13 +61,12 @@ class TargetReportGetHandlerTest { @Mock AssetJwtHelper jwt; @Mock WebServer webServer; @Mock ReportService reports; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new TargetReportGetHandler( - auth, credentialsManager, jwt, () -> webServer, reports, 30, logger); + auth, credentialsManager, jwt, () -> webServer, reports, 30); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetSnapshotPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetSnapshotPostHandlerTest.java index d6640a0701..b205f7bf6f 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetSnapshotPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetSnapshotPostHandlerTest.java @@ -27,7 +27,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.jmc.serialization.HyperlinkedSerializableRecordingDescriptor; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; @@ -62,8 +61,7 @@ class TargetSnapshotPostHandlerTest { @Mock AuthManager auth; @Mock CredentialsManager credentialsManager; @Mock RecordingTargetHelper recordingTargetHelper; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandlerTest.java index 3053e02c97..70408367b2 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetTemplateGetHandlerTest.java @@ -19,7 +19,6 @@ import java.util.Optional; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.TemplateService; import io.cryostat.net.AuthManager; @@ -59,18 +58,12 @@ class TargetTemplateGetHandlerTest { @Mock AssetJwtHelper jwt; @Mock WebServer webServer; @Mock TargetConnectionManager targetConnectionManager; - @Mock Logger logger; @BeforeEach void setup() { this.handler = new TargetTemplateGetHandler( - auth, - credentialsManager, - jwt, - () -> webServer, - targetConnectionManager, - logger); + auth, credentialsManager, jwt, () -> webServer, targetConnectionManager); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/TargetsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/TargetsPostHandlerTest.java index d7a6c56d6f..349ff94c8f 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/TargetsPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/TargetsPostHandlerTest.java @@ -24,7 +24,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.discovery.DiscoveryStorage; import io.cryostat.messaging.notifications.Notification; @@ -66,11 +65,10 @@ class TargetsPostHandlerTest { @Mock DiscoveryStorage storage; @Mock JvmIdHelper jvmIdHelper; @Mock CustomTargetPlatformClient customTargetPlatformClient; - @Mock Logger logger; @Mock NotificationFactory notificationFactory; @Mock Notification.Builder notificationBuilder; @Mock Notification notification; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { @@ -99,8 +97,7 @@ void setup() { storage, jvmIdHelper, customTargetPlatformClient, - notificationFactory, - logger); + notificationFactory); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcherTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcherTest.java index 59cbfbe5b8..a8bb9d6183 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcherTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/graph/AllArchivedRecordingsFetcherTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.api.v2.graph.ArchivedRecordingsFetcher.Archived; @@ -50,7 +49,6 @@ class AllArchivedRecordingsFetcherTest { @Mock AuthManager auth; @Mock RecordingArchiveHelper archiveHelper; - @Mock Logger logger; @Mock DataFetchingEnvironment env; @Mock GraphQLContext graphCtx; @@ -60,7 +58,7 @@ class AllArchivedRecordingsFetcherTest { @BeforeEach void setup() { - this.fetcher = new AllArchivedRecordingsFetcher(auth, archiveHelper, logger); + this.fetcher = new AllArchivedRecordingsFetcher(auth, archiveHelper); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandlerTest.java index e0ad3f9634..a7ac48716b 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLGetHandlerTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.CompletableFuture; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.api.ApiVersion; @@ -45,11 +44,10 @@ class GraphQLGetHandlerTest { @Mock GraphQL graph; @Mock AuthManager auth; - @Mock Logger logger; @BeforeEach void setup() { - this.handler = new GraphQLGetHandler(graph, auth, logger); + this.handler = new GraphQLGetHandler(graph, auth); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandlerTest.java index 0bf78e09a7..ff8d8ddc23 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/graph/GraphQLPostHandlerTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.CompletableFuture; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.security.ResourceAction; import io.cryostat.net.web.http.api.ApiVersion; @@ -45,11 +44,10 @@ class GraphQLPostHandlerTest { @Mock GraphQL graph; @Mock AuthManager auth; - @Mock Logger logger; @BeforeEach void setup() { - this.handler = new GraphQLPostHandler(graph, auth, logger); + this.handler = new GraphQLPostHandler(graph, auth); } @Nested diff --git a/src/test/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcherTest.java b/src/test/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcherTest.java index 752dd83c4b..5acb530e6a 100644 --- a/src/test/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcherTest.java +++ b/src/test/java/io/cryostat/net/web/http/api/v2/graph/RecordingsFetcherTest.java @@ -26,7 +26,6 @@ import javax.inject.Provider; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.net.AuthManager; import io.cryostat.net.ConnectionDescriptor; import io.cryostat.net.TargetConnectionManager; @@ -71,7 +70,6 @@ class RecordingsFetcherTest { @Mock CredentialsManager credentialsManager; @Mock RecordingMetadataManager metadataManager; @Mock Provider webServer; - @Mock Logger logger; @Mock DataFetchingEnvironment env; @Mock GraphQLContext graphCtx; @@ -94,8 +92,7 @@ void setup() { archiveHelper, credentialsManager, metadataManager, - webServer, - logger); + webServer); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/generic/CorsEnablingHandlerTest.java b/src/test/java/io/cryostat/net/web/http/generic/CorsEnablingHandlerTest.java index 73baa5c482..9a40a4968d 100644 --- a/src/test/java/io/cryostat/net/web/http/generic/CorsEnablingHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/generic/CorsEnablingHandlerTest.java @@ -15,7 +15,6 @@ */ package io.cryostat.net.web.http.generic; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.NetworkConfiguration; import io.cryostat.net.SslConfiguration; @@ -50,13 +49,12 @@ class CorsEnablingHandlerTest { @Mock Environment env; @Mock NetworkConfiguration netConf; @Mock SslConfiguration sslConf; - @Mock Logger logger; @BeforeEach void setup() { Mockito.when(env.getEnv("CRYOSTAT_CORS_ORIGIN", CorsEnablingHandler.DEV_ORIGIN)) .thenReturn(CUSTOM_ORIGIN); - this.handler = new CorsEnablingHandler(env, netConf, sslConf, logger); + this.handler = new CorsEnablingHandler(env, netConf, sslConf); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/generic/CorsOptionsHandlerTest.java b/src/test/java/io/cryostat/net/web/http/generic/CorsOptionsHandlerTest.java index 65c5b8bc12..141372c815 100644 --- a/src/test/java/io/cryostat/net/web/http/generic/CorsOptionsHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/generic/CorsOptionsHandlerTest.java @@ -15,7 +15,6 @@ */ package io.cryostat.net.web.http.generic; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.NetworkConfiguration; import io.cryostat.net.SslConfiguration; @@ -38,13 +37,12 @@ class CorsOptionsHandlerTest { @Mock Environment env; @Mock NetworkConfiguration netConf; @Mock SslConfiguration sslConf; - @Mock Logger logger; @BeforeEach void setup() { Mockito.when(env.getEnv("CRYOSTAT_CORS_ORIGIN", CorsEnablingHandler.DEV_ORIGIN)) .thenReturn("http://localhost:9000"); - this.handler = new CorsOptionsHandler(env, netConf, sslConf, logger); + this.handler = new CorsOptionsHandler(env, netConf, sslConf); } @Test diff --git a/src/test/java/io/cryostat/net/web/http/generic/HealthGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/generic/HealthGetHandlerTest.java index 9055729159..45e6499439 100644 --- a/src/test/java/io/cryostat/net/web/http/generic/HealthGetHandlerTest.java +++ b/src/test/java/io/cryostat/net/web/http/generic/HealthGetHandlerTest.java @@ -23,7 +23,6 @@ import io.cryostat.ApplicationVersion; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.Environment; import io.cryostat.net.web.http.HttpMimeType; @@ -59,12 +58,11 @@ class HealthGetHandlerTest { @Mock ApplicationVersion appVersion; @Mock WebClient webClient; @Mock Environment env; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() { - this.handler = new HealthGetHandler(appVersion, webClient, env, gson, logger); + this.handler = new HealthGetHandler(appVersion, webClient, env, gson); } @Test diff --git a/src/test/java/io/cryostat/platform/internal/DefaultPlatformClientTest.java b/src/test/java/io/cryostat/platform/internal/DefaultPlatformClientTest.java index 76f9ee1106..aa87072341 100644 --- a/src/test/java/io/cryostat/platform/internal/DefaultPlatformClientTest.java +++ b/src/test/java/io/cryostat/platform/internal/DefaultPlatformClientTest.java @@ -29,7 +29,6 @@ import javax.management.remote.JMXServiceURL; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.DiscoveredJvmDescriptor; import io.cryostat.core.net.discovery.JvmDiscoveryClient; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; @@ -59,12 +58,11 @@ class DefaultPlatformClientTest { @Mock Environment env; @Mock JvmDiscoveryClient discoveryClient; - @Mock Logger logger; DefaultPlatformClient client; @BeforeEach void setup() { - this.client = new DefaultPlatformClient(env, discoveryClient, logger); + this.client = new DefaultPlatformClient(env, discoveryClient); } @Test diff --git a/src/test/java/io/cryostat/platform/internal/KubeApiPlatformClientTest.java b/src/test/java/io/cryostat/platform/internal/KubeApiPlatformClientTest.java index da3fea2c56..0884d9f03a 100644 --- a/src/test/java/io/cryostat/platform/internal/KubeApiPlatformClientTest.java +++ b/src/test/java/io/cryostat/platform/internal/KubeApiPlatformClientTest.java @@ -27,7 +27,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import io.cryostat.core.sys.Environment; import io.cryostat.platform.ServiceRef; @@ -70,18 +69,12 @@ class WithDefaultPortNameAndNumber { KubernetesClient k8sClient; KubernetesMockServer server; @Mock Environment env; - @Mock Logger logger; @BeforeEach void setup() throws Exception { platformClient = new KubeApiPlatformClient( - env, - List.of(NAMESPACE), - Set.of("jfr-jmx"), - Set.of(9091), - k8sClient, - logger); + env, List.of(NAMESPACE), Set.of("jfr-jmx"), Set.of(9091), k8sClient); } @Test @@ -840,7 +833,6 @@ class WithNonDefaultPortNameAndNumber { KubernetesClient k8sClient; KubernetesMockServer server; @Mock Environment env; - @Mock Logger logger; @BeforeEach void setup() throws Exception { @@ -850,8 +842,7 @@ void setup() throws Exception { List.of(NAMESPACE), Set.of("cryostat-jmx", "cryostat-jfr"), Set.of(9999, 4545), - k8sClient, - logger); + k8sClient); } @Test @@ -1113,13 +1104,12 @@ class WithEmptyPortNameAndNumber { KubernetesClient k8sClient; KubernetesMockServer server; @Mock Environment env; - @Mock Logger logger; @BeforeEach void setup() throws Exception { platformClient = new KubeApiPlatformClient( - env, List.of(NAMESPACE), Set.of(), Set.of(), k8sClient, logger); + env, List.of(NAMESPACE), Set.of(), Set.of(), k8sClient); } @Test diff --git a/src/test/java/io/cryostat/recordings/RecordingArchiveHelperTest.java b/src/test/java/io/cryostat/recordings/RecordingArchiveHelperTest.java index 918d11adb0..76be86fd95 100644 --- a/src/test/java/io/cryostat/recordings/RecordingArchiveHelperTest.java +++ b/src/test/java/io/cryostat/recordings/RecordingArchiveHelperTest.java @@ -35,7 +35,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.Clock; @@ -78,7 +77,6 @@ class RecordingArchiveHelperTest { @Mock RecordingMetadataManager recordingMetadataManager; @Mock FileSystem fs; @Mock WebServer webServer; - @Mock Logger logger; @Mock Path destinationFile; @Mock Path archivedRecordingsPath; @Mock Path archivedRecordingsReportPath; @@ -148,7 +146,6 @@ public String answer(InvocationOnMock invocation) throws Throwable { new RecordingArchiveHelper( fs, () -> webServer, - logger, archivedRecordingsPath, archivedRecordingsReportPath, targetConnectionManager, diff --git a/src/test/java/io/cryostat/recordings/RecordingMetadataManagerTest.java b/src/test/java/io/cryostat/recordings/RecordingMetadataManagerTest.java index d63c0bef77..f0e0b5e108 100644 --- a/src/test/java/io/cryostat/recordings/RecordingMetadataManagerTest.java +++ b/src/test/java/io/cryostat/recordings/RecordingMetadataManagerTest.java @@ -32,7 +32,6 @@ import io.cryostat.MainModule; import io.cryostat.MockVertx; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.sys.FileSystem; import io.cryostat.messaging.notifications.Notification; @@ -73,7 +72,6 @@ public class RecordingMetadataManagerTest { @Mock FileSystem fs; @Mock Provider archiveHelperProvider; @Mock Base32 base32; - @Mock Logger logger; @Mock TargetConnectionManager targetConnectionManager; @Mock CredentialsManager credentialsManager; @Mock PlatformClient platformClient; @@ -83,7 +81,7 @@ public class RecordingMetadataManagerTest { @Mock Notification.OwnedResourceBuilder notificationOwnedResourceBuilder; @Mock JFRConnection connection; @Mock ConnectionDescriptor connectionDescriptor; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); @BeforeEach void setup() throws JvmIdGetException { @@ -145,8 +143,7 @@ public String answer(InvocationOnMock invocation) throws Throwable { notificationFactory, jvmIdHelper, gson, - base32, - logger); + base32); this.recordingMetadataManager.init(vertx, null); } diff --git a/src/test/java/io/cryostat/recordings/RecordingTargetHelperTest.java b/src/test/java/io/cryostat/recordings/RecordingTargetHelperTest.java index 9164a5a967..21124db45a 100644 --- a/src/test/java/io/cryostat/recordings/RecordingTargetHelperTest.java +++ b/src/test/java/io/cryostat/recordings/RecordingTargetHelperTest.java @@ -39,7 +39,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor.RecordingState; import io.cryostat.core.EventOptionsBuilder; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; import io.cryostat.core.templates.TemplateService; @@ -90,7 +89,6 @@ public class RecordingTargetHelperTest { @Mock ReportService reportService; @Mock RecordingMetadataManager recordingMetadataManager; @Mock RecordingArchiveHelper recordingArchiveHelper; - @Mock Logger logger; @Mock JFRConnection connection; @Mock CryostatFlightRecorderService service; @@ -132,8 +130,7 @@ void setup() throws JvmIdGetException { recordingOptionsBuilderFactory, reportService, recordingMetadataManager, - recordingArchiveHelper, - logger); + recordingArchiveHelper); } @Test diff --git a/src/test/java/io/cryostat/rules/MatchExpressionEvaluatorTest.java b/src/test/java/io/cryostat/rules/MatchExpressionEvaluatorTest.java index 6586eeb3d9..0e1cbc3e51 100644 --- a/src/test/java/io/cryostat/rules/MatchExpressionEvaluatorTest.java +++ b/src/test/java/io/cryostat/rules/MatchExpressionEvaluatorTest.java @@ -26,7 +26,6 @@ import io.cryostat.MainModule; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import io.cryostat.platform.ServiceRef.AnnotationKey; @@ -49,7 +48,6 @@ class MatchExpressionEvaluatorTest { MatchExpressionEvaluator ruleMatcher; @Mock ServiceRef serviceRef; - @Mock Logger logger; @Mock CredentialsManager credentials; @Mock RuleRegistry rules; @@ -63,8 +61,7 @@ class MatchExpressionEvaluatorTest { @BeforeEach void setup() throws Exception { this.ruleMatcher = - new MatchExpressionEvaluator( - MainModule.provideScriptEngine(), credentials, rules, logger); + new MatchExpressionEvaluator(MainModule.provideScriptEngine(), credentials, rules); this.serviceUri = new URI("service:jmx:rmi:///jndi/rmi://cryostat:9091/jmxrmi"); this.jvmId = "-some1234HashId="; diff --git a/src/test/java/io/cryostat/rules/MatchExpressionManagerTest.java b/src/test/java/io/cryostat/rules/MatchExpressionManagerTest.java index ddb2a2209d..cfe9600a1b 100644 --- a/src/test/java/io/cryostat/rules/MatchExpressionManagerTest.java +++ b/src/test/java/io/cryostat/rules/MatchExpressionManagerTest.java @@ -22,7 +22,6 @@ import java.util.Set; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.platform.PlatformClient; import io.cryostat.platform.ServiceRef; @@ -47,8 +46,7 @@ class MatchExpressionManagerTest { @Mock MatchExpressionEvaluator matchExpressionEvaluator; @Mock PlatformClient platformClient; @Mock MatchExpressionDao dao; - @Mock Logger logger; - Gson gson = MainModule.provideGson(logger); + Gson gson = MainModule.provideGson(); Base32 base32 = new Base32(); @BeforeEach @@ -59,8 +57,7 @@ void setup() { () -> matchExpressionEvaluator, platformClient, dao, - gson, - logger); + gson); } @Test diff --git a/src/test/java/io/cryostat/rules/PeriodicArchiverTest.java b/src/test/java/io/cryostat/rules/PeriodicArchiverTest.java index 7c57cdb6a6..3a02906a4f 100644 --- a/src/test/java/io/cryostat/rules/PeriodicArchiverTest.java +++ b/src/test/java/io/cryostat/rules/PeriodicArchiverTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import io.cryostat.configuration.CredentialsManager; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import io.cryostat.recordings.RecordingArchiveHelper; import io.cryostat.recordings.RecordingMetadataManager.Metadata; @@ -48,7 +47,6 @@ class PeriodicArchiverTest { Rule rule; @Mock RecordingArchiveHelper recordingArchiveHelper; AtomicInteger failureCounter; - @Mock Logger logger; @Mock Queue previousRecordings; @BeforeEach @@ -75,8 +73,7 @@ void setup() throws Exception { p -> { failureCounter.incrementAndGet(); return null; - }, - logger); + }); } @Test diff --git a/src/test/java/io/cryostat/rules/RuleProcessorTest.java b/src/test/java/io/cryostat/rules/RuleProcessorTest.java index c3b1bf7de6..4e160d1e00 100644 --- a/src/test/java/io/cryostat/rules/RuleProcessorTest.java +++ b/src/test/java/io/cryostat/rules/RuleProcessorTest.java @@ -31,7 +31,6 @@ import io.cryostat.FakeScheduledExecutorService; import io.cryostat.configuration.CredentialsManager; import io.cryostat.configuration.CredentialsManager.CredentialsEvent; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.Credentials; import io.cryostat.core.net.CryostatFlightRecorderService; import io.cryostat.core.net.JFRConnection; @@ -79,7 +78,6 @@ class RuleProcessorTest { @Mock RecordingTargetHelper recordingTargetHelper; @Mock RecordingMetadataManager metadataManager; @Mock PeriodicArchiverFactory periodicArchiverFactory; - @Mock Logger logger; @Mock JFRConnection connection; @Mock CryostatFlightRecorderService service; @@ -98,8 +96,7 @@ void setup() { recordingArchiveHelper, recordingTargetHelper, metadataManager, - periodicArchiverFactory, - logger); + periodicArchiverFactory); } @Test @@ -421,12 +418,7 @@ public PeriodicArchiver answer(InvocationOnMock invocation) Function, Void> fn = invocation.getArgument(4); PeriodicArchiver p = new PeriodicArchiver( - serviceRef, - cm, - rule, - recordingArchiveHelper, - fn, - logger); + serviceRef, cm, rule, recordingArchiveHelper, fn); pa[0] = p; return p; } diff --git a/src/test/java/io/cryostat/rules/RuleRegistryTest.java b/src/test/java/io/cryostat/rules/RuleRegistryTest.java index 1a378d4590..b9b5993537 100644 --- a/src/test/java/io/cryostat/rules/RuleRegistryTest.java +++ b/src/test/java/io/cryostat/rules/RuleRegistryTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.core.sys.FileSystem; import io.cryostat.platform.ServiceRef; import io.cryostat.rules.RuleRegistry.RuleEvent; @@ -53,8 +52,7 @@ class RuleRegistryTest { @Mock Path rulesDir; @Mock MatchExpressionEvaluator matchExpressionEvaluator; @Mock FileSystem fs; - @Mock Logger logger; - Gson gson = Mockito.spy(MainModule.provideGson(logger)); + Gson gson = Mockito.spy(MainModule.provideGson()); Rule testRule; String ruleJson; @@ -62,8 +60,7 @@ class RuleRegistryTest { @BeforeEach void setup() throws Exception { - this.registry = - new RuleRegistry(rulesDir, () -> matchExpressionEvaluator, fs, gson, logger); + this.registry = new RuleRegistry(rulesDir, () -> matchExpressionEvaluator, fs, gson); this.testRule = new Rule.Builder() .name("test rule") @@ -76,7 +73,7 @@ void setup() throws Exception { .maxAgeSeconds(78) .enabled(true) .build(); - this.ruleJson = MainModule.provideGson(logger).toJson(testRule); + this.ruleJson = MainModule.provideGson().toJson(testRule); this.fileReader = new BufferedReader(new StringReader(ruleJson)); } @@ -315,7 +312,7 @@ void testEnable() throws Exception { .maxAgeSeconds(78) .enabled(false) .build(); - this.ruleJson = MainModule.provideGson(logger).toJson(rule); + this.ruleJson = MainModule.provideGson().toJson(rule); this.fileReader = new BufferedReader(new StringReader(ruleJson)); registry.addRule(rule); diff --git a/src/test/java/itest/CredentialsIT.java b/src/test/java/itest/CredentialsIT.java index 397f773de3..bb44bc0582 100644 --- a/src/test/java/itest/CredentialsIT.java +++ b/src/test/java/itest/CredentialsIT.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.http.HttpMimeType; import io.cryostat.platform.ServiceRef; import io.cryostat.platform.ServiceRef.AnnotationKey; @@ -50,7 +49,7 @@ public class CredentialsIT extends ExternalTargetsTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); static final List CONTAINERS = new ArrayList<>(); static final Map NULL_RESULT = new HashMap<>(); diff --git a/src/test/java/itest/CredentialsV2_2IT.java b/src/test/java/itest/CredentialsV2_2IT.java index 268925f6bc..2c1c5927a8 100644 --- a/src/test/java/itest/CredentialsV2_2IT.java +++ b/src/test/java/itest/CredentialsV2_2IT.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.http.HttpMimeType; import io.cryostat.platform.ServiceRef; import io.cryostat.platform.ServiceRef.AnnotationKey; @@ -61,7 +60,7 @@ @TestMethodOrder(OrderAnnotation.class) public class CredentialsV2_2IT extends ExternalTargetsTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); static final List CONTAINERS = new ArrayList<>(); static final Map NULL_RESULT = new HashMap<>(); static final String REQUEST_URL = "/api/v2.2/credentials"; diff --git a/src/test/java/itest/FileSystemArchivedRequestsIT.java b/src/test/java/itest/FileSystemArchivedRequestsIT.java index 1dbe7c595f..704f542028 100644 --- a/src/test/java/itest/FileSystemArchivedRequestsIT.java +++ b/src/test/java/itest/FileSystemArchivedRequestsIT.java @@ -27,7 +27,6 @@ import java.util.concurrent.TimeoutException; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.http.HttpMimeType; import com.google.gson.Gson; @@ -45,7 +44,7 @@ import org.junit.jupiter.api.Test; public class FileSystemArchivedRequestsIT extends JwtAssetsSelfTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); static final String TEST_RECORDING_NAME = "FileSystemArchivedRequestsIT"; diff --git a/src/test/java/itest/GraphQLIT.java b/src/test/java/itest/GraphQLIT.java index 426f3b2e34..a2daed257c 100644 --- a/src/test/java/itest/GraphQLIT.java +++ b/src/test/java/itest/GraphQLIT.java @@ -35,7 +35,6 @@ import java.util.stream.Collectors; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.http.HttpMimeType; import io.cryostat.recordings.RecordingTargetHelper.ReplacementPolicy; @@ -63,7 +62,7 @@ @TestMethodOrder(OrderAnnotation.class) class GraphQLIT extends ExternalTargetsTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); private final ExecutorService worker = ForkJoinPool.commonPool(); diff --git a/src/test/java/itest/InterleavedExternalTargetRequestsIT.java b/src/test/java/itest/InterleavedExternalTargetRequestsIT.java index 591a33dc69..5ab24277bf 100644 --- a/src/test/java/itest/InterleavedExternalTargetRequestsIT.java +++ b/src/test/java/itest/InterleavedExternalTargetRequestsIT.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.platform.ServiceRef; import io.cryostat.platform.ServiceRef.AnnotationKey; @@ -54,7 +53,7 @@ @TestMethodOrder(OrderAnnotation.class) class InterleavedExternalTargetRequestsIT extends ExternalTargetsTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); static final int NUM_EXT_CONTAINERS = 4; static final int NUM_AUTH_EXT_CONTAINERS = 4; diff --git a/src/test/java/itest/RecordingMetadataIT.java b/src/test/java/itest/RecordingMetadataIT.java index d750ec1520..9ecdd99825 100644 --- a/src/test/java/itest/RecordingMetadataIT.java +++ b/src/test/java/itest/RecordingMetadataIT.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeoutException; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import io.cryostat.net.web.http.HttpMimeType; import io.cryostat.recordings.RecordingMetadataManager.Metadata; @@ -52,7 +51,7 @@ @TestMethodOrder(OrderAnnotation.class) public class RecordingMetadataIT extends ExternalTargetsTest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); static final Map NULL_RESULT = new HashMap<>(); static final Map requestLabels = diff --git a/src/test/java/itest/util/http/JvmIdWebRequest.java b/src/test/java/itest/util/http/JvmIdWebRequest.java index bd4965c311..84315b4615 100644 --- a/src/test/java/itest/util/http/JvmIdWebRequest.java +++ b/src/test/java/itest/util/http/JvmIdWebRequest.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeoutException; import io.cryostat.MainModule; -import io.cryostat.core.log.Logger; import com.google.gson.Gson; import io.vertx.core.buffer.Buffer; @@ -36,7 +35,7 @@ import org.apache.commons.lang3.tuple.Pair; public class JvmIdWebRequest { - private static final Gson gson = MainModule.provideGson(Logger.INSTANCE); + private static final Gson gson = MainModule.provideGson(); public static final int REQUEST_TIMEOUT_SECONDS = 10; public static final WebClient webClient = Utils.getWebClient();