[#noissue] Unify TimeWindow related classes across web and metric

pinpoint-apm · May 16, 2024 · 7233942 · 7233942
1 parent 4a2b4cc
commit 7233942
Show file tree

Hide file tree

Showing 128 changed files with 164 additions and 445 deletions.
diff --git a/...oint/web/util/FixedTimeWindowSampler.java → ...il/timewindow/FixedTimeWindowSampler.java b/...oint/web/util/FixedTimeWindowSampler.java → ...il/timewindow/FixedTimeWindowSampler.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
 
 /**
  * @author emeroad

diff --git a/...vercorp/pinpoint/web/util/TimeWindow.java → ...on/server/util/timewindow/TimeWindow.java b/...vercorp/pinpoint/web/util/TimeWindow.java → ...on/server/util/timewindow/TimeWindow.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 

diff --git a/...point/web/util/TimeWindowDownSampler.java → ...til/timewindow/TimeWindowDownSampler.java b/...point/web/util/TimeWindowDownSampler.java → ...til/timewindow/TimeWindowDownSampler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 

diff --git a/...pinpoint/web/util/TimeWindowFunction.java → ...r/util/timewindow/TimeWindowFunction.java b/...pinpoint/web/util/TimeWindowFunction.java → ...r/util/timewindow/TimeWindowFunction.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 
 @FunctionalInterface

diff --git a/.../web/util/TimeWindowOneMinuteSampler.java → ...imewindow/TimeWindowOneMinuteSampler.java b/.../web/util/TimeWindowOneMinuteSampler.java → ...imewindow/TimeWindowOneMinuteSampler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 

diff --git a/.../pinpoint/web/util/TimeWindowSampler.java → ...er/util/timewindow/TimeWindowSampler.java b/.../pinpoint/web/util/TimeWindowSampler.java → ...er/util/timewindow/TimeWindowSampler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 

diff --git a/...eb/util/TimeWindowSlotCentricSampler.java → ...ewindow/TimeWindowSlotCentricSampler.java b/...eb/util/TimeWindowSlotCentricSampler.java → ...ewindow/TimeWindowSlotCentricSampler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.util.MathUtils;
 import com.navercorp.pinpoint.common.server.util.time.Range;

diff --git a/...til/TimeWindowSlotCentricSamplerTest.java → ...dow/TimeWindowSlotCentricSamplerTest.java b/...til/TimeWindowSlotCentricSamplerTest.java → ...dow/TimeWindowSlotCentricSamplerTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
-import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_IDEAL_NUM_TIMESLOTS;
-import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_MINIMUM_TIMESLOT;
+import static com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler.DEFAULT_IDEAL_NUM_TIMESLOTS;
+import static com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler.DEFAULT_MINIMUM_TIMESLOT;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**

diff --git a/...orp/pinpoint/web/util/TimeWindowTest.java → ...erver/util/timewindow/TimeWindowTest.java b/...orp/pinpoint/web/util/TimeWindowTest.java → ...erver/util/timewindow/TimeWindowTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.util;
+package com.navercorp.pinpoint.common.server.util.timewindow;
 
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.time.Instant;
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 

diff --git a/...n/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java b/...n/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java
@@ -25,9 +25,9 @@
 import com.navercorp.pinpoint.exceptiontrace.web.util.GroupByAttributes;
 import com.navercorp.pinpoint.exceptiontrace.web.view.ExceptionMetaDataView;
 import com.navercorp.pinpoint.exceptiontrace.web.view.ExceptionTraceView;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
 import com.navercorp.pinpoint.metric.web.util.TimePrecision;
 import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java b/...-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java
@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.navercorp.pinpoint.exceptiontrace.web.model.ExceptionTraceGroup;
 import com.navercorp.pinpoint.exceptiontrace.web.model.ExceptionTraceValueView;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.metric.common.util.TimeUtils;
 import com.navercorp.pinpoint.metric.web.view.TimeSeriesView;
 import com.navercorp.pinpoint.metric.web.view.TimeseriesValueGroupView;

diff --git a/.../src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java b/.../src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java
@@ -25,9 +25,9 @@
 import com.navercorp.pinpoint.inspector.web.service.ApdexStatService;
 import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView;
 import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
 import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
 import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...ain/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java b/...ain/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java
@@ -9,9 +9,9 @@
 import com.navercorp.pinpoint.inspector.web.service.ApplicationStatService;
 import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView;
 import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler;
-import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
 import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
 import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java b/...-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java
@@ -18,7 +18,7 @@
 
 import com.navercorp.pinpoint.common.server.util.StringPrecondition;
 import com.navercorp.pinpoint.common.server.util.time.Range;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.metric.web.util.TimePrecision;
 
 import java.util.Objects;

diff --git a/...ctor-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java b/...ctor-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java
@@ -19,7 +19,7 @@
 import com.navercorp.pinpoint.inspector.web.model.InspectorDataSearchKey;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 
 /**
  * @author minwoo.jung

diff --git a/...ctor-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java b/...ctor-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java
@@ -16,7 +16,6 @@
 package com.navercorp.pinpoint.inspector.web.service;
 
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
 
 /**
  * @author minwoo-jung

diff --git a/...eb/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java b/...eb/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java
@@ -3,7 +3,7 @@
 import com.navercorp.pinpoint.inspector.web.model.InspectorDataSearchKey;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 
 public interface ApplicationStatService {
     InspectorMetricData selectApplicationStat(InspectorDataSearchKey inspectorDataSearchKey, TimeWindow timeWindow);

diff --git a/...b/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java b/...b/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java
@@ -32,7 +32,7 @@
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricValue;
 import com.navercorp.pinpoint.metric.common.model.Tag;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.metric.common.model.chart.SystemMetricPoint;
 import com.navercorp.pinpoint.metric.common.util.DoubleUncollectedDataCreator;
 import com.navercorp.pinpoint.metric.common.util.TimeSeriesBuilder;

diff --git a/...b/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java b/...b/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java
@@ -25,9 +25,9 @@
 import com.navercorp.pinpoint.metric.common.model.TagUtils;
 import com.navercorp.pinpoint.web.component.ApplicationFactory;
 import com.navercorp.pinpoint.web.service.ApdexScoreService;
-import com.navercorp.pinpoint.web.util.TimeWindow;
-import com.navercorp.pinpoint.web.util.TimeWindowSampler;
-import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler;
 import com.navercorp.pinpoint.web.vo.Application;
 import com.navercorp.pinpoint.web.vo.chart.Chart;
 import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup;

diff --git a/...main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java b/...main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java
@@ -14,7 +14,7 @@
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData;
 import com.navercorp.pinpoint.inspector.web.model.InspectorMetricValue;
 import com.navercorp.pinpoint.metric.common.model.Tag;
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMaxMetricPoint;
 import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMetricPoint;
 import com.navercorp.pinpoint.metric.common.model.chart.MinMaxMetricPoint;

diff --git a/...e/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/model/TimeWindow.java b/...e/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/model/TimeWindow.java
diff --git a/...ic-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java b/...ic-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java
@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.metric.common.util;
 
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMaxMetricPoint;
 import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMetricPoint;
 import com.navercorp.pinpoint.metric.common.model.chart.MinMaxMetricPoint;

diff --git a/...ule/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java b/...ule/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java
@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.metric.common.util;
 
-import com.navercorp.pinpoint.metric.common.model.TimeWindow;
+import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow;
 
 import java.util.ArrayList;
 import java.util.List;