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.

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

[#noissue] change inspector minimal time slot #11280

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
public class TimeWindowSlotCentricSampler implements TimeWindowSampler {

private static final long ONE_SECOND = 1000L;
static final long DEFAULT_MINIMUM_TIMESLOT = 5 * ONE_SECOND;
static final long DEFAULT_MINIMUM_TIMESLOT = 10 * ONE_SECOND;
static final long DEFAULT_IDEAL_NUM_TIMESLOTS = 200;

private final long minTimeslot;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@RequestMapping("/api/inspector/agentStat")
public class AgentInspectorStatController {

private final TimeWindowSampler DEFAULT_TIME_WINDOW_SAMPLER = new TimeWindowSlotCentricSampler(5000L, 200);
private final TimeWindowSampler DEFAULT_TIME_WINDOW_SAMPLER = new TimeWindowSlotCentricSampler(10000L, 200);

Check warning on line 48 in inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentInspectorStatController.java

View check run for this annotation

Codecov / codecov/patch

inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentInspectorStatController.java#L48

Added line #L48 was not covered by tests
private final AgentStatService agentStatService;
private final ApdexStatService apdexStatService;
private final TenantProvider tenantProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
@Validated
public class AgentStatController<DP extends AgentStatDataPoint> {
private final Logger logger = LogManager.getLogger(this.getClass());
private final TimeWindowSampler defaultStatTimeWindowSampler = new TimeWindowSlotCentricSampler();

Check warning on line 53 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java#L53

Added line #L53 was not covered by tests

private final Map<String, AgentStatService<DP>> agentStatServiceMap;

Expand Down Expand Up @@ -103,8 +104,7 @@
@PathVariable("chartType") @NotBlank String chartType,
@RequestParam("from") @PositiveOrZero long from,
@RequestParam("to") @PositiveOrZero long to) {
final TimeWindowSampler sampler = new TimeWindowSlotCentricSampler();
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), sampler);
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), defaultStatTimeWindowSampler);

Check warning on line 107 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java#L107

Added line #L107 was not covered by tests

final AgentStatChartService<?> agentStatChartService =
getChartService(this.agentStatChartServiceMap, chartType);
Expand Down Expand Up @@ -134,8 +134,7 @@
@PathVariable("chartType") @NotBlank String chartType,
@RequestParam("from") @PositiveOrZero long from,
@RequestParam("to") @PositiveOrZero long to) {
final TimeWindowSampler sampler = new TimeWindowSlotCentricSampler();
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), sampler);
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), defaultStatTimeWindowSampler);

Check warning on line 137 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java#L137

Added line #L137 was not covered by tests

final AgentStatChartService<? extends StatChart<?>> agentStatChartService =
getChartService(this.agentStatChartServiceMap, chartType);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.navercorp.pinpoint.web.authorization.controller;

import com.navercorp.pinpoint.common.server.util.time.Range;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
import com.navercorp.pinpoint.web.service.appmetric.ApplicationDataSourceService;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
Expand All @@ -22,6 +23,7 @@
@Validated
public class ApplicationDataSourceController {
private final Logger logger = LogManager.getLogger(this.getClass());
private final TimeWindowSampler defaultTimeWindowSampler = new TimeWindowSlotCentricSampler();

Check warning on line 26 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java#L26

Added line #L26 was not covered by tests

private final ApplicationDataSourceService applicationDataSourceService;

Expand All @@ -35,8 +37,7 @@
@RequestParam("from") @PositiveOrZero long from,
@RequestParam("to") @PositiveOrZero long to
) {
TimeWindowSlotCentricSampler sampler = new TimeWindowSlotCentricSampler();
TimeWindow timeWindow = new TimeWindow(Range.between(from, to), sampler);
TimeWindow timeWindow = new TimeWindow(Range.between(from, to), defaultTimeWindowSampler);

Check warning on line 40 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java#L40

Added line #L40 was not covered by tests
try {
return this.applicationDataSourceService.selectApplicationChart(applicationId, timeWindow);
} catch (Exception e ) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.navercorp.pinpoint.web.authorization.controller;

import com.navercorp.pinpoint.common.server.util.time.Range;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
import com.navercorp.pinpoint.web.service.appmetric.ApplicationStatChartService;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
Expand All @@ -25,6 +26,7 @@
public class ApplicationStatController {

private final Logger logger = LogManager.getLogger(this.getClass());
private final TimeWindowSampler defaultTimeWindowSampler = new TimeWindowSlotCentricSampler();

Check warning on line 29 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java#L29

Added line #L29 was not covered by tests

private final Map<String, ApplicationStatChartService> chartServiceMap;

Expand All @@ -51,8 +53,7 @@
@PathVariable("chartType") @NotBlank String chartType,
@RequestParam("from") @PositiveOrZero long from,
@RequestParam("to") @PositiveOrZero long to) {
final TimeWindowSlotCentricSampler sampler = new TimeWindowSlotCentricSampler();
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), sampler);
final TimeWindow timeWindow = new TimeWindow(Range.between(from, to), defaultTimeWindowSampler);

Check warning on line 56 in web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java

View check run for this annotation

Codecov / codecov/patch

web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java#L56

Added line #L56 was not covered by tests
try {
final ApplicationStatChartService<? extends StatChart> service = getService(chartType);
return service.selectApplicationChart(applicationId, timeWindow);
Expand Down