This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch events
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard 259b022 Rename event type
discard 3b60030 Remove debugging codes
discard 661c663 Add change log
discard b34cdee Complete the storage implementations
discard ff11b6d Add event query plugin
discard b1634f2 Add event receiver plugin
discard dfa234b Update protocol submodule
discard 1f4e36f Draft the doc of event concept
add 5e029c0 Sync UI (#6268)
add 3cf3145 Remove the strict rule of OAL disable statement parameter.
(#6267)
add 0884c87 Support dynamic change agent.trace.ignore_path on java agent
within CDS. (#6266)
add c0ed7d8 Fix a legal metric query adoption bug. (#6270)
add fd02bcd Support dynamic change agent.ignore_suffix on java agent.
(#6272)
add 01d1eff Enhancement log-recerive e2e test (#6248)
add 5e455c4 Polish doc structure. (#6278)
add 85083ad Sync ui submodule (#6279)
add 1376960 Add a new concept "Event" and its implementations to collect
events
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (259b022)
\
N -- N -- N refs/heads/events (1376960)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/{e2e.log.yaml => e2e.event.yaml} | 19 +--
.github/workflows/e2e.log.yaml | 13 +-
CHANGES.md | 17 ++-
README.md | 9 +-
.../skywalking/apm/agent/core/conf/Config.java | 1 +
.../core/context/ContextManagerExtendService.java | 16 ++-
.../core/context/IgnoreSuffixPatternsWatcher.java | 72 +++++++++++
.../context/IgnoreSuffixPatternsWatcherTest.java | 63 ++++++++++
.../common/log/GRPCLogReportServiceClient.java | 33 +++--
.../toolkit/logging/common/log/ToolkitConfig.java | 46 +++----
apm-sniffer/config/agent.config | 2 +-
.../trace/ignore/TraceIgnoreExtendService.java | 25 +++-
.../trace/ignore/TraceIgnorePatternWatcher.java | 69 +++++++++++
.../ignore/TraceIgnorePatternWatcherTest.java | 57 +++++++++
docs/README.md | 5 +-
docs/en/setup/backend/backend-meter.md | 2 +-
docs/en/setup/backend/backend-receivers.md | 117 +++++++++---------
docs/en/setup/backend/backend-setup.md | 6 +-
docs/en/setup/backend/configuration-vocabulary.md | 2 +-
.../java-agent/configuration-discovery.md | 2 +
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 18 ---
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 4 +-
.../src/main/resources/application.yml | 2 +-
.../oap/server/core/query/LogQueryService.java | 18 ++-
.../oap/server/core/query/type/event/Event.java | 16 +--
.../oap/server/core/query/type/event/Events.java | 4 +-
.../oap/server/core/query/type/event/Source.java | 6 +-
.../oap/query/graphql/resolver/MetricQuery.java | 1 +
.../skywalking-event-receiver-plugin/pom.xml | 5 -
.../oap/server/receiver/event/EventAnalyzer.java | 59 +++++++++
.../receiver/event/EventAnalyzerModuleConfig.java} | 15 +--
.../handler/grpc/EventServiceHandler.java | 28 ++---
.../event/listener/EventAnalysisListener.java | 34 +++---
.../EventAnalysisListenerFactoryManager.java} | 13 +-
.../event/listener/RecordAnalysisListener.java | 79 ++++++++++++
.../event/listener/TrafficAnalysisListener.java | 121 +++++++++++++++++++
.../server/receiver/event/module/EventModule.java | 7 +-
.../event/provider/EventModuleProvider.java | 40 +++---
.../event/service/EventAnalysisService.java} | 17 ++-
.../event/service/EventAnalysisServiceImpl.java | 51 ++++++++
.../plugin/influxdb/query/EventQueryDAO.java | 2 +
.../storage/plugin/influxdb/query/LogQuery.java | 2 +-
skywalking-ui | 2 +-
.../apache/skywalking/e2e/SimpleQueryClient.java | 25 +++-
.../skywalking/e2e/common/KeyValueMatcher.java | 2 +-
.../org/apache/skywalking/e2e/event/Event.java} | 51 +++++---
.../apache/skywalking/e2e/event/EventData.java} | 19 +--
.../apache/skywalking/e2e/event/EventMatcher.java | 112 +++++++++++++++++
.../apache/skywalking/e2e/event/EventsMatcher.java | 51 ++++++++
.../apache/skywalking/e2e/event/EventsQuery.java} | 18 +--
.../org/apache/skywalking/e2e/log/LogsQuery.java | 44 +------
.../src/main/resources/events.gql} | 53 ++++----
test/e2e/e2e-data/src/main/resources/logs.gql | 6 -
test/e2e/e2e-log-producer/pom.xml | 66 ----------
.../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 | 34 ++++++
.../Dockerfile.log.producer => Dockerfile.cli} | 20 +--
test/e2e/e2e-test/docker/Dockerfile.provider | 4 +
.../{Dockerfile.provider => Dockerfile.satellite} | 26 ++--
test/e2e/e2e-test/docker/base-compose.yml | 4 +-
.../{storage => event}/docker-compose.es6.yml | 0
.../{storage => event}/docker-compose.es7.0.yml | 0
.../docker/{log => event}/docker-compose.h2.yml | 0
.../{storage => event}/docker-compose.influxdb.yml | 0
.../{storage => event}/docker-compose.mysql.yml | 0
.../docker-compose.yml} | 51 +++++---
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 ++
.../KafkaMeterE2E.java => event/EventE2E.java} | 91 +++++++-------
.../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 ++----------------
.../test/resources/expected/event/endpoints.yml} | 15 +--
.../{log/endpoints.yml => event/events.yml} | 18 ++-
.../expected/{log => event}/instances.yml | 2 +-
.../resources/expected/{log => event}/services.yml | 2 +-
.../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 ++-
93 files changed, 1477 insertions(+), 907 deletions(-)
copy .github/workflows/{e2e.log.yaml => e2e.event.yaml} (72%)
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreSuffixPatternsWatcher.java
create mode 100644
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoreSuffixPatternsWatcherTest.java
create mode 100644
apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnorePatternWatcher.java
create mode 100644
apm-sniffer/optional-plugins/trace-ignore-plugin/src/test/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnorePatternWatcherTest.java
create mode 100644
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/EventAnalyzer.java
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Events.java
=>
server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/EventAnalyzerModuleConfig.java}
(73%)
rename
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/{provider
=> }/handler/grpc/EventServiceHandler.java (75%)
copy
test/e2e/e2e-log-producer/src/main/java/org/apache/skywalking/e2e/controller/HealthController.java
=>
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/listener/EventAnalysisListener.java
(53%)
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Events.java
=>
server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/listener/EventAnalysisListenerFactoryManager.java}
(73%)
create mode 100644
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/listener/RecordAnalysisListener.java
create mode 100644
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/listener/TrafficAnalysisListener.java
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Events.java
=>
server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/service/EventAnalysisService.java}
(71%)
create mode 100644
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/service/EventAnalysisServiceImpl.java
copy
test/e2e/{e2e-log-producer/src/main/java/org/apache/skywalking/e2e/controller/HealthController.java
=> e2e-data/src/main/java/org/apache/skywalking/e2e/event/Event.java} (56%)
copy
test/e2e/{e2e-log-producer/src/main/java/org/apache/skywalking/e2e/LogProducerApplication.java
=> e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventData.java} (71%)
create mode 100644
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventMatcher.java
create mode 100644
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventsMatcher.java
rename
test/e2e/{e2e-log-producer/src/main/java/org/apache/skywalking/e2e/LogProducerApplication.java
=> e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventsQuery.java}
(70%)
copy test/e2e/{e2e-test/docker/log/docker-compose.es7.yml =>
e2e-data/src/main/resources/events.gql} (58%)
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/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%)
create mode 100644 test/e2e/e2e-service-provider/src/main/resources/logback.xml
copy test/e2e/e2e-test/docker/{kafka/Dockerfile.log.producer =>
Dockerfile.cli} (66%)
copy test/e2e/e2e-test/docker/{Dockerfile.provider => Dockerfile.satellite}
(60%)
copy test/e2e/e2e-test/docker/{storage => event}/docker-compose.es6.yml (100%)
copy test/e2e/e2e-test/docker/{storage => event}/docker-compose.es7.0.yml
(100%)
copy test/e2e/e2e-test/docker/{log => event}/docker-compose.h2.yml (100%)
copy test/e2e/e2e-test/docker/{storage => event}/docker-compose.influxdb.yml
(100%)
copy test/e2e/e2e-test/docker/{storage => event}/docker-compose.mysql.yml
(100%)
copy test/e2e/e2e-test/docker/{log/docker-compose.h2.yml =>
event/docker-compose.yml} (60%)
create mode 100644 test/e2e/e2e-test/docker/kafka/satellite_config.yaml
copy
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/{kafka/KafkaMeterE2E.java
=> event/EventE2E.java} (51%)
rename test/e2e/e2e-test/{docker/kafka/Dockerfile.log.producer =>
src/test/resources/expected/event/endpoints.yml} (72%)
copy test/e2e/e2e-test/src/test/resources/expected/{log/endpoints.yml =>
event/events.yml} (69%)
copy test/e2e/e2e-test/src/test/resources/expected/{log =>
event}/instances.yml (96%)
copy test/e2e/e2e-test/src/test/resources/expected/{log => event}/services.yml
(97%)
