remove enqueue time from events

Azure · Apr 4, 2024 · b491f08 · b491f08
1 parent 85a45f8
commit b491f08
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 240 deletions.
diff --git a/public/interfaces/eventHubInterface.ts b/public/interfaces/eventHubInterface.ts
@@ -6,7 +6,6 @@ export interface StartEventHubMonitoringParameters {
     deviceId: string;
     moduleId: string;
     consumerGroup: string;
-    startTime: string;
     customEventHubConnectionString?: string;
     hubConnectionString?: string;
 }

diff --git a/src/app/api/parameters/deviceParameters.ts b/src/app/api/parameters/deviceParameters.ts
@@ -31,7 +31,6 @@ export interface MonitorEventsParameters {
     consumerGroup: string;
     customEventHubConnectionString?: string;
     hubConnectionString?: string;
-    startTime?: Date;
     decoderPrototype?: Type;
 }
 

diff --git a/src/app/api/services/devicesService.ts b/src/app/api/services/devicesService.ts
@@ -252,16 +252,13 @@ export const deleteDevices = async (parameters: DeleteDevicesParameters) => {
 };
 
 export const monitorEvents = async (parameters: MonitorEventsParameters): Promise<void> => {
-    let requestParameters = {
-        ...parameters,
-        startTime: parameters.startTime && parameters.startTime.toISOString()
-    };
+    let requestParameters = parameters;
 
     // if no custom event hub info is provided, use default hub connection string to connect to event hub
     if (!parameters.customEventHubConnectionString) {
         const connectionInfo = await dataPlaneConnectionHelper();
         requestParameters = {
-            ...requestParameters,
+            ...parameters,
             hubConnectionString: connectionInfo.connectionString
         };
     }

diff --git a/src/app/devices/deviceEvents/components/__snapshots__/deviceEvents.spec.tsx.snap b/src/app/devices/deviceEvents/components/__snapshots__/deviceEvents.spec.tsx.snap
@@ -31,13 +31,6 @@ exports[`deviceEvents matches snapshot after loaded 1`] = `
       setConsumerGroup={[Function]}
     />
   </div>
-  <StartTime
-    monitoringData={false}
-    setHasError={[Function]}
-    setSpecifyStartTime={[Function]}
-    setStartTime={[Function]}
-    specifyStartTime={false}
-  />
   <div
     className="horizontal-item"
   >

diff --git a/src/app/devices/deviceEvents/components/__snapshots__/startTime.spec.tsx.snap b/src/app/devices/deviceEvents/components/__snapshots__/startTime.spec.tsx.snap
diff --git a/src/app/devices/deviceEvents/components/deviceEvents.tsx b/src/app/devices/deviceEvents/components/deviceEvents.tsx
@@ -18,7 +18,6 @@ import { DeviceSimulationPanel } from './deviceSimulationPanel';
 import { Commands } from './commands';
 import { CustomEventHub } from './customEventHub';
 import { ConsumerGroup } from './consumerGroup';
-import { StartTime } from './startTime';
 import { DeviceContentTypePanel } from './deviceContentTypePanel';
 import { Loader } from './loader';
 import { EventsContent } from './eventsContent';
@@ -35,8 +34,6 @@ export const DeviceEvents: React.FC = () => {
 
     // event hub settings
     const [consumerGroup, setConsumerGroup] = React.useState(DEFAULT_CONSUMER_GROUP);
-    const [specifyStartTime, setSpecifyStartTime] = React.useState<boolean>(false);
-    const [startTime, setStartTime] = React.useState<Date>();
     const [useBuiltInEventHub, setUseBuiltInEventHub] = React.useState<boolean>(true);
     const [customEventHubConnectionString, setCustomEventHubConnectionString] = React.useState<string>(undefined);
     const [showSystemProperties, setShowSystemProperties] = React.useState<boolean>(false);
@@ -85,8 +82,6 @@ export const DeviceEvents: React.FC = () => {
     React.useEffect(    // tslint:disable-next-line: cyclomatic-complexity
         () => {
             if (state.formMode === 'updating' ||
-                // when specifying start time, valid time need to be provided
-                (specifyStartTime && (!startTime || hasError)) ||
                 // when using custom event hub, both valid connection string and name need to be provided
                 (!useBuiltInEventHub && (!customEventHubConnectionString || hasError))) {
                 setStartDisabled(true);
@@ -95,7 +90,7 @@ export const DeviceEvents: React.FC = () => {
                 setStartDisabled(false);
             }
         },
-        [hasError, state.formMode, useBuiltInEventHub, customEventHubConnectionString, specifyStartTime, startTime]);
+        [hasError, state.formMode, useBuiltInEventHub, customEventHubConnectionString]);
 
     const onSystemPropertyCheckBoxChange = (ev?: React.FormEvent<HTMLElement | HTMLInputElement>, checked?: boolean) => {
         setShowSystemProperties(!!checked);
@@ -131,19 +126,6 @@ export const DeviceEvents: React.FC = () => {
         );
     };
 
-    const renderStartTimePicker = () => {
-        return (
-            <StartTime
-                monitoringData={monitoringData}
-                specifyStartTime={specifyStartTime}
-                startTime={startTime}
-                setSpecifyStartTime={setSpecifyStartTime}
-                setStartTime={setStartTime}
-                setHasError={setHasError}
-            />
-        );
-    };
-
     const renderCustomEventHub = () => {
         return (
             <div className="horizontal-item">
@@ -170,8 +152,7 @@ export const DeviceEvents: React.FC = () => {
             consumerGroup,
             decoderPrototype,
             deviceId,
-            moduleId,
-            startTime
+            moduleId
         };
 
         if (!useBuiltInEventHub) {
@@ -203,7 +184,6 @@ export const DeviceEvents: React.FC = () => {
                 tooltip={ResourceKeys.deviceEvents.tooltip}
             />
             {renderConsumerGroup()}
-            {renderStartTimePicker()}
             {renderCustomEventHub()}
             <DeviceSimulationPanel
                 showSimulationPanel={showSimulationPanel}

diff --git a/src/app/devices/deviceEvents/components/startTime.spec.tsx b/src/app/devices/deviceEvents/components/startTime.spec.tsx
diff --git a/src/app/devices/deviceEvents/components/startTime.tsx b/src/app/devices/deviceEvents/components/startTime.tsx
diff --git a/src/app/devices/deviceEvents/reducer.spec.ts b/src/app/devices/deviceEvents/reducer.spec.ts
@@ -12,7 +12,7 @@ import { Type } from 'protobufjs';
 
 describe('deviceEventsReducer', () => {
     const deviceId = 'testDeviceId';
-    const params = {consumerGroup: DEFAULT_CONSUMER_GROUP, deviceId, moduleId:'', startTime: new Date()};
+    const params = {consumerGroup: DEFAULT_CONSUMER_GROUP, deviceId, moduleId:''};
     const events = [{
         body: {
             humid: '123' // intentionally set a value which type is double

diff --git a/src/localization/locales/en.json b/src/localization/locales/en.json
@@ -593,11 +593,6 @@
             "label": "Consumer group",
             "tooltip": "Consumer groups are used by applications to pull data from the IoT Hub. To change the current consumer group, stop monitoring telemetry."
         },
-        "startTime": {
-            "error": "Please enter datetime format in yyyy/mm/dd/hh/mm/ss",
-            "label": "Start time",
-            "tooltip": "Indicates the local enqueue time that should be used to read messages from the event hub. If not specified, the enqueue time would be the moment you click on the 'Start' button."
-        },
         "customEventHub": {
             "connectionString": {
                 "label": "Custom event hub connection string",

diff --git a/src/localization/resourceKeys.ts b/src/localization/resourceKeys.ts
@@ -419,11 +419,6 @@ export class ResourceKeys {
             tooltiop : "deviceEvents.simulation.prerequisite.tooltiop",
          },
       },
-      startTime : {
-         error : "deviceEvents.startTime.error",
-         label : "deviceEvents.startTime.label",
-         tooltip : "deviceEvents.startTime.tooltip",
-      },
       toggleShowRawData : {
          label : "deviceEvents.toggleShowRawData.label",
          off : "deviceEvents.toggleShowRawData.off",

diff --git a/src/server/serverBase.ts b/src/server/serverBase.ts
@@ -10,7 +10,7 @@ import * as express from 'express';
 import * as bodyParser from 'body-parser';
 import * as cors from 'cors';
 import fetch from 'node-fetch';
-import { EventHubConsumerClient, Subscription, ReceivedEventData } from '@azure/event-hubs';
+import { EventHubConsumerClient, Subscription, ReceivedEventData, earliestEventPosition } from '@azure/event-hubs';
 import { generateDataPlaneRequestBody, generateDataPlaneResponse } from './dataPlaneHelper';
 import { convertIotHubToEventHubsConnectionString } from './eventHubHelper';
 import { fetchDirectories, fetchDrivesOnWindows, findMatchingFile, readFileFromLocal } from './utils';
@@ -230,8 +230,10 @@ const initializeEventHubClient = async (params: any) =>  {
             },
             processError: async (err) => {
                 console.log(err);
-            }
+            },
+
         },
+        {startPosition: earliestEventPosition}
     );
 
     timerId = setInterval(() => {