Merge branch master into develop

.asf.yaml

@@ -37,13 +37,13 @@ github:
     - microservice
     - state-management
   enabled_merge_buttons:
-    merge:   true
     squash:  true
+    merge:   true
     rebase:  false
   protected_branches:
     master:
       required_status_checks:
         strict: true
       required_pull_request_reviews:
         dismiss_stale_reviews: true
-        required_approving_review_count: 2
+        required_approving_review_count: 1

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -37,14 +37,27 @@ body:
             no similar issues.
           required: true
 
-  - type: textarea
+  - type: dropdown
     attributes:
       label: Environment
       description: Describe the environment.
-      placeholder: >
-        - OS: [e.g. Ubuntu 21.04 LTS]
-        - EventMesh version(s): [e.g. 1.2.0]
-        - RocketMQ version(s): [e.g. 4.7.1]
+      options:
+        - Mac
+        - Window
+        - Linux
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: EventMesh version
+      description: Describe the EventMesh version.
+      options:
+        - master
+        - 1.3.0
+        - 1.2.0
+        - Other
     validations:
       required: true
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,10 +20,10 @@
 -->
 
 <!--
-(If this PR fixes a GitHub issue, please add `Fixes ISSUE#<XXX>`.)
+(If this PR fixes a GitHub issue, please add `Fixes ISSUE #<XXX>`.)
 -->
 
-Fixes ISSUE#<XXXX>.
+Fixes ISSUE #<XXXX>.
 
 ### Motivation
 

.github/workflows/ci.yml

@@ -21,14 +21,9 @@ name: "Continuous Integration"
 
 on:
   push:
-    branches:
-      - develop
-      - '[0-9]+.[0-9]+.[0-9]+**'
+    branches: ['*']
   pull_request:
-    branches:
-      - develop
-      - '[0-9]+.[0-9]+.[0-9]+**'
-  workflow_dispatch:
+    branches: [ '*' ]
 
 jobs:
   build:
@@ -50,34 +45,11 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Build
-        # We use -x check to skip check code style here, since this task will check all files.
-        # We use Checkstyle task to check the added file
-        run: ./gradlew clean build jar dist jacocoTestReport -x check
+        run: ./gradlew clean build jar dist jacocoTestReport
 
       - name: Install plugin
         run: ./gradlew installPlugin
 
-  checkstyle:
-    name: Checkstyle
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Download checkstyle exectable
-        run: wget -O - -q https://github.com/checkstyle/checkstyle/releases/download/checkstyle-8.44/checkstyle-8.44-all.jar > ./checkstyle.jar
-
-      - name: Download reviewdog exectable
-        run: wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b . v0.12.0
-
-      - name: Check code style
-        env:
-          REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          java -jar ./checkstyle.jar -c ./style/checkStyle.xml -f xml ./eventmesh-* \
-               | ./reviewdog -f=checkstyle -reporter=github-pr-check -filter-mode=added -fail-on-error
-
   license-check:
     name: License Check
     runs-on: ubuntu-latest

NOTICE

@@ -1,5 +1,5 @@
 Apache EventMesh (incubating)
-Copyright 2021 The Apache Software Foundation
+Copyright 2021-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

@@ -1,11 +1,11 @@
-# Apache EventMesh (incubating) 
+# Apache EventMesh (incubating)
 [![CI status](https://github.com/apache/incubator-eventmesh/actions/workflows/ci.yml/badge.svg)](https://github.com/apache/incubator-eventmesh/actions/workflows/ci.yml)
 [![CodeCov](https://codecov.io/gh/apache/incubator-eventmesh/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-eventmesh)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/apache/incubator-eventmesh.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/incubator-eventmesh/context:java)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/apache/incubator-eventmesh.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/incubator-eventmesh/alerts/)
 [![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.com/apache/incubator-eventmesh/releases)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-yx3n2ak7-HcVG98CDqb~7PwgoDzgfMA)
+[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-11974dndy-cn3Aq638eleKwKPWP9tkLg)
 
 [点我查看中文版](README.zh-CN.md)
 
@@ -16,12 +16,14 @@ EventMesh(incubating) is a dynamic event-driven application runtime used to deco
 **Multi-runtime:**
 ![architecture1](docs/images/eventmesh-arch3.png)
 
+
 **Orchestration:**
 ![architecture1](docs/images/eventmesh-orchestration.png)
 
 **Federation:**
 ![architecture1](docs/images/eventmesh-federation.png)
 
+
 **Components:**
 
 * **eventmesh-runtime** : an middleware to transmit events between event producers and consumers, support cloud native apps and microservices.
@@ -63,12 +65,12 @@ EventMesh enriches the <a href="https://landscape.cncf.io/serverless?license=apa
 ## Community
 |              WeChat Assistant                           |                WeChat public account                   | Slack                                                  |
 | :----------------------------------------------------:  | :----------------------------------------------------: | :----------------------------------------------------: |
-| ![wechat_qr](docs/images/mesh-helper.jpg) | ![wechat_official_qr](docs/images/wechat-official.png) |[Join slack chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-yx3n2ak7-HcVG98CDqb~7PwgoDzgfMA) |
+| ![wechat_qr](docs/images/mesh-helper.jpg) | ![wechat_official_qr](docs/images/wechat-official.png) |[Join slack chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-11974dndy-cn3Aq638eleKwKPWP9tkLg) |
 
 Mailing Lists:
 
 | Name | Description |Subscribe	|Unsubscribe|Archive
 | ----    | ----    |----    | ----    | ----    |
 |Users	|User support and questions mailing list|	[Subscribe](mailto:[email protected])	|[Unsubscribe](mailto:[email protected])	|[Mail Archives](https://lists.apache.org/[email protected])|
 |Development	|Development related discussions|	[Subscribe](mailto:[email protected])	|[Unsubscribe](mailto:[email protected])	|[Mail Archives](https://lists.apache.org/[email protected])|
-|Commits	|All commits to repositories|	[Subscribe](mailto:[email protected])	|[Unsubscribe](mailto:[email protected])	|[Mail Archives](https://lists.apache.org/[email protected])|
+|Commits	|All commits to repositories|	[Subscribe](mailto:[email protected])	|[Unsubscribe](mailto:[email protected])	|[Mail Archives](https://lists.apache.org/[email protected])|

README.zh-CN.md

@@ -20,13 +20,13 @@ EventMesh是一个动态的云原生事件驱动架构基础设施，用于分
 ![architecture1](docs/images/eventmesh-federation.png)
 
 **组件:**
-* **eventmesh-runtime** : an middleware to transmit events between event producers and consumers, support cloud native apps and microservices.
-* **eventmesh-sdk-java** : currently supports HTTP and TCP protocols.
-* **eventmesh-connector-plugin** : plugins for connect a middleware such as RocketMQ/Kafka/Redis/Pulsar etc.
-* **eventmesh-registry-plugin** : plugins for registry adapter, such as Nacos/Etcd.
-* **eventmesh-security-plugin** : plugins for security adpater, such as ACL/Authentication/Authorization.
-* **eventmesh-protocol-plugin** : plugins for protocol adapter, such as CloudEvents/MQTT.
-* **eventmesh-admin** : clients,topics,subscriptions and other management.
+* **eventmesh-runtime** : 一种中间件，用于在事件产生者和使用者之间传输事件，支持云原生应用程序和微服务。
+* **eventmesh-sdk-java** : 当前支持HTTP和TCP协议，未来会支持gRPC等。
+* **eventmesh-connector-plugin** : 连接中间件的插件，如RocketMQ/Kafka/Redis/Pulsar等。
+* **eventmesh-registry-plugin** : 注册表适配器插件，如Nacos/Etcd。
+* **eventmesh-security-plugin** : 安全适配器插件，如ACL/认证/授权。
+* **eventmesh-protocol-plugin** : 协议适配器的插件，如CloudEvents/MQTT。
+* **eventmesh-admin** : 客户端管理、主题管理、订阅管理和其他管理。
 
 ## 快速开始
 1. [Store quickstart](docs/en/instructions/eventmesh-store-quickstart.md)
@@ -59,7 +59,7 @@ EventMesh enriches the <a href="https://landscape.cncf.io/serverless?license=apa
 ## 开发社区
 |              微信助手                           |                微信公众号                   | Slack                                                  |
 | :----------------------------------------------------:  | :----------------------------------------------------: | :----------------------------------------------------: |
-| ![wechat_qr](docs/images/mesh-helper.jpg) | ![wechat_official_qr](docs/images/wechat-official.png) |[加入slack](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-yx3n2ak7-HcVG98CDqb~7PwgoDzgfMA) |
+| ![wechat_qr](docs/images/mesh-helper.jpg) | ![wechat_official_qr](docs/images/wechat-official.png) |[加入slack](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-11974dndy-cn3Aq638eleKwKPWP9tkLg) |
 
 Mailing Lists:
 

build.gradle

@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.1"
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.3"
         classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
         classpath "com.github.jk1:gradle-license-report:1.17"
     }
@@ -68,32 +68,41 @@ allprojects {
         delete 'out'
     }
 
-    if ((project.findProperty("snapshot") instanceof String) && (Boolean.valueOf(project.property("snapshot") as boolean))) {
-        version = version + "-SNAPSHOT"
-    }
-
     checkstyle {
         toolVersion = '9.0'
         ignoreFailures = false
         showViolations = true
         maxWarnings = 0
         configFile = new File("${rootDir}/style/checkStyle.xml")
     }
+
+    checkstyleMain.exclude '**/org/apache/eventmesh/client/grpc/protos**'
+
+    dependencies {
+        repositories {
+            maven {
+                url "https://maven.aliyun.com/repository/public"
+            }
+        }
+        testImplementation "junit:junit:4.13.2"
+    }
 }
 
 task tar(type: Tar) {
-    extension = 'tar.gz'
+    archiveBaseName.set(project.name)
+    archiveVersion.set(project.version.toString())
+    archiveExtension.set('tar.gz')
     compression = Compression.GZIP
-    archiveFileName = project.name + '_' + project.version + '.' + extension
     destinationDirectory = new File(projectDir, 'build')
     into('/') {
         from 'dist'
     }
 }
 
 task zip(type: Zip) {
-    extension = 'zip'
-    archiveFileName = project.name + '.' + project.version + '.' + extension
+    archiveBaseName.set(project.name)
+    archiveVersion.set(project.version.toString())
+    archiveExtension.set('zip')
     destinationDirectory = new File(projectDir, 'build')
     into('/') {
         from 'dist'
@@ -249,11 +258,14 @@ subprojects {
             new File("${projectDir}/dist/licenses").mkdirs()
         }
         Set<String> rootProject = ["eventmesh-admin",
+                                   "eventmesh-admin-rocketmq",
                                    "eventmesh-common",
                                    "eventmesh-connector-api",
+                                   "eventmesh-metrics-api",
                                    "eventmesh-registry-api",
                                    "eventmesh-runtime",
                                    "eventmesh-security-api",
+                                   "eventmesh-protocol-api",
                                    "eventmesh-starter",
                                    "eventmesh-spi"]
         doLast {
@@ -386,7 +398,7 @@ subprojects {
         }
         repositories {
             maven {
-                def releasesRepoUrl = 'https://repository.apache.org/content/repositories/releases/'
+                def releasesRepoUrl = 'https://repository.apache.org/service/local/staging/deploy/maven2'
                 def snapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots/'
                 url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
                 credentials {
@@ -409,22 +421,22 @@ subprojects {
             dependency "org.apache.commons:commons-text:1.9"
 
 
-            dependency "com.google.guava:guava:29.0-jre"
+            dependency "com.google.guava:guava:31.0.1-jre"
 
             dependency "org.slf4j:slf4j-api:1.7.30"
-            dependency "org.apache.logging.log4j:log4j-api:2.17.0"
-            dependency "org.apache.logging.log4j:log4j-core:2.17.0"
-            dependency "org.apache.logging.log4j:log4j-slf4j-impl:2.17.0"
+            dependency "org.apache.logging.log4j:log4j-api:2.17.1"
+            dependency "org.apache.logging.log4j:log4j-core:2.17.1"
+            dependency "org.apache.logging.log4j:log4j-slf4j-impl:2.17.1"
 
             dependency "com.lmax:disruptor:3.4.2"
 
             dependency "com.fasterxml.jackson.core:jackson-databind:2.11.0"
             dependency "com.fasterxml.jackson.core:jackson-core:2.11.0"
             dependency "com.fasterxml.jackson.core:jackson-annotations:2.11.0"
 
-            dependency "org.apache.httpcomponents:httpclient:4.5.2"
+            dependency "org.apache.httpcomponents:httpclient:4.5.13"
 
-            dependency "io.netty:netty-all:4.1.49.Final"
+            dependency "io.netty:netty-all:4.1.73.Final"
 
             dependency 'io.dropwizard.metrics:metrics-core:4.1.0'
             dependency "io.dropwizard.metrics:metrics-healthchecks:4.1.0"
@@ -448,7 +460,7 @@ subprojects {
             dependency "org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE"
             dependency "io.openmessaging:registry-server:0.0.1"
 
-            dependency "junit:junit:4.12"
+            dependency "junit:junit:4.13.2"
             dependency "com.github.stefanbirkner:system-rules:1.16.1"
             dependency "org.assertj:assertj-core:2.6.0"
 
@@ -458,6 +470,15 @@ subprojects {
 
             dependency "io.cloudevents:cloudevents-core:2.2.0"
             dependency "io.cloudevents:cloudevents-json-jackson:2.2.0"
+
+            dependency "io.grpc:grpc-protobuf:1.15.0"
+            dependency "io.grpc:grpc-stub:1.15.0"
+            dependency "io.grpc:grpc-netty:1.15.0"
+            dependency "io.grpc:grpc-netty-shaded:1.15.0"
+
+            dependency "javax.annotation:javax.annotation-api:1.3.2"
+
+            dependency "com.github.seancfoley:ipaddress:5.3.3"
         }
     }
-}
+}

docker/eventmesh-rocketmq/Dockerfile → docker/eventmesh/Dockerfile

@@ -23,7 +23,7 @@ MAINTAINER mikexue [email protected]
 
 WORKDIR /data
 RUN mkdir /data/app
-ADD EventMesh_1.3.0-SNAPSHOT.tar.gz  /data/app/eventmesh
+ADD EventMesh_1.3.0-release.tar.gz  /data/app/eventmesh
 WORKDIR /data/app/eventmesh/bin
 
 EXPOSE 10000

docs/cn/instructions/eventmesh-metrics-Prometheus-instruction.md

@@ -0,0 +1,49 @@
+## 通过Prometheus观察metrics
+
+### 1、下载Prometheus
+官网：https://prometheus.io/
+
+本地下载Prometheus：https://prometheus.io/download/ 
+
+选择自己电脑对应的版本下载并解压缩
+
+![Prometheus-download](../../images/Prometheus-download.png)
+
+### 2、在prometheus.yml中添加配置
+
+如果你是Prometheus的新手，可以直接复制eventmesh-runtime/conf/prometheus.yml替换
+
+例如：这是win-64的下载后的样子：
+
+![prometheus-yml](../../images/prometheus-yml.png)
+
+替换红框中的文件
+
+如果你十分了解Prometheus，可以自行配置，eventmesh默认的导出的端口为19090。
+
+
+
+ps：如果需要更换端口的话，请修改eventmesh-runtime/conf/eventmesh.properties中的
+
+```properties
+#prometheusPort
+eventMesh.metrics.prometheus.port=19090
+```
+
+### 3、运行Prometheus.exe和eventmesh
+
+双击Prometheus.exe运行
+
+运行eventmesh-starter(参考[eventmesh-runtime-quickstart](eventmesh-runtime-quickstart.md))
+
+运行eventmesh-example(参考[eventmesh-sdk-java-quickstart](eventmesh-sdk-java-quickstart.md))
+
+打开浏览器访问：http://localhost:9090/
+
+
+
+### 4、输入你想观察的metrics
+
+输入’**eventmesh_**‘ 就会出现相关的指标的提示
+
+![promethus-search](../../images/promethus-search.png)