Skip to content

Commit 9bba321

Browse files
committed
[#12434] Refactor BasicSpan
1 parent 70dc531 commit 9bba321

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

collector/src/main/java/com/navercorp/pinpoint/collector/heatmap/service/HeatmapService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void insertSpanChunk(SpanChunkBo spanChunkBo) {
4343

4444
@Override
4545
public void insertSpan(SpanBo spanBo) {
46-
HeatmapStat heatmapStat = new HeatmapStat(spanBo.getApplicationId(), spanBo.getAgentId(), spanBo.getCollectorAcceptTime(), spanBo.getElapsed(), spanBo.getErrCode());
46+
HeatmapStat heatmapStat = new HeatmapStat(spanBo.getApplicationName(), spanBo.getAgentId(), spanBo.getCollectorAcceptTime(), spanBo.getElapsed(), spanBo.getErrCode());
4747
heatmapDao.insert(heatmapStat);
4848
}
4949
}

collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.navercorp.pinpoint.collector.dao.TraceDao;
2323
import com.navercorp.pinpoint.collector.event.SpanStorePublisher;
2424
import com.navercorp.pinpoint.common.profiler.logging.ThrottledLogger;
25+
import com.navercorp.pinpoint.common.server.bo.BasicSpan;
2526
import com.navercorp.pinpoint.common.server.bo.SpanBo;
2627
import com.navercorp.pinpoint.common.server.bo.SpanChunkBo;
2728
import com.navercorp.pinpoint.common.server.bo.SpanEventBo;
@@ -96,8 +97,8 @@ public void insertSpanChunk(@Valid final SpanChunkBo spanChunkBo) {
9697
publisher.publishEvent(event, true);
9798
}
9899

99-
private ServiceType getApplicationServiceType(SpanChunkBo spanChunk) {
100-
final int applicationServiceTypeCode = spanChunk.getApplicationServiceType();
100+
private ServiceType getApplicationServiceType(BasicSpan basicSpan) {
101+
final int applicationServiceTypeCode = basicSpan.getApplicationServiceType();
101102
return registry.findServiceType(applicationServiceTypeCode);
102103
}
103104

@@ -158,12 +159,6 @@ private void insertAcceptorHost(SpanBo span) {
158159
}
159160
}
160161

161-
private ServiceType getApplicationServiceType(SpanBo span) {
162-
// Check if applicationServiceType is set. If not, use span's service type.
163-
final int applicationServiceTypeCode = span.getApplicationServiceType();
164-
return registry.findServiceType(applicationServiceTypeCode);
165-
}
166-
167162
private void insertSpanStat(SpanBo span) {
168163
final ServiceType applicationServiceType = getApplicationServiceType(span);
169164
final ServiceType spanServiceType = registry.findServiceType(span.getServiceType());

commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/BasicSpan.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ public interface BasicSpan {
5555
TransactionId getTransactionId();
5656
// void setTransactionId(TransactionId transactionId);
5757

58+
int getApplicationServiceType();
59+
void setApplicationServiceType(int applicationServiceType);
60+
boolean hasApplicationServiceType();
61+
62+
long getCollectorAcceptTime();
63+
void setCollectorAcceptTime(long collectorAcceptTime);
5864

5965
// List<SpanEventBo> getSpanEventBoList();
6066
}

commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanBo.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
*/
3232
public class SpanBo implements Event, BasicSpan {
3333

34+
private static final int UNDEFINED = ServiceType.UNDEFINED.getCode();
35+
3436
// version 0 means that the type of prefix's size is int
3537
private byte version = 0;
3638

@@ -309,10 +311,12 @@ public void setRemoteAddr(String remoteAddr) {
309311
this.remoteAddr = remoteAddr;
310312
}
311313

314+
@Override
312315
public long getCollectorAcceptTime() {
313316
return collectorAcceptTime;
314317
}
315318

319+
@Override
316320
public void setCollectorAcceptTime(long collectorAcceptTime) {
317321
this.collectorAcceptTime = collectorAcceptTime;
318322
}
@@ -348,14 +352,17 @@ public void setExceptionClass(String exceptionClass) {
348352
this.exceptionClass = exceptionClass;
349353
}
350354

355+
@Override
351356
public void setApplicationServiceType(int applicationServiceType) {
352357
this.applicationServiceType = applicationServiceType;
353358
}
354359

360+
@Override
355361
public boolean hasApplicationServiceType() {
356-
return applicationServiceType != 0 && applicationServiceType != ServiceType.UNDEFINED.getCode();
362+
return applicationServiceType != 0 && applicationServiceType != UNDEFINED;
357363
}
358364

365+
@Override
359366
public int getApplicationServiceType() {
360367
if (hasApplicationServiceType()) {
361368
return this.applicationServiceType;

commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanChunkBo.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.navercorp.pinpoint.common.profiler.util.TransactionId;
2020
import com.navercorp.pinpoint.common.server.util.ByteUtils;
2121
import com.navercorp.pinpoint.common.server.util.StringPrecondition;
22+
import com.navercorp.pinpoint.common.trace.ServiceType;
2223
import jakarta.validation.constraints.NotBlank;
2324
import jakarta.validation.constraints.PositiveOrZero;
2425

@@ -30,6 +31,8 @@
3031
*/
3132
public class SpanChunkBo implements BasicSpan {
3233

34+
private static final int UNDEFINED = ServiceType.UNDEFINED.getCode();
35+
3336
private byte version = 0;
3437

3538
@NotBlank private String agentId;
@@ -147,22 +150,31 @@ public void setEndPoint(String endPoint) {
147150
this.endPoint = endPoint;
148151
}
149152

153+
@Override
150154
public long getCollectorAcceptTime() {
151155
return collectorAcceptTime;
152156
}
153157

158+
@Override
154159
public void setCollectorAcceptTime(long collectorAcceptTime) {
155160
this.collectorAcceptTime = collectorAcceptTime;
156161
}
157162

163+
@Override
158164
public void setApplicationServiceType(int applicationServiceType) {
159165
this.applicationServiceType = applicationServiceType;
160166
}
161167

168+
@Override
162169
public int getApplicationServiceType() {
163170
return this.applicationServiceType;
164171
}
165172

173+
@Override
174+
public boolean hasApplicationServiceType() {
175+
return applicationServiceType != 0 && applicationServiceType != UNDEFINED;
176+
}
177+
166178
public List<SpanEventBo> getSpanEventBoList() {
167179
return spanEventBoList;
168180
}

0 commit comments

Comments
 (0)