Merge branch 'master' into file_test

.github/workflows/hera_package.yml

@@ -15,6 +15,7 @@ jobs:
   check-build-8:
     name: hera test
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/jdk8' || github.ref == 'refs/heads/jdk8' || github.event == 'workflow_dispatch'
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
@@ -72,6 +73,7 @@ jobs:
   check-build-20:
     name: hera test 20
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/mastaer' || github.ref == 'refs/heads/main' || github.event == 'workflow_dispatch'
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
@@ -89,4 +91,4 @@ jobs:
               - 'hera-all/hera-log/**'
         # run only if some file in 'src' folder was changed
       - if: always() && steps.changes.outputs.hera-log == 'true' || github.event == 'workflow_dispatch'
-        run: cd hera-all/hera-log; mvn -U clean package --fail-at-end -Dmaven.test.skip=true -pl 'log-agent'; cd ../..
+        run: cd hera-all/hera-log; mvn -U clean package --fail-at-end -Dmaven.test.skip=true -pl 'log-agent'; cd ../..

.github/workflows/jcommon_package.yml

@@ -15,6 +15,7 @@ jobs:
   check-build-8:
     name: Jcommon test
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/jdk8' || github.ref == 'refs/heads/jdk8' || github.event == 'workflow_dispatch'
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
@@ -27,6 +28,7 @@ jobs:
   check-build-20:
     name: Jcommon test 20
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.event == 'workflow_dispatch'
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
@@ -35,4 +37,17 @@ jobs:
           #settings-properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
 
       - run: echo '<settings>    <interactiveMode>false</interactiveMode>    <profiles>        <profile>            <repositories>                <repository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </repository>            </repositories>            <pluginRepositories>                <pluginRepository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </pluginRepository>            </pluginRepositories>            <id>artifactory</id>        </profile>    </profiles>    <activeProfiles>        <activeProfile>artifactory</activeProfile>    </activeProfiles>    <servers>        <server>            <id>github</id>            <username>${env.GITHUB_ACTOR}</username>            <password>${env.GITHUB_TOKEN}</password>        </server>    </servers>    <mirrors/>    <proxies/></settings>' > ~/.m2/settings.xml
-      - run: cd jcommon; mvn -U clean package --fail-at-end -Dmaven.test.skip=true -pl 'docean'
+      - run: cd jcommon; mvn -U clean package --fail-at-end -Dmaven.test.skip=true -pl 'docean'
+
+  check-build-21:
+    name: Jcommon test 21
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Maven Action
+        uses: s4u/[email protected]
+        with:
+          java-version: 21
+          #settings-properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
+
+      - run: echo '<settings>    <interactiveMode>false</interactiveMode>    <profiles>        <profile>            <repositories>                <repository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </repository>            </repositories>            <pluginRepositories>                <pluginRepository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </pluginRepository>            </pluginRepositories>            <id>artifactory</id>        </profile>    </profiles>    <activeProfiles>        <activeProfile>artifactory</activeProfile>    </activeProfiles>    <servers>        <server>            <id>github</id>            <username>${env.GITHUB_ACTOR}</username>            <password>${env.GITHUB_TOKEN}</password>        </server>    </servers>    <mirrors/>    <proxies/></settings>' > ~/.m2/settings.xml
+      - run: cd jcommon; mvn -U clean package --fail-at-end -Dmaven.test.skip=true

jcommon/file/pom.xml

@@ -41,4 +41,5 @@
         </plugins>
     </build>
 
+
 </project>

ozhera-all/README.md

@@ -10,32 +10,6 @@
 </p>
 
 
-## What is OzHera?
-OzHera is an Application Observable Platform in the Cloud Native Era. open-sourced by the R&D efficiency team of Xiaomi-China region. Centered around applications, it integrates metrics monitoring, link tracing, logging, and alerts. It achieves a seamless connection and interaction from metrics to tracing to logging. Moreover, OzHera offers a comprehensive monitoring dashboard featuring application health status lists, application metric boards, interface overviews, application overviews, gateway overviews, etc., along with clear and concise visual text alerts, enabling users to pinpoint issues accurately and efficiently.
+## ozhera has separated to a new repo
 
----
-
-## Architecture
-![ozhera](./readme/images/architecture.png)
-
----
-
-## Features
-- Accurate: Extract usability metrics based on business error codes.
-- Fast: Integrated metrics-tracing-logging.
-- Economical: <0.1% storage cost, meets 99.9% of tracing demands.
-- Cloud-native Friendly: Adheres to the Opentracing standard, deeply adapts to K8S, and integrates multiple star open-source products like Opentelemetry, Grafana, Prometheus, ES, and more.
-- Enterprise-level observability product.
-
----
-
-## Getting Started
-### Deployment
-[operator-usage-document.md](readme%2Fdeploy%2Fozhera-deploy-document.md)
-
----
-
-### Application Integration
-[application-integration-document.md](readme/application-integeration/application-integration-document.md)
-
----
+ozhera repo： [https://github.com/XiaoMi/ozhera/](https://github.com/XiaoMi/ozhera/)

ozhera-all/README_CN.md

@@ -10,32 +10,6 @@
 </p>
 
 
-## OzHera是什么？
-OzHera是由小米-中国区研发效能团队开源的一款云原生时代的应用观测平台(APM)。以应用为核心，集指标监控、链路追踪、日志、报警于一身，并实现了metrics->tracing->logging的串联和联动，OzHera还提供应用健康状态列表、应用指标看板、接口大盘、应用大盘、网关大盘等内容丰富的监测看板，以及简洁明了的可视化明文报警，让用户准确、高效定位故障。
+## ozhera 以拆成独立仓库
 
----
-
-## Architecture
-![ozhera](readme/images/architecture.png)
-
----
-
-## Features
-- 准：基于业务错误码提取可用性指标
-- 快：metrics-tracing-logging联动
-- 经济：<0.1%存储成本，满足99.9%的tracing诉求
-- 拥抱云原生：遵循Opentracing标准、深度适配K8S、集成集成Opentelemetry、Grafana、Prometheus、ES等多个开源明星产品
-- 企业级可观测产品
-
----
-
-## Getting Started
-### 部署
-[operator使用文档.md](readme%2Fdeploy%2Fozhera-deploy-document_cn.md)
-
----
-
-### 应用接入
-[应用接入文档.md](readme/application-integeration/application-integration-document_cn.md)
-
----
+ozhera repo： [https://github.com/XiaoMi/ozhera/](https://github.com/XiaoMi/ozhera/)，欢迎有兴趣的同学来新仓库讨论、交流。