Merge branch 'main' into kafka-api-restructure

SigNoz · Dec 27, 2024 · 57a194b · 57a194b
2 parents e5f946d + 7f6bad6
commit 57a194b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/frontend/src/container/TimeSeriesView/index.tsx b/frontend/src/container/TimeSeriesView/index.tsx
@@ -29,7 +29,8 @@ function TimeSeriesViewContainer({
 		currentQuery.builder.queryData.forEach(
 			({ aggregateAttribute, aggregateOperator }) => {
 				const isExistDurationNanoAttribute =
-					aggregateAttribute.key === 'durationNano';
+					aggregateAttribute.key === 'durationNano' ||
+					aggregateAttribute.key === 'duration_nano';
 
 				const isCountOperator =
 					aggregateOperator === 'count' || aggregateOperator === 'count_distinct';

diff --git a/frontend/src/container/Trace/TraceTable/util.ts b/frontend/src/container/Trace/TraceTable/util.ts
@@ -1,5 +1,5 @@
 export const getSpanOrderParam = (key: string): string => {
-	if (key === 'durationNano') {
+	if (key === 'durationNano' || key === 'duration_nano') {
 		return 'duration';
 	}
 	if (key === 'timestamp') {

diff --git a/frontend/src/container/TracesExplorer/ListView/utils.tsx b/frontend/src/container/TracesExplorer/ListView/utils.tsx
@@ -96,7 +96,7 @@ export const getListColumns = (
 					);
 				}
 
-				if (key === 'durationNano') {
+				if (key === 'durationNano' || key === 'duration_nano') {
 					return (
 						<BlockLink to={getTraceLink(item)} openInNewTab={false}>
 							<Typography data-testid={key}>{getMs(value)}ms</Typography>

diff --git a/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/EvaluationTimeSelector.tsx b/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/EvaluationTimeSelector.tsx
@@ -41,7 +41,9 @@ function EvaluationTimeSelector({
 	setInterval: Dispatch<SetStateAction<string>>;
 }): JSX.Element {
 	const [inputValue, setInputValue] = useState<string>('');
-	const [selectedInterval, setSelectedInterval] = useState<string | null>('5ms');
+	const [selectedInterval, setSelectedInterval] = useState<string | null>(
+		'10ms',
+	);
 	const [dropdownOpen, setDropdownOpen] = useState<boolean>(false);
 
 	const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
@@ -98,11 +100,13 @@ function EvaluationTimeSelector({
 				onDropdownVisibleChange={setDropdownOpen}
 				dropdownRender={renderDropdown}
 			>
-				<Option value="1ms">1ms</Option>
-				<Option value="2ms">2ms</Option>
-				<Option value="5ms">5ms</Option>
 				<Option value="10ms">10ms</Option>
-				<Option value="15ms">15ms</Option>
+				<Option value="20ms">20ms</Option>
+				<Option value="50ms">50ms</Option>
+				<Option value="100ms">100ms</Option>
+				<Option value="150ms">150ms</Option>
+				<Option value="200ms">200ms</Option>
+				<Option value="500ms">500ms</Option>
 			</Select>
 		</div>
 	);