Merge branch 'master' into fix-gotify-default-url

.github/workflows/collector-native-build.yml

@@ -39,12 +39,6 @@ jobs:
           - platform: linux-arm64
             runner: ubuntu-24.04-arm
             archive_ext: tar.gz
-          - platform: macos-amd64
-            runner: macos-13
-            archive_ext: tar.gz
-          - platform: macos-arm64
-            runner: macos-14
-            archive_ext: tar.gz
           - platform: windows-amd64
             runner: windows-latest
             archive_ext: zip

CONTRIBUTING.md

@@ -131,7 +131,7 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 ## 🥐 Architecture
 
-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![hertzBeat](home/static/img/docs/hertzbeat-architecture.png)
 
 <br>
 
@@ -271,4 +271,4 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 ### 模块
 
-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![hertzBeat](home/static/img/docs/hertzbeat-architecture.png)

README.md

@@ -47,7 +47,7 @@
 
 ## 🥐 Architecture
 
-![HertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![HertzBeat](home/static/img/docs/hertzbeat-architecture.png)
 
 ## 🐕 Quick Start
 

README_CN.md

@@ -47,7 +47,7 @@
 
 ## 🥐 模块
 
-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![hertzBeat](home/static/img/docs/hertzbeat-architecture.png)
 
 ## 🐕 快速开始
 

README_JP.md

@@ -46,7 +46,7 @@
 
 ## 🥐 モジュール
 
-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![hertzBeat](home/static/img/docs/hertzbeat-architecture.png)
 
 ## 🐕 クイックスタート
 

hertzbeat-collector/hertzbeat-collector-collector/src/main/resources/META-INF/native-image/org.apache.hertzbeat/hertzbeat-collector-native/reachability-metadata.json

@@ -0,0 +1,25 @@
+{
+  "comment": "Hand-written native hints for the native collector. NOTE: must NOT live under org.apache.hertzbeat/hertzbeat-collector-collector/ - Spring AOT generates reachability-metadata.json at that exact path and silently overwrites it.",
+  "reflection": [
+    {"type": "org.apache.coyote.AbstractProtocol", "allPublicMethods": true},
+    {"type": "org.apache.coyote.http11.AbstractHttp11Protocol", "allPublicMethods": true},
+    {"type": "org.apache.coyote.http11.Http11NioProtocol", "allPublicMethods": true},
+
+    {"type": "io.netty.channel.kqueue.KQueueDatagramChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.kqueue.KQueueSocketChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.kqueue.KQueueEventLoopGroup", "allPublicConstructors": true},
+    {"type": "io.netty.channel.epoll.EpollDatagramChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.epoll.EpollSocketChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.epoll.EpollEventLoopGroup", "allPublicConstructors": true},
+    {"type": "io.netty.channel.socket.nio.NioDatagramChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.socket.nio.NioSocketChannel", "allPublicConstructors": true},
+    {"type": "io.netty.channel.nio.NioEventLoopGroup", "allPublicConstructors": true},
+
+    {"type": "java.lang.management.ThreadInfo", "allPublicMethods": true},
+    {"type": "java.lang.management.LockInfo", "allPublicMethods": true},
+    {"type": "java.lang.management.MonitorInfo", "allPublicMethods": true},
+    {"type": "java.lang.StackTraceElement", "allPublicMethods": true},
+    {"type": "java.lang.management.MemoryUsage", "allPublicMethods": true},
+    {"type": "com.sun.management.GcInfo", "allPublicMethods": true}
+  ]
+}

hertzbeat-collector/hertzbeat-collector-collector/src/native/resources/META-INF/native-image/org.apache.hertzbeat/hertzbeat-collector-collector/reflect-config.json

@@ -1,54 +0,0 @@
-[
-  {
-    "name": "org.apache.hertzbeat.collector.Collector__ApplicationContextInitializer",
-    "allDeclaredConstructors": true,
-    "allDeclaredMethods": true
-  },
-  {
-    "name": "org.apache.hertzbeat.collector.Collector__BeanFactoryRegistrations",
-    "allDeclaredConstructors": true,
-    "allDeclaredMethods": true
-  },
-  {
-    "name": "org.apache.hertzbeat.common.entity.dto.ServerInfo",
-    "allDeclaredConstructors": true,
-    "allDeclaredFields": true,
-    "allDeclaredMethods": true
-  },
-  {
-    "name": "io.netty.channel.kqueue.KQueueDatagramChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.kqueue.KQueueSocketChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.kqueue.KQueueEventLoopGroup",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.epoll.EpollDatagramChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.epoll.EpollSocketChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.epoll.EpollEventLoopGroup",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.socket.nio.NioDatagramChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.socket.nio.NioSocketChannel",
-    "allPublicConstructors": true
-  },
-  {
-    "name": "io.netty.channel.nio.NioEventLoopGroup",
-    "allPublicConstructors": true
-  }
-]

hertzbeat-collector/hertzbeat-collector-collector/src/native/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect

@@ -1,37 +0,0 @@
-org.apache.hertzbeat.collector.collect.http.HttpCollectImpl
-org.apache.hertzbeat.collector.collect.http.SslCertificateCollectImpl
-org.apache.hertzbeat.collector.collect.database.JdbcCommonCollect
-org.apache.hertzbeat.collector.collect.icmp.IcmpCollectImpl
-org.apache.hertzbeat.collector.collect.jmx.JmxCollectImpl
-org.apache.hertzbeat.collector.collect.redis.RedisCommonCollectImpl
-org.apache.hertzbeat.collector.collect.mongodb.MongodbSingleCollectImpl
-org.apache.hertzbeat.collector.collect.rocketmq.RocketmqSingleCollectImpl
-org.apache.hertzbeat.collector.collect.snmp.SnmpCollectImpl
-org.apache.hertzbeat.collector.collect.ssh.SshCollectImpl
-org.apache.hertzbeat.collector.collect.telnet.TelnetCollectImpl
-org.apache.hertzbeat.collector.collect.smtp.SmtpCollectImpl
-org.apache.hertzbeat.collector.collect.ntp.NtpCollectImpl
-org.apache.hertzbeat.collector.collect.websocket.WebsocketCollectImpl
-org.apache.hertzbeat.collector.collect.ftp.FtpCollectImpl
-org.apache.hertzbeat.collector.collect.udp.UdpCollectImpl
-org.apache.hertzbeat.collector.collect.dns.DnsCollectImpl
-org.apache.hertzbeat.collector.collect.nginx.NginxCollectImpl
-org.apache.hertzbeat.collector.collect.memcached.MemcachedCollectImpl
-org.apache.hertzbeat.collector.collect.nebulagraph.NebulaGraphCollectImpl
-org.apache.hertzbeat.collector.collect.pop3.Pop3CollectImpl
-org.apache.hertzbeat.collector.collect.registry.RegistryImpl
-org.apache.hertzbeat.collector.collect.redfish.RedfishCollectImpl
-org.apache.hertzbeat.collector.collect.nebulagraph.NgqlCollectImpl
-org.apache.hertzbeat.collector.collect.imap.ImapCollectImpl
-org.apache.hertzbeat.collector.collect.script.ScriptCollectImpl
-org.apache.hertzbeat.collector.collect.mqtt.MqttCollectImpl
-org.apache.hertzbeat.collector.collect.ipmi2.IpmiCollectImpl
-org.apache.hertzbeat.collector.collect.kafka.KafkaCollectImpl
-org.apache.hertzbeat.collector.collect.sd.HttpSdCollectImpl
-org.apache.hertzbeat.collector.collect.sd.NacosSdCollectImpl
-org.apache.hertzbeat.collector.collect.sd.DnsSdCollectImpl
-org.apache.hertzbeat.collector.collect.sd.EurekaSdCollectImpl
-org.apache.hertzbeat.collector.collect.sd.ConsulSdCollectImpl
-org.apache.hertzbeat.collector.collect.modbus.ModbusCollectImpl
-org.apache.hertzbeat.collector.collect.s7.S7CollectImpl
-org.apache.hertzbeat.collector.collect.sd.ZookeeperSdCollectImpl

hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/EntityFreeObservabilityTransitionContractTest.java

@@ -233,7 +233,7 @@ class EntityFreeObservabilityTransitionContractTest {
             String content = Files.readString(REPOSITORY_ROOT.resolve(relativePath));
             assertTrue(content.contains("`POST /api/logs/otlp/v1/logs` | `POST /api/otlp/v1/logs`"), relativePath);
             assertTrue(content.contains("`GET /api/logs/list` | `GET /api/observability/logs`"), relativePath);
-            assertTrue(content.contains("`GET /api/traces/**` | `GET /api/observability/traces/**`"), relativePath);
+            assertFalse(content.contains("`GET /api/traces/**`"), relativePath);
         }
 
         String logService = Files.readString(REPOSITORY_ROOT.resolve("web-app/src/app/service/log.service.ts"));