This is an automated email from the ASF dual-hosted git repository. harshitha pushed a commit to branch harshithasudhakar-eventmesh#4254 in repository https://gitbox.apache.org/repos/asf/eventmesh.git
commit 36ebe5abec246edc55aeae263414aad803c65e45 Merge: 0b2632a1d 13f4d98ff Author: Harshitha Sudhakar <[email protected]> AuthorDate: Wed Nov 15 00:39:26 2023 +0530 Merge branch 'master' into harshithasudhakar-eventmesh#4254 .github/workflows/ci.yml | 8 + .gitmodules | 7 + build.gradle | 1 + .../eventmesh/admin/config/AdminProperties.java | 2 +- .../eventmesh/admin/config/MetaTypeConfig.java | 4 +- .../admin/{common => constant}/ConfigConst.java | 2 +- .../admin/{common => constant}/NacosConst.java | 2 +- .../org/apache/eventmesh/admin/dto/Result.java | 50 +- .../admin/enums/{Errors.java => Status.java} | 30 +- .../eventmesh/admin/exception/BaseException.java | 20 +- .../admin/exception/EventMeshAdminException.java | 6 +- .../admin/exception/GlobalExceptionHandler.java | 9 +- .../eventmesh/admin/exception/MetaException.java | 10 +- .../service/impl/NacosSubscriptionService.java | 16 +- .../ExceptionUtil.java} | 4 +- eventmesh-common/build.gradle | 5 + .../org/apache/eventmesh/common/Constants.java | 7 + .../common/config/CommonConfiguration.java | 4 + .../eventmesh/common/file/WatchFileManager.java | 10 +- .../eventmesh/common/file/WatchFileTask.java | 10 +- .../common/protocol/http/common/ProtocolKey.java | 1 + .../eventmesh/common/protocol/tcp/codec/Codec.java | 13 +- .../eventmesh/common/utils/JsonPathUtils.java | 144 + .../apache/eventmesh/common/utils/NetUtils.java | 3 +- .../connector/jdbc/connection/JdbcConnection.java | 35 +- .../source/dialect/cdc/mysql/MysqlCdcEngine.java | 4 +- .../source/dialect/mysql/MysqlDatabaseDialect.java | 17 +- .../connector/PrometheusSourceConnector.java | 1 + .../eventmesh-connector-redis/build.gradle | 3 + .../connector/redis/AbstractRedisServer.java | 29 +- .../sink/connector/RedisSinkConnectorTest.java | 101 + .../source/connector/RedisSourceConnectorTest.java | 98 + .../src/test/resources/sink-config.yml | 31 + .../src/test/resources/source-config.yml | 30 + .../eventmesh-connector-rocketmq/build.gradle | 3 + .../sink/connector/RocketMQSinkConnectorTest.java | 93 + .../connector/RocketMQSourceConnectorTest.java | 92 + .../src/test/resources/sink-config.yml | 30 + .../src/test/resources/source-config.yml | 40 + .../eventmesh-connector-spring/build.gradle | 5 + .../spring/source/MessageSendingOperations.java | 4 + .../source/connector/SpringSourceConnector.java | 21 + .../sink/connector/SpringSinkConnectorTest.java | 80 + .../connector/SpringSourceConnectorTest.java | 59 + eventmesh-examples/build.gradle | 1 + .../WorkflowAsyncPublishInstance.java | 5 +- .../grpc/sub/CloudEventsAsyncSubscribe.java | 5 +- .../grpc/sub/CloudEventsSubscribeReply.java | 5 +- .../grpc/sub/EventMeshAsyncSubscribe.java | 5 +- .../grpc/sub/EventMeshSubscribeBroadcast.java | 5 +- .../grpc/sub/EventMeshSubscribeReply.java | 5 +- .../grpc/sub/WorkflowExpressAsyncSubscribe.java | 9 +- .../grpc/sub/WorkflowOrderAsyncSubscribe.java | 9 +- .../grpc/sub/WorkflowPaymentAsyncSubscribe.java | 9 +- .../grpc/sub/app/controller/SubController.java | 5 +- .../eventmesh/grpc/sub/app/service/SubService.java | 25 +- .../eventmeshmessage/AsyncSyncRequestInstance.java | 11 +- .../pub/eventmeshmessage/SyncRequestInstance.java | 7 +- .../http/demo/sub/controller/SubController.java | 9 +- .../http/demo/sub/service/SubService.java | 21 +- .../spring/SpringBootDemoApplication.java | 14 +- .../eventmesh/spring/pub/SpringPubController.java | 62 + .../eventmesh/spring/sub/SpringSubHandler.java | 19 +- .../tcp/demo/pub/cloudevents/AsyncPublish.java | 5 +- .../tcp/demo/pub/cloudevents/SyncRequest.java | 9 +- .../demo/pub/eventmeshmessage/AsyncPublish.java | 5 +- .../eventmeshmessage/AsyncPublishBroadcast.java | 5 +- .../tcp/demo/pub/eventmeshmessage/SyncRequest.java | 9 +- .../tcp/demo/sub/cloudevents/AsyncSubscribe.java | 5 +- .../tcp/demo/sub/cloudevents/SyncResponse.java | 5 +- .../demo/sub/eventmeshmessage/AsyncSubscribe.java | 5 +- .../eventmeshmessage/AsyncSubscribeBroadcast.java | 5 +- .../demo/sub/eventmeshmessage/SyncResponse.java | 5 +- .../src/main/resources/server-config.yml | 19 + .../src/main/resources/sink-config.yml | 28 + .../src/main/resources/source-config.yml | 28 + .../build.gradle | 6 +- .../org/apache/eventmesh/filter/PatternEntry.java | 68 + .../filter/condition/AnythingButCondition.java | 71 + .../eventmesh/filter/condition/Condition.java | 11 +- .../filter/condition/ConditionsBuilder.java | 65 + .../filter/condition/ExistsCondition.java | 20 +- .../filter/condition/NumericCondition.java | 80 + .../filter/condition/PrefixCondition.java | 25 +- .../filter/condition/SpecifiedCondition.java | 25 +- .../filter/condition/SuffixCondition.java | 25 +- .../apache/eventmesh/filter/pattern/Pattern.java | 87 + .../filter/patternbuild/PatternBuilder.java | 189 + .../org/apache/eventmesh/filter/PatternTest.java | 147 + .../metrics/api/model/HttpSummaryMetrics.java | 11 +- .../metrics/api/model/RetrySummaryMetrics.java | 13 +- .../metrics/api/model/TcpSummaryMetrics.java | 6 +- .../apache/eventmesh/openconnect/SourceWorker.java | 29 +- .../api/callback/SendExcepionContext.java | 40 +- .../api/callback/SendMessageCallback.java | 9 +- .../openconnect/api/callback/SendResult.java | 35 +- .../offsetmgmt/api/data/ConnectRecord.java | 9 +- .../offsetmgmt/api/data/DefaultKeyValue.java | 25 +- .../openconnect/offsetmgmt/api/data/KeyValue.java | 4 +- .../protocol/api/MockProtocolAdaptorImpl.java | 37 +- .../protocol/api/ProtocolPluginFactoryTest.java | 69 + ...g.apache.eventmesh.protocol.api.ProtocolAdaptor | 17 + .../protocol/http/HttpProtocolAdaptor.java | 5 +- .../eventmesh-retry-api}/build.gradle | 11 +- .../eventmesh/retry/api/AbstractRetryer.java | 87 + .../org/apache/eventmesh/retry/api/Retryer.java | 20 +- .../retry/api/conf/RetryConfiguration.java | 26 +- .../retry/api/strategy/RetryStrategy.java | 14 +- .../retry/api/timer/HashedWheelTimer.java | 802 +++ .../apache/eventmesh/retry/api/timer/Timeout.java | 56 + .../apache/eventmesh/retry/api/timer/Timer.java | 62 + .../eventmesh/retry/api/timer/TimerTask.java | 27 +- .../eventmesh-retry-rocketmq}/build.gradle | 12 +- .../eventmesh-retry-rocketmq/gradle.properties | 19 + .../retry/rocketmq/RocketMQRetryStrategyImpl.java | 75 + ...ache.eventmesh.retry.api.strategy.RetryStrategy | 16 + eventmesh-runtime/build.gradle | 2 + eventmesh-runtime/conf/eventmesh.properties | 2 + .../handler/RedirectClientByIpPortHandler.java | 2 +- .../admin/handler/RedirectClientByPathHandler.java | 2 +- .../handler/RedirectClientBySubSystemHandler.java | 22 +- .../admin/handler/RejectAllClientHandler.java | 5 +- .../admin/handler/RejectClientByIpPortHandler.java | 2 +- .../handler/RejectClientBySubSystemHandler.java | 2 +- .../admin/handler/ShowClientBySystemHandler.java | 5 +- .../runtime/admin/response/GetMetricsResponse.java | 8 +- .../eventmesh/runtime/boot/AbstractHTTPServer.java | 41 +- .../runtime/boot/AbstractRemotingServer.java | 57 +- .../eventmesh/runtime/boot/AbstractTCPServer.java | 17 +- .../runtime/boot/EventMeshGrpcServer.java | 20 +- .../runtime/boot/EventMeshHTTPServer.java | 21 +- .../eventmesh/runtime/boot/EventMeshServer.java | 21 +- .../eventmesh/runtime/boot/EventMeshStartup.java | 10 +- .../eventmesh/runtime/boot/EventMeshTCPServer.java | 27 +- .../eventmesh/runtime/boot/RemotingServer.java | 11 +- .../configuration/EventMeshHTTPConfiguration.java | 1 + .../runtime/core/protocol/AbstractRetryer.java | 87 - .../runtime/core/protocol/RetryContext.java | 87 +- .../protocol/consumer/HandleMessageContext.java | 11 +- .../protocol/grpc/consumer/ConsumerManager.java | 31 +- .../protocol/grpc/consumer/EventMeshConsumer.java | 33 +- .../consumer/consumergroup/StreamTopicConfig.java | 7 +- .../processor/BatchPublishCloudEventProcessor.java | 6 +- .../processor/PublishCloudEventsProcessor.java | 6 +- .../grpc/processor/ReplyMessageProcessor.java | 6 +- .../grpc/processor/RequestCloudEventProcessor.java | 6 +- .../grpc/processor/SubscribeProcessor.java | 17 +- .../protocol/grpc/producer/ProducerManager.java | 90 - .../protocol/grpc/push/AbstractPushRequest.java | 14 +- .../core/protocol/grpc/retry/GrpcRetryer.java | 29 +- .../protocol/http/consumer/EventMeshConsumer.java | 13 +- .../protocol/http/consumer/HandleMsgContext.java | 3 +- .../http/consumer/HttpClientGroupMapping.java | 82 +- .../http/processor/BatchSendMessageProcessor.java | 21 +- .../processor/BatchSendMessageV2Processor.java | 13 +- .../http/processor/CreateTopicProcessor.java | 5 +- .../http/processor/DeleteTopicProcessor.java | 5 +- .../protocol/http/processor/HandlerService.java | 9 +- .../http/processor/HeartBeatProcessor.java | 23 +- .../processor/LocalSubscribeEventProcessor.java | 33 +- .../processor/LocalUnSubscribeEventProcessor.java | 32 +- .../http/processor/QuerySubscriptionProcessor.java | 5 +- .../http/processor/ReplyMessageProcessor.java | 13 +- .../http/processor/SendAsyncEventProcessor.java | 51 +- .../http/processor/SendAsyncMessageProcessor.java | 19 +- .../processor/SendAsyncRemoteEventProcessor.java | 47 +- .../http/processor/SendSyncMessageProcessor.java | 67 +- .../http/processor/SubscribeProcessor.java | 32 +- .../http/processor/UnSubscribeProcessor.java | 32 +- .../protocol/http/producer/EventMeshProducer.java | 130 - .../protocol/http/producer/SendMessageContext.java | 151 - .../http/push/AbstractHTTPPushRequest.java | 17 +- .../protocol/http/push/AsyncHTTPPushRequest.java | 42 +- .../protocol/http/push/HTTPMessageHandler.java | 4 +- .../core/protocol/http/retry/HttpRetryer.java | 36 +- .../{grpc => }/producer/EventMeshProducer.java | 25 +- .../{http => }/producer/ProducerManager.java | 20 +- .../{grpc => }/producer/SendMessageContext.java | 16 +- .../tcp/client/group/ClientGroupWrapper.java | 50 +- .../client/group/ClientSessionGroupMapping.java | 5 +- .../dispatch/FreePriorityDispatchStrategy.java | 15 +- .../tcp/client/processor/HelloProcessor.java | 2 +- .../client/processor/MessageTransferProcessor.java | 5 +- .../tcp/client/processor/SubscribeProcessor.java | 7 +- .../client/recommend/EventMeshRecommendImpl.java | 85 +- .../client/session/push/DownStreamMsgContext.java | 5 +- .../tcp/client/session/push/SessionPusher.java | 5 +- .../{EventMeshTcpRetryer.java => TcpRetryer.java} | 40 +- .../client/session/send/UpStreamMsgContext.java | 12 +- .../runtime/metrics/grpc/EventMeshGrpcMonitor.java | 2 +- .../runtime/metrics/http/HTTPMetricsServer.java | 116 +- .../runtime/metrics/tcp/EventMeshTcpMonitor.java | 4 +- .../eventmesh/runtime/util/EventMeshUtil.java | 14 +- .../apache/eventmesh/runtime/util/WebhookUtil.java | 11 +- .../runtime/client/common/RequestContext.java | 5 +- .../runtime/client/impl/PubClientImpl.java | 27 +- .../runtime/client/impl/SubClientImpl.java | 19 +- .../eventmesh/runtime/demo/AsyncPubClient.java | 5 +- .../eventmesh/runtime/demo/AsyncSubClient.java | 5 +- .../eventmesh/runtime/demo/BroadCastSubClient.java | 5 +- .../apache/eventmesh/runtime/demo/CCSubClient.java | 5 +- .../apache/eventmesh/runtime/demo/CClientDemo.java | 5 +- .../eventmesh/runtime/demo/SyncPubClient.java | 7 +- .../eventmesh/runtime/demo/SyncSubClient.java | 5 +- eventmesh-sdks/eventmesh-sdk-c/README.md | 20 + eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf | 61 + eventmesh-sdks/eventmesh-sdk-c/examples/demo.c | 1715 ++++++ .../eventmesh-sdk-c/include/message_log_api.h | 55 + .../eventmesh-sdk-c/include/rmb_access_config.h | 45 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_cfg.h | 60 + .../eventmesh-sdk-c/include/rmb_common.h | 269 + .../eventmesh-sdk-c/include/rmb_context.h | 66 + .../eventmesh-sdk-c/include/rmb_define.h | 1264 +++++ eventmesh-sdks/eventmesh-sdk-c/include/rmb_errno.h | 137 + .../eventmesh-sdk-c/include/rmb_http_client.h | 38 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_list.h | 564 ++ eventmesh-sdks/eventmesh-sdk-c/include/rmb_log.h | 121 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_mq.h | 282 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_msg.h | 163 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_pub.h | 157 + eventmesh-sdks/eventmesh-sdk-c/include/rmb_sub.h | 335 ++ eventmesh-sdks/eventmesh-sdk-c/include/rmb_udp.h | 78 + .../eventmesh-sdk-c/include/rmb_vector.h | 43 + eventmesh-sdks/eventmesh-sdk-c/include/wemq_fifo.h | 639 +++ .../eventmesh-sdk-c/include/wemq_proto.h | 562 ++ eventmesh-sdks/eventmesh-sdk-c/include/wemq_tcp.h | 39 + .../eventmesh-sdk-c/include/wemq_thread.h | 113 + .../eventmesh-sdk-c/include/wemq_topic_list.h | 53 + eventmesh-sdks/eventmesh-sdk-c/makefile | 99 + eventmesh-sdks/eventmesh-sdk-c/src/common.h | 39 + .../eventmesh-sdk-c/src/message_log_api.c | 397 ++ .../eventmesh-sdk-c/src/rmb_access_config.c | 827 +++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_cfg.c | 594 +++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_context.c | 907 ++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_errno.c | 155 + .../eventmesh-sdk-c/src/rmb_http_client.c | 211 + eventmesh-sdks/eventmesh-sdk-c/src/rmb_log.c | 1273 +++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_mq.c | 1357 +++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_msg.c | 1686 ++++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_pub.c | 2453 +++++++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_sub.c | 1379 +++++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_udp.c | 383 ++ eventmesh-sdks/eventmesh-sdk-c/src/rmb_vector.c | 84 + eventmesh-sdks/eventmesh-sdk-c/src/wemq_fifo.c | 350 ++ eventmesh-sdks/eventmesh-sdk-c/src/wemq_proto.c | 748 +++ eventmesh-sdks/eventmesh-sdk-c/src/wemq_tcp.c | 773 +++ eventmesh-sdks/eventmesh-sdk-c/src/wemq_thread.c | 5467 ++++++++++++++++++++ .../eventmesh-sdk-c/src/wemq_topic_list.c | 237 + eventmesh-sdks/eventmesh-sdk-c/third_party/curl | 1 + eventmesh-sdks/eventmesh-sdk-c/third_party/json-c | 1 + .../client/catalog/EventMeshCatalogClient.java | 5 +- .../grpc/consumer/EventMeshGrpcConsumer.java | 37 +- .../client/grpc/consumer/SubStreamHandler.java | 39 +- .../client/grpc/producer/CloudEventProducer.java | 38 +- .../grpc/producer/EventMeshGrpcProducer.java | 9 +- .../grpc/producer/EventMeshMessageProducer.java | 25 +- .../http/consumer/EventMeshHttpConsumer.java | 12 +- .../eventmesh/client/http/util/HttpUtils.java | 9 +- .../client/tcp/common/RequestContext.java | 5 +- .../eventmesh/client/tcp/common/TcpClient.java | 29 +- .../EventMeshMessageTCPPubClient.java | 5 +- .../client/workflow/EventMeshWorkflowClient.java | 5 +- .../client/http/demo/SyncRequestInstance.java | 7 +- eventmesh-sdks/eventmesh-sdk-rust/Cargo.toml | 24 +- .../examples/grpc/producer_example.rs | 101 +- .../eventmesh-sdk-rust/rust-toolchain.toml | 21 + eventmesh-sdks/eventmesh-sdk-rust/src/common.rs | 2 +- ...ge_utils.rs => grpc_eventmesh_message_utils.rs} | 222 +- .../eventmesh-sdk-rust/src/common/protocol_key.rs | 4 + eventmesh-sdks/eventmesh-sdk-rust/src/grpc.rs | 6 +- .../eventmesh-sdk-rust/src/grpc/grpc_consumer.rs | 6 +- .../eventmesh-sdk-rust/src/grpc/grpc_producer.rs | 15 +- .../src/grpc/{eventmesh_message.rs => impl.rs} | 4 +- .../grpc_producer_impl.rs} | 67 +- eventmesh-sdks/eventmesh-sdk-rust/src/lib.rs | 18 +- eventmesh-sdks/eventmesh-sdk-rust/src/model.rs | 1 + .../eventmesh-sdk-rust/src/model/event_clouds.rs | 21 +- .../eventmesh-sdk-rust/src/model/message.rs | 16 +- .../tests/eventmesh_message_utils_test.rs | 2 +- .../eventmesh/spi/EventMeshExtensionType.java | 1 + .../org/apache/eventmesh/api/TopicNameHelper.java | 18 +- .../rocketmq/common/TopicNameHelperImpl.java | 25 +- .../org.apache.eventmesh.api.TopicNameHelper | 16 + .../standalone/broker/model/TopicMetadata.java | 4 +- .../build.gradle | 6 +- .../eventmesh/transformer/ConstantTransformer.java | 17 +- .../eventmesh/transformer/JsonPathParser.java | 86 + .../eventmesh/transformer/OriginalTransformer.java | 13 +- .../org/apache/eventmesh/transformer/Template.java | 52 + .../eventmesh/transformer/TemplateTransformer.java | 34 +- .../eventmesh/transformer/TransformException.java | 19 +- .../apache/eventmesh/transformer/Transformer.java | 13 +- .../eventmesh/transformer/TransformerBuilder.java | 71 + .../eventmesh/transformer/TransformerType.java | 9 +- .../org/apache/eventmesh/transformer/Variable.java | 41 +- .../eventmesh/transformer/TransformTest.java | 139 + .../admin/AdminWebHookConfigOperationManager.java | 6 +- .../webhook/admin/FileWebHookConfigOperation.java | 35 +- .../webhook/admin/NacosWebHookConfigOperation.java | 35 +- .../webhook/receive/WebHookController.java | 9 +- settings.gradle | 6 + tools/dependency-check/known-dependencies.txt | 4 + 302 files changed, 31387 insertions(+), 2310 deletions(-) diff --cc eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java index bf3d4c77d,2c788d29b..2fe7bdd44 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java @@@ -73,7 -71,7 +73,8 @@@ public class NetUtils return result; } - public static String addressToString(Collection<InetSocketAddress> clients) { + public String addressToString(List<InetSocketAddress> clients) { ++ if (clients.isEmpty()) { return "no session had been closed"; } diff --cc eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java index 12a61950b,1985e4c51..cd32bfbf3 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java @@@ -169,12 -169,10 +171,10 @@@ public class EventMeshUtil return propMap; } - public static String getLocalAddr() { - // priority of networkInterface when generating client ip + public String getLocalAddr() { + //priority of networkInterface when generating client ip final String priority = System.getProperty("networkInterface.priority", "bond1<eth1<eth0"); - if (log.isDebugEnabled()) { - log.debug("networkInterface.priority: {}", priority); - } + LogUtils.debug(log, "networkInterface.priority: {}", priority); final List<String> preferList = new ArrayList<>(); preferList.addAll(Arrays.asList(priority.split("<"))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
