Skip to content

Commit 10e9c0b

Browse files
minwoo-jungminwoo-jung
committed
[#10776] Change id to name in the otlp logic.
1 parent 6a6a1a8 commit 10e9c0b

18 files changed

+136
-132
lines changed

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/dao/PinotOtlpMetricDao.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ public PinotOtlpMetricDao(@Qualifier("kafkaOtlpMetadataTemplate") KafkaTemplate<
7272
@Override
7373
public void updateMetadata(PinotOtlpMetricMetadata metadata) {
7474
Objects.requireNonNull(metadata);
75-
CompletableFuture<SendResult<String, PinotOtlpMetricMetadata>> response = this.kafkaOtlpMetadataTemplate.send(metadataTopic, metadata.applicationId(), metadata);
75+
CompletableFuture<SendResult<String, PinotOtlpMetricMetadata>> response = this.kafkaOtlpMetadataTemplate.send(metadataTopic, metadata.applicationName(), metadata);
7676
response.whenComplete(metadataResultCallback);
7777
}
7878

7979
@Override
8080
public void insertDouble(PinotOtlpMetricDoubleData data) {
8181
Objects.requireNonNull(data);
82-
String doubleTopic = doubleTopicNameManager.getTopicName(data.getApplicationId());
82+
String doubleTopic = doubleTopicNameManager.getTopicName(data.getApplicationName());
8383
CompletableFuture<SendResult<String, PinotOtlpMetricDoubleData>> response = this.kafkaOtlpDoubleMetricTemplate.send(doubleTopic, data.getSortKey(), data);
8484
response.whenComplete(doubleResultCallback);
8585
}
8686

8787
@Override
8888
public void insertLong(PinotOtlpMetricLongData data) {
8989
Objects.requireNonNull(data);
90-
String longTopic = longTopicNameManager.getTopicName(data.getApplicationId());
90+
String longTopic = longTopicNameManager.getTopicName(data.getApplicationName());
9191
CompletableFuture<SendResult<String, PinotOtlpMetricLongData>> response = this.kafkaOtlpLongMetricTemplate.send(longTopic, data.getSortKey(), data);
9292
response.whenComplete(longResultCallback);
9393
}

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/model/PinotOtlpMetricDataRow.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
public class PinotOtlpMetricDataRow {
2424

25-
protected final String serviceId;
25+
protected final String serviceName;
2626
protected final String sortKey;
2727
@NotBlank
28-
protected final String applicationId;
28+
protected final String applicationName;
2929
@NotBlank
3030
protected final String agentId;
3131
protected final String metricGroupName;
@@ -38,13 +38,13 @@ public class PinotOtlpMetricDataRow {
3838
protected final Long eventTime;
3939
protected final Long startTime;
4040

41-
public PinotOtlpMetricDataRow(String serviceId, String sortKey, String applicationName,
42-
String agentId, String metricGroupName, String metricName, String fieldName,int flag,
41+
public PinotOtlpMetricDataRow(String serviceName, String sortKey, String applicationName,
42+
String agentId, String metricGroupName, String metricName, String fieldName, int flag,
4343
List<String> tags, String version,
4444
Long eventTime, Long startTime) {
45-
this.serviceId = serviceId;
45+
this.serviceName = serviceName;
4646
this.sortKey = sortKey;
47-
this.applicationId = applicationName;
47+
this.applicationName = applicationName;
4848
this.agentId = agentId;
4949
this.metricGroupName = metricGroupName;
5050
this.metricName = metricName;
@@ -56,12 +56,12 @@ public PinotOtlpMetricDataRow(String serviceId, String sortKey, String applicati
5656
this.tags = tags;
5757
}
5858

59-
public String getServiceId() {
60-
return serviceId;
59+
public String getServiceName() {
60+
return serviceName;
6161
}
6262

63-
public String getApplicationId() {
64-
return applicationId;
63+
public String getApplicationName() {
64+
return applicationName;
6565
}
6666

6767
public String getMetricGroupName() {
@@ -106,9 +106,9 @@ public String getSortKey() {
106106
@Override
107107
public String toString() {
108108
return "PinotOtlpMetricDataRow{" +
109-
"serviceId='" + serviceId + '\'' +
109+
"serviceName='" + serviceName + '\'' +
110110
", sortKey='" + sortKey + '\'' +
111-
", applicationId='" + applicationId + '\'' +
111+
", applicationName='" + applicationName + '\'' +
112112
", agentId='" + agentId + '\'' +
113113
", metricGroupName='" + metricGroupName + '\'' +
114114
", metricName='" + metricName + '\'' +

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/model/PinotOtlpMetricDoubleData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
public class PinotOtlpMetricDoubleData extends PinotOtlpMetricDataRow {
2222
private final double value;
2323

24-
public PinotOtlpMetricDoubleData(String serviceId, String sortKey, String applicationId,
24+
public PinotOtlpMetricDoubleData(String serviceName, String sortKey, String applicationName,
2525
String agentId, String metricGroupName, String metricName, String fieldName,
2626
int flag, List<String> tags, String version, double value, Long eventTime, Long startTime) {
27-
super(serviceId, sortKey, applicationId, agentId, metricGroupName, metricName, fieldName, flag, tags, version, eventTime, startTime);
27+
super(serviceName, sortKey, applicationName, agentId, metricGroupName, metricName, fieldName, flag, tags, version, eventTime, startTime);
2828
this.value = value;
2929
}
3030

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/model/PinotOtlpMetricLongData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
public class PinotOtlpMetricLongData extends PinotOtlpMetricDataRow {
2222
private final long value;
2323

24-
public PinotOtlpMetricLongData(String serviceId, String sortKey, String applicationId,
24+
public PinotOtlpMetricLongData(String serviceName, String sortKey, String applicationName,
2525
String agentId, String metricGroupName, String metricName, String fieldName,
2626
int flag, List<String> tags, String version, long value, long eventTime, long startTime) {
27-
super(serviceId, sortKey, applicationId, agentId, metricGroupName, metricName, fieldName, flag, tags, version, eventTime, startTime);
27+
super(serviceName, sortKey, applicationName, agentId, metricGroupName, metricName, fieldName, flag, tags, version, eventTime, startTime);
2828
this.value = value;
2929
}
3030

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/model/PinotOtlpMetricMetadata.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.util.Objects;
44

55
public record PinotOtlpMetricMetadata(
6-
String serviceId,
7-
String applicationId,
6+
String serviceName,
7+
String applicationName,
88
String agentId,
99
String metricGroupName,
1010
String metricName,
@@ -21,7 +21,7 @@ public record PinotOtlpMetricMetadata(
2121
String version
2222
) {
2323
public PinotOtlpMetricMetadata {
24-
Objects.requireNonNull(applicationId, "applicationId");
24+
Objects.requireNonNull(applicationName, "applicationName");
2525
Objects.requireNonNull(agentId, "agentId");
2626
Objects.requireNonNull(metricGroupName, "metricGroupName");
2727
Objects.requireNonNull(metricName, "metricName");

‎otlpmetric/otlpmetric-collector/src/main/java/com/navercorp/pinpoint/otlp/collector/service/PinotOtlpMetricCollectorService.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@
3232

3333
@Service
3434
public class PinotOtlpMetricCollectorService implements OtlpMetricCollectorService {
35+
3536
private final Logger logger = LogManager.getLogger(this.getClass());
36-
@NotNull private final OtlpMetricDao otlpMetricDao;
37+
private final String DEFAULT_SERVICE_NAME = "";
38+
39+
@NotNull
40+
private final OtlpMetricDao otlpMetricDao;
3741

3842
public PinotOtlpMetricCollectorService(@Valid OtlpMetricDao otlpMetricDao) {
3943
this.otlpMetricDao = Objects.requireNonNull(otlpMetricDao, "otlpMetricDao");
@@ -70,21 +74,21 @@ public void save(OtlpMetricData otlpMetricData) {
7074
}).collect(Collectors.toList());
7175

7276
String rawTags = String.join(",", tagList);
73-
PinotOtlpMetricMetadata metadata = new PinotOtlpMetricMetadata("", applicationName, agentId,
77+
PinotOtlpMetricMetadata metadata = new PinotOtlpMetricMetadata(DEFAULT_SERVICE_NAME, applicationName, agentId,
7478
metricGroupName, metricName, dataPoint.getFieldName(), unit, dataPoint.getDescription(), metricType,
7579
dataType.getNumber(), dataPoint.getAggreFunc(), aggreTemporality, rawTags, dataPoint.getStartTime(), saveTime, version);
7680
otlpMetricDao.updateMetadata(metadata);
7781

7882
String sortKey = SortKeyUtils.generateKey(applicationName, metricGroupName, metricName);
7983
if (dataType == DataType.LONG) {
8084
long longValue = dataPoint.getValue().longValue();
81-
PinotOtlpMetricLongData row = new PinotOtlpMetricLongData("", sortKey, applicationName, agentId, metricGroupName, metricName, dataPoint.getFieldName(),
85+
PinotOtlpMetricLongData row = new PinotOtlpMetricLongData(DEFAULT_SERVICE_NAME, sortKey, applicationName, agentId, metricGroupName, metricName, dataPoint.getFieldName(),
8286
dataPoint.getFlag(), tagList, version, longValue, dataPoint.getEventTime(), dataPoint.getStartTime());
8387
otlpMetricDao.insertLong(row);
8488

8589
} else {
8690
double doubleValue = dataPoint.getValue().doubleValue();
87-
PinotOtlpMetricDoubleData row = new PinotOtlpMetricDoubleData("", sortKey, applicationName, agentId, metricGroupName, metricName, dataPoint.getFieldName(),
91+
PinotOtlpMetricDoubleData row = new PinotOtlpMetricDoubleData(DEFAULT_SERVICE_NAME, sortKey, applicationName, agentId, metricGroupName, metricName, dataPoint.getFieldName(),
8892
dataPoint.getFlag(), tagList, version, doubleValue, dataPoint.getEventTime(), dataPoint.getStartTime());
8993
otlpMetricDao.insertDouble(row);
9094
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
public class OpenTelemetryMetricController {
5151
private final TimeWindowSampler DEFAULT_TIME_WINDOW_SAMPLER_30S = new TimeWindowSlotCentricSampler(30000L, 200);
5252
private final OtlpMetricWebService otlpMetricWebService;
53-
private static final String DEFAULT_SERVICE_ID = "00000000-0000-0000-0000-000000000001";
53+
private static final String DEFAULT_SERVICE_NAME = "";
5454
@NotBlank
5555
private final String tenantId;
5656
private final RangeValidator rangeValidator;
@@ -64,38 +64,38 @@ public OpenTelemetryMetricController(OtlpMetricWebService otlpMetricWebService,
6464

6565
@Deprecated
6666
@GetMapping("/metricGroups")
67-
public List<String> getMetricGroups(@RequestParam("applicationId") @NotBlank String applicationId,
67+
public List<String> getMetricGroups(@RequestParam("applicationName") @NotBlank String applicationName,
6868
@RequestParam(value = "agentId", required = false) String agentId) {
69-
return otlpMetricWebService.getMetricGroupList(tenantId, DEFAULT_SERVICE_ID, applicationId, agentId);
69+
return otlpMetricWebService.getMetricGroupList(tenantId, DEFAULT_SERVICE_NAME, applicationName, agentId);
7070
}
7171

7272
@Deprecated
7373
@GetMapping("/metrics")
74-
public List<String> getMetricGroups(@RequestParam("applicationId") @NotBlank String applicationId,
74+
public List<String> getMetricGroups(@RequestParam("applicationName") @NotBlank String applicationName,
7575
@RequestParam(value = "agentId", required = false) String agentId,
7676
@RequestParam("metricGroupName") @NotBlank String metricGroupName) {
77-
return otlpMetricWebService.getMetricList(tenantId, DEFAULT_SERVICE_ID, applicationId, agentId, metricGroupName);
77+
return otlpMetricWebService.getMetricList(tenantId, DEFAULT_SERVICE_NAME, applicationName, agentId, metricGroupName);
7878
}
7979

8080
@Deprecated
8181
@GetMapping("/tags")
82-
public List<String> getTags(@RequestParam("applicationId") @NotBlank String applicationId,
82+
public List<String> getTags(@RequestParam("applicationName") @NotBlank String applicationName,
8383
@RequestParam(value = "agentId", required = false) String agentId,
8484
@RequestParam("metricGroupName") @NotBlank String metricGroupName,
8585
@RequestParam("metricName") @NotBlank String metricName) {
86-
return otlpMetricWebService.getTags(tenantId, DEFAULT_SERVICE_ID, applicationId, agentId, metricGroupName, metricName);
86+
return otlpMetricWebService.getTags(tenantId, DEFAULT_SERVICE_NAME, applicationName, agentId, metricGroupName, metricName);
8787
}
8888

8989
@Deprecated
9090
@GetMapping("/chart")
91-
public OtlpChartView getMetricChartData(@RequestParam("applicationId") @NotBlank String applicationId,
91+
public OtlpChartView getMetricChartData(@RequestParam("applicationName") @NotBlank String applicationName,
9292
@RequestParam(value = "agentId", required = false) String agentId,
9393
@RequestParam("metricGroupName") @NotBlank String metricGroupName,
9494
@RequestParam("metricName") @NotBlank String metricName,
9595
@RequestParam("tag") String tag,
9696
@RequestParam("from") @PositiveOrZero long from,
9797
@RequestParam("to") @PositiveOrZero long to) {
98-
return otlpMetricWebService.getMetricChartData(tenantId, DEFAULT_SERVICE_ID, applicationId, agentId, metricGroupName, metricName, tag, from, to);
98+
return otlpMetricWebService.getMetricChartData(tenantId, DEFAULT_SERVICE_NAME, applicationName, agentId, metricGroupName, metricName, tag, from, to);
9999
}
100100

101101
@PostMapping("/metricData")
@@ -112,7 +112,7 @@ public MetricDataView getMetricChartDataV3(@Valid @RequestBody MetricDataRequest
112112
rangeValidator.validate(range.getFromInstant(), range.getToInstant());
113113
TimeWindow timeWindow = new TimeWindow(range, DEFAULT_TIME_WINDOW_SAMPLER_30S);
114114

115-
MetricData metricData = otlpMetricWebService.getMetricData(tenantId, DEFAULT_SERVICE_ID, parameter.getApplicationName(), parameter.getAgentId(), parameter.getMetricGroupName(), parameter.getMetricName(), primaryForFieldAndTagRelation, tagGroupList, fieldNameList, chartType, aggregationFunction, timeWindow);
115+
MetricData metricData = otlpMetricWebService.getMetricData(tenantId, DEFAULT_SERVICE_NAME, parameter.getApplicationName(), parameter.getAgentId(), parameter.getMetricGroupName(), parameter.getMetricName(), primaryForFieldAndTagRelation, tagGroupList, fieldNameList, chartType, aggregationFunction, timeWindow);
116116
return new MetricDataView(metricData);
117117
}
118118
}

‎otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/dao/OtlpMetricDao.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import java.util.concurrent.CompletableFuture;
1111

1212
public interface OtlpMetricDao {
13-
List<String> getMetricGroups(String tenantId, String serviceId, String applicationId, String agentId);
13+
List<String> getMetricGroups(String tenantId, String serviceName, String applicationName, String agentId);
1414

15-
List<String> getMetrics(String tenantId, String serviceId, String applicationId, String agentId, String metricGroupName);
15+
List<String> getMetrics(String tenantId, String serviceName, String applicationName, String agentId, String metricGroupName);
1616

17-
List<String> getTags(String tenantId, String serviceId, String applicationId, String agentId, String metricGroupName, String metricName);
17+
List<String> getTags(String tenantId, String serviceName, String applicationName, String agentId, String metricGroupName, String metricName);
1818

19-
List<FieldAttribute> getFields(String serviceId, String applicationId, String agentId, String metricGroupName, String metricName, String tag);
19+
List<FieldAttribute> getFields(String serviceName, String applicationName, String agentId, String metricGroupName, String metricName, String tag);
2020

21-
List<FieldAttribute> getFields(String serviceId, String applicationId, String agentId, String metricGroupName, String metricName, List<String> tagGroupList, List<String> fieldNameList);
21+
List<FieldAttribute> getFields(String serviceName, String applicationName, String agentId, String metricGroupName, String metricName, List<String> tagGroupList, List<String> fieldNameList);
2222

2323
CompletableFuture<List<OtlpMetricChartResult>> getChartPoints(OtlpMetricChartQueryParameter chartQueryParameter);
2424

‎otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/dao/pinot/PinotOtlpMetricDao.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,42 +51,42 @@ public PinotOtlpMetricDao(@Qualifier("otlpMetricPinotSessionTemplate") SqlSessio
5151

5252
@Deprecated
5353
@Override
54-
public List<String> getMetricGroups(String tenantId, String serviceId, String applicationId, String agentId) {
54+
public List<String> getMetricGroups(String tenantId, String serviceName, String applicationName, String agentId) {
5555
List<String> metricGroups = this.syncTemplate.selectList(NAMESPACE + "getMetricGroups",
56-
new OtlpMetricGroupsQueryParam(serviceId, applicationId, agentId));
56+
new OtlpMetricGroupsQueryParam(serviceName, applicationName, agentId));
5757
return metricGroups;
5858
}
5959

6060
@Deprecated
6161
@Override
62-
public List<String> getMetrics(String tenantId, String serviceId, String applicationId, String agentId, String metricGroupName) {
62+
public List<String> getMetrics(String tenantId, String serviceName, String applicationName, String agentId, String metricGroupName) {
6363
// TODO:
6464
// 1. Check mysql if metrics to be displayed are specified
6565
// 2. if no data in mysql, query pinot to get all metric names
6666
List<String> metrics = this.syncTemplate.selectList(NAMESPACE + "getMetricNames",
67-
new OtlpMetricNamesQueryParam(serviceId, applicationId, agentId, metricGroupName));
67+
new OtlpMetricNamesQueryParam(serviceName, applicationName, agentId, metricGroupName));
6868
return metrics;
6969
}
7070

7171
@Deprecated
7272
@Override
73-
public List<String> getTags(String tenantId, String serviceId, String applicationId, String agentId, String metricGroupName, String metricName) {
74-
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceId, applicationId, agentId, metricGroupName, metricName, new ArrayList<>(0));
73+
public List<String> getTags(String tenantId, String serviceName, String applicationName, String agentId, String metricGroupName, String metricName) {
74+
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceName, applicationName, agentId, metricGroupName, metricName, new ArrayList<>(0));
7575

7676
List<String> tags = this.syncTemplate.selectList(NAMESPACE + "getTags", queryParam);
7777
return tags;
7878
}
7979

8080
@Deprecated
8181
@Override
82-
public List<FieldAttribute> getFields(String serviceId, String applicationId, String agentId, String metricGroupName, String metricName, String tag) {
83-
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceId, applicationId, agentId, metricGroupName, metricName, Arrays.asList(tag));
82+
public List<FieldAttribute> getFields(String serviceName, String applicationName, String agentId, String metricGroupName, String metricName, String tag) {
83+
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceName, applicationName, agentId, metricGroupName, metricName, Arrays.asList(tag));
8484
return this.syncTemplate.selectList(NAMESPACE + "getFields", queryParam);
8585
}
8686

8787
@Override
88-
public List<FieldAttribute> getFields(String serviceId, String applicationId, String agentId, String metricGroupName, String metricName, List<String> tagGroupList, List<String> fieldNameList) {
89-
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceId, applicationId, agentId, metricGroupName, metricName, fieldNameList, tagGroupList);
88+
public List<FieldAttribute> getFields(String serviceName, String applicationName, String agentId, String metricGroupName, String metricName, List<String> tagGroupList, List<String> fieldNameList) {
89+
OtlpMetricDetailsQueryParam queryParam = new OtlpMetricDetailsQueryParam(serviceName, applicationName, agentId, metricGroupName, metricName, fieldNameList, tagGroupList);
9090
return this.syncTemplate.selectList(NAMESPACE + "getFields", queryParam);
9191
}
9292

0 commit comments

Comments
 (0)