wankai123 commented on code in PR #13770:
URL: https://github.com/apache/skywalking/pull/13770#discussion_r3008045118
##########
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/handler/SkyWalkingTraceQLApiHandler.java:
##########
@@ -18,36 +18,113 @@
package org.apache.skywalking.oap.query.traceql.handler;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.linecorp.armeria.common.HttpResponse;
+import com.linecorp.armeria.common.HttpStatus;
+import io.grafana.tempo.tempopb.TraceByIDResponse;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.codec.DecoderException;
+import org.apache.skywalking.oap.query.traceql.TraceQLConfig;
+import org.apache.skywalking.oap.query.traceql.converter.OTLPConverter;
+import
org.apache.skywalking.oap.query.traceql.converter.SkyWalkingOTLPConverter;
+import org.apache.skywalking.oap.query.traceql.entity.OtlpTraceResponse;
+import org.apache.skywalking.oap.query.traceql.entity.SearchResponse;
+import org.apache.skywalking.oap.query.traceql.entity.TagNamesResponse;
+import org.apache.skywalking.oap.query.traceql.entity.TagNamesV2Response;
+import org.apache.skywalking.oap.query.traceql.entity.TagValuesResponse;
+import
org.apache.skywalking.oap.query.traceql.exception.IllegalExpressionException;
+import org.apache.skywalking.oap.query.traceql.rt.TraceQLParseResult;
+import org.apache.skywalking.oap.query.traceql.rt.TraceQLQueryParams;
+import org.apache.skywalking.oap.query.traceql.rt.TraceQLQueryParser;
+import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.analysis.IDManager;
+import org.apache.skywalking.oap.server.core.analysis.Layer;
+import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag;
+import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.TagType;
+import org.apache.skywalking.oap.server.core.query.MetadataQueryService;
+import org.apache.skywalking.oap.server.core.query.TagAutoCompleteQueryService;
import org.apache.skywalking.oap.server.core.query.TraceQueryService;
+import org.apache.skywalking.oap.server.core.query.input.Duration;
+import org.apache.skywalking.oap.server.core.query.input.TraceQueryCondition;
+import org.apache.skywalking.oap.server.core.query.type.Endpoint;
+import org.apache.skywalking.oap.server.core.query.type.Pagination;
+import org.apache.skywalking.oap.server.core.query.type.QueryOrder;
+import org.apache.skywalking.oap.server.core.query.type.ServiceInstance;
+import org.apache.skywalking.oap.server.core.query.type.Trace;
+import org.apache.skywalking.oap.server.core.query.type.TraceState;
+import org.apache.skywalking.oap.server.core.query.type.trace.v2.TraceList;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.apache.skywalking.oap.server.library.util.StringUtil;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
/**
* SkyWalking-native implementation of TraceQL API Handler.
*/
public class SkyWalkingTraceQLApiHandler extends TraceQLApiHandler {
private final TraceQueryService traceQueryService;
- private final ModuleManager moduleManager;
+ private final TagAutoCompleteQueryService tagAutoCompleteQueryService;
+ private final MetadataQueryService metadataQueryService;
+ private final TraceQLConfig traceQLConfig;
+ private final Set<String> allowedTags;
- public SkyWalkingTraceQLApiHandler(ModuleManager moduleManager) {
+ public SkyWalkingTraceQLApiHandler(ModuleManager moduleManager,
TraceQLConfig config) {
super();
- this.moduleManager = moduleManager;
this.traceQueryService = moduleManager.find(CoreModule.NAME)
.provider()
.getService(TraceQueryService.class);
+ this.tagAutoCompleteQueryService = moduleManager.find(CoreModule.NAME)
+ .provider()
+
.getService(TagAutoCompleteQueryService.class);
+ this.metadataQueryService = moduleManager.find(CoreModule.NAME)
+ .provider()
+
.getService(MetadataQueryService.class);
+ this.traceQLConfig = config;
+ this.allowedTags =
Arrays.stream(config.getSkywalkingTracesListResultTags().trim().split(Const.COMMA))
+ .map(String::trim)
+ .collect(Collectors.toSet());
+ // Add fixed tags
+ this.allowedTags.add(SPAN_KIND);
+ this.allowedTags.add(SERVICE_NAME);
}
@Override
- protected HttpResponse queryTraceImpl(String traceId, Optional<String>
accept) throws IOException, DecoderException {
- // TODO: Implement SkyWalking native trace query
- // 1. Query trace from TraceQueryService
- // 2. Convert SkyWalking trace format to OTLP format
- // 3. Return based on Accept header (JSON or Protobuf)
- return HttpResponse.ofJson("Not implemented yet");
+ protected HttpResponse queryTraceImpl(String traceId,
+ Optional<Long> start,
+ Optional<Long> end,
+ Optional<String> accept) throws
IOException, DecoderException {
+ // If start/end are provided use them; otherwise cover the full
historical range from 2020-01-01 00:00:00 UTC
+ final long startOf2020Sec = new DateTime(2020, 1, 1, 0, 0, 0,
DateTimeZone.UTC).getMillis() / 1000;
+ Duration duration = buildDuration(
+ start.isPresent() ? start : Optional.of(startOf2020Sec),
+ end,
+ 0L
+ );
Review Comment:
can not pass null here, if duration = null, the default lookback time is
only 1 day, not enough
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
