简柏林 / thingskit · Commits

Commit 4de258f2aed48e4e6df6191a0b2bfa6c71810d2a

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent 674512dd

removed ServiceId from kafka consumer groupId

Inline Side-by-side
Showing 4 changed files with 15 additions and 15 deletions
... ... @@ -153,7 +153,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
153 153 consumerBuilder.settings(kafkaSettings);
154 154 consumerBuilder.topic(ruleEngineSettings.getTopic());
155 155 consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
156   - consumerBuilder.groupId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
  156 + consumerBuilder.groupId("re-" + queueName + "-consumer");
157 157 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
158 158 consumerBuilder.admin(ruleEngineAdmin);
159 159 return consumerBuilder.build();
... ... @@ -165,7 +165,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
165 165 consumerBuilder.settings(kafkaSettings);
166 166 consumerBuilder.topic(partitionService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName());
167 167 consumerBuilder.clientId("monolith-rule-engine-notifications-consumer-" + serviceInfoProvider.getServiceId());
168   - consumerBuilder.groupId("monolith-rule-engine-notifications-consumer-" + serviceInfoProvider.getServiceId());
  168 + consumerBuilder.groupId("monolith-rule-engine-notifications-consumer");
169 169 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
170 170 consumerBuilder.admin(notificationAdmin);
171 171 return consumerBuilder.build();
... ... @@ -177,7 +177,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
177 177 consumerBuilder.settings(kafkaSettings);
178 178 consumerBuilder.topic(coreSettings.getTopic());
179 179 consumerBuilder.clientId("monolith-core-consumer-" + serviceInfoProvider.getServiceId());
180   - consumerBuilder.groupId("monolith-core-consumer-" + serviceInfoProvider.getServiceId());
  180 + consumerBuilder.groupId("monolith-core-consumer");
181 181 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
182 182 consumerBuilder.admin(coreAdmin);
183 183 return consumerBuilder.build();
... ... @@ -189,7 +189,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
189 189 consumerBuilder.settings(kafkaSettings);
190 190 consumerBuilder.topic(partitionService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
191 191 consumerBuilder.clientId("monolith-core-notifications-consumer-" + serviceInfoProvider.getServiceId());
192   - consumerBuilder.groupId("monolith-core-notifications-consumer-" + serviceInfoProvider.getServiceId());
  192 + consumerBuilder.groupId("monolith-core-notifications-consumer");
193 193 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
194 194 consumerBuilder.admin(notificationAdmin);
195 195 return consumerBuilder.build();
... ... @@ -230,7 +230,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
230 230 responseBuilder.settings(kafkaSettings);
231 231 responseBuilder.topic(jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId());
232 232 responseBuilder.clientId("js-" + serviceInfoProvider.getServiceId());
233   - responseBuilder.groupId("rule-engine-node-" + serviceInfoProvider.getServiceId());
  233 + responseBuilder.groupId("rule-engine-node");
234 234 responseBuilder.decoder(msg -> {
235 235 JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
236 236 JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
... ... @@ -256,7 +256,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
256 256 consumerBuilder.settings(kafkaSettings);
257 257 consumerBuilder.topic(coreSettings.getUsageStatsTopic());
258 258 consumerBuilder.clientId("monolith-us-consumer-" + serviceInfoProvider.getServiceId());
259   - consumerBuilder.groupId("monolith-us-consumer-" + serviceInfoProvider.getServiceId());
  259 + consumerBuilder.groupId("monolith-us-consumer");
260 260 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
261 261 consumerBuilder.admin(coreAdmin);
262 262 return consumerBuilder.build();
... ...
... ... @@ -147,7 +147,7 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
147 147 consumerBuilder.settings(kafkaSettings);
148 148 consumerBuilder.topic(coreSettings.getTopic());
149 149 consumerBuilder.clientId("tb-core-consumer-" + serviceInfoProvider.getServiceId());
150   - consumerBuilder.groupId("tb-core-node-" + serviceInfoProvider.getServiceId());
  150 + consumerBuilder.groupId("tb-core-node");
151 151 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
152 152 consumerBuilder.admin(coreAdmin);
153 153 return consumerBuilder.build();
... ... @@ -159,7 +159,7 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
159 159 consumerBuilder.settings(kafkaSettings);
160 160 consumerBuilder.topic(partitionService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
161 161 consumerBuilder.clientId("tb-core-notifications-consumer-" + serviceInfoProvider.getServiceId());
162   - consumerBuilder.groupId("tb-core-notifications-node-" + serviceInfoProvider.getServiceId());
  162 + consumerBuilder.groupId("tb-core-notifications-node");
163 163 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
164 164 consumerBuilder.admin(notificationAdmin);
165 165 return consumerBuilder.build();
... ... @@ -200,7 +200,7 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
200 200 responseBuilder.settings(kafkaSettings);
201 201 responseBuilder.topic(jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId());
202 202 responseBuilder.clientId("js-" + serviceInfoProvider.getServiceId());
203   - responseBuilder.groupId("rule-engine-node-" + serviceInfoProvider.getServiceId());
  203 + responseBuilder.groupId("rule-engine-node");
204 204 responseBuilder.decoder(msg -> {
205 205 JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
206 206 JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
... ... @@ -226,7 +226,7 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
226 226 consumerBuilder.settings(kafkaSettings);
227 227 consumerBuilder.topic(coreSettings.getUsageStatsTopic());
228 228 consumerBuilder.clientId("tb-core-us-consumer-" + serviceInfoProvider.getServiceId());
229   - consumerBuilder.groupId("tb-core-us-consumer-" + serviceInfoProvider.getServiceId());
  229 + consumerBuilder.groupId("tb-core-us-consumer");
230 230 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
231 231 consumerBuilder.admin(coreAdmin);
232 232 return consumerBuilder.build();
... ...
... ... @@ -142,7 +142,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
142 142 consumerBuilder.settings(kafkaSettings);
143 143 consumerBuilder.topic(ruleEngineSettings.getTopic());
144 144 consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
145   - consumerBuilder.groupId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
  145 + consumerBuilder.groupId("re-" + queueName + "-consumer");
146 146 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
147 147 consumerBuilder.admin(ruleEngineAdmin);
148 148 return consumerBuilder.build();
... ... @@ -154,7 +154,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
154 154 consumerBuilder.settings(kafkaSettings);
155 155 consumerBuilder.topic(partitionService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName());
156 156 consumerBuilder.clientId("tb-rule-engine-notifications-consumer-" + serviceInfoProvider.getServiceId());
157   - consumerBuilder.groupId("tb-rule-engine-notifications-node-" + serviceInfoProvider.getServiceId());
  157 + consumerBuilder.groupId("tb-rule-engine-notifications-node");
158 158 consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
159 159 consumerBuilder.admin(notificationAdmin);
160 160 return consumerBuilder.build();
... ... @@ -173,7 +173,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
173 173 responseBuilder.settings(kafkaSettings);
174 174 responseBuilder.topic(jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId());
175 175 responseBuilder.clientId("js-" + serviceInfoProvider.getServiceId());
176   - responseBuilder.groupId("rule-engine-node-" + serviceInfoProvider.getServiceId());
  176 + responseBuilder.groupId("rule-engine-node");
177 177 responseBuilder.decoder(msg -> {
178 178 JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
179 179 JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
... ...
... ... @@ -92,7 +92,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
92 92 responseBuilder.settings(kafkaSettings);
93 93 responseBuilder.topic(transportApiSettings.getResponsesTopic() + "." + serviceInfoProvider.getServiceId());
94 94 responseBuilder.clientId("transport-api-response-" + serviceInfoProvider.getServiceId());
95   - responseBuilder.groupId("transport-node-" + serviceInfoProvider.getServiceId());
  95 + responseBuilder.groupId("transport-node");
96 96 responseBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiResponseMsg.parseFrom(msg.getData()), msg.getHeaders()));
97 97 responseBuilder.admin(transportApiAdmin);
98 98
... ... @@ -133,7 +133,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
133 133 responseBuilder.settings(kafkaSettings);
134 134 responseBuilder.topic(transportNotificationSettings.getNotificationsTopic() + "." + serviceInfoProvider.getServiceId());
135 135 responseBuilder.clientId("transport-api-notifications-" + serviceInfoProvider.getServiceId());
136   - responseBuilder.groupId("transport-node-" + serviceInfoProvider.getServiceId());
  136 + responseBuilder.groupId("transport-node");
137 137 responseBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToTransportMsg.parseFrom(msg.getData()), msg.getHeaders()));
138 138 responseBuilder.admin(notificationAdmin);
139 139 return responseBuilder.build();
... ...