Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 22 additions & 2 deletions packages/contact-center/ui-logging/src/withMetrics.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React, {useEffect, useRef} from 'react';
import {havePropsChanged, logMetrics} from './metricsLogger';

export default function withMetrics<P extends object>(Component: any, widgetName: string) {
export default function withMetrics<P extends object>(Component: any, widgetName: string, propsToWatch?: string[]) {
return React.memo(
(props: P) => {
const prevWatchedPropsRef = useRef<Record<string, any> | null>(null);

useEffect(() => {
logMetrics({
widgetName,
Expand All @@ -20,7 +22,25 @@ export default function withMetrics<P extends object>(Component: any, widgetName
};
}, []);

// TODO: https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6890 PROPS_UPDATED event
useEffect(() => {
if (!propsToWatch || propsToWatch.length === 0) return;

const currentWatchedProps: Record<string, any> = {};
for (const key of propsToWatch) {
currentWatchedProps[key] = (props as Record<string, any>)[key];
}

if (prevWatchedPropsRef.current !== null && havePropsChanged(prevWatchedPropsRef.current, currentWatchedProps)) {
logMetrics({
widgetName,
event: 'PROPS_UPDATED',
props: currentWatchedProps,
timestamp: Date.now(),
});
}

prevWatchedPropsRef.current = currentWatchedProps;
});

return <Component {...props} />;
},
Expand Down
85 changes: 85 additions & 0 deletions packages/contact-center/ui-logging/tests/withMetrics.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,89 @@ describe('withMetrics HOC', () => {
rerender(<WrappedSpy name="different" />);
expect(renderSpy).toHaveBeenCalledTimes(2);
});

describe('PROPS_UPDATED event', () => {
it('should log PROPS_UPDATED when watched props change', () => {
const mockTime = 1234567890;
jest.setSystemTime(mockTime);

const WrappedWithWatch = withMetrics<TestComponentProps>(TestComponent, 'TestWidget', ['name']);

const {rerender} = render(<WrappedWithWatch name="initial" />);
logMetricsSpy.mockClear();

rerender(<WrappedWithWatch name="updated" />);

expect(logMetricsSpy).toHaveBeenCalledWith({
widgetName: 'TestWidget',
event: 'PROPS_UPDATED',
props: {name: 'updated'},
timestamp: mockTime,
});
});

it('should not log PROPS_UPDATED when only unwatched props change', () => {
const mockTime = 1234567890;
jest.setSystemTime(mockTime);

const WrappedWithWatch = withMetrics<TestComponentProps>(TestComponent, 'TestWidget', ['name']);

const {rerender} = render(<WrappedWithWatch name="test" otherProp="a" />);
logMetricsSpy.mockClear();

rerender(<WrappedWithWatch name="test" otherProp="b" />);

expect(logMetricsSpy).not.toHaveBeenCalledWith(
expect.objectContaining({event: 'PROPS_UPDATED'})
);
});

it('should not log PROPS_UPDATED when no propsToWatch is provided', () => {
const mockTime = 1234567890;
jest.setSystemTime(mockTime);

const WrappedNoWatch = withMetrics<TestComponentProps>(TestComponent, 'TestWidget');

const {rerender} = render(<WrappedNoWatch name="test" />);
logMetricsSpy.mockClear();

rerender(<WrappedNoWatch name="different" />);

expect(logMetricsSpy).not.toHaveBeenCalledWith(
expect.objectContaining({event: 'PROPS_UPDATED'})
);
});

it('should not log PROPS_UPDATED on initial render', () => {
const mockTime = 1234567890;
jest.setSystemTime(mockTime);

const WrappedWithWatch = withMetrics<TestComponentProps>(TestComponent, 'TestWidget', ['name']);

render(<WrappedWithWatch name="initial" />);

expect(logMetricsSpy).not.toHaveBeenCalledWith(
expect.objectContaining({event: 'PROPS_UPDATED'})
);
});

it('should only include watched props in the log payload', () => {
const mockTime = 1234567890;
jest.setSystemTime(mockTime);

const WrappedWithWatch = withMetrics<TestComponentProps>(TestComponent, 'TestWidget', ['name']);

const {rerender} = render(<WrappedWithWatch name="initial" otherProp="secret" />);
logMetricsSpy.mockClear();

rerender(<WrappedWithWatch name="updated" otherProp="secret" />);

const propsUpdatedCall = logMetricsSpy.mock.calls.find(
(call) => call[0].event === 'PROPS_UPDATED'
);
expect(propsUpdatedCall).toBeDefined();
expect(propsUpdatedCall[0].props).toEqual({name: 'updated'});
expect(propsUpdatedCall[0].props).not.toHaveProperty('otherProp');
});
});
});