kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LAL test query api. (#12206)

This commit is contained in:
weixiang1862 2024-05-10 16:47:24 +08:00 committed by GitHub
parent 054d0e4ff9
commit 19fba2dae8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changes/changes.md
View File

@ -5,6 +5,7 @@
#### OAP Server
* Fix LAL test query api.
#### UI

1
oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
View File

@ -162,7 +162,6 @@ public class ExtractorSpec extends AbstractSpec {
.collect(Collectors.toList())
)
);
BINDING.get().log(logData);
}
@SuppressWarnings("unused")

21
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
View File

@ -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<KeyValue> 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<KeyValue> 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);
});