You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/09/25 08:05:05 UTC

[skywalking] branch meter-mal updated (5177620 -> abdded5)

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

hanahmily pushed a change to branch meter-mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 5177620  Merge branch 'master' into meter-mal
     add f396784  Fix the failure of Oracle scenario (#5540)
     add 7135414  Fixed some bugs with browser-recevier (#5543)
     add fa62c63  remove minor version test tasks (#5544)
     add 5b5a122  doc fix (#5548)
     add 84d49c4  Add kafka config for how long does kafka query server topic will trigger timeout (#5554)
     add d2eabdc  Add a muse configuration file (#5557)
     add abdded5  Merge branch 'master' into meter-mal

No new revisions were added by this update.

Summary of changes:
 .github/workflows/plugins-test.3.yaml              |  2 +-
 .muse/config.toml                                  |  2 +
 .muse/setup.sh                                     |  2 +
 apm-dist-es7/src/main/assembly/binary-es7.xml      |  1 +
 apm-dist/src/main/assembly/binary.xml              |  1 +
 .../apm/agent/core/kafka/KafkaProducerManager.java | 14 +++++-
 .../core/kafka/KafkaReporterPluginConfig.java      |  5 ++
 docs/en/concepts-and-designs/oal.md                |  6 ---
 docs/en/guides/Plugin-test.md                      |  2 +-
 docs/en/protocols/Browser-HTTP-API-Protocol.md     | 12 ++---
 docs/en/setup/backend/backend-receivers.md         |  1 +
 docs/en/setup/backend/configuration-vocabulary.md  |  2 +
 .../java-agent/How-to-enable-kafka-reporter.md     |  1 +
 docs/en/setup/service-agent/java-agent/README.md   |  1 +
 oap-server/server-bootstrap/pom.xml                |  1 +
 .../src/main/resources/application.yml             |  2 +
 .../server/core/analysis/metrics/RateMetrics.java  |  3 ++
 .../provider/BrowserServiceModuleConfig.java       |  4 +-
 .../handler/grpc/BrowserPerfServiceHandler.java    |  2 +-
 .../BrowserErrorLogReportBaseServletHandler.java   |  4 ++
 .../rest/BrowserPerfDataReportServletHandler.java  |  5 +-
 .../errorlog/listener/ErrorLogRecordListener.java  |  9 ++--
 pom.xml                                            |  1 +
 test/e2e/e2e-test/docker/kafka/Dockerfile.provider |  1 +
 .../e2e-test/docker/kafka/docker-compose.base.yml  |  1 +
 .../e2e-test/docker/kafka/docker-compose.meter.yml |  1 +
 .../docker/kafka/docker-compose.profiling.yml      |  1 +
 .../archetype-resources/support-version.list       |  2 +-
 .../archetype-resources/support-version.list       |  2 +-
 .../activemq-scenario/support-version.list         | 16 -------
 .../support-version.list                           |  4 --
 .../scenarios/avro-scenario/support-version.list   |  8 ----
 .../baidu-brpc-scenario/support-version.list       | 10 ----
 .../scenarios/canal-scenario/support-version.list  |  5 +-
 .../support-version.list                           |  2 -
 .../dubbo-2.5.x-scenario/support-version.list      |  8 ----
 .../dubbo-2.7.x-scenario/support-version.list      |  3 --
 .../ehcache-2.x-scenario/support-version.list      | 18 +-------
 .../elasticjob-2.x-scenario/support-version.list   |  1 -
 .../elasticjob-3.x-scenario/support-version.list   |  2 -
 .../support-version.list                           |  3 +-
 .../support-version.list                           |  6 +--
 .../support-version.list                           |  8 ----
 .../support-version.list                           |  1 -
 .../support-version.list                           |  1 -
 .../scenarios/feign-scenario/support-version.list  |  3 +-
 .../gateway-2.0.x-scenario/support-version.list    |  2 -
 .../gateway-2.1.x-scenario/support-version.list    |  5 --
 .../graphql-8.x-scenario/support-version.list      |  2 -
 .../scenarios/grpc-scenario/support-version.list   |  5 +-
 .../scenarios/gson-scenario/support-version.list   | 10 +---
 .../scenarios/h2-scenario/support-version.list     | 24 ----------
 .../scenarios/hbase-scenario/support-version.list  |  2 -
 .../httpasyncclient-scenario/support-version.list  |  6 +--
 .../httpclient-3.x-scenario/support-version.list   |  2 -
 .../httpclient-4.3.x-scenario/support-version.list | 13 +-----
 .../hystrix-scenario/support-version.list          | 18 --------
 .../influxdb-scenario/support-version.list         |  1 -
 test/plugin/scenarios/jdk-http-scenario/pom.xml    |  3 --
 .../jdk-http-scenario/support-version.list         |  2 -
 .../jdk14-with-gson-scenario/support-version.list  |  2 -
 .../scenarios/jedis-scenario/support-version.list  | 14 +-----
 .../scenarios/jetty-scenario/support-version.list  | 30 ------------
 .../scenarios/kafka-scenario/support-version.list  |  9 ----
 .../kotlin-coroutine-scenario/support-version.list |  1 +
 .../lettuce-scenario/support-version.list          | 16 +------
 .../mariadb-scenario/support-version.list          |  2 -
 .../mongodb-3.x-scenario/support-version.list      | 22 ---------
 .../mongodb-4.x-scenario/support-version.list      |  5 --
 .../scenarios/mysql-scenario/support-version.list  | 31 +------------
 .../netty-socketio-scenario/support-version.list   |  3 --
 .../scenarios/okhttp-scenario/support-version.list | 19 --------
 .../scenarios/play-scenario/support-version.list   | 10 ----
 .../support-version.list                           | 38 ---------------
 .../postgresql-scenario/support-version.list       | 34 +-------------
 .../scenarios/pulsar-scenario/support-version.list |  7 ---
 .../support-version.list                           |  2 -
 .../scenarios/quasar-scenario/support-version.list |  6 ---
 .../rabbitmq-scenario/support-version.list         |  8 +---
 .../redisson-scenario/support-version.list         | 32 +------------
 .../resttemplate-4.x-scenario/support-version.list | 54 +---------------------
 .../scenarios/retransform-class-scenario/pom.xml   |  1 -
 .../support-version.list                           |  2 -
 .../support-version.list                           |  2 -
 .../servicecomb-0.x-scenario/support-version.list  |  2 -
 .../servicecomb-1.x-scenario/support-version.list  |  1 -
 .../support-version.list                           |  1 -
 .../support-version.list                           |  1 -
 .../support-version.list                           |  1 -
 .../sofarpc-scenario/support-version.list          | 20 --------
 .../solrj-7.x-scenario/support-version.list        |  7 +--
 .../spring-3.0.x-scenario/support-version.list     |  9 +---
 .../spring-3.1.x-scenario/support-version.list     | 31 -------------
 .../spring-4.1.x-scenario/support-version.list     | 18 --------
 .../spring-4.3.x-scenario/support-version.list     | 50 --------------------
 .../spring-async-scenario/support-version.list     | 32 -------------
 .../support-version.list                           |  8 +---
 .../support-version.list                           | 21 +--------
 .../support-version.list                           | 12 +----
 .../support-version.list                           |  8 +---
 .../support-version.list                           |  8 +---
 .../spring-scheduled-scenario/support-version.list |  2 -
 .../spring-tx-scenario/support-version.list        |  6 ---
 .../support-version.list                           |  7 +--
 .../struts2.3-scenario/support-version.list        | 36 ---------------
 .../struts2.5-scenario/support-version.list        | 16 -------
 .../undertow-scenario/support-version.list         | 20 --------
 .../support-version.list                           | 22 +--------
 .../support-version.list                           | 12 +----
 .../support-version.list                           | 10 ----
 .../webflux-scenario/support-version.list          |  7 +--
 .../xxl-job-2.x-scenario/support-version.list      |  1 -
 .../zookeeper-scenario/support-version.list        | 15 +-----
 113 files changed, 96 insertions(+), 923 deletions(-)
 create mode 100644 .muse/config.toml
 create mode 100755 .muse/setup.sh