Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add subaccount id as kafka key for subaccount messages #2149

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Add subaccount id as kafka key for subaccount messages #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions indexer/services/ender/__tests__/lib/kafka-publisher.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { AnnotatedSubaccountMessage, ConsolidatedKafkaEvent, SingleTradeMessage
import { KafkaPublisher } from '../../src/lib/kafka-publisher';
import {
defaultDateTime,
defaultSubaccountId,
defaultSubaccountMessage,
defaultTradeContent,
defaultTradeKafkaEvent,
Expand Down Expand Up @@ -69,6 +70,9 @@ describe('kafka-publisher', () => {
expect(producerSendMock).toHaveBeenCalledWith({
topic: subaccountKafkaEvent.topic,
messages: [{
key: Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(defaultSubaccountId).finish(),
)),
value: Buffer.from(SubaccountMessage.encode(subaccountKafkaEvent.message).finish()),
}],
});
Expand Down Expand Up @@ -420,6 +424,10 @@ describe('kafka-publisher', () => {
topic: KafkaTopics.TO_WEBSOCKETS_SUBACCOUNTS,
messages: _.map(expectedMsgs, (message: SubaccountMessage) => {
return {
key: message.subaccountId !== undefined
? Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(message.subaccountId).finish(),
)) : undefined,
value: Buffer.from(Uint8Array.from(SubaccountMessage.encode(message).finish())),
};
}),
Expand Down
6 changes: 6 additions & 0 deletions indexer/services/ender/src/lib/kafka-publisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { FillSubaccountMessageContents, TradeMessageContents } from '@dydxprotoc
import {
BlockHeightMessage,
CandleMessage,
IndexerSubaccountId,
MarketMessage,
OffChainUpdateV1,
SubaccountMessage,
Expand Down Expand Up @@ -220,10 +221,15 @@ export class KafkaPublisher {

if (this.subaccountMessages.length > 0) {
this.aggregateFillEventsForSubaccountMessages();

allTopicKafkaMessages.push({
topic: KafkaTopics.TO_WEBSOCKETS_SUBACCOUNTS,
messages: _.map(this.subaccountMessages, (message: SubaccountMessage) => {
return {
key: message.subaccountId !== undefined
? Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(message.subaccountId).finish(),
)) : undefined,
value: Buffer.from(Uint8Array.from(SubaccountMessage.encode(message).finish())),
};
}),
Expand Down
4 changes: 4 additions & 0 deletions indexer/services/vulcan/src/handlers/order-place-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
import { getOrderIdHash, isStatefulOrder, ORDER_FLAG_SHORT_TERM } from '@dydxprotocol-indexer/v4-proto-parser';
import {
IndexerOrder,
IndexerSubaccountId,
OffChainUpdateV1,
OrderPlaceV1,
OrderPlaceV1_OrderPlacementStatus,
Expand Down Expand Up @@ -116,6 +117,9 @@ export class OrderPlaceHandler extends Handler {
await this.sendCachedOrderUpdate(orderUuid, headers);
}
const subaccountMessage: Message = {
key: Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(redisOrder.order!.orderId!.subaccountId!).finish(),
)),
value: createSubaccountWebsocketMessage(
redisOrder,
dbOrder,
Expand Down
10 changes: 10 additions & 0 deletions indexer/services/vulcan/src/handlers/order-remove-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
import {
OffChainUpdateV1,
IndexerOrder,
IndexerSubaccountId,
OrderRemoveV1,
OrderRemovalReason,
OrderRemoveV1_OrderRemovalStatus,
Expand Down Expand Up @@ -220,6 +221,9 @@ export class OrderRemoveHandler extends Handler {
}

const subaccountMessage: Message = {
key: Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(orderRemove.removedOrderId!.subaccountId!).finish(),
)),
value: this.createSubaccountWebsocketMessageFromPostgresOrder(
order,
orderRemove,
Expand Down Expand Up @@ -282,6 +286,9 @@ export class OrderRemoveHandler extends Handler {
this.generateTimingStatsOptions('find_order'),
);
const subaccountMessage: Message = {
key: Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(orderRemove.removedOrderId!.subaccountId!).finish(),
)),
value: this.createSubaccountWebsocketMessageFromOrderRemoveMessage(
canceledOrder,
orderRemove,
Expand Down Expand Up @@ -321,6 +328,9 @@ export class OrderRemoveHandler extends Handler {
}

const subaccountMessage: Message = {
key: Buffer.from(Uint8Array.from(
IndexerSubaccountId.encode(orderRemove.removedOrderId!.subaccountId!).finish(),
)),
value: this.createSubaccountWebsocketMessageFromRemoveOrderResult(
removeOrderResult,
canceledOrder,
Expand Down
Loading