This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch groovy-replace
in repository https://gitbox.apache.org/repos/asf/skywalking.git
from e8a848047e Use flatten:flatten install before license-eye in CI to
pre-install reactor modules
add d966678b4b Support TraceQL and Tempo API for Zipkin trace query.
(#13719)
add d89a993c26 Merge origin/master, add .flattened-pom.xml to .gitignore
No new revisions were added by this update.
Summary of changes:
.github/workflows/skywalking.yaml | 2 +
.gitignore | 3 +
.licenserc.yaml | 1 +
docs/en/api/traceql-service.md | 710 +++++++++++++++++++++
docs/en/changes/changes.md | 1 +
docs/menu.yml | 2 +
.../oap/server/core/zipkin/source/ZipkinSpan.java | 2 +-
.../oap/server/library/server/http/HTTPServer.java | 18 +
oap-server/server-query-plugin/pom.xml | 1 +
.../oap/query/debug/DebuggingHTTPHandler.java | 4 +-
.../traceql-plugin}/pom.xml | 42 +-
.../oap/query/tempo/grammar/TraceQLLexer.g4 | 93 +++
.../oap/query/tempo/grammar/TraceQLParser.g4 | 99 +++
.../oap/query/traceql/TraceQLConfig.java} | 9 +-
.../oap/query/traceql/TraceQLModule.java} | 8 +-
.../oap/query/traceql/TraceQLProvider.java} | 46 +-
.../traceql/converter/ZipkinOTLPConverter.java | 567 ++++++++++++++++
.../query/traceql/entity/BuildInfoResponse.java} | 17 +-
.../oap/query/traceql/entity/ErrorResponse.java} | 28 +-
.../query/traceql/entity/OtlpTraceResponse.java | 97 +++
.../oap/query/traceql/entity/QueryResponse.java} | 5 +-
.../oap/query/traceql/entity/SearchResponse.java | 73 +++
.../query/traceql/entity/TagNamesResponse.java} | 8 +-
.../query/traceql/entity/TagNamesV2Response.java} | 28 +-
.../query/traceql/entity/TagValuesResponse.java} | 12 +-
.../exception/IllegalExpressionException.java | 2 +-
.../handler/SkyWalkingTraceQLApiHandler.java | 110 ++++
.../query/traceql/handler/TraceQLApiHandler.java | 354 ++++++++++
.../traceql/handler/ZipkinTraceQLApiHandler.java | 372 +++++++++++
.../oap/query/traceql/rt/TraceQLParseResult.java | 65 ++
.../oap/query/traceql/rt/TraceQLQueryParams.java} | 50 +-
.../oap/query/traceql/rt/TraceQLQueryParser.java | 63 ++
.../oap/query/traceql/rt/TraceQLQueryVisitor.java | 217 +++++++
.../src/main/proto/tempopb/tempo.proto | 488 ++++++++++++++
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../query/tempo/parser/TraceQLQueryParserTest.java | 135 ++++
.../oap/query/zipkin/ZipkinQueryModule.java | 5 +-
.../oap/query/zipkin/ZipkinQueryProvider.java | 7 +-
.../query/zipkin/handler/ZipkinQueryHandler.java | 105 +--
oap-server/server-starter/pom.xml | 5 +
.../src/main/resources/application.yml | 12 +
.../banyandb => traceql/zipkin}/docker-compose.yml | 24 +-
.../otel-collector => traceql/zipkin}/e2e.yaml | 11 +-
.../cases/traceql/zipkin/expected/buildinfo.yml | 10 +-
.../zipkin/expected/search-tags-v1.yml} | 6 +-
.../zipkin/expected/search-tags-v2.yml} | 15 +-
.../zipkin/expected/search-traces-by-duration.yml} | 50 +-
.../zipkin/expected/search-traces-by-service.yml} | 50 +-
.../zipkin/expected/search-traces-complex.yml} | 50 +-
.../zipkin/expected/tag-values-http-method.yml | 10 +-
.../traceql/zipkin/expected/tag-values-service.yml | 11 +-
.../traceql/zipkin/expected/tag-values-status.yml | 9 +-
.../traceql/zipkin/expected/trace-by-id-json.yml | 154 +++++
.../expected/trace-by-id-protobuf-header.yml} | 3 +-
.../e2e-v2/cases/traceql/zipkin/traceql-cases.yaml | 73 +++
test/e2e-v2/script/env | 2 +-
.../{install-istioctl.sh => install-jq.sh} | 12 +-
58 files changed, 4085 insertions(+), 275 deletions(-)
create mode 100644 docs/en/api/traceql-service.md
copy oap-server/{exporter => server-query-plugin/traceql-plugin}/pom.xml (70%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/antlr4/org/apache/skywalking/oap/query/tempo/grammar/TraceQLLexer.g4
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/antlr4/org/apache/skywalking/oap/query/tempo/grammar/TraceQLParser.g4
copy
oap-server/server-query-plugin/{logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLConfig.java
=>
traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/TraceQLConfig.java}
(79%)
copy
oap-server/server-query-plugin/{logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLModule.java
=>
traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/TraceQLModule.java}
(84%)
copy
oap-server/server-query-plugin/{logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLProvider.java
=>
traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/TraceQLProvider.java}
(66%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/converter/ZipkinOTLPConverter.java
copy
oap-server/server-query-plugin/{promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/entity/BuildInfo.java
=>
traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/BuildInfoResponse.java}
(70%)
copy
oap-server/server-query-plugin/{promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/entity/response/QueryResponse.java
=>
traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/ErrorResponse.java}
(66%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/OtlpTraceResponse.java
copy oap-server/{server-testing/src/main/java/org/junit/rules/TestRule.java =>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/QueryResponse.java}
(89%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/SearchResponse.java
copy
oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/status/ClusterAlarmStatus.java
=>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/TagNamesResponse.java}
(84%)
copy
oap-server/{analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/MeterConfig.java
=>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/TagNamesV2Response.java}
(67%)
copy
oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/status/AlarmRuleList.java
=>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/entity/TagValuesResponse.java}
(76%)
copy oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt =>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql}/exception/IllegalExpressionException.java
(94%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/handler/SkyWalkingTraceQLApiHandler.java
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/handler/TraceQLApiHandler.java
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/handler/ZipkinTraceQLApiHandler.java
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/rt/TraceQLParseResult.java
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/menu/UIMenuItemSetting.java
=>
server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/rt/TraceQLQueryParams.java}
(52%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/rt/TraceQLQueryParser.java
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/java/org/apache/skywalking/oap/query/traceql/rt/TraceQLQueryVisitor.java
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/main/proto/tempopb/tempo.proto
copy oap-server/{server-tools/data-generator =>
server-query-plugin/traceql-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
(93%)
copy oap-server/server-query-plugin/{logql-plugin =>
traceql-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
(93%)
create mode 100644
oap-server/server-query-plugin/traceql-plugin/src/test/java/org/apache/skywalking/oap/query/tempo/parser/TraceQLQueryParserTest.java
copy test/e2e-v2/cases/{zipkin/banyandb => traceql/zipkin}/docker-compose.yml
(76%)
copy test/e2e-v2/cases/{apisix/otel-collector => traceql/zipkin}/e2e.yaml (84%)
copy
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
=> test/e2e-v2/cases/traceql/zipkin/expected/buildinfo.yml (89%)
copy test/e2e-v2/cases/{profiling/trace/expected/profile-dump-process.yml =>
traceql/zipkin/expected/search-tags-v1.yml} (92%)
copy test/e2e-v2/cases/{profiling/trace/expected/profile-dump-process.yml =>
traceql/zipkin/expected/search-tags-v2.yml} (78%)
copy test/e2e-v2/cases/{nodejs/expected/traces-list.yml =>
traceql/zipkin/expected/search-traces-by-duration.yml} (52%)
copy test/e2e-v2/cases/{nodejs/expected/traces-list.yml =>
traceql/zipkin/expected/search-traces-by-service.yml} (52%)
copy test/e2e-v2/cases/{nodejs/expected/traces-list.yml =>
traceql/zipkin/expected/search-traces-complex.yml} (52%)
copy
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
=> test/e2e-v2/cases/traceql/zipkin/expected/tag-values-http-method.yml (91%)
copy
oap-server/ai-pipeline/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
=> test/e2e-v2/cases/traceql/zipkin/expected/tag-values-service.yml (86%)
copy
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
=> test/e2e-v2/cases/traceql/zipkin/expected/tag-values-status.yml (88%)
create mode 100644
test/e2e-v2/cases/traceql/zipkin/expected/trace-by-id-json.yml
copy test/e2e-v2/cases/{profiling/ebpf/continuous/expected/policy-set.yml =>
traceql/zipkin/expected/trace-by-id-protobuf-header.yml} (95%)
create mode 100644 test/e2e-v2/cases/traceql/zipkin/traceql-cases.yaml
copy test/e2e-v2/script/prepare/setup-e2e-shell/{install-istioctl.sh =>
install-jq.sh} (82%)
mode change 100644 => 100755
