Skip to content

Commit 362da97

Browse files
emeroademeroad
committed
[#noissue] Update Service parameter for application creation
1 parent 86f5d98 commit 362da97

File tree

7 files changed

+27
-23
lines changed

7 files changed

+27
-23
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView;
3232
import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView;
3333
import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
34+
import com.navercorp.pinpoint.web.vo.Service;
3435
import jakarta.validation.constraints.NotBlank;
3536
import org.springframework.security.access.prepost.PreAuthorize;
3637
import org.springframework.web.bind.annotation.GetMapping;
@@ -94,7 +95,7 @@ public InspectorMetricView getApdexStatChart(
9495
Range range = Range.between(from, to);
9596
rangeValidator.validate(range.getFromInstant(), range.getToInstant());
9697

97-
InspectorMetricData inspectorMetricData = apdexStatService.selectAgentStat(applicationName, serviceTypeName, metricDefinitionId, agentId, from, to);
98+
InspectorMetricData inspectorMetricData = apdexStatService.selectAgentStat(Service.DEFAULT, applicationName, serviceTypeName, metricDefinitionId, agentId, from, to);
9899
return new InspectorMetricView(inspectorMetricData);
99100
}
100101

‎inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationInspectorStatController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView;
1616
import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView;
1717
import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
18+
import com.navercorp.pinpoint.web.vo.Service;
1819
import jakarta.validation.constraints.NotBlank;
1920
import org.springframework.security.access.prepost.PreAuthorize;
2021
import org.springframework.web.bind.annotation.GetMapping;
@@ -71,7 +72,7 @@ public InspectorMetricView getApdexStatChart(
7172
Range range = Range.between(from, to);
7273
rangeValidator.validate(range.getFromInstant(), range.getToInstant());
7374

74-
InspectorMetricData inspectorMetricData = apdexStatService.selectApplicationStat(applicationName, serviceTypeName, metricDefinitionId, from, to);
75+
InspectorMetricData inspectorMetricData = apdexStatService.selectApplicationStat(Service.DEFAULT, applicationName, serviceTypeName, metricDefinitionId, from, to);
7576
return new InspectorMetricView(inspectorMetricData);
7677
}
7778

‎inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
package com.navercorp.pinpoint.inspector.web.service;
1717

1818
import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData;
19+
import com.navercorp.pinpoint.web.vo.Service;
1920

2021
/**
2122
* @author minwoo-jung
2223
*/
2324
public interface ApdexStatService {
24-
InspectorMetricData selectAgentStat(String applicationName, String serviceTypeName, String metricDefinitionId, String agentId, long from, long to);
25+
InspectorMetricData selectAgentStat(Service service, String applicationName, String serviceTypeName, String metricDefinitionId, String agentId, long from, long to);
2526

26-
InspectorMetricData selectApplicationStat(String applicationName, String serviceTypeName, String metricDefinitionId, long from, long to);
27+
InspectorMetricData selectApplicationStat(Service service, String applicationName, String serviceTypeName, String metricDefinitionId, long from, long to);
2728
}

‎inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import com.navercorp.pinpoint.web.component.ApplicationFactory;
3434
import com.navercorp.pinpoint.web.service.ApdexScoreService;
3535
import com.navercorp.pinpoint.web.vo.Application;
36+
import com.navercorp.pinpoint.web.vo.Service;
3637
import com.navercorp.pinpoint.web.vo.chart.Chart;
3738
import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup;
3839
import com.navercorp.pinpoint.web.vo.stat.chart.agent.AgentApdexScoreChart;
3940
import com.navercorp.pinpoint.web.vo.stat.chart.application.ApplicationApdexScoreChart;
4041
import com.navercorp.pinpoint.web.vo.stat.chart.application.ApplicationStatPoint;
4142
import org.springframework.beans.factory.annotation.Qualifier;
42-
import org.springframework.stereotype.Service;
4343

4444
import java.util.Collection;
4545
import java.util.Iterator;
@@ -51,7 +51,7 @@
5151
/**
5252
* @author minwoo-jung
5353
*/
54-
@Service
54+
@org.springframework.stereotype.Service
5555
public class DefaultApdexStatService implements ApdexStatService {
5656

5757
private static final TimeWindowSampler APDEX_SCORE_TIME_WINDOW_SAMPLER = new TimeWindowSlotCentricSampler(60 * 1000, 200);
@@ -79,24 +79,24 @@ public DefaultApdexStatService(ApplicationFactory applicationFactory,
7979
}
8080

8181
@Override
82-
public InspectorMetricData selectAgentStat(String applicationName, String serviceTypeName, String metricDefinitionId, String agentId, long from, long to) {
82+
public InspectorMetricData selectAgentStat(Service service, String applicationName, String serviceTypeName, String metricDefinitionId, String agentId, long from, long to) {
8383
MetricDefinition metricDefinition = agentYmlInspectorManager.findElementOfBasicGroup(metricDefinitionId);
8484

8585
final Range range = Range.between(from, to);
8686
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
87-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
87+
Application application = applicationFactory.createApplicationByTypeName(service, applicationName, serviceTypeName);
8888

8989
AgentApdexScoreChart agentApdexScoreChart = (AgentApdexScoreChart) apdexScoreService.selectAgentChart(application, timeWindow, agentId);
9090

9191
return convertToInspectorMetricData(metricDefinition, agentApdexScoreChart);
9292
}
9393

9494
@Override
95-
public InspectorMetricData selectApplicationStat(String applicationName, String serviceTypeName, String metricDefinitionId, long from, long to) {
95+
public InspectorMetricData selectApplicationStat(Service service, String applicationName, String serviceTypeName, String metricDefinitionId, long from, long to) {
9696
MetricDefinition metricDefinition = appYmlInspectorManager.findElementOfBasicGroup(metricDefinitionId);
9797
final Range range = Range.between(from, to);
9898
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
99-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
99+
Application application = applicationFactory.createApplicationByTypeName(service, applicationName, serviceTypeName);
100100
ApplicationApdexScoreChart applicationApdexScoreChart = (ApplicationApdexScoreChart) apdexScoreService.selectApplicationChart(application, timeWindow);
101101

102102
return convertToInspectorMetricData(metricDefinition, applicationApdexScoreChart);

‎web/src/main/java/com/navercorp/pinpoint/web/agentlist/controller/AgentsController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public List<AgentStatusAndLink> getAgentsListWithVirtualNodes(
156156
rangeValidator.validate(range);
157157
TimeWindow timeWindow = new TimeWindow(range);
158158

159-
final Application application = applicationFactory.createApplication(applicationName, serviceType.getCode());
159+
final Application application = applicationFactory.createApplication(Service.DEFAULT, applicationName, serviceType.getCode());
160160

161161
final List<Application> fromApplications =
162162
pairsToList(applicationPairs.getFromApplications());

‎web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AdminController.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.navercorp.pinpoint.web.component.ApplicationFactory;
2121
import com.navercorp.pinpoint.web.service.AdminService;
2222
import com.navercorp.pinpoint.web.vo.Application;
23+
import com.navercorp.pinpoint.web.vo.Service;
2324
import jakarta.validation.constraints.Min;
2425
import jakarta.validation.constraints.NotBlank;
2526
import jakarta.validation.constraints.PositiveOrZero;
@@ -73,7 +74,7 @@ public String removeApplicationName(@RequestParam("applicationName") @NotBlank S
7374
public String removeApplicationName(@RequestParam("applicationName") @NotBlank String applicationName,
7475
@RequestParam(value = "serviceTypeCode", required = false) Integer serviceTypeCode,
7576
@RequestParam(value = "serviceTypeName", required = false) String serviceTypeName) {
76-
Application application = getApplication(applicationName, serviceTypeCode, serviceTypeName);
77+
Application application = getApplication(Service.DEFAULT, applicationName, serviceTypeCode, serviceTypeName);
7778
if (application.getServiceType().equals(ServiceType.UNDEFINED)) {
7879
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Undefined service type");
7980
}
@@ -108,7 +109,7 @@ public String removeAgentId(
108109
@RequestParam(value = "serviceTypeCode", required = false) Integer serviceTypeCode,
109110
@RequestParam(value = "serviceTypeName", required = false) String serviceTypeName,
110111
@RequestParam(value = "agentId") @NotBlank String agentId) {
111-
Application application = getApplication(applicationName, serviceTypeCode, serviceTypeName);
112+
Application application = getApplication(Service.DEFAULT, applicationName, serviceTypeCode, serviceTypeName);
112113
if (application.getServiceType().equals(ServiceType.UNDEFINED)) {
113114
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Undefined service type");
114115
}
@@ -160,11 +161,11 @@ public Map<String, List<Application>> getInactiveAgents(
160161
return this.adminService.getInactiveAgents(applicationName, durationDays);
161162
}
162163

163-
private Application getApplication(String applicationName, Integer serviceTypeCode, String serviceTypeName) {
164+
private Application getApplication(Service service, String applicationName, Integer serviceTypeCode, String serviceTypeName) {
164165
if (serviceTypeCode != null) {
165-
return applicationFactory.createApplication(applicationName, serviceTypeCode);
166+
return applicationFactory.createApplication(service, applicationName, serviceTypeCode);
166167
} else if (serviceTypeName != null) {
167-
return applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
168+
return applicationFactory.createApplicationByTypeName(service, applicationName, serviceTypeName);
168169
}
169170
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "No service type provided.");
170171
}

‎web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public ApdexScore getApdexScore(
5757
final Range range = Range.between(from, to);
5858
TimeWindow timeWindow = new TimeWindow(range);
5959

60-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
60+
Application application = applicationFactory.createApplicationByTypeName(Service.DEFAULT, applicationName, serviceTypeName);
6161

6262
return apdexScoreService.selectApdexScoreData(application, timeWindow);
6363
}
@@ -72,7 +72,7 @@ public ApdexScore getApdexScore(
7272
final Range range = Range.between(from, to);
7373
TimeWindow timeWindow = new TimeWindow(range);
7474

75-
Application application = applicationFactory.createApplication(applicationName, serviceTypeCode);
75+
Application application = applicationFactory.createApplication(Service.DEFAULT, applicationName, serviceTypeCode);
7676

7777
return apdexScoreService.selectApdexScoreData(application, agentId, timeWindow);
7878
}
@@ -87,7 +87,7 @@ public ApdexScore getApdexScore(
8787
final Range range = Range.between(from, to);
8888
TimeWindow timeWindow = new TimeWindow(range);
8989

90-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
90+
Application application = applicationFactory.createApplicationByTypeName(Service.DEFAULT, applicationName, serviceTypeName);
9191

9292
return apdexScoreService.selectApdexScoreData(application, agentId, timeWindow);
9393
}
@@ -101,7 +101,7 @@ public StatChart<?> getApplicationApdexScoreChart(
101101
final Range range = Range.between(from, to);
102102
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
103103

104-
Application application = applicationFactory.createApplication(applicationName, serviceTypeCode);
104+
Application application = applicationFactory.createApplication(Service.DEFAULT, applicationName, serviceTypeCode);
105105

106106
return apdexScoreService.selectApplicationChart(application, timeWindow);
107107
}
@@ -115,7 +115,7 @@ public StatChart<?> getApplicationApdexScoreChart(
115115
final Range range = Range.between(from, to);
116116
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
117117

118-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
118+
Application application = applicationFactory.createApplicationByTypeName(Service.DEFAULT, applicationName, serviceTypeName);
119119

120120
return apdexScoreService.selectApplicationChart(application, timeWindow);
121121
}
@@ -130,7 +130,7 @@ public StatChart<?> getAgentApdexScoreChart(
130130
final Range range = Range.between(from, to);
131131
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
132132

133-
Application application = applicationFactory.createApplication(applicationName, serviceTypeCode);
133+
Application application = applicationFactory.createApplication(Service.DEFAULT, applicationName, serviceTypeCode);
134134

135135
return apdexScoreService.selectAgentChart(application, timeWindow, agentId);
136136
}
@@ -145,7 +145,7 @@ public StatChart<?> getAgentApdexScoreChart(
145145
final Range range = Range.between(from, to);
146146
TimeWindow timeWindow = new TimeWindow(range, APDEX_SCORE_TIME_WINDOW_SAMPLER);
147147

148-
Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
148+
Application application = applicationFactory.createApplicationByTypeName(Service.DEFAULT, applicationName, serviceTypeName);
149149

150150
return apdexScoreService.selectAgentChart(application, timeWindow, agentId);
151151
}

0 commit comments

Comments
 (0)