Skip to content

Commit 7a3f3b2

Browse files
committed
[#noissue] Relocate MetricData and associated classes to enable reuse across modules
1 parent 78393b0 commit 7a3f3b2

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/vo/MetricData.java renamed to otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/web/vo/MetricData.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 NAVER Corp.
2+
* Copyright 2025 NAVER Corp.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,10 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.navercorp.pinpoint.otlp.web.vo;
17+
package com.navercorp.pinpoint.otlp.common.web.vo;
1818

1919
import com.navercorp.pinpoint.otlp.common.web.definition.property.ChartType;
20-
import com.navercorp.pinpoint.otlp.common.web.model.MetricValue;
2120

2221
import java.util.ArrayList;
2322
import java.util.List;

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/web/model/MetricValue.java renamed to otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/web/vo/MetricValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.navercorp.pinpoint.otlp.common.web.model;
17+
package com.navercorp.pinpoint.otlp.common.web.vo;
1818

1919
import java.util.List; /**
2020
* @author minwoo-jung

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/view/MetricDataView.java renamed to otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/web/vo/view/MetricDataView.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 NAVER Corp.
2+
* Copyright 2025 NAVER Corp.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.navercorp.pinpoint.otlp.web.view;
17+
package com.navercorp.pinpoint.otlp.common.web.vo.view;
1818

1919
import com.navercorp.pinpoint.otlp.common.web.definition.property.ChartType;
20-
import com.navercorp.pinpoint.otlp.common.web.model.MetricValue;
21-
import com.navercorp.pinpoint.otlp.web.vo.MetricData;
20+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricData;
21+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricValue;
2222

2323
import java.util.List;
2424
import java.util.stream.Collectors;

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/controller/OpenTelemetryMetricController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import com.navercorp.pinpoint.otlp.web.config.OtlpMetricProperties;
2929
import com.navercorp.pinpoint.otlp.web.service.OtlpMetricWebService;
3030
import com.navercorp.pinpoint.otlp.web.view.MetricDataRequestParameter;
31-
import com.navercorp.pinpoint.otlp.web.view.MetricDataView;
31+
import com.navercorp.pinpoint.otlp.common.web.vo.view.MetricDataView;
3232
import com.navercorp.pinpoint.otlp.web.view.legacy.OtlpChartView;
33-
import com.navercorp.pinpoint.otlp.web.vo.MetricData;
33+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricData;
3434
import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
3535
import jakarta.validation.Valid;
3636
import jakarta.validation.constraints.NotBlank;

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/service/OtlpMetricWebService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.navercorp.pinpoint.otlp.common.web.definition.property.AggregationFunction;
66
import com.navercorp.pinpoint.otlp.common.web.definition.property.ChartType;
77
import com.navercorp.pinpoint.otlp.web.view.legacy.OtlpChartView;
8-
import com.navercorp.pinpoint.otlp.web.vo.MetricData;
8+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricData;
99

1010
import java.util.List;
1111

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/service/OtlpMetricWebServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import com.navercorp.pinpoint.otlp.common.web.defined.PrimaryForFieldAndTagRelation;
1313
import com.navercorp.pinpoint.otlp.common.web.definition.property.AggregationFunction;
1414
import com.navercorp.pinpoint.otlp.common.web.definition.property.ChartType;
15-
import com.navercorp.pinpoint.otlp.common.web.model.MetricValue;
15+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricValue;
1616
import com.navercorp.pinpoint.otlp.web.config.pinot.OtlpMetricPinotTableProperties;
1717
import com.navercorp.pinpoint.otlp.web.dao.OtlpMetricDao;
1818
import com.navercorp.pinpoint.otlp.web.view.legacy.OtlpChartFieldView;
1919
import com.navercorp.pinpoint.otlp.web.view.legacy.OtlpChartView;
2020
import com.navercorp.pinpoint.otlp.web.view.legacy.OtlpChartViewBuilder;
2121
import com.navercorp.pinpoint.otlp.web.vo.FieldAttribute;
22-
import com.navercorp.pinpoint.otlp.web.vo.MetricData;
22+
import com.navercorp.pinpoint.otlp.common.web.vo.MetricData;
2323
import com.navercorp.pinpoint.otlp.web.vo.OtlpMetricChartQueryParameter;
2424
import com.navercorp.pinpoint.otlp.web.vo.OtlpMetricChartResult;
2525
import com.navercorp.pinpoint.otlp.web.vo.OtlpMetricDataQueryParameter;

0 commit comments

Comments
 (0)