diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index eaf520c883..0067618669 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -5,6 +5,7 @@ #### OAP Server +* Fix LAL test query api. #### UI diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java index 2a52cd64e1..6c229f6f69 100644 --- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java +++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java @@ -162,7 +162,6 @@ public class ExtractorSpec extends AbstractSpec { .collect(Collectors.toList()) ) ); - BINDING.get().log(logData); } @SuppressWarnings("unused") diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java index 943294deb6..bc57bb0a46 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java @@ -18,6 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; +import com.google.protobuf.InvalidProtocolBufferException; import graphql.kickstart.tools.GraphQLQueryResolver; import java.util.ArrayList; import java.util.Arrays; @@ -26,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.skywalking.apm.network.logging.v3.LogData; +import org.apache.skywalking.apm.network.logging.v3.LogTags; import org.apache.skywalking.oap.log.analyzer.dsl.Binding; import org.apache.skywalking.oap.log.analyzer.dsl.DSL; import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule; @@ -88,7 +90,7 @@ public class LogTestQuery implements GraphQLQueryResolver { } l.setServiceId(it.getServiceId()); if (isNotBlank(it.getServiceInstanceId())) { - String name = IDManager.ServiceInstanceID.analysisId(it.getServiceId()).getName(); + String name = IDManager.ServiceInstanceID.analysisId(it.getServiceInstanceId()).getName(); l.setServiceInstanceName(name); } l.setServiceInstanceId(it.getServiceInstanceId()); @@ -101,11 +103,18 @@ public class LogTestQuery implements GraphQLQueryResolver { l.setTimestamp(it.getTimestamp()); l.setContentType(it.getContentType()); l.setContent(it.getContent()); - final List tags = it.getTags() - .stream() - .map(tag -> new KeyValue(tag.getKey(), tag.getValue())) - .collect(Collectors.toList()); - l.getTags().addAll(tags); + if (it.getTagsRawData() != null) { + try { + final List tags = LogTags.parseFrom(it.getTagsRawData()) + .getDataList() + .stream() + .map(tag -> new KeyValue(tag.getKey(), tag.getValue())) + .collect(Collectors.toList()); + l.getTags().addAll(tags); + } catch (InvalidProtocolBufferException e) { + // ignore + } + } builder.log(l); });