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/02/02 04:28:38 UTC

[skywalking] branch events updated (18883c3 -> 2ed6573)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch events
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 18883c3  Add a new concept "Event" and its implementations to collect events
     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 2ed6573  Add a new concept "Event" and its implementations to collect events

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (18883c3)
            \
             N -- N -- N   refs/heads/events (2ed6573)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                         | 124 ++-------------------
 apm-application-toolkit/apm-toolkit-kafka/pom.xml  |   2 +-
 .../apm-toolkit-log4j-1.x/pom.xml                  |   2 +-
 .../apm-toolkit-log4j-2.x/pom.xml                  |   2 +-
 .../apm-toolkit-logback-1.x/pom.xml                |   2 +-
 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 +-
 apm-application-toolkit/pom.xml                    |   2 +-
 apm-commons/apm-datacarrier/pom.xml                |   2 +-
 apm-commons/apm-util/pom.xml                       |   2 +-
 apm-commons/pom.xml                                |   2 +-
 apm-dist-es7/pom.xml                               |   2 +-
 apm-dist/pom.xml                                   |   2 +-
 apm-protocol/apm-network/pom.xml                   |   2 +-
 apm-protocol/pom.xml                               |   2 +-
 apm-sniffer/apm-agent-core/pom.xml                 |   2 +-
 apm-sniffer/apm-agent/pom.xml                      |   2 +-
 .../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 +-
 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-sdk-plugin/dubbo-conflict-patch/pom.xml    |   2 +-
 apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml    |   2 +-
 .../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 +-
 .../feign-default-http-9.x-plugin/pom.xml          |   2 +-
 .../apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml   |   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-plugin/pom.xml        |   2 +-
 .../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-sdk-plugin/jedis-2.x-plugin/pom.xml        |   2 +-
 .../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-sdk-plugin/lettuce-5.x-plugin/pom.xml      |   2 +-
 .../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   |   2 +-
 .../apm-sdk-plugin/mssql-jdbc-plugin/pom.xml       |   2 +-
 .../apm-sdk-plugin/mssql-jtds-1.x-plugin/pom.xml   |   2 +-
 .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml        |   2 +-
 .../apm-sdk-plugin/mysql-6.x-plugin/pom.xml        |   2 +-
 .../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 +-
 .../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                 |   2 +-
 .../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 +-
 .../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml     |   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 +-
 .../mvc-annotation-5.x-plugin/pom.xml              |   2 +-
 .../spring-plugins/mvc-annotation-commons/pom.xml  |   2 +-
 apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml  |   2 +-
 .../spring-plugins/resttemplate-4.x-plugin/pom.xml |   2 +-
 .../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 +-
 .../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 +-
 .../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       |   2 +-
 .../log4j/v1/x/log/GRPCLogAppenderActivation.java  |  11 +-
 .../apm-toolkit-log4j-2.x-activation/pom.xml       |   2 +-
 .../log4j/v2/x/log/GRPCLogAppenderInterceptor.java |  50 ++++++---
 .../apm-toolkit-logback-1.x-activation/pom.xml     |   2 +-
 .../v1/x/log/GRPCLogAppenderInterceptor.java       |  49 ++++++--
 .../apm-toolkit-logging-common/pom.xml             |   5 +-
 .../toolkit/logging/common/log/ToolkitConfig.java  |   6 +
 .../apm-toolkit-meter-activation/pom.xml           |   2 +-
 .../apm-toolkit-opentracing-activation/pom.xml     |   2 +-
 .../apm-toolkit-trace-activation/pom.xml           |   2 +-
 apm-sniffer/apm-toolkit-activation/pom.xml         |   2 +-
 .../bootstrap-plugins/jdk-http-plugin/pom.xml      |   2 +-
 .../bootstrap-plugins/jdk-threading-plugin/pom.xml |   2 +-
 apm-sniffer/bootstrap-plugins/pom.xml              |   2 +-
 .../customize-enhance-plugin/pom.xml               |   2 +-
 .../optional-plugins/gson-2.8.x-plugin/pom.xml     |   2 +-
 .../kotlin-coroutine-plugin/pom.xml                |   2 +-
 .../gateway-2.0.x-plugin/pom.xml                   |   2 +-
 .../gateway-2.1.x-plugin/pom.xml                   |   2 +-
 .../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               |   2 +-
 .../quartz-scheduler-2.x-plugin/pom.xml            |   2 +-
 .../optional-plugins/trace-ignore-plugin/pom.xml   |   2 +-
 .../zookeeper-3.4.x-plugin/pom.xml                 |   2 +-
 .../kafka-reporter-plugin/pom.xml                  |   2 +-
 apm-sniffer/optional-reporter-plugins/pom.xml      |   2 +-
 apm-sniffer/pom.xml                                |   2 +-
 apm-webapp/pom.xml                                 |   2 +-
 changes/changes-8.3.0.md                           |   2 -
 CHANGES.md => changes/changes-8.4.0.md             |   7 +-
 docs/README.md                                     |   6 +-
 docs/en/concepts-and-designs/oal.md                |   4 +-
 docs/en/setup/envoy/als_setting.md                 | 104 +++++++++++------
 docs/en/setup/envoy/metrics_service_setting.md     |  42 ++++++-
 docs/en/setup/istio/README.md                      |   8 +-
 .../java-agent/Application-toolkit-log4j-2.x.md    |  39 ++++++-
 .../java-agent/Application-toolkit-logback-1.x.md  |  40 ++++++-
 docs/en/setup/service-agent/java-agent/README.md   |   1 +
 oap-server/analyzer/agent-analyzer/pom.xml         |   2 +-
 oap-server/analyzer/log-analyzer/pom.xml           |   6 +-
 oap-server/analyzer/meter-analyzer/pom.xml         |   2 +-
 oap-server/analyzer/pom.xml                        |   2 +-
 oap-server/exporter/pom.xml                        |   2 +-
 oap-server/oal-grammar/pom.xml                     |   2 +-
 oap-server/oal-rt/pom.xml                          |   2 +-
 oap-server/pom.xml                                 |   2 +-
 oap-server/server-alarm-plugin/pom.xml             |   2 +-
 oap-server/server-bootstrap/pom.xml                |   4 +-
 .../main/resources/ui-initialized-templates/vm.yml |   3 +-
 .../cluster-consul-plugin/pom.xml                  |   2 +-
 .../cluster-etcd-plugin/pom.xml                    |   2 +-
 .../cluster-kubernetes-plugin/pom.xml              |   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 +-
 .../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 +-
 .../core/event/{EventRecord.java => Event.java}    | 104 ++++++++++++++---
 .../oap/server/core/query/EventQueryService.java   |  11 ++
 .../kafka-fetcher-plugin/pom.xml                   |   2 +-
 oap-server/server-fetcher-plugin/pom.xml           |   2 +-
 .../prometheus-fetcher-plugin/pom.xml              |   2 +-
 oap-server/server-health-checker/pom.xml           |   2 +-
 oap-server/server-library/library-client/pom.xml   |   2 +-
 oap-server/server-library/library-module/pom.xml   |   2 +-
 oap-server/server-library/library-server/pom.xml   |   2 +-
 oap-server/server-library/library-util/pom.xml     |   2 +-
 oap-server/server-library/pom.xml                  |   2 +-
 oap-server/server-query-plugin/pom.xml             |   2 +-
 .../query-graphql-plugin/pom.xml                   |   2 +-
 .../pom.xml                                        |   6 +-
 .../envoy-metrics-receiver-plugin/pom.xml          |   2 +-
 .../jaeger-receiver-plugin/pom.xml                 |   2 +-
 .../otel-receiver-plugin/pom.xml                   |   2 +-
 oap-server/server-receiver-plugin/pom.xml          |   2 +-
 .../server-receiver-plugin/receiver-proto/pom.xml  |   2 +-
 .../skywalking-browser-receiver-plugin/pom.xml     |   2 +-
 .../skywalking-clr-receiver-plugin/pom.xml         |   2 +-
 .../event/listener/RecordAnalysisListener.java     |  35 +++---
 .../skywalking-jvm-receiver-plugin/pom.xml         |   2 +-
 .../skywalking-log-recevier-plugin/pom.xml         |   6 +-
 .../skywalking-management-receiver-plugin/pom.xml  |   2 +-
 .../skywalking-mesh-receiver-plugin/pom.xml        |   2 +-
 .../skywalking-meter-receiver-plugin/pom.xml       |   2 +-
 .../skywalking-profile-receiver-plugin/pom.xml     |   2 +-
 .../skywalking-sharing-server-plugin/pom.xml       |   2 +-
 .../skywalking-trace-receiver-plugin/pom.xml       |   2 +-
 .../zipkin-receiver-plugin/pom.xml                 |   2 +-
 oap-server/server-starter-es7/pom.xml              |   2 +-
 oap-server/server-starter/pom.xml                  |   2 +-
 oap-server/server-storage-plugin/pom.xml           |   2 +-
 .../storage-elasticsearch-plugin/pom.xml           |   2 +-
 .../elasticsearch/query/ESEventQueryDAO.java       |  47 ++++----
 .../plugin/elasticsearch/query/LogQueryEsDAO.java  |  52 ++++-----
 .../storage-elasticsearch7-plugin/pom.xml          |   2 +-
 .../elasticsearch7/query/ES7EventQueryDAO.java     |   4 +-
 .../elasticsearch7/query/LogQueryEs7DAO.java       |  53 ++++-----
 .../storage-influxdb-plugin/pom.xml                |   2 +-
 .../plugin/influxdb/query/EventQueryDAO.java       |  47 ++++----
 .../storage-jaeger-plugin/pom.xml                  |   2 +-
 .../storage-jdbc-hikaricp-plugin/pom.xml           |   5 +-
 .../plugin/jdbc/h2/dao/H2EventQueryDAO.java        |  47 ++++----
 .../storage-tidb-plugin/pom.xml                    |   2 +-
 .../storage-zipkin-plugin/pom.xml                  |   2 +-
 oap-server/server-telemetry/pom.xml                |   2 +-
 oap-server/server-telemetry/telemetry-api/pom.xml  |   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 +-
 .../tool-profile-snapshot-exporter-es7/pom.xml     |   4 +-
 .../tool-profile-snapshot-exporter/pom.xml         |   4 +-
 .../tool-profile-snapshot-server-mock/pom.xml      |   4 +-
 pom.xml                                            |   5 +-
 skywalking-ui                                      |   2 +-
 263 files changed, 788 insertions(+), 617 deletions(-)
 copy CHANGES.md => changes/changes-8.4.0.md (97%)
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/event/{EventRecord.java => Event.java} (56%)