You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/01/28 16:07:56 UTC
[skywalking] branch enhancement/logging updated (dba6a69 -> a6d6f7f)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch enhancement/logging
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from dba6a69 Remove more codes
add 01d1eff Enhancement log-recerive e2e test (#6248)
add a6d6f7f Merge branch 'master' into enhancement/logging
No new revisions were added by this update.
Summary of changes:
.github/workflows/e2e.log.yaml | 13 +-
.../common/log/GRPCLogReportServiceClient.java | 33 +++--
.../toolkit/logging/common/log/ToolkitConfig.java | 46 +++----
docs/en/setup/backend/configuration-vocabulary.md | 2 +-
.../src/main/resources/application.yml | 2 +-
.../oap/server/core/query/LogQueryService.java | 18 ++-
.../storage/plugin/influxdb/query/LogQuery.java | 2 +-
.../apache/skywalking/e2e/SimpleQueryClient.java | 4 -
.../org/apache/skywalking/e2e/log/LogsQuery.java | 44 +------
test/e2e/e2e-data/src/main/resources/logs.gql | 6 -
test/e2e/e2e-log-producer/pom.xml | 66 ----------
.../skywalking/e2e/LogProducerApplication.java | 28 -----
.../skywalking/e2e/controller/LogController.java | 134 ---------------------
test/e2e/e2e-service-provider/pom.xml | 14 +++
.../skywalking/apm/toolkit/trace/TraceContext.java | 57 ---------
.../skywalking/e2e/controller/LogController.java} | 22 ++--
.../src/main}/resources/logback.xml | 19 +--
test/e2e/e2e-test/docker/Dockerfile.provider | 4 +
.../{go/Dockerfile.go => Dockerfile.satellite} | 25 ++--
test/e2e/e2e-test/docker/base-compose.yml | 4 +-
.../e2e-test/docker/kafka/Dockerfile.log.producer | 27 -----
test/e2e/e2e-test/docker/kafka/Dockerfile.provider | 4 +
.../e2e-test/docker/kafka/docker-compose.log.yml | 30 +++--
test/e2e/e2e-test/docker/kafka/docker-compose.yml | 8 --
.../e2e-test/docker/kafka/satellite_config.yaml | 61 ++++++++++
.../e2e/e2e-test/docker/log/docker-compose.es6.yml | 9 +-
.../e2e/e2e-test/docker/log/docker-compose.es7.yml | 7 ++
test/e2e/e2e-test/docker/log/docker-compose.h2.yml | 8 ++
.../docker/log/docker-compose.influxdb.yml | 8 ++
.../e2e-test/docker/log/docker-compose.mysql.yml | 8 ++
.../org/apache/skywalking/e2e/kafka/KafkaE2E.java | 2 +-
.../apache/skywalking/e2e/kafka/KafkaLogE2E.java | 24 +---
.../apache/skywalking/e2e/kafka/KafkaMeterE2E.java | 2 +-
.../skywalking/e2e/kafka/KafkaProfileE2E.java | 2 +-
.../java/org/apache/skywalking/e2e/log/LogE2E.java | 116 ++----------------
.../src/test/resources/expected/log/endpoints.yml | 2 +-
.../src/test/resources/expected/log/instances.yml | 2 +-
.../src/test/resources/expected/log/logs.yml | 12 +-
.../src/test/resources/expected/log/services.yml | 2 +-
test/e2e/pom.xml | 16 ++-
40 files changed, 285 insertions(+), 608 deletions(-)
delete mode 100644 test/e2e/e2e-log-producer/pom.xml
delete mode 100644 test/e2e/e2e-log-producer/src/main/java/org/apache/skywalking/e2e/LogProducerApplication.java
delete mode 100644 test/e2e/e2e-log-producer/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
delete mode 100644 test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
rename test/e2e/{e2e-log-producer/src/main/java/org/apache/skywalking/e2e/controller/HealthController.java => e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java} (70%)
copy test/e2e/{e2e-test/src/test => e2e-service-provider/src/main}/resources/logback.xml (59%)
copy test/e2e/e2e-test/docker/{go/Dockerfile.go => Dockerfile.satellite} (62%)
delete mode 100644 test/e2e/e2e-test/docker/kafka/Dockerfile.log.producer
create mode 100644 test/e2e/e2e-test/docker/kafka/satellite_config.yaml