Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fix(reports): report generation does not cause recursive update #368

Merged
merged 5 commits into from
Apr 24, 2024
Merged

fix(reports): report generation does not cause recursive update #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e29d0d1
Revert "build(deps): upgrade quarkus to 3.2.9 (#352)"
andrewazores Apr 15, 2024
ba17a62
partially fix up old report generation test
andrewazores Apr 15, 2024
6706990
Reapply "build(deps): upgrade quarkus to 3.2.9 (#352)"
andrewazores Apr 15, 2024
86c5c59
remove default implementations from interface
andrewazores Apr 15, 2024
aee6e18
rename config property constants (only source, not external config name)
andrewazores Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/cryostat/ConfigProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public class ConfigProperties {
public static final String CONNECTIONS_FAILED_TIMEOUT = "cryostat.connections.failed-timeout";

public static final String REPORTS_SIDECAR_URL = "cryostat.services.reports.url";
public static final String MEMORY_CACHE_ENABLED =
public static final String REPORTS_MEMORY_CACHE_ENABLED =
"cryostat.services.reports.memory-cache.enabled";
public static final String STORAGE_CACHE_ENABLED =
public static final String REPORTS_STORAGE_CACHE_ENABLED =
"cryostat.services.reports.storage-cache.enabled";
public static final String ARCHIVED_REPORTS_STORAGE_CACHE_NAME =
"cryostat.services.reports.storage-cache.name";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/cryostat/reports/MemoryCachingReportsListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class MemoryCachingReportsListener {
@ConfigProperty(name = "quarkus.cache.enabled")
boolean quarkusCache;

@ConfigProperty(name = ConfigProperties.MEMORY_CACHE_ENABLED)
@ConfigProperty(name = ConfigProperties.REPORTS_MEMORY_CACHE_ENABLED)
boolean memoryCache;

@Inject
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/io/cryostat/reports/MemoryCachingReportsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class MemoryCachingReportsService implements ReportsService {
@ConfigProperty(name = "quarkus.cache.enabled")
boolean quarkusCache;

@ConfigProperty(name = ConfigProperties.MEMORY_CACHE_ENABLED)
@ConfigProperty(name = ConfigProperties.REPORTS_MEMORY_CACHE_ENABLED)
boolean memoryCache;

@Inject
Expand Down Expand Up @@ -98,4 +98,14 @@ public Uni<Map<String, AnalysisResult>> reportFor(
return delegate.reportFor(jvmId, filename);
});
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
return reportFor(recording, r -> true);
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
return reportFor(jvmId, filename, r -> true);
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/cryostat/reports/Reports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
@Path("")
public class Reports {

@ConfigProperty(name = ConfigProperties.STORAGE_CACHE_ENABLED)
@ConfigProperty(name = ConfigProperties.REPORTS_STORAGE_CACHE_ENABLED)
boolean storageCacheEnabled;

@ConfigProperty(name = ConfigProperties.ARCHIVED_REPORTS_STORAGE_CACHE_NAME)
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/io/cryostat/reports/ReportsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,12 @@ public interface ReportsService {
Uni<Map<String, AnalysisResult>> reportFor(
ActiveRecording recording, Predicate<IRule> predicate);

default Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
return reportFor(recording, r -> true);
}
Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording);

Uni<Map<String, AnalysisResult>> reportFor(
String jvmId, String filename, Predicate<IRule> predicate);

default Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
return reportFor(jvmId, filename, r -> true);
}
Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename);

static String key(ActiveRecording recording) {
return String.format("%s/%d", recording.target.jvmId, recording.id);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/io/cryostat/reports/ReportsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ public Uni<Map<String, AnalysisResult>> reportFor(
return Uni.createFrom().future(future);
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
return reportFor(recording, r -> true);
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
return reportFor(jvmId, filename, r -> true);
}

private Future<Map<String, AnalysisResult>> process(
InputStream stream, Predicate<IRule> predicate) {
return reportGenerator.generateEvalMapInterruptibly(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/cryostat/reports/StorageCachingReportsListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@ApplicationScoped
class StorageCachingReportsListener {

@ConfigProperty(name = ConfigProperties.STORAGE_CACHE_ENABLED)
@ConfigProperty(name = ConfigProperties.REPORTS_STORAGE_CACHE_ENABLED)
boolean enabled;

@ConfigProperty(name = ConfigProperties.ARCHIVED_REPORTS_STORAGE_CACHE_NAME)
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/io/cryostat/reports/StorageCachingReportsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
@Dependent
class StorageCachingReportsService implements ReportsService {

@ConfigProperty(name = ConfigProperties.STORAGE_CACHE_ENABLED)
@ConfigProperty(name = ConfigProperties.REPORTS_STORAGE_CACHE_ENABLED)
boolean enabled;

@ConfigProperty(name = ConfigProperties.ARCHIVED_REPORTS_STORAGE_CACHE_NAME)
Expand Down Expand Up @@ -157,4 +157,14 @@ private Uni<Map<String, AnalysisResult>> getStorage(String key) {
}
});
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
return reportFor(recording, r -> true);
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
return reportFor(jvmId, filename, r -> true);
}
}
Loading
Loading