Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#noissue] Remove Header for Thrift #12030

Merged
merged 1 commit into from
Feb 10, 2025
Merged

[#noissue] Remove Header for Thrift #12030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ...or/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PAgentStat;
import com.navercorp.pinpoint.grpc.trace.PAgentStatBatch;
import com.navercorp.pinpoint.grpc.trace.PAgentUriStat;
Expand Down Expand Up @@ -69,10 +68,11 @@
@Override
public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 71 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java#L71 

Added line #L71 was not covered by tests
if (data instanceof PAgentStat agentStat) {
handleAgentStat(agentStat);
handleAgentStat(header, agentStat);

Check warning on line 73 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java#L73 

Added line #L73 was not covered by tests
} else if (data instanceof PAgentStatBatch agentStatBatch) {
handleAgentStatBatch(agentStatBatch);
handleAgentStatBatch(header, agentStatBatch);

Check warning on line 75 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java#L75 

Added line #L75 was not covered by tests
} else if (data instanceof PAgentUriStat) {
// do nothing
} else {
Expand All @@ -81,12 +81,11 @@
}
}

private void handleAgentStat(PAgentStat agentStat) {
private void handleAgentStat(Header header, PAgentStat agentStat) {
if (logger.isDebugEnabled()) {
logger.debug("Handle PAgentStat={}", MessageFormatUtils.debugLog(agentStat));
}

final Header header = ServerContext.getAgentInfo();
final AgentEventBo agentEventBo = this.agentEventMapper.map(agentStat, header);
if (agentEventBo == null) {
return;
Expand All @@ -99,12 +98,11 @@
}
}

private void handleAgentStatBatch(PAgentStatBatch agentStatBatch) {
private void handleAgentStatBatch(Header header, PAgentStatBatch agentStatBatch) {
if (logger.isDebugEnabled()) {
logger.debug("Handle PAgentStatBatch={}", MessageFormatUtils.debugLog(agentStatBatch));
}

final Header header = ServerContext.getAgentInfo();
final List<AgentEventBo> agentEventBoList = this.agentEventBatchMapper.map(agentStatBatch, header);
if (CollectionUtils.isEmpty(agentEventBoList)) {
return;
Expand Down
10 changes: 5 additions & 5 deletions ...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.navercorp.pinpoint.common.server.bo.AgentInfoBo;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PAgentInfo;
import com.navercorp.pinpoint.grpc.trace.PResult;
import com.navercorp.pinpoint.io.request.ServerRequest;
Expand Down Expand Up @@ -62,8 +61,9 @@
@Override
public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 64 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java#L64 

Added line #L64 was not covered by tests
if (data instanceof PAgentInfo agentInfo) {
handleAgentInfo(agentInfo);
handleAgentInfo(header, agentInfo);

Check warning on line 66 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java#L66 

Added line #L66 was not covered by tests
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
Expand All @@ -73,23 +73,23 @@
@Override
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 76 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java#L76 

Added line #L76 was not covered by tests
if (data instanceof PAgentInfo agentInfo) {
final PResult result = handleAgentInfo(agentInfo);
final PResult result = handleAgentInfo(header, agentInfo);

Check warning on line 78 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java#L78 

Added line #L78 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private PResult handleAgentInfo(PAgentInfo agentInfo) {
private PResult handleAgentInfo(Header header, PAgentInfo agentInfo) {
if (isDebug) {
logger.debug("Handle PAgentInfo={}", MessageFormatUtils.debugLog(agentInfo));
}

try {
// agent info
final Header header = ServerContext.getAgentInfo();
final AgentInfoBo agentInfoBo = this.agentInfoBoMapper.map(agentInfo, header);
this.agentInfoService.insert(agentInfoBo);
return PResult.newBuilder().setSuccess(true).build();
Expand Down
6 changes: 2 additions & 4 deletions ...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentStatHandlerV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,9 @@ public GrpcAgentStatHandlerV2(List<GrpcMetricHandler> metricHandlers) {

@Override
public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
final GeneratedMessageV3 data = serverRequest.getData();

for (GrpcMetricHandler messageHandler : metricHandlers) {
if (messageHandler.accept(data)) {
messageHandler.handle(data);
if (messageHandler.accept(serverRequest)) {
messageHandler.handle(serverRequest);
return;
}
}
Expand Down
7 changes: 3 additions & 4 deletions ...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.navercorp.pinpoint.common.util.LineNumber;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PApiMetaData;
import com.navercorp.pinpoint.grpc.trace.PResult;
import com.navercorp.pinpoint.io.request.ServerRequest;
Expand Down Expand Up @@ -60,22 +59,22 @@
@Override
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 62 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java#L62 

Added line #L62 was not covered by tests
if (data instanceof PApiMetaData apiMetaData) {
GeneratedMessageV3 result = handleApiMetaData(apiMetaData);
GeneratedMessageV3 result = handleApiMetaData(header, apiMetaData);

Check warning on line 64 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java#L64 

Added line #L64 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

PResult handleApiMetaData(final PApiMetaData apiMetaData) {
PResult handleApiMetaData(Header header, final PApiMetaData apiMetaData) {
if (isDebug) {
logger.debug("Handle PApiMetaData={}", MessageFormatUtils.debugLog(apiMetaData));
}

try {
final Header header = ServerContext.getAgentInfo();
final String agentId = header.getAgentId();
final long agentStartTime = header.getAgentStartTime();
final int line = LineNumber.defaultLineNumber(apiMetaData.getLine());
Expand Down
10 changes: 4 additions & 6 deletions ...main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.navercorp.pinpoint.common.util.StringUtils;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PException;
import com.navercorp.pinpoint.grpc.trace.PExceptionMetaData;
import com.navercorp.pinpoint.grpc.trace.PResult;
Expand Down Expand Up @@ -67,24 +66,23 @@
@Override
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 69 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java#L69 

Added line #L69 was not covered by tests
if (data instanceof PExceptionMetaData exceptionMetaData) {
PResult result = handleExceptionMetaData(exceptionMetaData);
PResult result = handleExceptionMetaData(header, exceptionMetaData);

Check warning on line 71 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java#L71 

Added line #L71 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private PResult handleExceptionMetaData(final PExceptionMetaData exceptionMetaData) {
private PResult handleExceptionMetaData(final Header header, final PExceptionMetaData exceptionMetaData) {
if (isDebug) {
logger.debug("Handle PExceptionMetaData={}", MessageFormatUtils.debugLog(exceptionMetaData));
}

try {
final Header agentInfo = ServerContext.getAgentInfo();

ExceptionMetaDataBo exceptionMetaDataBo = mapExceptionMetaDataBo(agentInfo, exceptionMetaData);
ExceptionMetaDataBo exceptionMetaDataBo = mapExceptionMetaDataBo(header, exceptionMetaData);

Check warning on line 85 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java#L85 

Added line #L85 was not covered by tests

List<ExceptionWrapperBo> exceptionWrapperBos = mapExceptionWrapperBo(exceptionMetaData.getExceptionsList());
exceptionMetaDataBo.setExceptionWrapperBos(exceptionWrapperBos);
Expand Down
5 changes: 3 additions & 2 deletions collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcMetricHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.navercorp.pinpoint.collector.handler.grpc;

import com.google.protobuf.GeneratedMessageV3;
import com.navercorp.pinpoint.io.request.ServerRequest;
import org.springframework.stereotype.Component;

@Component
public interface GrpcMetricHandler {
boolean accept(GeneratedMessageV3 message);
boolean accept(ServerRequest<GeneratedMessageV3> message);

void handle(GeneratedMessageV3 message);
void handle(ServerRequest<GeneratedMessageV3> message);
}
8 changes: 3 additions & 5 deletions ...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PSpanChunk;
import com.navercorp.pinpoint.grpc.trace.PSpanEvent;
import com.navercorp.pinpoint.grpc.trace.PTransactionId;
Expand Down Expand Up @@ -61,22 +60,21 @@
@Override
public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 63 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java#L63 

Added line #L63 was not covered by tests
if (data instanceof PSpanChunk spanChunk) {
handleSpanChunk(spanChunk);
handleSpanChunk(header, spanChunk);

Check warning on line 65 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java#L65 

Added line #L65 was not covered by tests
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}


private void handleSpanChunk(PSpanChunk spanChunk) {
private void handleSpanChunk(Header header, PSpanChunk spanChunk) {
if (isDebug) {
logger.debug("Handle PSpanChunk={}", createSimpleSpanChunkLog(spanChunk));
}


final Header header = ServerContext.getAgentInfo();
final BindAttribute attribute = BindAttribute.of(header, acceptedTimeService.getAcceptedTime());
final SpanChunkBo spanChunkBo = spanFactory.buildSpanChunkBo(spanChunk, attribute);
if (!sampler.isSampling(spanChunkBo)) {
Expand Down
7 changes: 3 additions & 4 deletions collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PSpan;
import com.navercorp.pinpoint.grpc.trace.PSpanEvent;
import com.navercorp.pinpoint.grpc.trace.PTransactionId;
Expand Down Expand Up @@ -77,20 +76,20 @@
@Override
public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 79 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java#L79 

Added line #L79 was not covered by tests
if (data instanceof PSpan span) {
handleSpan(span);
handleSpan(header, span);

Check warning on line 81 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java#L81 

Added line #L81 was not covered by tests
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private void handleSpan(PSpan span) {
private void handleSpan(Header header, PSpan span) {
if (isDebug) {
logger.debug("Handle PSpan={}", createSimpleSpanLog(span));
}

final Header header = ServerContext.getAgentInfo();
final BindAttribute attribute = BindAttribute.of(header, acceptedTimeService.getAcceptedTime());
final SpanBo spanBo = spanFactory.buildSpanBo(span, attribute);
if (!sampler.isSampling(spanBo)) {
Expand Down
8 changes: 3 additions & 5 deletions ...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.navercorp.pinpoint.common.server.bo.SqlMetaDataBo;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PResult;
import com.navercorp.pinpoint.grpc.trace.PSqlMetaData;
import com.navercorp.pinpoint.io.request.ServerRequest;
Expand Down Expand Up @@ -60,21 +59,20 @@
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
if (data instanceof PSqlMetaData sqlMetaData) {
PResult result = handleSqlMetaData(sqlMetaData);
PResult result = handleSqlMetaData(serverRequest.getHeader(), sqlMetaData);

Check warning on line 62 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java#L62 

Added line #L62 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private PResult handleSqlMetaData(PSqlMetaData sqlMetaData) {
private PResult handleSqlMetaData(Header header, PSqlMetaData sqlMetaData) {
if (isDebug) {
logger.debug("Handle PSqlMetaData={}", MessageFormatUtils.debugLog(sqlMetaData));
}

final Header agentInfo = ServerContext.getAgentInfo();
final SqlMetaDataBo sqlMetaDataBo = mapSqlMetaDataBo(agentInfo, sqlMetaData);
final SqlMetaDataBo sqlMetaDataBo = mapSqlMetaDataBo(header, sqlMetaData);

Check warning on line 75 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java#L75 

Added line #L75 was not covered by tests

boolean result = true;
for (SqlMetaDataService sqlMetaDataService : sqlMetaDataServices) {
Expand Down
9 changes: 4 additions & 5 deletions ...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.navercorp.pinpoint.common.server.bo.SqlUidMetaDataBo;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PResult;
import com.navercorp.pinpoint.grpc.trace.PSqlUidMetaData;
import com.navercorp.pinpoint.io.request.ServerRequest;
Expand Down Expand Up @@ -56,22 +55,22 @@
@Override
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 58 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java#L58 

Added line #L58 was not covered by tests
if (data instanceof PSqlUidMetaData sqlUidMetaData) {
PResult result = handleSqlUidMetaData(sqlUidMetaData);
PResult result = handleSqlUidMetaData(header, sqlUidMetaData);

Check warning on line 60 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java#L60 

Added line #L60 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private PResult handleSqlUidMetaData(PSqlUidMetaData sqlUidMetaData) {
private PResult handleSqlUidMetaData(Header header, PSqlUidMetaData sqlUidMetaData) {
if (isDebug) {
logger.debug("Handle PSqlUidMetaData={}", MessageFormatUtils.debugLog(sqlUidMetaData));
}

final Header agentInfo = ServerContext.getAgentInfo();
SqlUidMetaDataBo sqlUidMetaDataBo = mapSqlUidMetaDataBo(agentInfo, sqlUidMetaData);
SqlUidMetaDataBo sqlUidMetaDataBo = mapSqlUidMetaDataBo(header, sqlUidMetaData);

Check warning on line 73 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java#L73 

Added line #L73 was not covered by tests

boolean result = true;
for (SqlUidMetaDataService sqlUidMetaDataService : sqlUidMetaDataServices) {
Expand Down
11 changes: 5 additions & 6 deletions ...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.navercorp.pinpoint.common.server.bo.StringMetaDataBo;
import com.navercorp.pinpoint.grpc.Header;
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
import com.navercorp.pinpoint.grpc.server.ServerContext;
import com.navercorp.pinpoint.grpc.trace.PResult;
import com.navercorp.pinpoint.grpc.trace.PStringMetaData;
import com.navercorp.pinpoint.io.request.ServerRequest;
Expand Down Expand Up @@ -57,24 +56,24 @@
@Override
public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
final GeneratedMessageV3 data = serverRequest.getData();
final Header header = serverRequest.getHeader();

Check warning on line 59 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java#L59 

Added line #L59 was not covered by tests
if (data instanceof PStringMetaData stringMetaData) {
PResult result = handleStringMetaData(stringMetaData);
PResult result = handleStringMetaData(header, stringMetaData);

Check warning on line 61 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java#L61 

Added line #L61 was not covered by tests
serverResponse.write(result);
} else {
logger.warn("Invalid request type. serverRequest={}", serverRequest);
throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
}
}

private PResult handleStringMetaData(final PStringMetaData stringMetaData) {
private PResult handleStringMetaData(Header header, final PStringMetaData stringMetaData) {
if (logger.isDebugEnabled()) {
logger.debug("Handle PStringMetaData={}", MessageFormatUtils.debugLog(stringMetaData));
}

try {
final Header agentInfo = ServerContext.getAgentInfo();
final String agentId = agentInfo.getAgentId();
final long agentStartTime = agentInfo.getAgentStartTime();
final String agentId = header.getAgentId();
final long agentStartTime = header.getAgentStartTime();

Check warning on line 76 in collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java

View check run for this annotation

Codecov / codecov/patch

collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java#L75-L76 

Added lines #L75 - L76 were not covered by tests

final String stringValue = stringMetaData.getStringValue();

Expand Down
Loading