[#noissue] Remove Header for Thrift

pinpoint-apm · Feb 10, 2025 · 070665c · 070665c
1 parent beb5f64
commit 070665c
Show file tree

Hide file tree

Showing 27 changed files with 110 additions and 127 deletions.
diff --git a/...or/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java b/...or/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentEventHandler.java
@@ -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;
@@ -69,10 +68,11 @@ public GrpcAgentEventHandler(GrpcAgentEventMapper agentEventMapper,
     @Override
     public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PAgentStat agentStat) {
-            handleAgentStat(agentStat);
+            handleAgentStat(header, agentStat);
         } else if (data instanceof PAgentStatBatch agentStatBatch) {
-            handleAgentStatBatch(agentStatBatch);
+            handleAgentStatBatch(header, agentStatBatch);
         } else if (data instanceof PAgentUriStat) {
             // do nothing
         } else {
@@ -81,12 +81,11 @@ public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
         }
     }
 
-    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;
@@ -99,12 +98,11 @@ private void handleAgentStat(PAgentStat agentStat) {
         }
     }
 
-    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;

diff --git a/...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java b/...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentInfoHandler.java
@@ -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;
@@ -62,8 +61,9 @@ public MessageType type() {
     @Override
     public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PAgentInfo agentInfo) {
-            handleAgentInfo(agentInfo);
+            handleAgentInfo(header, agentInfo);
         } else {
             logger.warn("Invalid request type. serverRequest={}", serverRequest);
             throw Status.INTERNAL.withDescription("Bad Request(invalid request type)").asRuntimeException();
@@ -73,23 +73,23 @@ public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
     @Override
     public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PAgentInfo agentInfo) {
-            final PResult result = handleAgentInfo(agentInfo);
+            final PResult result = handleAgentInfo(header, agentInfo);
             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();

diff --git a/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentStatHandlerV2.java b/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentStatHandlerV2.java
@@ -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;
             }
         }

diff --git a/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java b/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcApiMetaDataHandler.java
@@ -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;
@@ -60,22 +59,22 @@ public MessageType type() {
     @Override
     public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PApiMetaData apiMetaData) {
-            GeneratedMessageV3 result = handleApiMetaData(apiMetaData);
+            GeneratedMessageV3 result = handleApiMetaData(header, apiMetaData);
             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());

diff --git a/...main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java b/...main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcExceptionMetaDataHandler.java
@@ -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;
@@ -67,24 +66,23 @@ public MessageType type() {
     @Override
     public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PExceptionMetaData exceptionMetaData) {
-            PResult result = handleExceptionMetaData(exceptionMetaData);
+            PResult result = handleExceptionMetaData(header, exceptionMetaData);
             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);
 
             List<ExceptionWrapperBo> exceptionWrapperBos = mapExceptionWrapperBo(exceptionMetaData.getExceptionsList());
             exceptionMetaDataBo.setExceptionWrapperBos(exceptionWrapperBos);

diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcMetricHandler.java b/collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcMetricHandler.java
@@ -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);
 }
diff --git a/...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java b/...tor/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanChunkHandler.java
@@ -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;
@@ -61,22 +60,21 @@ public GrpcSpanChunkHandler(TraceService[] traceServices, GrpcSpanFactory spanFa
     @Override
     public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PSpanChunk spanChunk) {
-            handleSpanChunk(spanChunk);
+            handleSpanChunk(header, spanChunk);
         } 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)) {

diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java b/collector/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSpanHandler.java
@@ -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;
@@ -77,20 +76,20 @@ public GrpcSpanHandler(TraceService[] traceServices, GrpcSpanFactory spanFactory
     @Override
     public void handleSimple(ServerRequest<GeneratedMessageV3> serverRequest) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PSpan span) {
-            handleSpan(span);
+            handleSpan(header, span);
         } 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)) {

diff --git a/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java b/...r/src/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlMetaDataHandler.java
@@ -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;
@@ -60,21 +59,20 @@ public MessageType type() {
     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);
             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);
 
         boolean result = true;
         for (SqlMetaDataService sqlMetaDataService : sqlMetaDataServices) {

diff --git a/...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java b/...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcSqlUidMetaDataHandler.java
@@ -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;
@@ -56,22 +55,22 @@ public MessageType type() {
     @Override
     public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PSqlUidMetaData sqlUidMetaData) {
-            PResult result = handleSqlUidMetaData(sqlUidMetaData);
+            PResult result = handleSqlUidMetaData(header, sqlUidMetaData);
             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);
 
         boolean result = true;
         for (SqlUidMetaDataService sqlUidMetaDataService : sqlUidMetaDataServices) {

diff --git a/...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java b/...rc/main/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcStringMetaDataHandler.java
@@ -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;
@@ -57,24 +56,24 @@ public MessageType type() {
     @Override
     public void handleRequest(ServerRequest<GeneratedMessageV3> serverRequest, ServerResponse<GeneratedMessageV3> serverResponse) {
         final GeneratedMessageV3 data = serverRequest.getData();
+        final Header header = serverRequest.getHeader();
         if (data instanceof PStringMetaData stringMetaData) {
-            PResult result = handleStringMetaData(stringMetaData);
+            PResult result = handleStringMetaData(header, stringMetaData);
             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();
 
             final String stringValue = stringMetaData.getStringValue();