Revert "[CT-708] Indexer track e2e latency (#1237)"

This reverts commit 60b94df.
dydxprotocol · Mar 29, 2024 · 2d70df5 · 2d70df5
1 parent 9a1da9d
commit 2d70df5
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 234 deletions.
diff --git a/indexer/packages/v4-protos/src/index.ts b/indexer/packages/v4-protos/src/index.ts
@@ -16,4 +16,3 @@ export * from './codegen/google/protobuf/timestamp';
 export * from './codegen/dydxprotocol/indexer/protocol/v1/clob';
 export * from './codegen/dydxprotocol/indexer/protocol/v1/subaccount';
 export * from './codegen/dydxprotocol/indexer/shared/removal_reason';
-export * from './utils';
diff --git a/indexer/packages/v4-protos/src/utils.ts b/indexer/packages/v4-protos/src/utils.ts
diff --git a/indexer/services/ender/__tests__/helpers/indexer-proto-helpers.ts b/indexer/services/ender/__tests__/helpers/indexer-proto-helpers.ts
@@ -50,7 +50,6 @@ import {
   IndexerOrderId,
   PerpetualMarketCreateEventV1,
   DeleveragingEventV1,
-  protoTimestampToDate,
 } from '@dydxprotocol-indexer/v4-protos';
 import {
   PerpetualMarketType,
@@ -64,6 +63,7 @@ import {
   generatePerpetualMarketMessage,
   generatePerpetualPositionsContents,
 } from '../../src/helpers/kafka-helper';
+import { protoTimestampToDate } from '../../src/lib/helper';
 import { DydxIndexerSubtypes, VulcanMessage } from '../../src/lib/types';
 
 // TX Hash is SHA256, so is of length 64 hexadecimal without the '0x'.

diff --git a/indexer/services/ender/src/lib/helper.ts b/indexer/services/ender/src/lib/helper.ts
@@ -8,6 +8,7 @@ import {
 import {
   IndexerTendermintEvent,
   IndexerTendermintEvent_BlockEvent,
+  Timestamp,
   OrderFillEventV1,
   MarketEventV1,
   SubaccountUpdateEventV1,
@@ -28,6 +29,10 @@ import Big from 'big.js';
 import _ from 'lodash';
 import { DateTime } from 'luxon';
 
+import {
+  MILLIS_IN_NANOS,
+  SECONDS_IN_MILLIS,
+} from '../constants';
 import {
   AnnotatedSubaccountMessage,
   DydxIndexerSubtypes,
@@ -65,6 +70,15 @@ export function convertToSubaccountMessage(
   return subaccountMessage;
 }
 
+export function protoTimestampToDate(
+  protoTime: Timestamp,
+): Date {
+  const timeInMillis: number = Number(protoTime.seconds) * SECONDS_IN_MILLIS +
+    Math.floor(protoTime.nanos / MILLIS_IN_NANOS);
+
+  return new Date(timeInMillis);
+}
+
 export function dateToDateTime(
   protoTime: Date,
 ): DateTime {

diff --git a/indexer/services/socks/src/lib/message-forwarder.ts b/indexer/services/socks/src/lib/message-forwarder.ts
@@ -3,7 +3,6 @@ import {
   logger,
   InfoObject,
   safeJsonStringify,
-  STATS_NO_SAMPLING,
 } from '@dydxprotocol-indexer/base';
 import { updateOnMessageFunction } from '@dydxprotocol-indexer/kafka';
 import { KafkaMessage } from 'kafkajs';
@@ -86,10 +85,9 @@ export class MessageForwarder {
   }
 
   public onMessage(topic: string, message: KafkaMessage): void {
-    const start: number = Date.now();
     stats.timing(
       `${config.SERVICE_NAME}.message_time_in_queue`,
-      start - Number(message.timestamp),
+      Date.now() - Number(message.timestamp),
       config.MESSAGE_FORWARDER_STATSD_SAMPLE_RATE,
       {
         topic,
@@ -127,31 +125,18 @@ export class MessageForwarder {
       return;
     }
 
-    const startForwardMessage: number = Date.now();
+    const start: number = Date.now();
     this.forwardMessage(messageToForward);
     const end: number = Date.now();
     stats.timing(
       `${config.SERVICE_NAME}.forward_message`,
-      end - startForwardMessage,
+      end - start,
       config.MESSAGE_FORWARDER_STATSD_SAMPLE_RATE,
       {
         topic,
         channel: String(channel),
       },
     );
-
-    const originalMessageTimestamp = message.headers?.message_received_timestamp;
-    if (originalMessageTimestamp !== undefined) {
-      stats.timing(
-        `${config.SERVICE_NAME}.message_time_since_received`,
-        startForwardMessage - Number(originalMessageTimestamp),
-        STATS_NO_SAMPLING,
-        {
-          topic,
-          event_type: String(message.headers?.event_type),
-        },
-      );
-    }
   }
 
   public forwardMessage(message: MessageToForward): void {

diff --git a/indexer/services/vulcan/__tests__/handlers/order-place-handler.test.ts b/indexer/services/vulcan/__tests__/handlers/order-place-handler.test.ts
@@ -62,7 +62,6 @@ import { expectCanceledOrderStatus, expectOpenOrderIds, handleInitialOrderPlace
 import { expectOffchainUpdateMessage, expectWebsocketOrderbookMessage, expectWebsocketSubaccountMessage } from '../helpers/websocket-helpers';
 import { OrderbookSide } from '../../src/lib/types';
 import { getOrderIdHash, isLongTermOrder, isStatefulOrder } from '@dydxprotocol-indexer/v4-proto-parser';
-import { defaultKafkaHeaders } from '../helpers/constants';
 import config from '../../src/config';
 
 jest.mock('@dydxprotocol-indexer/base', () => ({
@@ -197,12 +196,6 @@ describe('order-place-handler', () => {
     const replacementMessageIoc: KafkaMessage = createKafkaMessage(
       Buffer.from(Uint8Array.from(OffChainUpdateV1.encode(replacementUpdateIoc).finish())),
     );
-    [replacementMessage, replacementMessageGoodTilBlockTime, replacementMessageConditional,
-      replacementMessageFok, replacementMessageIoc].forEach((message) => {
-      // eslint-disable-next-line no-param-reassign
-      message.headers = defaultKafkaHeaders;
-    });
-
     const dbDefaultOrder: OrderFromDatabase = {
       ...testConstants.defaultOrder,
       id: testConstants.defaultOrderId,
@@ -1232,11 +1225,7 @@ function expectWebsocketMessagesSent(
       version: SUBACCOUNTS_WEBSOCKET_MESSAGE_VERSION,
     });
 
-    expectWebsocketSubaccountMessage(
-      producerSendSpy.mock.calls[callIndex][0],
-      subaccountMessage,
-      defaultKafkaHeaders,
-    );
+    expectWebsocketSubaccountMessage(producerSendSpy.mock.calls[callIndex][0], subaccountMessage);
     callIndex += 1;
   }