You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/04/12 06:16:56 UTC
[skywalking] branch jdk15 updated (cb70dac -> 7a5fc4c)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch jdk15
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from cb70dac Merge branch 'master' into jdk15
add d36b350 Fix the priority setting doesn't work of the ALS analyzers (#6121)
add e24b2bc Fix bug that endpoint-name-grouping.yml can not be customized in docker / helm (#6124)
add 35a0e9e Sync UI (#6132)
add cf9b7b1 Add Dolphinscheduler plugin definition (#6134)
add 1307b0b Fix mssql-plugin occur ClassCastException when call the method of return generate key (#6133)
add f3d5153 Add ElasticSearch 7.10 to test matrix (#6137)
add 5aacf2f Sync UI (#6145)
add 1e93cd2 Fix istio control plane ui template metric type mismatch issue (#6147)
add c989bb2 make sampling still works when the trace ignores plug-in activation (#6146)
add 4acbca0 Fix bug that rocketmq-plugin set the wrong tag. (#6144)
add e0a4c44 new feature add witness method (#6103)
add 4ae4f0e ReadWriteSafeCache concurrency read-write (#6149)
add afc44d4 Unify the service name rule in `metadata-service-mapping.yml` of `mx-… (#6131)
add e3fbb3f Fix some influxdb plugin bug (#6139)
add 5fd06a7 Fix `timeBucket` not taking effect in EqualsAndHashCode annotation. (#6153)
add e962203 Dubbo link tracing- show "group" attribute value in OperationName (#6159)
add 34684ce Fix scheduled tasks timezone in GHA (#6161)
add 67fbad1 Fix CI badge links (#6163)
add 3e4d550 Update year to 2021 (#6165)
add 4877a22 Fix Java.lang.ClassFormatError: Duplicate interface name "org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/EnhancedInstance" (#6173)
add 7b40aeb SharingServerConfig properties is not correct, contextPath -> restContextPath (#6174)
add 688a9c7 Update CHANGES.md (#6178)
add 50c74a6 Upgrade kafka clients support version (#6182)
add d299ce0 Remove redundant metrics and polish panel layout (#6190)
add 9dcad4a Fix thread leakage caused by es client connection creation (#6187)
add 1545202 Log collecting and query implementation (#6120)
add 825a7cc Make source builder set service name and endpoint name in right order (#6188)
add 98d0430 chore: set up license-eye to check license header (#6200)
add b0cc913 export the segmentId and spanId in toolkit (#6213)
add cbfe7ee Set up test for Istio 1.8.2 to verify Envoy V3 protocol (#6215)
add 020a995 change spanId toolkit api type (#6216)
add 9021e67 fix kafka e2e testing (#6217)
add 4e43f22 Support Alarm to feishu (#6193)
add ea8a496 fix recording url tag with wrong port (#6214)
add eb4b121 Collect Log with java agent (#6127) (#6194)
add 97f5411 Add the implementation of ConfigurationDiscovery on the OAP side. (#6220)
add 6893fec Fix bug in `parseInternalErrorCode` where some error codes are never reached (#6226)
add a8e6624 Fix apm-toolkit-logging-common dependency (#6229)
add 762e347 OAL supports multiple values when as numeric (#6233)
add 1520478 Sync UI (#6235)
add db61015 Support dynamic change SAMPLE_N_PER_3_SECS on java agent (#6232)
add 43e2458 [FAQ doc] Fix compiling on Mac M1 chip (#6241)
add 100823c Support DNS period resolving mechanism (#6240)
add 777c670 Support the identification of the source host of the metric data in otel-receiver-plugin (#6243)
add 0bd8149 LogQuery remove unused field (#6246)
add c52aa02 Fix bug that the same sample name in one MAL expression caused `IllegalArgumentException` in `Analyzer.analyse`. (#6250)
add e138d29 add text analyzer for es (#6249)
add 9268b98 Fix wrong FAQ catalog (#6254)
add 52c438b Fix that the dynamic configuration is deleted on the server side but does not take effect on the agent. (#6255)
add 3a9a015 Sync UI and add change logs of UI (#6256)
add 7b1c63d Remove optional log plugin (#6259)
add 8c51043 Remove duplicate codes in Envoy ALS handler (#6263)
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 5d47d4d Remove state / isError and collect exception stacktrace in error logs (#6275)
add 1753e5e Support Prometheus node-exporter VM metrics monitoring (#6277)
add 56c264d test: fix flaky E2E test of Kafka (#6281)
add cdf69fa docs: fix typo (#6271)
add 0dd856d Fix missed group in UI template (#6285)
add 8332d3e Update GRPCLogAppenderActivation.java (#6287)
add ff95520 Sync latest UI. (#6290)
add 2a245ca Sync UI, continue fixing the log related issues. (#6291)
add 2739b71 chore: fix occasional build failure on Mac (#6293)
add 93165ab Multiple exclude and include query conditions don't work as expected. (#6295)
add 74ef595 doc: polish the documentations on ALS and MS (#6292)
add f592516 Ability to send log template + arguments instead of pre-formatted message (#6286)
add 1f391b8 sync ui (#6297)
add d0c8d9b Finalize the 8.4.0 changes, and open the release process soon. (#6298)
add cdfe6ab Begin the 8.5.0 iteration (#6302)
add 59114fe Update frontend-maven-plugin to 1.11.0, for Download node x64 binary on Apple Silicon. (#6282)
add 5edcdee Remove invalid mysql configuration in agent.config. (#6303)
add d4ea997 chore: add @Override tag on some methods (#6304)
add d12d3f2 add redefine listener (#6309)
add f44ed75 Allow user-defined `JAVA_OPTS` in the startup script (#6316)
add 1e78a0a Metrics combination API supports abandoning results (#6318)
add de256f0 sync ui (#6319)
add 547f5f1 Add some defensive codes for NPE and bump up Kubernetes client version to expose exception stack trace (#6327)
add b92eac2 Add a new concept "Event" and its implementations to collect events (#6183)
add 5445b7d Fix CI link (#6332)
add fc23dab Support multiple implementations of StorageBuilder in different storage implementations - stage 1. (#6334)
add 5e8f1eb Support multiple implementations of StorageBuilder in different storage implementations - stage 2 (#6336)
add ba6d49a Update the timestamp field type for LogQuery (#6335)
add 30a88b5 Skip CI in some cases to save resources (#6340)
add 638f131 sync ui (#6349)
add 8fed876 Update CHANGES.md (#6350)
add c1736b6 Update Supported-list.md (#6359)
add 75f03ac Adopt Zabbix protocol (#6176)
add 92d0465 Simplify the Zabbix UT, reduce use time (#6362)
add fcf64a2 Change the Apdex metric combine calculator (#6363)
add 544bdbe Add prometheus, open-telemetry, zabbix as labels (#6364)
add cd920e2 Issue#6377 changed slf4j LoggingEvent to apache log4j LoggingEvent (#6378)
add badd057 Fix dead link of Envoy statistics list (#6383)
add ecd0213 Fix the incorrect package imports of the log4j grpc log appender. (#6385)
add 06f4b90 Protect website-docs/8.* branches. (#6386)
add bf013fa Try to fix branch protection (#6387)
add 92ea7a5 Update .asf.yaml (#6389)
add 3c980c2 Add latest doc menu.yml (#6391)
add b70c9be Replace the URL width https (#6392)
add 1e4a8ee Fix dead links and add checker to detect them (#6394)
add e60950c Change the Zabbix receiver is disabled by default (#6395)
add 1adea8a Delete Es7DAO.java (#6397)
add 6d92bc6 Meter system enhancement (#6398)
add 6c6a8a7 Add E2E test for VM monitoring that the metrics from Promethues node-exporter via OTEL. (#6404)
add c45bb36 Storage plugin supports PostgreSQL (#6345)
add 3d2fba3 Fix kubernetes.client.opeanapi.ApiException (#6412)
add 430a85d Fix KafkaContextManagerExtendService boot error of kafka plugin. (#6410)
add 317a658 Remove filename suffix in the meter active file config (#6413)
add 9de9311 Enhance gRPC log appender to allow layout pattern (#6403)
add f6081e1 doc: add ALS metadata-exchange blog and polish E2E doc (#6417)
add 1c52995 Supplement the E2E test for skywalking-client-js (#6409)
add 85fc4f8 Fix spelling (#6418)
add 1d4ff66 Update Dockerfile.nginx (#6421)
add 96f1c12 Introduce log analysis language (LAL) (#6388)
add 665a07c Clean up some warnings in maven build (#6426)
add 8c3d167 Fix apm-dubbo-2.7.x-plugin memory leak due to some Dubbo RpcExceptions. (#6432)
add 08bceb9 Add pulsar version 2.6.3 and 2.7.0 (#6438)
add 5b49f8f Fix alarm httpclient connection leak (#6431)
add 2d258d3 grammar error for "The answer definitely YES" (#6439)
add 47ec0bb Fix grammar error on (#6440)
add 77082de Add `sum` function in meter system (#6427)
add cb00d63 Update the comments in TomcatInstrumentation class. (#6442)
add 9ba17cf Polish a log to doc and menu for latest status. (#6446)
add 92a0b89 fix: docs/menu.yml (#6449)
add 3a6c39c Bugfix/lettucev5 plugin (#6453)
add 258962c removed a duplicate file (#6458)
add 0e1d5c3 Make Zipkin trace query available (#6454)
add daefd5e docs: fix typo in Java-Plugin-Development-Guide.md (#6463)
add aacaade Refine README.md (#6464)
add 3ce4dc0 Fix ClassCastException from CallbackAdapterInterceptor (#6462)
add a11a048 Refine Compatible-with-other-javaagent-bytecode-processing.md and rename to Compatibility-with-other-Java-agent-bytecode-processes.md (#6467)
add 63bfb8d Update README.md (#6468)
add 19d4a77 New doc menu for the website. (#6469)
add 72546a7 fix `DatabaseSlowStatementBuilder` statement maybe null (#6470)
add b1a8238 Remove fields of parent entity in the relation sources. (#6471)
add 6bc3ba0 docs: fix typo (#6473)
add 5289996 Sync UI (#6474)
add de6a731 Save Envoy http access logs when error occurs (#6322)
add 207cef7 Add Istio 1.9.1 into test matrix (#6476)
add cb16e52 Enhance the LAL to allow easily skipping logs with malformed formats (#6477)
add 9946ec4 Sync uI and update license (#6478)
add 871fdf2 Remove unnecessary check for getSkyWalkingDynamicField invocation (#6480)
add 9f00af6 Refine ES-Server-FAQ.md (#6486)
add a0196b1 Fix the line chart problem of topology instance (#6489)
add e2f2cce Fix NullPointerException with KafkaProducer.send(record) (#6487)
add 80a9a5e Support config `agent.span_limit_per_segment` can be changed in the runtime. (#6482)
add 1b8fdd5 sync ui (#6496)
add 28f338c sync ui (#6501)
add 2ec89da Refine Hour-Day-Metrics-Stopping.md and How-to-build-with-mac-m1.md (#6500)
add 78487ad Upgrade lombok to 1.18.16 (#6506)
add 20425c3 Add test cases for kafka-plugin (#6503)
add e9196b7 remove meaningless code (#6508)
add 254f755 add reportError (#6509)
add 1a7cc80 Refine FAQ (#6512)
add d61a4ef Modify the enumeration judgment usage (#6518)
add 0fdb165 Set up code quality check and fix some (#6519)
add a202144 Bugfix/fix UI template wrong metrics name (#6527)
add 9ad26c3 Fix dead links (#6530)
add ad94caf Refine FAQ (#6525)
add d9617cb Add telemetry data about metrics in, metrics scraping and trace in metrics to zipkin receiver. (#6516)
add 0382447 Fix tags store of log and trace on h2/mysql/pg storage (#6505)
add fd1d210 [Incompatible Enhancement]New index policy of ElasticSearch storage option (#6499)
add a01e846 Refine FAQ (#6536)
add 03b45d2 Fix some comments and documentation (#6534)
add 169640b optimize moduleServiceLoader traversal logic (#6537)
add cc60f15 resolve "receiver don't need to get itself when healthCheck #6515 " (#6538)
add 1bd397d Add telemetry data about mesh error. (#6550)
add af6f7d2 Remove group concept from AvgHistogramFunction (#6552)
add c2fa8ba Improvement lua e2e case (#6553)
add 0be76ac Fix unclosed </a> element error (#6558)
add a8810b1 Support metrics grouped by scope labelValue in MAL, no need global same labelValue as before. (#6495)
add bc77726 Refine FAQ (#6560)
add bfef6d9 Fix typos (#6568)
add 3553b2e Update storage-extention.md (#6564)
add 25214e9 Collect and report agent starting / shutdown events (#6559)
add fadbeca Sync UI and upate change logs. (#6582)
add b48433e Optimize the self monitoring grafana dashboard. (#6549)
add c2c3830 Add functions in MAL to filter metrics according to the metric value (#6587)
add 56425f1 support jedis pipeline (#6565)
add 54997d1 Refine FAQ (#6591)
add 9b4766e fix no trace id in async log (#6567)
add fdab7f0 Add go2sky correlation context E2E test (#6590)
add b28f270 sync ui (#6603)
add f3b5671 Enhance the export service. (#6602)
add 32736dc Refine backend-overview.md (#6609)
add a396888 Fix negative number on the grafana dashboard. (#6615)
add 35d7a52 A unit test can be better. (#6620)
add 51b60ae Update the agent HBase plugin to support HBase Client 2.x (#6577)
add 073fbbc Refine event.md (#6622)
add 92c0cb8 Add function `retagByK8sMeta` and opt type `K8sRetagType.Pod2Service` in MAL for k8s to relate pods and services. (#6608)
add f3ca0d0 Timestamp in GlobalIdGenerator is implemented using ThreadLocalRandom (#6623)
add f94bf97 Refine lal.md (#6626)
add 1a0a938 added Component ID for Node Mongoose plugin (#6628)
add ec043d5 document description supplement for #6403 (#6630)
add db9cc26 Remove binary files and download them in CI process instead (#6631)
add 0047829 Fixbug/springmvn-annotation-4.x-plugin, witness class does not exist in some versions (#6629)
add 56bebb8 Remove the close_before_method and close_after_method parameters of custom-enhance-plugin to avoid memory leaks (#6632)
add 0c0a8d4 Revise document description for #4651 (#6638)
add 523944a Add arg `namespace` to func `retagByK8sMeta`, rebuild the relationship between pod and service by labels (#6650)
add 9a3e835 Fix NullPointerException when call "ReactiveRequestHolder.getHeaders" (#6651)
add 7d06c21 Resolve envoy service name from a different position (#6654)
add 4af2b61 Fix ALS K8SServiceRegistry didn't remove the correct entry (#6658)
add 75b5291 Refine concepts and designs (#6655)
add b8a040e Append the root slash(/) to getIndex and getTemplate requests in ES client (#6663)
add fc7d8dc Redis Lettuce span UI doesn't show detailed Redis command parameters in 'db.statement' field (#6614)
add 2af77d4 make sync metrics concurrency (#6642)
add 0dd9cc1 Update oal.md (#6666)
add 573c335 Fix Agent Plugin "asynchttpclient" not record the status code of the … (#6665)
add 41bc528 Refine concepts and designs (#6677)
add c986948 Fix springmvc reactive api can't collect HTTP statusCode. (#6671)
add f6e2467 Refine concepts and designs (#6681)
add 776f19c Fix spanLayer is null in optional plugin(gateway-2.0.x-plugin gateway-2.1.x-plugin) (#6683)
add 2bc3b61 Delete unused code (MachineInfo) (#6679)
add d7beac5 Update the release doc, add clean part (#6684)
add 2b85ba1 Fix `disable` statement not working (#6687)
add c2c6262 Update Dockerfile.go (#6689)
add 647e234 Fix CHANGES.md typo (#6688)
add 411bcf2 Support @Trace, @Tag and @Tags work for static methods (#6685)
add 9661139 Sync UI (#6690)
add f9096f5 Support k8s monitoring (#6479)
add 4dadbfc Refine project-goals.md (#6691)
add 5884b02 sync ui (#6693)
add 0f43dd6 doc: add Apache APISIX for Lua agent in README. (#6692)
add 8d7d865 Add Dockerfile and build script for Java agent Docker image (#6686)
add ea56206 Update submodule (#6699)
add fc7b88b doc: add event exporter link (#6704)
add 41ad39b Refine scope-definitions.md (#6706)
add b6620f5 Remove the useless metrics in `vm.yaml` (#6705)
add 58854af Fix slash root issues in es7 client (#6707)
add d657160 Add backend-infrastructure-monitoring doc (#6711)
add 5c9b79f Refine service-agent.md (#6714)
add d6b73cd sync ui (#6717)
add 35c7fa5 Pin the tidb docker image to 4.0.12 (#6716)
add b0865e7 sync ui (#6718)
add 17e820f Begin 8.6.0 iteration (#6721)
add 5ba8f00 Doc: Polish k8s monitoring otel-collector configuration example. (#6722)
add 024f810 Refine concepts and designs (#6724)
add 7a5fc4c Merge branch 'master' into jdk15
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 10 +
.dlc.json | 21 +
.github/actions/e2e-test/action.yml | 83 +
.github/actions/plugins-test/action.yml | 88 +
.github/actions/skip/action.yml | 86 +
.github/workflows/cancel.yaml | 171 -
.github/workflows/ci-it.yaml | 39 +-
.github/workflows/codeql.yaml | 51 +
.github/workflows/dead-link-checker.yaml | 32 +
.github/workflows/docker-ci.yaml | 6 +-
.github/workflows/e2e.cluster.yaml | 26 +-
.github/workflows/e2e.compat.yaml | 32 +-
.github/workflows/e2e.event.yaml | 57 +
.github/workflows/e2e.go.yaml | 23 +-
.github/workflows/e2e.istio.yaml | 94 +-
.github/workflows/e2e.jdk-versions.yaml | 30 +-
.github/workflows/e2e.js.yaml | 53 +-
.github/workflows/e2e.kafka.yaml | 98 +-
.github/workflows/e2e.log.yaml | 57 +
.github/workflows/e2e.nodejs.yaml | 22 +-
.github/workflows/e2e.php.yaml | 26 +-
.github/workflows/e2e.profiling.yaml | 26 +-
.github/workflows/e2e.python.yaml | 23 +-
.github/workflows/e2e.so11y.yaml | 26 +-
.github/workflows/e2e.storages.yaml | 28 +-
.github/workflows/e2e.ttl.yaml | 28 +-
.github/workflows/e2e.yaml | 147 +-
.github/workflows/plugins-jdk14-test.0.yaml | 19 +-
.github/workflows/plugins-test.0.yaml | 15 +-
.github/workflows/plugins-test.1.yaml | 18 +-
.github/workflows/plugins-test.2.yaml | 15 +-
.github/workflows/plugins-test.3.yaml | 15 +-
.gitignore | 1 +
.licenserc.yaml | 67 +
CHANGES.md | 63 +-
CODE_OF_CONDUCT.md | 2 +-
LICENSE | 2 +-
Makefile | 6 +-
NOTICE | 2 +-
README.md | 24 +-
apm-application-toolkit/apm-toolkit-kafka/pom.xml | 2 +-
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../log/log4j/v1/x/log/GRPCLogClientAppender.java | 48 +
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../log/log4j/v2/x/log/GRPCLogClientAppender.java | 78 +
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
.../logback/v1/x/log/GRPCLogClientAppender.java | 38 +
apm-application-toolkit/apm-toolkit-meter/pom.xml | 2 +-
.../apm-toolkit-micrometer-registry/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
.../skywalking/apm/toolkit/trace/TraceContext.java | 19 +
apm-application-toolkit/pom.xml | 2 +-
apm-checkstyle/checkStyle.xml | 1 +
apm-commons/apm-datacarrier/pom.xml | 2 +-
.../datacarrier/common/AtomicRangeInteger.java | 4 +
apm-commons/apm-util/pom.xml | 2 +-
.../apache/skywalking/apm/util/MachineInfo.java | 88 -
.../skywalking/apm/util/MachineInfoTest.java | 41 -
apm-commons/pom.xml | 2 +-
apm-dist-es7/pom.xml | 8 +-
apm-dist-es7/src/main/assembly/binary-es7.xml | 40 +-
apm-dist/pom.xml | 8 +-
apm-dist/src/main/assembly/binary.xml | 40 +-
apm-protocol/apm-network/pom.xml | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
.../component/command/CommandDeserializer.java | 2 +
.../command/ConfigurationDiscoveryCommand.java | 92 +
apm-protocol/apm-network/src/main/proto | 2 +-
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 6 +-
.../apm/agent/core/ServiceInstanceGenerator.java | 59 +
.../apm/agent/core/boot/BootService.java | 9 +
.../apm/agent/core/boot/ServiceManager.java | 13 +-
.../core/commands/CommandExecutorService.java | 5 +
.../ConfigurationDiscoveryCommandExecutor.java | 45 +
.../skywalking/apm/agent/core/conf/Config.java | 10 +-
.../conf/dynamic/AgentConfigChangeWatcher.java | 62 +
.../dynamic/ConfigurationDiscoveryService.java | 272 ++
.../watcher/IgnoreSuffixPatternsWatcher.java | 73 +
.../conf/dynamic/watcher/SamplingRateWatcher.java | 77 +
.../conf/dynamic/watcher/SpanLimitWatcher.java | 69 +
.../agent/core/context/AbstractTracerContext.java | 14 +
.../apm/agent/core/context/ContextManager.java | 28 +-
.../core/context/ContextManagerExtendService.java | 37 +-
.../apm/agent/core/context/CorrelationContext.java | 1 +
.../agent/core/context/IgnoredTracerContext.java | 13 +-
.../apm/agent/core/context/TracingContext.java | 21 +-
.../core/context/ids/DistributedTraceIds.java | 2 +-
.../agent/core/context/ids/GlobalIdGenerator.java | 9 +-
.../apm/agent/core/context/tag/Tags.java | 11 +-
.../core/context/util/ThrowableTransformer.java | 2 +
.../apm/agent/core/jvm/JVMMetricsSender.java | 1 +
.../plugin/AbstractClassEnhancePluginDefine.java | 20 +-
.../apm/agent/core/plugin/WitnessClassFinder.java | 56 -
.../apm/agent/core/plugin/WitnessFinder.java | 83 +
.../apm/agent/core/plugin/WitnessMethod.java | 45 +
.../enhance/ClassEnhancePluginDefine.java | 13 +-
.../core/plugin/match/ProtectiveShieldMatcher.java | 1 +
.../core/remote/EventReportServiceClient.java | 182 +
.../apm/agent/core/remote/GRPCChannelManager.java | 30 +-
.../agent/core/remote/LogReportServiceClient.java | 74 +
.../agent/core/remote/ServiceManagementClient.java | 6 -
.../apm/agent/core/sampling/SamplingService.java | 59 +-
...ache.skywalking.apm.agent.core.boot.BootService | 6 +-
.../apm/agent/core/boot/ServiceManagerTest.java | 4 +-
.../watcher/IgnoreSuffixPatternsWatcherTest.java | 72 +
.../core/conf/watcher/SamplingRateWatcherTest.java | 72 +
.../core/conf/watcher/SpanLimitWatcherTest.java | 65 +
.../apm/agent/core/context/TracingContextTest.java | 5 +-
.../apm/agent/core/plugin/witness/WitnessTest.java | 67 +
apm-sniffer/apm-agent/pom.xml | 10 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 22 +
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 2 +-
.../asynchttpclient-2.x-plugin/pom.xml | 2 +-
.../asynchttpclient/v2/AsyncHandlerWrapper.java | 8 +-
apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/baidu-brpc-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +-
.../cassandra-java-driver-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/cxf-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/dbcp-2.x-plugin/pom.xml | 2 +-
.../dubbo-2.7.x-conflict-patch/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +-
.../apm/plugin/asf/dubbo/DubboInterceptor.java | 14 +-
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm/plugin/dubbo/DubboInterceptor.java | 5 +
.../apm-sdk-plugin/ehcache-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-3.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../elasticsearch-6.x-plugin/pom.xml | 2 +-
.../RestHighLevelClientConInterceptor.java | 13 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml | 2 +-
.../ClientDestTracingFilterInterceptor.java | 2 +-
.../graphql-plugin/graphql-12.x-plugin/pom.xml | 2 +-
.../graphql-plugin/graphql-8.x-plugin/pom.xml | 2 +-
.../graphql-plugin/graphql-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hbase-1.x-2.x-plugin/pom.xml | 45 +
.../apm/plugin/hbase/HTable100Interceptor.java | 41 +
.../apm/plugin/hbase/HTable200Interceptor.java | 41 +
.../apm/plugin/hbase/HTable220Interceptor.java | 43 +
.../apm/plugin/hbase/HTableInterceptor.java | 0
.../plugin/hbase/define/HTableInstrumentation.java | 143 +
.../src/main/resources/skywalking-plugin.def | 17 +
.../apm-sdk-plugin/hbase-1.x-plugin/pom.xml | 45 -
.../plugin/hbase/define/HTableInstrumentation.java | 101 -
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpclient-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpclient-commons/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/influxdb-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm/plugin/jdbc/trace/SWCallableStatement.java | 225 +
.../apm/plugin/jdbc/trace/SWPreparedStatement.java | 112 +
.../apm/plugin/jdbc/trace/SWStatement.java | 54 +
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../v2/PipelineSetClientMethodInterceptor.java | 52 +
.../MultiKeyPipelineBaseInstrumentation.java | 67 +
.../v2/define/PipelineBaseInstrumentation.java | 67 +
.../jedis/v2/define/PipelineInstrumentation.java | 68 +
.../src/main/resources/skywalking-plugin.def | 5 +
.../v2/PipelineSetClientMethodInterceptorTest.java | 72 +
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-commons/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 2 +-
.../apm/plugin/kafka/CallbackAdapter.java | 62 -
.../plugin/kafka/CallbackAdapterInterceptor.java | 12 +-
.../kafka/CallbackConstructorInterceptor.java | 11 +-
.../apm/plugin/kafka/CallbackInterceptor.java | 5 +-
.../apm/plugin/kafka/CallbackInterceptorTest.java | 40 +-
.../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 2 +-
.../apm/plugin/lettuce/v5/LettucePluginConfig.java | 41 +
.../lettuce/v5/RedisChannelWriterInterceptor.java | 32 +-
.../v5/RedisClientConstructorInterceptor.java | 13 +-
.../v5/RedisChannelWriterInterceptorTest.java | 34 +-
.../plugin/lettuce/v5/mock/MockClientOptions.java | 45 +
.../lettuce/v5/mock/MockRedisClusterClient.java | 31 +-
...ckRedisClusterClientConstructorInterceptor.java | 39 -
.../light4j-plugins/light4j-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/mariadb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-4.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/mssql-commons/pom.xml | 53 +
.../apm/plugin/mssql/commons/Constants.java | 27 +
.../CreateCallableStatementInterceptor.java | 49 +
.../CreatePreparedStatementInterceptor.java | 48 +
.../mssql/commons/CreateStatementInterceptor.java | 49 +
...PreparedStatementExecuteMethodsInterceptor.java | 76 +
.../StatementExecuteMethodsInterceptor.java | 81 +
.../define/AbstractConnectionInstrumentation.java | 119 +
.../apm-sdk-plugin/mssql-jdbc-plugin/pom.xml | 8 +-
.../define/AbstractConnectionInstrumentation.java | 150 -
.../jdbc/define/ConnectionInstrumentation.java | 1 +
.../define/PreparedStatementInstrumentation.java | 69 +
.../jdbc/define/StatementInstrumentation.java | 70 +
.../src/main/resources/skywalking-plugin.def | 2 +
.../apm-sdk-plugin/mssql-jtds-1.x-plugin/pom.xml | 8 +-
.../define/AbstractConnectionInstrumentation.java | 150 -
.../jtds/v1/define/ConnectionInstrumentation.java | 1 +
.../define/PreparedStatementInstrumentation.java | 69 +
.../jtds/v1/define/StatementInstrumentation.java | 70 +
.../src/main/resources/skywalking-plugin.def | 2 +
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
.../mysql/v5/define/CallableInstrumentation.java | 5 +-
.../define/PreparedStatementInstrumentation.java | 6 +-
.../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +-
.../mysql/v6/define/CallableInstrumentation.java | 5 +-
.../define/PreparedStatementInstrumentation.java | 6 +-
.../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +-
.../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 2 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 2 +-
.../define/AbstractNutzHttpInstrumentation.java | 1 +
.../NutzHttpFilePostSenderInstrumentation.java | 1 +
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 9 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/quasar-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 2 +-
.../resteasy-server-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../v3/MessageConcurrentlyConsumeInterceptor.java | 2 +-
.../v3/MessageOrderlyConsumeInterceptor.java | 2 +-
.../plugin/rocketMQ/v3/OnSuccessInterceptor.java | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../v4/MessageConcurrentlyConsumeInterceptor.java | 2 +-
.../v4/MessageOrderlyConsumeInterceptor.java | 2 +-
.../plugin/rocketMQ/v4/OnSuccessInterceptor.java | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
.../sharding-sphere-3.x-plugin/pom.xml | 2 +-
.../sharding-sphere-4.0.x-plugin/pom.xml | 2 +-
.../sharding-sphere-4.1.0-plugin/pom.xml | 2 +-
.../sharding-sphere-4.x-RC3-plugin/pom.xml | 2 +-
.../sharding-sphere-4.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 2 +-
.../spring-plugins/async-annotation-plugin/pom.xml | 2 +-
.../concurrent-util-4.x-plugin/pom.xml | 2 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../ControllerForLowVersionInstrumentation.java | 2 +-
...RestControllerForLowVersionInstrumentation.java | 2 +-
.../mvc-annotation-5.x-plugin/pom.xml | 9 +-
.../plugin/spring/mvc/v5/InvokeInterceptor.java | 25 +-
.../InvocableHandlerMethodInstrumentation.java | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
.../spring/mvc/commons/ReactiveRequestHolder.java | 7 +-
.../spring/mvc/commons/ReactiveResponseHolder.java | 11 +
.../interceptor/AbstractMethodInterceptor.java | 7 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +-
.../resttemplate/async/RestExecuteInterceptor.java | 4 +-
.../resttemplate/sync/RestExecuteInterceptor.java | 4 +-
.../scheduled-annotation-plugin/pom.xml | 2 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-cloud-feign-2.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-commons/pom.xml | 2 +-
.../spring-plugins/spring-kafka-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-kafka-2.x-plugin/pom.xml | 2 +-
.../spring-webflux-5.x-webclient-plugin/pom.xml | 2 +-
.../v5/webclient/WebFluxWebClientInterceptor.java | 2 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/thrift-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../tomcat78x/define/TomcatInstrumentation.java | 4 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +-
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xxl-job-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 2 +-
.../apm-toolkit-kafka-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 9 +-
.../log4j/v1/x/log/GRPCLogAppenderActivation.java | 84 +
.../log4j/v1/x/log/GRPCLogAppenderInterceptor.java | 115 +
.../src/main/resources/skywalking-plugin.def | 1 +
.../apm-toolkit-log4j-2.x-activation/pom.xml | 18 +-
.../v2/x/async/CreateMementoInstrumentation.java | 83 +
.../log4j/v2/x/async/CreateMementoInterceptor.java | 51 +
.../async/Log4jLogEventConstructorInterceptor.java | 2 +
.../log4j/v2/x/log/GRPCLogAppenderActivation.java | 75 +
.../log4j/v2/x/log/GRPCLogAppenderInterceptor.java | 129 +
.../src/main/resources/skywalking-plugin.def | 4 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 7 +-
.../v1/x/log/GRPCLogAppenderActivation.java | 75 +
.../v1/x/log/GRPCLogAppenderInterceptor.java | 130 +
.../src/main/resources/skywalking-plugin.def | 3 +-
.../apm-toolkit-logging-common/pom.xml | 80 +
.../common/log/GRPCLogReportServiceClient.java | 147 +
.../toolkit/logging/common/log/ToolkitConfig.java | 61 +
...ache.skywalking.apm.agent.core.boot.BootService | 19 +
.../apm-toolkit-meter-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
.../trace/BaseTagAnnotationInterceptor.java | 78 +
.../trace/BaseTraceAnnotationInterceptor.java | 89 +
.../activation/trace/SegmentIDInterceptor.java | 49 +
.../activation/trace/SpanIDInterceptor.java | 49 +
.../activation/trace/TagAnnotationActivation.java | 28 +-
.../trace/TagAnnotationMethodInterceptor.java | 67 +-
.../TagAnnotationStaticMethodInterceptor.java | 45 +
.../trace/TraceAnnotationActivation.java | 28 +-
.../trace/TraceAnnotationMethodInterceptor.java | 60 +-
.../TraceAnnotationStaticMethodInterceptor.java | 45 +
.../activation/trace/TraceContextActivation.java | 45 +-
.../activation/trace/TraceContextInterceptor.java | 49 -
.../activation/trace/TraceIDInterceptor.java | 49 +
apm-sniffer/apm-toolkit-activation/pom.xml | 7 +-
.../bootstrap-plugins/jdk-http-plugin/pom.xml | 2 +-
.../bootstrap-plugins/jdk-threading-plugin/pom.xml | 2 +-
apm-sniffer/bootstrap-plugins/pom.xml | 8 +-
apm-sniffer/config/agent.config | 6 +-
.../customize-enhance-plugin/pom.xml | 2 +-
.../customize/conf/CustomizeConfiguration.java | 16 -
.../plugin/customize/conf/MethodConfiguration.java | 16 -
.../apm/plugin/customize/constants/Constants.java | 8 -
.../interceptor/BaseInterceptorMethods.java | 72 +-
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +-
.../kotlin-coroutine-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/logger-plugin/pom.xml | 50 -
.../apm/plugin/logger/ContextConfig.java | 251 -
.../logger/DebugLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/DebugLog4jLoggerInterceptor.java | 49 -
.../logger/DebugLogbackLoggerInterceptor.java | 48 -
.../logger/ErrorLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/ErrorLog4jLoggerInterceptor.java | 49 -
.../logger/ErrorLogbackLoggerInterceptor.java | 48 -
.../logger/FatalLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/FatalLog4jLoggerInterceptor.java | 49 -
.../plugin/logger/InfoLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/InfoLog4jLoggerInterceptor.java | 49 -
.../logger/InfoLogbackLoggerInterceptor.java | 48 -
.../logger/TraceLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/TraceLog4jLoggerInterceptor.java | 49 -
.../logger/TraceLogbackLoggerInterceptor.java | 48 -
.../plugin/logger/WarnLog4j2LoggerInterceptor.java | 48 -
.../plugin/logger/WarnLog4jLoggerInterceptor.java | 49 -
.../logger/WarnLogbackLoggerInterceptor.java | 48 -
.../logger/define/Log4j2LoggerInstrumentation.java | 75 -
.../logger/define/Log4jLoggerInstrumentation.java | 75 -
.../define/LogbackLoggerInstrumentation.java | 75 -
.../src/main/resources/skywalking-plugin.def | 18 -
.../plugin/logger/ContextConfigDefaultTest.java | 45 -
.../plugin/logger/ContextConfigExceptionTest.java | 97 -
.../apm/plugin/logger/ContextConfigTest.java | 96 -
.../gateway-2.0.x-plugin/pom.xml | 2 +-
.../gateway/v20x/HttpClientRequestInterceptor.java | 3 +-
.../gateway-2.1.x-plugin/pom.xml | 2 +-
.../v21x/HttpClientFinalizerSendInterceptor.java | 3 +-
.../optional-spring-cloud/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
.../spring-tx-plugin/pom.xml | 2 +-
.../spring-webflux-5.x-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 9 +-
.../quartz-scheduler-2.x-plugin/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 2 +-
.../trace/ignore/TraceIgnoreExtendService.java | 30 +-
.../trace/ignore/TraceIgnorePatternWatcher.java | 69 +
.../ignore/TraceIgnorePatternWatcherTest.java | 66 +
.../apm/plugin/trace/ignore/TraceIgnoreTest.java | 7 +-
.../zookeeper-3.4.x-plugin/pom.xml | 2 +-
.../kafka-reporter-plugin/pom.xml | 10 +-
apm-sniffer/optional-reporter-plugins/pom.xml | 4 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 4 +-
changes/changes-5.x.md | 4 +-
changes/changes-8.0.0.md | 2 +-
changes/changes-8.3.0.md | 2 -
changes/changes-8.4.0.md | 136 +
changes/changes-8.5.0.md | 108 +
codeStyle.xml | 1 +
dist-material/bin/oapService.sh | 9 +-
dist-material/bin/oapServiceInit.sh | 9 +-
dist-material/bin/oapServiceNoInit.sh | 9 +-
dist-material/bin/webappService.sh | 9 +-
.../alarm-settings.yml} | 0
dist-material/config-examples/lal.yaml | 50 +
dist-material/config-examples/log-mal.yaml | 37 +
dist-material/release-docs/LICENSE | 35 +-
dist-material/release-docs/NOTICE | 4 +-
dist-material/release-docs/README.txt | 4 +-
.../release-docs/licenses/LICENSE-postgresql.txt | 23 +
docker/agent/Dockerfile.agent | 46 +
docs/README.md | 108 +-
...ble-with-other-javaagent-bytecode-processing.md | 42 +-
docs/en/FAQ/ES-Server-FAQ.md | 10 +-
.../EnhanceRequireObjectCache-Cast-Exception.md | 11 +-
docs/en/FAQ/Hour-Day-Metrics-Stopping.md | 10 +-
docs/en/FAQ/How-to-build-with-mac-m1.md | 30 +
...mport-Project-Eclipse-RequireItems-Exception.md | 14 +-
docs/en/FAQ/Memory-leak-enhance-Worker-thread.md | 18 +-
docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md | 10 +-
docs/en/FAQ/README.md | 29 +-
docs/en/FAQ/Unexpected-endpoint-register.md | 10 +-
docs/en/FAQ/Why-have-traces-no-others.md | 8 +-
docs/en/FAQ/install_agent_on_websphere.md | 12 +-
docs/en/FAQ/kafka-plugin.md | 6 +-
docs/en/FAQ/maven-compile-npm-failure.md | 16 +-
docs/en/FAQ/thrift-plugin.md | 10 +-
docs/en/FAQ/v3-version-upgrade.md | 6 +-
docs/en/FAQ/v6-version-upgrade.md | 34 +-
docs/en/FAQ/v8-version-upgrade.md | 14 +-
docs/en/FAQ/vnode.md | 20 +-
docs/en/FAQ/why_mq_not_involved.md | 38 +-
docs/en/concepts-and-designs/README.md | 25 -
docs/en/concepts-and-designs/backend-overview.md | 42 +-
docs/en/concepts-and-designs/event.md | 56 +
docs/en/concepts-and-designs/lal.md | 356 ++
docs/en/concepts-and-designs/mal.md | 135 +-
docs/en/concepts-and-designs/manual-sdk.md | 8 +-
docs/en/concepts-and-designs/meter.md | 34 +-
docs/en/concepts-and-designs/oal.md | 98 +-
docs/en/concepts-and-designs/overview.md | 21 +-
docs/en/concepts-and-designs/probe-introduction.md | 46 +-
docs/en/concepts-and-designs/project-goals.md | 26 +-
docs/en/concepts-and-designs/scope-definitions.md | 286 +-
docs/en/concepts-and-designs/service-agent.md | 44 +-
docs/en/concepts-and-designs/service-mesh-probe.md | 31 +-
docs/en/concepts-and-designs/ui-overview.md | 14 +-
docs/en/guides/How-to-release.md | 7 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 31 +-
docs/en/guides/Plugin-test.md | 2 -
docs/en/guides/README.md | 9 +-
docs/en/guides/storage-extention.md | 4 +
docs/en/protocols/Browser-HTTP-API-Protocol.md | 2 +-
docs/en/protocols/JVM-Protocol.md | 2 +-
docs/en/protocols/Log-Data-Protocol.md | 5 +
docs/en/protocols/README.md | 7 +-
docs/en/setup/README.md | 60 -
docs/en/setup/backend/backend-alarm.md | 21 +-
docs/en/setup/backend/backend-fetcher.md | 2 +-
.../backend/backend-infrastructure-monitoring.md | 119 +
docs/en/setup/backend/backend-meter.md | 2 +-
docs/en/setup/backend/backend-receivers.md | 134 +-
docs/en/setup/backend/backend-setup.md | 52 +-
docs/en/setup/backend/backend-storage.md | 63 +-
docs/en/setup/backend/backend-telemetry.md | 3 +-
docs/en/setup/backend/backend-ui-setup.md | 48 -
docs/en/setup/backend/backend-zabbix.md | 73 +
docs/en/setup/backend/configuration-vocabulary.md | 28 +-
docs/en/setup/backend/dynamic-config.md | 1 +
docs/en/setup/backend/grafana-cluster.json | 4453 +++++++++++++++++
docs/en/setup/backend/grafana-instance.json | 5066 ++++++++++++++++++++
docs/en/setup/backend/grafana.json | 1118 -----
docs/en/setup/backend/log-analyzer.md | 15 +
docs/en/setup/backend/metrics-exporter.md | 18 +-
docs/en/setup/backend/otel-collector-config.yaml | 168 +
docs/en/setup/backend/spring-sleuth-setup.md | 8 +-
docs/en/setup/envoy/als_setting.md | 123 +-
docs/en/setup/envoy/metrics_service_setting.md | 44 +-
docs/en/setup/istio/README.md | 8 +-
docs/en/setup/service-agent/browser-agent.md | 10 +
.../java-agent/Application-toolkit-log4j-1.x.md | 24 +
.../java-agent/Application-toolkit-log4j-2.x.md | 60 +
.../java-agent/Application-toolkit-logback-1.x.md | 63 +
.../java-agent/Application-toolkit-trace.md | 17 +
.../setup/service-agent/java-agent/Plugin-list.md | 7 +-
docs/en/setup/service-agent/java-agent/README.md | 21 +-
.../service-agent/java-agent/Supported-list.md | 14 +-
.../Kotlin-Coroutine-plugin.md | 6 +-
.../agent-optional-plugins/Logger-plugin.md | 78 -
.../agent-optional-plugins/trace-ignore-plugin.md | 3 +
.../java-agent/configuration-discovery.md | 32 +
docs/en/setup/service-agent/server-agents.md | 23 +
docs/en/ui/README.md | 18 +-
docs/menu.yml | 172 +
oap-server/analyzer/agent-analyzer/pom.xml | 2 +-
.../analyzer/provider/AnalyzerModuleConfig.java | 5 +-
.../analyzer/provider/AnalyzerModuleProvider.java | 6 +-
.../provider/meter/config/MeterConfigs.java | 13 +-
.../provider/trace/parser/TraceAnalyzer.java | 46 +-
.../listener/DatabaseSlowStatementBuilder.java | 70 +
.../listener/MultiScopesAnalysisListener.java | 46 +-
.../parser/listener/SegmentAnalysisListener.java | 6 +-
.../trace/parser/listener/SourceBuilder.java | 52 +-
.../provider/meter/process/MeterBaseTest.java | 124 -
.../provider/meter/process/MeterBuilderTest.java | 92 -
oap-server/analyzer/event-analyzer/pom.xml | 38 +
.../oap/server/analyzer/event/EventAnalyzer.java | 60 +
.../server/analyzer/event/EventAnalyzerModule.java | 36 +
.../analyzer/event/EventAnalyzerModuleConfig.java | 24 +
.../event/EventAnalyzerModuleProvider.java | 70 +
.../analyzer/event/EventAnalyzerService.java | 26 +
.../analyzer/event/EventAnalyzerServiceImpl.java | 50 +
.../event/listener/EventAnalyzerListener.java | 41 +
.../EventAnalyzerListenerFactoryManager.java | 29 +
.../listener/EventRecordAnalyzerListener.java | 87 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 19 +
oap-server/analyzer/log-analyzer/pom.xml | 47 +
.../skywalking/oap/log/analyzer/dsl/Binding.java | 117 +
.../skywalking/oap/log/analyzer/dsl/DSL.java | 58 +
.../oap/log/analyzer/dsl/spec/AbstractSpec.java | 52 +
.../analyzer/dsl/spec/extractor/ExtractorSpec.java | 209 +
.../log/analyzer/dsl/spec/filter/FilterSpec.java | 172 +
.../dsl/spec/parser/AbstractParserSpec.java | 43 +
.../analyzer/dsl/spec/parser/JsonParserSpec.java | 45 +
.../analyzer/dsl/spec/parser/TextParserSpec.java | 58 +
.../analyzer/dsl/spec/parser/YamlParserSpec.java | 42 +
.../log/analyzer/dsl/spec/sink/SamplerSpec.java | 67 +
.../oap/log/analyzer/dsl/spec/sink/SinkSpec.java | 61 +
.../dsl/spec/sink/sampler/RateLimitingSampler.java | 107 +
.../analyzer/dsl/spec/sink/sampler/Sampler.java | 42 +
.../oap/log/analyzer/module/LogAnalyzerModule.java | 36 +
.../oap/log/analyzer/provider/LALConfig.java | 28 +
.../oap/log/analyzer/provider/LALConfigs.java | 77 +
.../analyzer/provider/LogAnalyzerModuleConfig.java | 68 +
.../provider/LogAnalyzerModuleProvider.java | 80 +
.../log/ILogAnalysisListenerFactoryManager.java | 29 +
.../analyzer/provider/log/ILogAnalyzerService.java | 34 +
.../oap/log/analyzer/provider/log/LogAnalyzer.java | 70 +
.../provider/log/LogAnalyzerServiceImpl.java | 49 +
.../provider/log/listener/LogAnalysisListener.java | 37 +
.../log/listener/LogAnalysisListenerFactory.java | 27 +
.../provider/log/listener/LogFilterListener.java | 76 +
.../log/listener/RecordAnalysisListener.java | 145 +
.../log/listener/TrafficAnalysisListener.java | 109 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 18 +
oap-server/analyzer/meter-analyzer/pom.xml | 8 +-
.../skywalking/oap/meter/analyzer/Analyzer.java | 128 +-
.../oap/meter/analyzer/MetricConvert.java | 18 +-
.../skywalking/oap/meter/analyzer/dsl/DSL.java | 5 +
.../oap/meter/analyzer/dsl/DownsamplingType.java | 2 +-
.../EndpointEntityDescription.java | 46 +
.../dsl/EntityDescription/EntityDescription.java | 34 +
.../InstanceEntityDescription.java | 46 +
.../ServiceEntityDescription.java | 48 +
.../oap/meter/analyzer/dsl/Expression.java | 69 +-
.../analyzer/dsl/ExpressionParsingContext.java | 16 +-
.../skywalking/oap/meter/analyzer/dsl/Sample.java | 8 +-
.../oap/meter/analyzer/dsl/SampleFamily.java | 355 +-
.../meter/analyzer/dsl/tagOpt/K8sRetagType.java | 53 +
.../oap/meter/analyzer/dsl/tagOpt/Retag.java | 26 +
.../oap/meter/analyzer/k8s/K8sInfoRegistry.java | 230 +
.../oap/meter/analyzer/dsl/AnalyzerTest.java | 230 +
.../oap/meter/analyzer/dsl/ArithmeticTest.java | 14 +
.../meter/analyzer/dsl/ExpressionParsingTest.java | 57 +-
.../oap/meter/analyzer/dsl/K8sTagTest.java | 281 ++
.../oap/meter/analyzer/dsl/ScopeTest.java | 328 ++
.../oap/meter/analyzer/dsl/ValueFilterTest.java | 161 +
oap-server/analyzer/pom.xml | 6 +-
oap-server/exporter/pom.xml | 2 +-
.../exporter/provider/grpc/GRPCExporter.java | 134 +-
.../provider/grpc/GRPCExporterProvider.java | 2 +-
.../exporter/src/main/proto/metric-exporter.proto | 15 +-
.../provider/grpc/ExporterMockReceiver.java | 16 +-
.../provider/grpc/GRPCExporterProviderTest.java | 2 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 18 +-
.../provider/grpc/MockMetricExportServiceImpl.java | 14 +-
.../server/exporter/provider/grpc/MockMetrics.java | 4 +-
oap-server/oal-grammar/pom.xml | 2 +-
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 18 -
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 4 +-
oap-server/oal-rt/pom.xml | 2 +-
.../org/apache/skywalking/oal/rt/OALRuntime.java | 18 +-
.../oal/rt/parser/ConditionExpression.java | 9 +-
.../skywalking/oal/rt/parser/OALListener.java | 1 +
.../code-templates/metrics-builder/data2Map.ftl | 31 -
.../metrics-builder/entity2Storage.ftl | 31 +
.../code-templates/metrics-builder/map2Data.ftl | 22 -
.../metrics-builder/storage2Entity.ftl | 22 +
.../skywalking/oal/rt/parser/ScriptParserTest.java | 22 +-
oap-server/pom.xml | 17 +-
oap-server/server-alarm-plugin/pom.xml | 2 +-
.../core/alarm/provider/AlarmRulesWatcher.java | 5 +
.../server/core/alarm/provider/NotifyHandler.java | 2 +
.../oap/server/core/alarm/provider/Rules.java | 2 +
.../server/core/alarm/provider/RulesReader.java | 33 +-
.../core/alarm/provider/WebhookCallback.java | 12 +-
.../provider/dingtalk/DingtalkHookCallback.java | 12 +-
.../alarm/provider/feishu/FeishuHookCallback.java | 183 +
.../core/alarm/provider/feishu/FeishuSettings.java | 50 +
.../alarm/provider/slack/SlackhookCallback.java | 12 +-
.../alarm/provider/wechat/WechatHookCallback.java | 12 +-
.../core/alarm/provider/RulesReaderTest.java | 10 +
.../core/alarm/provider/RunningRuleTest.java | 12 +-
.../provider/feishu/FeishuHookCallbackTest.java | 211 +
.../src/test/resources/alarm-settings.yml | 14 +
oap-server/server-bootstrap/pom.xml | 28 +-
.../src/main/resources/alarm-settings.yml | 14 +
.../src/main/resources/application.yml | 88 +-
.../src/main/resources/component-libraries.yml | 6 +
.../src/main/resources/lal/default.yaml | 23 +
.../src/main/resources/lal/envoy-als.yaml | 47 +
.../main/resources/log-mal-rules/placeholder.yaml | 16 +
.../server-bootstrap/src/main/resources/log4j2.xml | 1 +
.../main/resources/metadata-service-mapping.yaml | 2 +-
.../src/main/resources/oal/core.oal | 11 -
.../src/main/resources/oal/disable.oal | 31 +
.../otel-oc-rules/istio-controlplane.yaml | 6 -
.../main/resources/otel-oc-rules/k8s-cluster.yaml | 89 +
.../src/main/resources/otel-oc-rules/k8s-node.yaml | 74 +
.../main/resources/otel-oc-rules/k8s-service.yaml | 66 +
.../src/main/resources/otel-oc-rules/vm.yaml | 94 +
.../resources/ui-initialized-templates/istio.yml | 14 +-
.../resources/ui-initialized-templates/k8s.yml | 512 ++
.../self-observability.yml | 12 +-
.../ui-initialized-templates/topology-instance.yml | 4 +-
.../main/resources/ui-initialized-templates/vm.yml | 204 +
.../src/main/resources/zabbix-rules/agent.yaml | 89 +
.../cluster-consul-plugin/pom.xml | 2 +-
.../cluster-etcd-plugin/pom.xml | 2 +-
.../cluster-kubernetes-plugin/pom.xml | 2 +-
.../kubernetes/NamespacedPodListInformer.java | 2 +
.../cluster-nacos-plugin/pom.xml | 2 +-
.../cluster-standalone-plugin/pom.xml | 2 +-
.../cluster-zookeeper-plugin/pom.xml | 2 +-
oap-server/server-cluster-plugin/pom.xml | 2 +-
.../server-configuration/configuration-api/pom.xml | 2 +-
.../configuration-apollo/pom.xml | 2 +-
.../configuration-consul/pom.xml | 2 +-
.../configuration-etcd/pom.xml | 2 +-
.../configuration-k8s-configmap/pom.xml | 2 +-
.../configmap/ConfigurationConfigmapInformer.java | 2 +
.../configuration-nacos/pom.xml | 2 +-
.../configuration-zookeeper/pom.xml | 2 +-
.../grpc-configuration-sync/pom.xml | 2 +-
oap-server/server-configuration/pom.xml | 2 +-
oap-server/server-core/pom.xml | 2 +-
.../skywalking/oap/server/core/CoreModule.java | 2 +
.../oap/server/core/CoreModuleConfig.java | 36 +-
.../oap/server/core/CoreModuleProvider.java | 17 +-
.../oap/server/core/alarm/AlarmRecord.java | 8 +-
.../oap/server/core/analysis/FunctionCategory.java | 63 +
.../oap/server/core/analysis/Stream.java | 7 +-
.../core/analysis/StreamAnnotationListener.java | 4 +
.../oap/server/core/analysis/StreamDefinition.java | 2 +-
.../core/analysis/data/MergableBufferedData.java | 5 +-
.../core/analysis/data/ReadWriteSafeCache.java | 4 +-
.../manual/database/TopNDatabaseStatement.java | 8 +-
.../manual/endpoint/EndpointMetaDispatcher.java | 34 +
.../analysis/manual/endpoint/EndpointTraffic.java | 12 +-
.../analysis/manual/instance/InstanceTraffic.java | 11 +-
.../analysis/manual/log/AbstractLogRecord.java | 105 +-
.../manual/log/HTTPAccessLogDispatcher.java | 44 -
.../analysis/manual/log/HTTPAccessLogRecord.java | 41 -
.../server/core/analysis/manual/log/LogRecord.java | 67 +
.../analysis/manual/log/LogRecordDispatcher.java | 48 +
.../manual/networkalias/NetworkAddressAlias.java | 11 +-
.../EndpointRelationServerSideMetrics.java | 17 +-
.../ServiceInstanceRelationClientSideMetrics.java | 17 +-
.../ServiceInstanceRelationServerSideMetrics.java | 17 +-
.../service/ServiceRelationClientSideMetrics.java | 17 +-
.../service/ServiceRelationServerSideMetrics.java | 17 +-
.../server/core/analysis/manual/searchtag/Tag.java | 52 +
.../analysis/manual/segment/SegmentDispatcher.java | 3 +-
.../analysis/manual/segment/SegmentRecord.java | 11 +-
.../core/analysis/manual/segment/SpanTag.java | 56 -
.../analysis/manual/service/ServiceTraffic.java | 12 +-
.../server/core/analysis/meter/MeterSystem.java | 23 +-
.../analysis/meter/function/AcceptableValue.java | 4 +-
.../analysis/meter/function/HistogramFunction.java | 15 +-
.../meter/function/PercentileFunction.java | 19 +-
.../analysis/meter/function/avg/AvgFunction.java | 13 +-
.../meter/function/avg/AvgHistogramFunction.java | 21 +-
.../avg/AvgHistogramPercentileFunction.java | 15 +-
.../meter/function/avg/AvgLabeledFunction.java | 11 +-
.../meter/function/latest/LatestFunction.java | 11 +-
.../analysis/meter/function/sum/SumFunction.java | 186 +
.../server/core/analysis/metrics/ApdexMetrics.java | 7 +-
.../server/core/analysis/metrics/CPMMetrics.java | 3 +-
.../server/core/analysis/metrics/CountMetrics.java | 3 +-
.../core/analysis/metrics/DoubleAvgMetrics.java | 3 +-
.../core/analysis/metrics/HistogramMetrics.java | 3 +-
.../core/analysis/metrics/LongAvgMetrics.java | 3 +-
.../core/analysis/metrics/MaxDoubleMetrics.java | 3 +-
.../core/analysis/metrics/MaxLongMetrics.java | 3 +-
.../oap/server/core/analysis/metrics/Metrics.java | 7 +-
.../core/analysis/metrics/MinDoubleMetrics.java | 3 +-
.../core/analysis/metrics/MinLongMetrics.java | 3 +-
.../core/analysis/metrics/PercentMetrics.java | 3 +-
.../core/analysis/metrics/PercentileMetrics.java | 4 +-
.../server/core/analysis/metrics/PxxMetrics.java | 3 +-
.../server/core/analysis/metrics/RateMetrics.java | 3 +-
.../server/core/analysis/metrics/SumMetrics.java | 3 +-
.../core/analysis/metrics/expression/InMatch.java | 19 +
.../oap/server/core/analysis/record/Record.java | 2 +-
.../analysis/worker/ManagementStreamProcessor.java | 15 +-
.../analysis/worker/MetricsPersistentWorker.java | 5 +-
.../analysis/worker/MetricsStreamProcessor.java | 19 +-
.../core/analysis/worker/NoneStreamProcessor.java | 17 +-
.../analysis/worker/RecordStreamProcessor.java | 19 +-
.../core/analysis/worker/TopNStreamProcessor.java | 23 +-
.../manual/errorlog/BrowserErrorLogRecord.java | 8 +-
.../oap/server/core/cluster/OAPNodeChecker.java | 15 +-
.../oap/server/core/config/ConfigService.java | 2 +
.../oap/server/core/config/NamingControl.java | 9 +-
.../skywalking/oap/server/core/event/Event.java | 231 +
.../oap/server/core/exporter/ExportData.java | 12 +-
.../core/management/ui/template/UITemplate.java | 8 +-
.../oap/server/core/oal/rt/DisableOALDefine.java | 30 +
.../oap/server/core/oal/rt/OALEngine.java | 3 +
.../server/core/oal/rt/OALEngineLoaderService.java | 5 +
.../server/core/profile/ProfileTaskLogRecord.java | 8 +-
.../oap/server/core/profile/ProfileTaskRecord.java | 8 +-
.../core/profile/ProfileThreadSnapshotRecord.java | 8 +-
.../server/core/query/BrowserLogQueryService.java | 2 +-
.../oap/server/core/query/EventQueryService.java | 59 +
.../oap/server/core/query/LogQueryService.java | 53 +-
.../oap/server/core/query/TraceQueryService.java | 4 +-
.../server/core/query/input/LogQueryCondition.java | 18 +-
.../core/query/input/TraceQueryCondition.java | 4 +-
.../core/query/input/TraceScopeCondition.java | 30 +
.../oap/server/core/query/type/ContentType.java | 8 +-
.../skywalking/oap/server/core/query/type/Log.java | 11 +-
.../oap/server/core/query/type/LogState.java | 23 -
.../oap/server/core/query/type/event/Event.java | 62 +
.../core/query/type/event/EventQueryCondition.java | 47 +
.../server/core/query/type/event/EventType.java | 35 +
.../oap/server/core/query/type/event/Events.java | 30 +
.../oap/server/core/query/type/event/Source.java | 32 +
.../oap/server/core/source/AbstractLog.java | 15 +-
.../oap/server/core/source/DefaultScopeDefine.java | 7 +-
.../oap/server/core/source/EndpointMeta.java | 55 +
.../oap/server/core/source/EndpointRelation.java | 7 +-
.../oap/server/core/source/HTTPAccessLog.java | 29 -
.../skywalking/oap/server/core/source/Log.java | 39 +
.../skywalking/oap/server/core/source/Segment.java | 4 +-
.../core/source/ServiceInstanceRelation.java | 4 -
.../oap/server/core/storage/PersistenceTimer.java | 27 +-
.../oap/server/core/storage/StorageBuilder.java | 33 -
.../server/core/storage/StorageBuilderFactory.java | 80 +
.../oap/server/core/storage/StorageDAO.java | 13 +-
.../server/core/storage/StorageHashMapBuilder.java | 34 +
.../oap/server/core/storage/StorageModule.java | 39 +-
.../oap/server/core/storage/annotation/Column.java | 28 +
.../oap/server/core/storage/model/Model.java | 5 +-
.../oap/server/core/storage/model/ModelColumn.java | 6 +-
.../server/core/storage/model/ModelInstaller.java | 1 +
.../server/core/storage/model/StorageModels.java | 8 +-
.../server/core/storage/query/IEventQueryDAO.java | 30 +
.../server/core/storage/query/ILogQueryDAO.java | 43 +-
.../server/core/storage/query/ITraceQueryDAO.java | 6 +-
.../server/core/storage/type/StorageBuilder.java | 33 +
.../oap/server/core/CoreModuleConfigTest.java | 44 +
.../skywalking/oap/server/core/CoreModuleTest.java | 2 +-
.../manual/endpoint/EndpointTrafficTest.java | 2 +-
.../endpoint/EndpointCallRelationTest.java | 54 +
.../instance/ServiceInstanceRelationTest.java | 84 +
.../relation/service/ServiceRelationTest.java | 76 +
.../core/analysis/manual/searchtag/TagTest.java | 34 +
.../core/analysis/manual/segment/SpanTagTest.java | 35 -
.../manual/service/ServiceTrafficTest.java | 4 +-
.../core/analysis/meter/MeterSystemTest.java | 89 +
.../meter/function/HistogramFunctionTest.java | 8 +-
.../meter/function/PercentileFunctionTest.java | 8 +-
.../function/avg/AvgHistogramFunctionTest.java | 14 +-
.../avg/AvgHistogramPercentileFunctionTest.java | 8 +-
.../meter/function/avg/AvgLabeledFunctionTest.java | 8 +-
.../meter/function/latest/LatestFunctionTest.java | 8 +-
.../core/analysis/metrics/ApdexMetricsTest.java | 2 +-
.../server/core/analysis/metrics/MetricsTest.java | 4 +-
.../analysis/metrics/expression/InMatchTest.java | 20 +-
.../server/core/cluster/OAPNodeCheckerTest.java | 10 +
.../management/ui/template/UITemplateTest.java | 2 +-
.../server/core/storage/model/ModelColumnTest.java | 13 +-
.../core/storage/model/StorageModelsTest.java | 8 +-
.../kafka-fetcher-plugin/pom.xml | 7 +-
.../agent/kafka/module/KafkaFetcherConfig.java | 4 +
.../agent/kafka/provider/KafkaFetcherProvider.java | 12 +-
.../agent/kafka/provider/handler/LogHandler.java | 85 +
.../provider/handler/MeterServiceHandler.java | 28 +-
.../provider/handler/TraceSegmentHandler.java | 1 +
oap-server/server-fetcher-plugin/pom.xml | 2 +-
.../prometheus-fetcher-plugin/pom.xml | 2 +-
.../provider/PrometheusFetcherProvider.java | 103 +-
oap-server/server-health-checker/pom.xml | 2 +-
oap-server/server-library/library-client/pom.xml | 2 +-
.../client/elasticsearch/ElasticSearchClient.java | 96 +-
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 2 +-
.../elasticsearch/ITElasticSearchClient.java | 9 +-
oap-server/server-library/library-module/pom.xml | 2 +-
.../oap/server/library/module/ModuleManager.java | 18 +-
oap-server/server-library/library-server/pom.xml | 4 +-
.../library/server/grpc/ssl/DynamicSslContext.java | 2 +
.../library/server/pool/CustomThreadFactory.java | 1 +
.../library/server/ssl/HttpDynamicSslContext.java | 2 +
oap-server/server-library/library-util/pom.xml | 7 +-
.../oap/server/library/util/ProtoBufJsonUtils.java | 11 +-
.../oap/server/library/util/ResourceUtils.java | 3 +-
oap-server/server-library/pom.xml | 2 +-
oap-server/server-query-plugin/pom.xml | 2 +-
.../query-graphql-plugin/pom.xml | 2 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 3 +
.../oap/query/graphql/resolver/EventQuery.java | 51 +
.../oap/query/graphql/resolver/LogQuery.java | 25 +-
.../oap/query/graphql/resolver/MetricQuery.java | 1 +
.../src/main/resources/query-protocol | 2 +-
.../pom.xml | 36 +
.../discovery/AgentConfigurations.java | 45 +
.../discovery/AgentConfigurationsReader.java | 75 +
.../discovery/AgentConfigurationsTable.java | 39 +
.../discovery/AgentConfigurationsWatcher.java | 80 +
.../discovery/ConfigurationDiscoveryModule.java | 34 +
.../ConfigurationDiscoveryModuleConfig.java | 33 +
.../discovery/ConfigurationDiscoveryProvider.java | 92 +
.../grpc/ConfigurationDiscoveryServiceHandler.java | 88 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 19 +
.../discovery/AgentConfigurationsReaderTest.java | 56 +
.../discovery/AgentConfigurationsWatcherTest.java | 111 +
.../test/resources/agent-dynamic-configuration.yml | 22 +
.../envoy-metrics-receiver-plugin/pom.xml | 7 +-
.../envoy/AccessLogServiceGRPCHandler.java | 36 +-
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 6 +
.../envoy/EnvoyMetricReceiverProvider.java | 2 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 29 +-
.../receiver/envoy/ServiceMetaInfoFactory.java | 42 +
.../receiver/envoy/ServiceMetaInfoFactoryImpl.java | 40 +
.../server/receiver/envoy/als/ALSHTTPAnalysis.java | 18 +-
.../receiver/envoy/als/AbstractALSAnalyzer.java | 4 +-
.../envoy/als/LogEntry2MetricsAdapter.java | 9 +-
.../receiver/envoy/als/k8s/K8SServiceRegistry.java | 52 +-
.../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 11 +-
.../envoy/als/k8s/ServiceNameFormatter.java | 2 +-
.../server/receiver/envoy/als/mx/FieldsHelper.java | 31 +-
.../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java | 26 +-
.../envoy/als/mx/ServiceMetaInfoAdapter.java | 51 +-
.../envoy/persistence/LogsPersistence.java | 117 +
...g.oap.server.receiver.envoy.als.ALSHTTPAnalysis | 1 +
.../als/k8s/K8SALSServiceMeshHTTPAnalysisTest.java | 9 +-
.../envoy/als/k8s/ServiceNameFormatterTest.java | 17 +-
.../receiver/envoy/als/mx/FieldsHelperTest.java | 8 +-
.../jaeger-receiver-plugin/pom.xml | 47 -
.../server/receiver/jaeger/JaegerGRPCHandler.java | 113 -
.../receiver/jaeger/JaegerReceiverConfig.java | 34 -
.../receiver/jaeger/JaegerReceiverModule.java | 37 -
.../receiver/jaeger/JaegerReceiverProvider.java | 107 -
...ywalking.oap.server.library.module.ModuleDefine | 20 -
...alking.oap.server.library.module.ModuleProvider | 19 -
.../otel-receiver-plugin/pom.xml | 2 +-
.../server/receiver/otel/oc/OCMetricHandler.java | 33 +-
oap-server/server-receiver-plugin/pom.xml | 9 +-
.../server-receiver-plugin/receiver-proto/pom.xml | 2 +-
.../envoy/service/metrics/v2/metrics_service.proto | 6 -
.../src/main/proto/jaeger/collector.proto | 66 -
.../src/main/proto/jaeger/model.proto | 160 -
.../skywalking-browser-receiver-plugin/pom.xml | 2 +-
.../parser/performance/PerfDataAnalyzer.java | 16 +-
.../skywalking-clr-receiver-plugin/pom.xml | 2 +-
.../skywalking-event-receiver-plugin/pom.xml | 43 +
.../oap/server/receiver/event/EventModule.java | 34 +
.../server/receiver/event/EventModuleConfig.java | 24 +
.../server/receiver/event/EventModuleProvider.java | 75 +
.../event/grpc/EventGrpcServiceHandler.java | 89 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 19 +
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-log-recevier-plugin/pom.xml | 41 +
.../oap/server/recevier/log/module/LogModule.java | 32 +
.../recevier/log/provider/LogModuleProvider.java | 78 +
.../provider/handler/LogReportServiceHandler.java | 114 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 19 +
.../skywalking-management-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 14 +-
.../skywalking-meter-receiver-plugin/pom.xml | 2 +-
.../meter/provider/MeterReceiverProvider.java | 4 +-
.../provider/handler/MeterServiceHandler.java | 28 +-
.../skywalking-profile-receiver-plugin/pom.xml | 2 +-
.../skywalking-sharing-server-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../v8/grpc/TraceSegmentReportServiceHandler.java | 2 +
.../skywalking-zabbix-receiver-plugin/pom.xml | 48 +
.../zabbix/module/ZabbixReceiverModule.java | 34 +
.../receiver/zabbix/provider/ZabbixMetrics.java | 312 ++
.../zabbix/provider/ZabbixModuleConfig.java | 47 +
.../zabbix/provider/ZabbixReceiverProvider.java | 95 +
.../zabbix/provider/config/ZabbixConfig.java | 58 +
.../zabbix/provider/config/ZabbixConfigs.java | 71 +
.../protocol/ZabbixErrorProtocolException.java | 30 +
.../provider/protocol/ZabbixProtocolDataCodec.java | 27 +
.../provider/protocol/ZabbixProtocolDecoder.java | 117 +
.../provider/protocol/ZabbixProtocolEncoder.java | 59 +
.../provider/protocol/ZabbixProtocolHandler.java | 83 +
.../zabbix/provider/protocol/ZabbixServer.java | 90 +
.../provider/protocol/bean/ZabbixProtocolType.java | 50 +
.../provider/protocol/bean/ZabbixRequest.java | 61 +
.../bean/ZabbixRequestJsonDeserializer.java | 61 +
.../provider/protocol/bean/ZabbixResponse.java | 53 +
.../bean/ZabbixResponseJsonSerializer.java | 49 +
...ywalking.oap.server.library.module.ModuleDefine | 19 +
...alking.oap.server.library.module.ModuleProvider | 19 +
.../receiver/zabbix/provider/ZabbixBaseTest.java | 309 ++
.../zabbix/provider/ZabbixMetricsTest.java | 131 +
.../protocol/ZabbixProtocolHandlerTest.java | 87 +
.../src/test/resources/zabbix-rules/agent.yaml | 32 +
.../zipkin-receiver-plugin/pom.xml | 18 +-
.../receiver/zipkin/ZipkinReceiverConfig.java | 3 -
.../receiver/zipkin/ZipkinReceiverProvider.java | 25 +-
.../zipkin/analysis/Receiver2AnalysisBridge.java | 40 -
.../zipkin/analysis/ZipkinSkyWalkingTransfer.java | 33 -
.../zipkin/analysis/cache/CacheFactory.java | 42 -
.../receiver/zipkin/analysis/cache/ISpanCache.java | 25 -
.../analysis/cache/caffeine/CaffeineSpanCache.java | 92 -
.../zipkin/analysis/data/SkyWalkingTrace.java | 33 -
.../receiver/zipkin/analysis/data/ZipkinTrace.java | 56 -
.../zipkin/analysis/transform/SegmentBuilder.java | 437 --
.../zipkin/analysis/transform/SegmentListener.java | 25 -
.../transform/Zipkin2SkyWalkingTransfer.java | 48 -
.../receiver/zipkin/handler/SpanProcessor.java | 20 +-
.../zipkin/handler/SpanV1JettyHandler.java | 38 +-
.../zipkin/handler/SpanV2JettyHandler.java | 37 +-
.../server/receiver/zipkin/trace/SpanForward.java | 62 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 117 -
oap-server/server-starter-es7/pom.xml | 7 +-
oap-server/server-starter/pom.xml | 17 +-
oap-server/server-storage-plugin/pom.xml | 5 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../StorageModuleElasticsearchConfig.java | 16 +-
.../StorageModuleElasticsearchProvider.java | 20 +-
.../plugin/elasticsearch/base/AnalyzerSetting.java | 119 +
.../elasticsearch/base/BatchProcessEsDAO.java | 28 +-
.../elasticsearch/base/HistoryDeleteEsDAO.java | 7 +-
.../plugin/elasticsearch/base/IndexController.java | 102 +
.../plugin/elasticsearch/base/IndexStructures.java | 157 +
.../plugin/elasticsearch/base/ManagementEsDAO.java | 19 +-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 30 +-
.../plugin/elasticsearch/base/NoneStreamEsDAO.java | 14 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 14 +-
.../plugin/elasticsearch/base/StorageEsDAO.java | 19 +-
.../elasticsearch/base/StorageEsInstaller.java | 150 +-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 24 +-
.../cache/NetworkAddressAliasEsDAO.java | 2 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 39 +-
.../elasticsearch/query/AlarmQueryEsDAO.java | 11 +-
.../elasticsearch/query/BrowserLogQueryEsDAO.java | 5 +-
.../elasticsearch/query/ESEventQueryDAO.java | 145 +
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 128 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 28 +-
.../elasticsearch/query/MetricsQueryEsDAO.java | 58 +-
.../elasticsearch/query/ProfileTaskLogEsDAO.java | 4 +-
.../elasticsearch/query/ProfileTaskQueryEsDAO.java | 7 +-
.../query/ProfileThreadSnapshotQueryEsDAO.java | 62 +-
.../elasticsearch/query/TopNRecordsQueryEsDAO.java | 4 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 10 +-
.../elasticsearch/query/TraceQueryEsDAO.java | 18 +-
.../query/UITemplateManagementEsDAO.java | 20 +-
.../elasticsearch/base/AnalyzerSettingTest.java | 179 +
.../elasticsearch/base/IndexStructuresTest.java | 104 +
.../elasticsearch/base/TimeSeriesUtilsTest.java | 37 +-
.../storage-elasticsearch7-plugin/pom.xml | 2 +-
.../storage/plugin/elasticsearch7/Es7DAO.java | 28 -
.../StorageModuleElasticsearch7Provider.java | 22 +-
.../elasticsearch7/base/IndexEs7Structures.java | 40 +
.../elasticsearch7/base/StorageEs7Installer.java | 19 +-
.../client/ElasticSearch7Client.java | 113 +-
.../plugin/elasticsearch7/dao/MetricsEs7DAO.java | 22 +-
.../plugin/elasticsearch7/dao/StorageEs7DAO.java | 19 +-
.../query/AggregationQueryEs7DAO.java | 35 +-
.../elasticsearch7/query/AlarmQueryEs7DAO.java | 19 +-
.../query/BrowserLogQueryEs7DAO.java | 5 +-
.../elasticsearch7/query/ES7EventQueryDAO.java | 52 +
.../elasticsearch7/query/LogQueryEs7DAO.java | 131 +-
.../elasticsearch7/query/MetricsQueryEs7DAO.java | 11 +-
.../elasticsearch7/query/TraceQueryEs7DAO.java | 17 +-
.../storage-influxdb-plugin/pom.xml | 6 +-
.../plugin/influxdb/InfluxStorageProvider.java | 7 +
.../plugin/influxdb/base/InfluxInsertRequest.java | 9 +-
.../plugin/influxdb/base/InfluxStorageDAO.java | 19 +-
.../plugin/influxdb/base/ManagementDAO.java | 8 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 8 +-
.../plugin/influxdb/base/NoneStreamDAO.java | 6 +-
.../storage/plugin/influxdb/base/RecordDAO.java | 27 +-
.../plugin/influxdb/query/EventQueryDAO.java | 164 +
.../storage/plugin/influxdb/query/LogQuery.java | 111 +-
.../influxdb/query/NetworkAddressAliasDAO.java | 2 +-
.../plugin/influxdb/query/TopNRecordsQuery.java | 4 +-
.../storage/plugin/influxdb/query/TraceQuery.java | 6 +-
.../query/UITemplateManagementDAOImpl.java | 6 +-
.../storage-jaeger-plugin/pom.xml | 42 -
.../server/storage/plugin/jaeger/JaegerSpan.java | 78 -
.../storage/plugin/jaeger/JaegerSpanRecord.java | 156 -
.../plugin/jaeger/JaegerSpanRecordDispatcher.java | 48 -
.../JaegerStorageModuleElasticsearchProvider.java | 45 -
.../elasticsearch/JaegerTraceQueryEsDAO.java | 309 --
...alking.oap.server.library.module.ModuleProvider | 19 -
.../storage-jdbc-hikaricp-plugin/pom.xml | 6 +-
.../server/storage/plugin/jdbc/SQLExecutor.java | 2 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 30 +-
.../jdbc/h2/dao/AbstractSearchTagBuilder.java | 75 +
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 21 +-
.../plugin/jdbc/h2/dao/H2EventQueryDAO.java | 142 +
.../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 122 +-
.../plugin/jdbc/h2/dao/H2LogRecordBuilder.java | 100 +
.../plugin/jdbc/h2/dao/H2ManagementDAO.java | 6 +-
.../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 6 +-
.../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 8 +-
.../plugin/jdbc/h2/dao/H2NoneStreamDAO.java | 6 +-
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 21 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 22 +-
.../plugin/jdbc/h2/dao/H2SegmentRecordBuilder.java | 45 +-
.../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 19 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 2 -
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 22 +-
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 8 +-
.../plugin/jdbc/mysql/MySQLLogQueryDAO.java | 8 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 24 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 2 +-
.../jdbc/postgresql/PostgreSQLStorageConfig.java | 29 +
.../jdbc/postgresql/PostgreSQLStorageProvider.java | 193 +
.../jdbc/postgresql/PostgreSQLTableInstaller.java | 87 +
.../dao/PostgreSQLAggregationQueryDAO.java | 43 +
.../postgresql/dao/PostgreSQLAlarmQueryDAO.java | 40 +
.../dao/PostgreSQLBrowserLogQueryDAO.java | 34 +
.../jdbc/postgresql/dao/PostgreSQLLogQueryDAO.java | 37 +
.../postgresql/dao/PostgreSQLMetricsQueryDAO.java | 36 +
.../postgresql/dao/PostgreSQLTraceQueryDAO.java | 37 +
...alking.oap.server.library.module.ModuleProvider | 3 +-
.../storage-tidb-plugin/pom.xml | 2 +-
.../plugin/jdbc/tidb/TiDBStorageProvider.java | 24 +-
.../storage-zipkin-elasticsearch7-plugin/pom.xml | 49 +
.../server/storage/plugin/zipkin/ZipkinSpan.java | 83 +
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 164 +
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 49 +
.../ZipkinStorageModuleElasticsearchProvider.java | 46 +
.../elasticsearch/ZipkinTraceQueryEs7DAO.java | 253 +
...alking.oap.server.library.module.ModuleProvider | 0
.../storage-zipkin-plugin/pom.xml | 41 -
.../server/storage/plugin/zipkin/ZipkinSpan.java | 78 -
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 156 -
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 48 -
.../ZipkinStorageModuleElasticsearchProvider.java | 46 -
.../elasticsearch/ZipkinTraceQueryEsDAO.java | 255 -
oap-server/server-telemetry/pom.xml | 2 +-
oap-server/server-telemetry/telemetry-api/pom.xml | 2 +-
.../server/telemetry/api/HealthCheckMetrics.java | 2 +
.../server-telemetry/telemetry-prometheus/pom.xml | 2 +-
oap-server/server-testing/pom.xml | 2 +-
oap-server/server-tools/pom.xml | 2 +-
oap-server/server-tools/profile-exporter/pom.xml | 4 +-
.../tool-profile-snapshot-bootstrap/pom.xml | 4 +-
.../profile/exporter/test/ProfileTraceDAO.java | 4 +-
.../tool-profile-snapshot-exporter-es7/pom.xml | 4 +-
.../tool-profile-snapshot-exporter/pom.xml | 4 +-
.../tool-profile-snapshot-server-mock/pom.xml | 4 +-
.../tool/profile/core/MockCoreModuleProvider.java | 3 +
pom.xml | 129 +-
skywalking-ui | 2 +-
test/e2e-mesh/e2e-istio/scripts/istio.sh | 2 +-
.../skywalking/e2e/SkyWalkingAnnotations.java | 9 +-
.../apache/skywalking/e2e/common/HostAndPort.java | 5 +
.../apache/skywalking/e2e/SimpleQueryClient.java | 118 +-
.../e2e/browser/BrowserErrorLogMatcher.java | 6 +-
.../org/apache/skywalking/e2e/common/KeyValue.java | 29 +
.../skywalking/e2e/common/KeyValueMatcher.java | 46 +
.../dashboard/DashboardConfigurationMatcher.java | 4 +-
.../org/apache/skywalking/e2e/event/Event.java | 53 +
.../org/apache/skywalking/e2e/event/EventData.java | 33 +
.../apache/skywalking/e2e/event/EventMatcher.java | 112 +
.../apache/skywalking/e2e/event/EventsMatcher.java | 51 +
.../apache/skywalking/e2e/event/EventsQuery.java | 30 +
.../java/org/apache/skywalking/e2e/log/Log.java | 40 +
.../org/apache/skywalking/e2e/log/LogData.java | 33 +
.../org/apache/skywalking/e2e/log/LogMatcher.java | 98 +
.../org/apache/skywalking/e2e/log/LogsMatcher.java | 51 +
.../org/apache/skywalking/e2e/log/LogsQuery.java | 139 +
.../e2e/log/SupportQueryLogsByKeywords.java | 26 +
.../skywalking/e2e/metrics/MetricsQuery.java | 29 +
.../e2e/metrics/ReadLabeledMetricsQuery.java | 41 +
.../skywalking/e2e/metrics/ReadMetricsQuery.java | 2 +
.../apache/skywalking/e2e/topo/TopoMatcher.java | 6 +-
.../apache/skywalking/e2e/trace/TraceMatcher.java | 2 +-
.../apache/skywalking/e2e/trace/TracesQuery.java | 31 +-
.../e2e/verification/AbstractMatcher.java | 12 +
test/e2e/e2e-data/src/main/resources/events.gql | 39 +
test/e2e/e2e-data/src/main/resources/logs.gql | 60 +
.../src/main/resources/read-labeled-metrics.gql | 7 +-
.../e2e-data/src/main/resources/read-metrics.gql | 2 +-
.../resources/support-query-logs-by-keywords.gql | 20 +
test/e2e/e2e-data/src/main/resources/traces.gql | 3 +-
.../org/apache/skywalking/e2e/TestLogsMatcher.java | 75 +
test/e2e/e2e-data/src/test/resources/log.yml | 29 +
test/e2e/e2e-protocol/src/main/proto | 2 +-
test/e2e/e2e-service-consumer/pom.xml | 8 +
.../skywalking/e2e/controller/UserController.java | 20 +-
test/e2e/e2e-service-provider/pom.xml | 48 +
.../skywalking/apm/toolkit/trace/TraceContext.java | 57 -
.../skywalking/e2e/controller/LogController.java | 42 +
.../skywalking/e2e/controller/UserController.java | 10 +
.../src/main/resources/log4j.properties | 18 +
.../src/main/resources/log4j2.xml | 36 +
.../src/main/resources/logback.xml | 40 +
test/e2e/e2e-test/docker/Dockerfile.cli | 33 +
.../e2e-test/docker/{profile => }/Dockerfile.h2 | 0
test/e2e/e2e-test/docker/Dockerfile.provider | 4 +
test/e2e/e2e-test/docker/Dockerfile.satellite | 36 +
test/e2e/e2e-test/docker/base-compose.yml | 3 +
test/e2e/e2e-test/docker/browser/Dockerfile.h2 | 24 -
.../docker/browser/docker-compose.h2.client-js.yml | 108 +
.../e2e-test/docker/browser/docker-compose.h2.yml | 2 +-
test/e2e/e2e-test/docker/browser/download-mysql.sh | 26 -
.../Dockerfile.generate-traffic | 22 +
.../with-skywalking-client-js/Dockerfile.test-ui | 50 +
.../browser/with-skywalking-client-js/index.js | 50 +
.../browser/with-skywalking-client-js/nginx.conf | 39 +
.../browser/with-skywalking-client-js/test.py | 42 +
.../{storage => event}/docker-compose.es6.yml | 0
.../{storage => event}/docker-compose.es7.0.yml | 0
.../e2e-test/docker/event/docker-compose.h2.yml | 45 +
.../{storage => event}/docker-compose.influxdb.yml | 0
.../{storage => event}/docker-compose.mysql.yml | 0
test/e2e/e2e-test/docker/event/docker-compose.yml | 56 +
test/e2e/e2e-test/docker/go/Dockerfile.go | 4 +-
test/e2e/e2e-test/docker/go/docker-compose.yml | 2 +-
test/e2e/e2e-test/docker/kafka/Dockerfile.provider | 4 +
.../e2e-test/docker/kafka/docker-compose.log.yml | 71 +
.../e2e-test/docker/kafka/docker-compose.meter.yml | 2 +-
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 | 56 +
.../e2e/e2e-test/docker/log/docker-compose.es7.yml | 56 +
test/e2e/e2e-test/docker/log/docker-compose.h2.yml | 58 +
.../docker/log/docker-compose.influxdb.yml | 55 +
.../e2e-test/docker/log/docker-compose.mysql.yml | 60 +
test/e2e/e2e-test/docker/log/lal.yaml | 34 +
test/e2e/e2e-test/docker/log/log-mal.yaml | 36 +
test/e2e/e2e-test/docker/lua/Dockerfile.nginx | 5 +-
test/e2e/e2e-test/docker/lua/nginx.conf | 4 +-
test/e2e/e2e-test/docker/meter/docker-compose.yml | 2 +-
.../e2e-test/docker/profile/docker-compose.h2.yml | 2 +-
.../docker/promOtelVM/Dockerfile.nodeExporter | 21 +
.../e2e-test/docker/promOtelVM/docker-compose.yml | 56 +
.../docker/promOtelVM/otel-collector-config.yaml | 41 +
.../docker/storage/docker-compose.es7.10.yml | 47 +
.../docker/storage/docker-compose.es7.9.yml | 47 -
.../docker/storage/docker-compose.postgresql.yml | 48 +
.../docker/storage/docker-compose.tidb.yml | 2 +-
.../docker/ttl/docker-compose.postgresql.yml | 48 +
.../e2e-test/docker/ttl/docker-compose.tidb.yml | 2 +-
test/e2e/e2e-test/docker/zabbix/agent.yaml | 55 +
test/e2e/e2e-test/docker/zabbix/docker-compose.yml | 47 +
test/e2e/e2e-test/docker/zabbix/zabbix_agentd.conf | 22 +
test/e2e/e2e-test/pom.xml | 26 +
.../test/java/org/apache/skywalking/e2e/GOE2E.java | 18 +-
.../apache/skywalking/e2e/browser/BrowserE2E.java | 4 +-
.../e2e/browser/BrowserWithClientJSE2E.java | 233 +
.../org/apache/skywalking/e2e/event/EventE2E.java | 66 +
.../org/apache/skywalking/e2e/kafka/KafkaE2E.java | 7 +-
.../apache/skywalking/e2e/kafka/KafkaLogE2E.java | 124 +
.../apache/skywalking/e2e/kafka/KafkaMeterE2E.java | 2 +-
.../skywalking/e2e/kafka/KafkaProfileE2E.java | 2 +-
.../java/org/apache/skywalking/e2e/log/LogE2E.java | 166 +
.../org/apache/skywalking/e2e/mesh/ALSE2E.java | 10 +-
.../skywalking/e2e/promOtelVM/PromOtelVME2E.java | 115 +
.../apache/skywalking/e2e/storage/StorageE2E.java | 11 +-
.../apache/skywalking/e2e/zabbix/ZabbixE2E.java | 102 +
.../resources/expected/als/endpoints-details.yml | 2 +-
.../expected/als/endpoints-productpage.yml | 2 +-
.../resources/expected/als/endpoints-ratings.yml | 2 +-
.../resources/expected/als/endpoints-reviews.yml | 2 +-
.../src/test/resources/expected/als/services.yml | 10 +-
.../src/test/resources/expected/als/topo.yml | 28 +-
.../expected/browser-with-client-js/error-log.yml | 23 +
.../expected/browser-with-client-js/page-path.yml | 18 +
.../expected/browser-with-client-js/services.yml | 18 +
.../expected/browser-with-client-js/topo.yml | 39 +
.../expected/browser-with-client-js/traces.yml | 32 +
.../expected/browser-with-client-js/version.yml | 18 +
.../src/test/resources/expected/event/events.yml | 30 +
.../resources/expected/go/endpoints-consumer.yml | 4 +-
.../resources/expected/go/endpoints-go2sky.yml | 4 +-
.../resources/expected/go/endpoints-provider.yml | 4 +-
.../src/test/resources/expected/go/traces.yml | 2 +-
.../src/test/resources/expected/log/endpoints.yml | 18 +
.../expected/{metricsservice => log}/instances.yml | 0
.../src/test/resources/expected/log/logs.yml | 27 +
.../src/test/resources/expected/log/services.yml | 18 +
.../resources/expected/promOtelVM/services.yml | 18 +
.../test/resources/expected/zabbix/services.yml | 18 +
.../test/resources/metadata-service-mapping.yaml | 17 +
test/e2e/pom.xml | 30 +-
test/jacoco/jacocoagent.jar | Bin 281989 -> 0 bytes
test/jacoco/jacococli.jar | Bin 551134 -> 0 bytes
test/plugin/agent-test-tools/bin/fetch-code.sh | 4 +-
.../archetype-resources/support-version.list | 4 +-
.../archetype-resources/support-version.list | 4 +-
test/plugin/containers/jvm-container/pom.xml | 2 +-
test/plugin/containers/tomcat-container/pom.xml | 4 +-
test/plugin/generator.sh | 4 +-
test/plugin/run.sh | 7 +-
.../activemq-scenario/support-version.list | 2 +-
.../config/expectedData.yaml | 18 +
.../scenarios/apm-toolkit-trace-scenario/pom.xml | 6 +-
.../skywalking/apm/toolkit/trace/TraceContext.java | 19 +
.../toolkit/controller/TestController.java | 8 +-
.../testcase/toolkit/controller/TestService.java | 8 +
.../config/expectedData.yaml | 1 +
.../asynchttpclient-scenario/support-version.list | 2 +-
.../scenarios/avro-scenario/support-version.list | 4 +-
.../baidu-brpc-scenario/support-version.list | 2 +-
.../scenarios/canal-scenario/support-version.list | 4 +-
.../support-version.list | 2 +-
.../support-version.list | 4 +-
test/plugin/scenarios/customize-scenario/pom.xml | 6 +-
.../scenarios/cxf-scenario/support-version.list | 4 +-
.../src/main/resources/jdbc.properties | 2 +-
.../dbcp-2.x-scenario/support-version.list | 4 +-
test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml | 6 +-
test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml | 6 +-
.../elasticjob-2.x-scenario/support-version.list | 4 +-
.../elasticjob-3.x-scenario/support-version.list | 2 +-
.../scenarios/elasticsearch-7.x-scenario/pom.xml | 2 +-
.../support-version.list | 2 +-
.../support-version.list | 4 +-
.../support-version.list | 4 +-
.../scenarios/feign-scenario/support-version.list | 2 +-
.../finagle-17.10.x-scenario/support-version.list | 4 +-
.../finagle-6.44.x-scenario/support-version.list | 4 +-
.../config/expectedData.yaml | 1 +
.../gateway-projectA-scenario/pom.xml | 4 +-
.../config/expectedData.yaml | 1 +
.../gateway-projectA-scenario/pom.xml | 4 +-
.../graphql-12.x-scenario/support-version.list | 4 +-
.../graphql-8.x-scenario/support-version.list | 4 +-
.../graphql-9.x-scenario/support-version.list | 4 +-
.../scenarios/grpc-scenario/support-version.list | 4 +-
.../scenarios/gson-scenario/support-version.list | 4 +-
.../scenarios/h2-scenario/support-version.list | 4 +-
.../scenarios/hbase-scenario/configuration.yml | 2 +-
.../scenarios/hbase-scenario/support-version.list | 4 +-
.../hystrix-scenario/support-version.list | 2 +-
.../influxdb-scenario/support-version.list | 4 +-
.../jdk-http-scenario/support-version.list | 4 +-
.../config/expectedData.yaml | 4 +-
.../jdk14-with-gson-scenario/support-version.list | 4 +-
.../jedis-scenario/config/expectedData.yaml | 45 +
.../testcase/jedis/controller/CaseController.java | 4 +
.../controller/RedisPipelineCommandExecutor.java | 42 +
.../scenarios/jedis-scenario/support-version.list | 4 +-
.../jetty-scenario/jettyclient-scenario/pom.xml | 6 +-
.../kafka-scenario/config/expectedData.yaml | 19 +
test/plugin/scenarios/kafka-scenario/pom.xml | 6 +-
.../testcase/kafka/controller/CaseController.java | 17 +
.../scenarios/kafka-scenario/support-version.list | 6 +-
.../kotlin-coroutine-scenario/support-version.list | 4 +-
.../scenarios/lettuce-scenario/bin/startup.sh | 2 +-
.../lettuce-scenario/config/expectedData.yaml | 2 +-
.../scenarios/logger-log4j-scenario/bin/startup.sh | 21 -
.../logger-log4j-scenario/config/expectedData.yaml | 138 -
.../logger-log4j-scenario/configuration.yml | 22 -
.../plugin/scenarios/logger-log4j-scenario/pom.xml | 105 -
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/logger/Application.java | 34 -
.../testcase/logger/controller/CaseController.java | 64 -
.../apm/testcase/logger/utils/HttpUtils.java | 57 -
.../src/main/resources/application.yaml | 19 -
.../logger-log4j-scenario/support-version.list | 17 -
.../logger-log4j2-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 180 -
.../logger-log4j2-scenario/configuration.yml | 22 -
.../scenarios/logger-log4j2-scenario/pom.xml | 110 -
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/logger/Application.java | 34 -
.../testcase/logger/controller/CaseController.java | 73 -
.../apm/testcase/logger/utils/HttpUtils.java | 57 -
.../src/main/resources/application.yaml | 19 -
.../logger-log4j2-scenario/support-version.list | 31 -
.../logger-logback-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 181 -
.../logger-logback-scenario/configuration.yml | 22 -
.../scenarios/logger-logback-scenario/pom.xml | 111 -
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/logger/Application.java | 34 -
.../testcase/logger/controller/CaseController.java | 73 -
.../apm/testcase/logger/utils/HttpUtils.java | 57 -
.../src/main/resources/application.yaml | 19 -
.../logger-logback-scenario/support-version.list | 19 -
.../src/main/resources/jdbc.properties | 2 +-
.../mariadb-scenario/support-version.list | 2 +-
test/plugin/scenarios/mongodb-3.x-scenario/pom.xml | 6 +-
.../src/main/resources/jdbc.properties | 2 +-
.../mssql-jdbc-scenario/support-version.list | 4 +-
.../src/main/resources/jdbc.properties | 2 +-
.../mssql-jtds-scenario/support-version.list | 4 +-
.../src/main/resources/jdbc.properties | 2 +-
.../scenarios/mysql-scenario/support-version.list | 4 +-
test/plugin/scenarios/okhttp-scenario/pom.xml | 6 +-
.../scenarios/oracle-scenario/support-version.list | 2 +-
.../scenarios/play-scenario/support-version.list | 2 +-
test/plugin/scenarios/pulsar-scenario/pom.xml | 4 +-
.../scenarios/pulsar-scenario/support-version.list | 4 +-
.../support-version.list | 4 +-
.../scenarios/quasar-scenario/support-version.list | 2 +-
.../rabbitmq-scenario/support-version.list | 2 +-
test/plugin/scenarios/redisson-scenario/pom.xml | 6 +-
.../redisson-scenario/support-version.list | 4 +-
.../support-version.list | 4 +-
.../support-version.list | 4 +-
.../servicecomb-0.x-scenario/support-version.list | 4 +-
.../servicecomb-1.x-scenario/support-version.list | 4 +-
.../scenarios/shardingsphere-3.x-scenario/pom.xml | 6 +-
.../support-version.list | 4 +-
.../shardingsphere-4.0.x-scenario/pom.xml | 6 +-
.../support-version.list | 2 +-
.../shardingsphere-4.x-RC1-RC2-scenario/pom.xml | 6 +-
.../support-version.list | 4 +-
.../shardingsphere-4.x-RC3-scenario/pom.xml | 6 +-
.../support-version.list | 2 +-
.../scenarios/shardingsphere-4.x-scenario/pom.xml | 6 +-
.../support-version.list | 2 +-
test/plugin/scenarios/sofarpc-scenario/pom.xml | 6 +-
.../sofarpc-scenario/support-version.list | 2 +-
.../plugin/scenarios/spring-3.0.x-scenario/pom.xml | 6 +-
.../spring-3.0.x-scenario/support-version.list | 4 +-
.../plugin/scenarios/spring-3.1.x-scenario/pom.xml | 6 +-
.../spring-3.1.x-scenario/support-version.list | 2 +-
.../plugin/scenarios/spring-4.1.x-scenario/pom.xml | 6 +-
.../spring-4.1.x-scenario/support-version.list | 2 +-
.../plugin/scenarios/spring-4.3.x-scenario/pom.xml | 6 +-
.../spring-4.3.x-scenario/support-version.list | 6 +-
.../plugin/scenarios/spring-async-scenario/pom.xml | 6 +-
.../spring-async-scenario/support-version.list | 2 +-
.../support-version.list | 2 +-
.../support-version.list | 2 +-
.../support-version.list | 2 +-
.../scenarios/spring-kafka-1.3.x-scenario/pom.xml | 6 +-
.../support-version.list | 4 +-
.../scenarios/spring-kafka-2.2.x-scenario/pom.xml | 6 +-
.../support-version.list | 4 +-
.../scenarios/spring-kafka-2.3.x-scenario/pom.xml | 6 +-
.../support-version.list | 4 +-
.../spring-scheduled-scenario/support-version.list | 4 +-
test/plugin/scenarios/spring-tx-scenario/pom.xml | 6 +-
.../spring-tx-scenario/support-version.list | 4 +-
.../config/expectedData.yaml | 55 +-
.../springmvcreactive/controller/Controller.java | 14 +
.../struts2.3-scenario/support-version.list | 4 +-
.../struts2.5-scenario/support-version.list | 2 +-
.../scenarios/thrift-scenario/support-version.list | 4 +-
test/plugin/scenarios/undertow-scenario/pom.xml | 6 +-
.../undertow-scenario/support-version.list | 4 +-
.../support-version.list | 4 +-
.../support-version.list | 4 +-
.../support-version.list | 2 +-
.../xxl-job-2.x-scenario/support-version.list | 4 +-
test/plugin/scenarios/zookeeper-scenario/pom.xml | 6 +-
.../known-oap-backend-dependencies-es7.txt | 35 +-
.../known-oap-backend-dependencies.txt | 36 +-
1372 files changed, 41095 insertions(+), 13608 deletions(-)
create mode 100644 .dlc.json
create mode 100644 .github/actions/e2e-test/action.yml
create mode 100644 .github/actions/plugins-test/action.yml
create mode 100644 .github/actions/skip/action.yml
delete mode 100644 .github/workflows/cancel.yaml
create mode 100644 .github/workflows/codeql.yaml
create mode 100644 .github/workflows/dead-link-checker.yaml
create mode 100644 .github/workflows/e2e.event.yaml
create mode 100644 .github/workflows/e2e.log.yaml
create mode 100644 .licenserc.yaml
create mode 100644 apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/log/GRPCLogClientAppender.java
create mode 100644 apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/log/GRPCLogClientAppender.java
create mode 100644 apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/log/GRPCLogClientAppender.java
delete mode 100644 apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
delete mode 100644 apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
create mode 100644 apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ConfigurationDiscoveryCommand.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/ServiceInstanceGenerator.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ConfigurationDiscoveryCommandExecutor.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/AgentConfigChangeWatcher.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/ConfigurationDiscoveryService.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/watcher/IgnoreSuffixPatternsWatcher.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/watcher/SamplingRateWatcher.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/watcher/SpanLimitWatcher.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessClassFinder.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessFinder.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessMethod.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/EventReportServiceClient.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/LogReportServiceClient.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/watcher/IgnoreSuffixPatternsWatcherTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/watcher/SamplingRateWatcherTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/watcher/SpanLimitWatcherTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/witness/WitnessTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/pom.xml
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTable100Interceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTable200Interceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTable220Interceptor.java
rename apm-sniffer/apm-sdk-plugin/{hbase-1.x-plugin => hbase-1.x-2.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java (100%)
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-2.x-plugin/src/main/resources/skywalking-plugin.def
delete mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-plugin/pom.xml
delete mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-plugin/src/main/resources/skywalking-plugin.def
create mode 100644 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/PipelineSetClientMethodInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/MultiKeyPipelineBaseInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/PipelineBaseInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/PipelineInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/PipelineSetClientMethodInterceptorTest.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java
create mode 100644 apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/LettucePluginConfig.java
create mode 100644 apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockClientOptions.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClientConstructorInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/pom.xml
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/Constants.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/CreateCallableStatementInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/CreatePreparedStatementInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/CreateStatementInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/PreparedStatementExecuteMethodsInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/StatementExecuteMethodsInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/define/AbstractConnectionInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc/define/AbstractConnectionInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc/define/PreparedStatementInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc/define/StatementInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1/define/AbstractConnectionInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1/define/PreparedStatementInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1/define/StatementInstrumentation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/log/GRPCLogAppenderActivation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/log/GRPCLogAppenderInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/CreateMementoInstrumentation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/CreateMementoInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/log/GRPCLogAppenderActivation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/log/GRPCLogAppenderInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/log/GRPCLogAppenderActivation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/log/GRPCLogAppenderInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/pom.xml
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/java/org/apache/skywalking/apm/toolkit/logging/common/log/GRPCLogReportServiceClient.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/java/org/apache/skywalking/apm/toolkit/logging/common/log/ToolkitConfig.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/BaseTagAnnotationInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/BaseTraceAnnotationInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/SegmentIDInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/SpanIDInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationStaticMethodInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationStaticMethodInterceptor.java
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceIDInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/pom.xml
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ContextConfig.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLogbackLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLogbackLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/FatalLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/FatalLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLogbackLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLogbackLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLog4j2LoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLog4jLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLogbackLoggerInterceptor.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/Log4j2LoggerInstrumentation.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/Log4jLoggerInstrumentation.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/LogbackLoggerInstrumentation.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/resources/skywalking-plugin.def
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/java/org/apache/skywalking/apm/plugin/logger/ContextConfigDefaultTest.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/java/org/apache/skywalking/apm/plugin/logger/ContextConfigExceptionTest.java
delete mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/java/org/apache/skywalking/apm/plugin/logger/ContextConfigTest.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 changes/changes-8.4.0.md
create mode 100644 changes/changes-8.5.0.md
rename dist-material/{alarm-settings-sample.yml => config-examples/alarm-settings.yml} (100%)
create mode 100644 dist-material/config-examples/lal.yaml
create mode 100644 dist-material/config-examples/log-mal.yaml
create mode 100644 dist-material/release-docs/licenses/LICENSE-postgresql.txt
create mode 100644 docker/agent/Dockerfile.agent
create mode 100644 docs/en/FAQ/How-to-build-with-mac-m1.md
delete mode 100644 docs/en/concepts-and-designs/README.md
create mode 100644 docs/en/concepts-and-designs/event.md
create mode 100644 docs/en/concepts-and-designs/lal.md
create mode 100644 docs/en/protocols/Log-Data-Protocol.md
delete mode 100644 docs/en/setup/README.md
create mode 100644 docs/en/setup/backend/backend-infrastructure-monitoring.md
delete mode 100644 docs/en/setup/backend/backend-ui-setup.md
create mode 100644 docs/en/setup/backend/backend-zabbix.md
create mode 100644 docs/en/setup/backend/grafana-cluster.json
create mode 100644 docs/en/setup/backend/grafana-instance.json
delete mode 100644 docs/en/setup/backend/grafana.json
create mode 100644 docs/en/setup/backend/log-analyzer.md
create mode 100644 docs/en/setup/backend/otel-collector-config.yaml
create mode 100644 docs/en/setup/service-agent/browser-agent.md
delete mode 100644 docs/en/setup/service-agent/java-agent/agent-optional-plugins/Logger-plugin.md
create mode 100644 docs/en/setup/service-agent/java-agent/configuration-discovery.md
create mode 100644 docs/en/setup/service-agent/server-agents.md
create mode 100644 docs/menu.yml
create mode 100644 oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/DatabaseSlowStatementBuilder.java
delete mode 100644 oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterBaseTest.java
delete mode 100644 oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterBuilderTest.java
create mode 100644 oap-server/analyzer/event-analyzer/pom.xml
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzer.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzerModule.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzerModuleConfig.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzerModuleProvider.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzerService.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/EventAnalyzerServiceImpl.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/listener/EventAnalyzerListener.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/listener/EventAnalyzerListenerFactoryManager.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/event/listener/EventRecordAnalyzerListener.java
create mode 100644 oap-server/analyzer/event-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/analyzer/event-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/analyzer/log-analyzer/pom.xml
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/Binding.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/DSL.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/AbstractSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/filter/FilterSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/AbstractParserSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/JsonParserSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/TextParserSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/YamlParserSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SamplerSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SinkSpec.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/RateLimitingSampler.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/Sampler.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/module/LogAnalyzerModule.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfig.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfigs.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleConfig.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleProvider.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalysisListenerFactoryManager.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalyzerService.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzer.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzerServiceImpl.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListener.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListenerFactory.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogFilterListener.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/TrafficAnalysisListener.java
create mode 100644 oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EndpointEntityDescription.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EntityDescription.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceEntityDescription.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/K8sRetagType.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/Retag.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
create mode 100644 oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ValueFilterTest.java
delete mode 100644 oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl
create mode 100644 oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/entity2Storage.ftl
delete mode 100644 oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl
create mode 100644 oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/storage2Entity.ftl
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
create mode 100644 oap-server/server-bootstrap/src/main/resources/lal/default.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/lal/envoy-als.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/log-mal-rules/placeholder.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/oal/disable.oal
create mode 100644 oap-server/server-bootstrap/src/main/resources/otel-oc-rules/k8s-cluster.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/otel-oc-rules/k8s-node.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/otel-oc-rules/k8s-service.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/otel-oc-rules/vm.yaml
create mode 100644 oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/k8s.yml
create mode 100644 oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/vm.yml
create mode 100644 oap-server/server-bootstrap/src/main/resources/zabbix-rules/agent.yaml
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/FunctionCategory.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpoint/EndpointMetaDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogRecord.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecord.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/Tag.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SpanTag.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/event/Event.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/DisableOALDefine.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/EventQueryService.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TraceScopeCondition.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/LogState.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Event.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/EventQueryCondition.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/EventType.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Events.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/event/Source.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointMeta.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/HTTPAccessLog.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Log.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilderFactory.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageHashMapBuilder.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IEventQueryDAO.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageBuilder.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleConfigTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointCallRelationTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/TagTest.java
delete mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SpanTagTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterSystemTest.java
create mode 100644 oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandler.java
create mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/pom.xml
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurations.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsReader.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsTable.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsWatcher.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryModule.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryModuleConfig.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryProvider.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/handler/grpc/ConfigurationDiscoveryServiceHandler.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsReaderTest.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsWatcherTest.java
create mode 100644 oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/resources/agent-dynamic-configuration.yml
create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/ServiceMetaInfoFactory.java
create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/ServiceMetaInfoFactoryImpl.java
create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100755 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/jaeger/collector.proto
delete mode 100755 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/jaeger/model.proto
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/pom.xml
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/EventModule.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/EventModuleConfig.java
create mode 100755 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/EventModuleProvider.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/grpc/EventGrpcServiceHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/pom.xml
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/module/LogModule.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/LogModuleProvider.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/LogReportServiceHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/pom.xml
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/module/ZabbixReceiverModule.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetrics.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixModuleConfig.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixReceiverProvider.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfig.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfigs.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixErrorProtocolException.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixProtocolDataCodec.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixProtocolDecoder.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixProtocolEncoder.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixProtocolHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixServer.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/bean/ZabbixProtocolType.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/bean/ZabbixRequest.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/bean/ZabbixRequestJsonDeserializer.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/bean/ZabbixResponse.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/bean/ZabbixResponseJsonSerializer.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixBaseTest.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetricsTest.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/protocol/ZabbixProtocolHandlerTest.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/resources/zabbix-rules/agent.yaml
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/Receiver2AnalysisBridge.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/SkyWalkingTrace.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentListener.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/AnalyzerSetting.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexStructures.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ESEventQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/AnalyzerSettingTest.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexStructuresTest.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/IndexEs7Structures.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ES7EventQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/EventQueryDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java
delete mode 100755 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/AbstractSearchTagBuilder.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EventQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/PostgreSQLStorageConfig.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/PostgreSQLStorageProvider.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/PostgreSQLTableInstaller.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLAggregationQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLAlarmQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLLogQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLMetricsQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLTraceQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/pom.xml
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java
create mode 100644 oap-server/server-storage-plugin/storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEs7DAO.java
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java
delete mode 100644 oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/common/KeyValue.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/common/KeyValueMatcher.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/event/Event.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventData.java
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
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/event/EventsQuery.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/Log.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogData.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogMatcher.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsMatcher.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/SupportQueryLogsByKeywords.java
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/ReadLabeledMetricsQuery.java
create mode 100644 test/e2e/e2e-data/src/main/resources/events.gql
create mode 100644 test/e2e/e2e-data/src/main/resources/logs.gql
create mode 100644 test/e2e/e2e-data/src/main/resources/support-query-logs-by-keywords.gql
create mode 100644 test/e2e/e2e-data/src/test/java/org/apache/skywalking/e2e/TestLogsMatcher.java
create mode 100644 test/e2e/e2e-data/src/test/resources/log.yml
delete mode 100644 test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
create mode 100644 test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
create mode 100644 test/e2e/e2e-service-provider/src/main/resources/log4j.properties
create mode 100644 test/e2e/e2e-service-provider/src/main/resources/log4j2.xml
create mode 100644 test/e2e/e2e-service-provider/src/main/resources/logback.xml
create mode 100644 test/e2e/e2e-test/docker/Dockerfile.cli
rename test/e2e/e2e-test/docker/{profile => }/Dockerfile.h2 (100%)
create mode 100644 test/e2e/e2e-test/docker/Dockerfile.satellite
delete mode 100644 test/e2e/e2e-test/docker/browser/Dockerfile.h2
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.h2.client-js.yml
delete mode 100644 test/e2e/e2e-test/docker/browser/download-mysql.sh
create mode 100644 test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.generate-traffic
create mode 100644 test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui
create mode 100644 test/e2e/e2e-test/docker/browser/with-skywalking-client-js/index.js
create mode 100644 test/e2e/e2e-test/docker/browser/with-skywalking-client-js/nginx.conf
create mode 100644 test/e2e/e2e-test/docker/browser/with-skywalking-client-js/test.py
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%)
create mode 100644 test/e2e/e2e-test/docker/event/docker-compose.h2.yml
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%)
create mode 100644 test/e2e/e2e-test/docker/event/docker-compose.yml
create mode 100644 test/e2e/e2e-test/docker/kafka/docker-compose.log.yml
create mode 100644 test/e2e/e2e-test/docker/kafka/satellite_config.yaml
create mode 100644 test/e2e/e2e-test/docker/log/docker-compose.es6.yml
create mode 100644 test/e2e/e2e-test/docker/log/docker-compose.es7.yml
create mode 100644 test/e2e/e2e-test/docker/log/docker-compose.h2.yml
create mode 100644 test/e2e/e2e-test/docker/log/docker-compose.influxdb.yml
create mode 100644 test/e2e/e2e-test/docker/log/docker-compose.mysql.yml
create mode 100644 test/e2e/e2e-test/docker/log/lal.yaml
create mode 100644 test/e2e/e2e-test/docker/log/log-mal.yaml
create mode 100644 test/e2e/e2e-test/docker/promOtelVM/Dockerfile.nodeExporter
create mode 100644 test/e2e/e2e-test/docker/promOtelVM/docker-compose.yml
create mode 100644 test/e2e/e2e-test/docker/promOtelVM/otel-collector-config.yaml
create mode 100644 test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
delete mode 100644 test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml
create mode 100644 test/e2e/e2e-test/docker/storage/docker-compose.postgresql.yml
create mode 100644 test/e2e/e2e-test/docker/ttl/docker-compose.postgresql.yml
create mode 100644 test/e2e/e2e-test/docker/zabbix/agent.yaml
create mode 100644 test/e2e/e2e-test/docker/zabbix/docker-compose.yml
create mode 100644 test/e2e/e2e-test/docker/zabbix/zabbix_agentd.conf
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/event/EventE2E.java
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/kafka/KafkaLogE2E.java
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/log/LogE2E.java
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/promOtelVM/PromOtelVME2E.java
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/zabbix/ZabbixE2E.java
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/error-log.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/page-path.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/services.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/topo.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/traces.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser-with-client-js/version.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/event/events.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/log/endpoints.yml
copy test/e2e/e2e-test/src/test/resources/expected/{metricsservice => log}/instances.yml (100%)
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/log/logs.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/log/services.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/promOtelVM/services.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/zabbix/services.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/metadata-service-mapping.yaml
delete mode 100644 test/jacoco/jacocoagent.jar
delete mode 100644 test/jacoco/jacococli.jar
create mode 100644 test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisPipelineCommandExecutor.java
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/bin/startup.sh
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/config/expectedData.yaml
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/configuration.yml
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/pom.xml
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/assembly/assembly.xml
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/resources/application.yaml
delete mode 100644 test/plugin/scenarios/logger-log4j-scenario/support-version.list
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/bin/startup.sh
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/config/expectedData.yaml
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/configuration.yml
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/pom.xml
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/assembly/assembly.xml
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/resources/application.yaml
delete mode 100644 test/plugin/scenarios/logger-log4j2-scenario/support-version.list
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/bin/startup.sh
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/config/expectedData.yaml
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/configuration.yml
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/pom.xml
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/assembly/assembly.xml
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/resources/application.yaml
delete mode 100644 test/plugin/scenarios/logger-logback-scenario/support-version.list