chore: use last 1day data for apdex latency metric meta (#4846)

SigNoz · Apr 15, 2024 · a9464de · a9464de
1 parent 57bfded
commit a9464de
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 1,633 deletions.
diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go
@@ -152,7 +152,6 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddlew
  router.HandleFunc("/api/v1/register", am.OpenAccess(ah.registerUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/login", am.OpenAccess(ah.loginUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(ah.searchTraces)).Methods(http.MethodGet)
- router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost)
 
  // PAT APIs
  router.HandleFunc("/api/v1/pats", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)

diff --git a/ee/query-service/app/api/metrics.go b/ee/query-service/app/api/metrics.go
diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go
@@ -329,7 +329,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e
  r.Use(loggingMiddleware)
 
  apiHandler.RegisterRoutes(r, am)
- apiHandler.RegisterMetricsRoutes(r, am)
  apiHandler.RegisterLogsRoutes(r, am)
  apiHandler.RegisterIntegrationRoutes(r, am)
  apiHandler.RegisterQueryRangeV3Routes(r, am)

diff --git a/frontend/src/api/metrics/ApDex/getMetricMeta.ts b/frontend/src/api/metrics/ApDex/getMetricMeta.ts
@@ -1,9 +1,11 @@
-import axios from 'api';
+import { ApiV4Instance } from 'api';
 import { AxiosResponse } from 'axios';
 import { MetricMetaProps } from 'types/api/metrics/getApDex';
 
 export const getMetricMeta = (
  metricName: string,
  servicename: string,
 ): Promise<AxiosResponse<MetricMetaProps>> =>
- axios.get(`/metric_meta?metricName=${metricName}&serviceName=${servicename}`);
+ ApiV4Instance.get(
+ `/metric/metric_metadata?metricName=${metricName}&serviceName=${servicename}`,
+ );
diff --git a/frontend/src/api/metrics/getMetricName.ts b/frontend/src/api/metrics/getMetricName.ts
diff --git a/frontend/src/api/metrics/getResourceAttributes.ts b/frontend/src/api/metrics/getResourceAttributes.ts
@@ -1,22 +1,27 @@
-import { ApiV2Instance as axios } from 'api';
+import { ApiV3Instance as axios } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
+import createQueryParams from 'lib/createQueryParams';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import {
  TagKeyProps,
  TagKeysPayloadProps,
  TagValueProps,
  TagValuesPayloadProps,
 } from 'types/api/metrics/getResourceAttributes';
+import { DataSource, MetricAggregateOperator } from 'types/common/queryBuilder';
 
 export const getResourceAttributesTagKeys = async (
  props: TagKeyProps,
 ): Promise<SuccessResponse<TagKeysPayloadProps> | ErrorResponse> => {
  try {
  const response = await axios.get(
- `/metrics/autocomplete/tagKey?metricName=${props.metricName}${
- props.match ? `&match=${props.match}` : ''
- }`,
+ `/autocomplete/attribute_keys?${createQueryParams({
+ aggregateOperator: MetricAggregateOperator.RATE,
+ searchText: props.match,
+ dataSource: DataSource.METRICS,
+ aggregateAttribute: props.metricName,
+ })}`,
  );
 
  return {
@@ -35,7 +40,13 @@ export const getResourceAttributesTagValues = async (
 ): Promise<SuccessResponse<TagValuesPayloadProps> | ErrorResponse> => {
  try {
  const response = await axios.get(
- `/metrics/autocomplete/tagValue?metricName=${props.metricName}&tagKey=${props.tagKey}`,
+ `/autocomplete/attribute_values?${createQueryParams({
+ aggregateOperator: MetricAggregateOperator.RATE,
+ dataSource: DataSource.METRICS,
+ aggregateAttribute: props.metricName,
+ attributeKey: props.tagKey,
+ searchText: '',
+ })}`,
  );
 
  return {

diff --git a/frontend/src/container/MetricsApplication/constant.ts b/frontend/src/container/MetricsApplication/constant.ts
@@ -1,3 +1,5 @@
+/* eslint-disable sonarjs/no-duplicate-string */
+
 import { DownloadOptions } from 'container/Download/Download.types';
 import { MenuItemKeys } from 'container/GridCardLayout/WidgetHeader/contants';
 
@@ -20,7 +22,7 @@ export enum FORMULA {
  ERROR_PERCENTAGE = 'A*100/B',
  DATABASE_CALLS_AVG_DURATION = 'A/B',
  APDEX_TRACES = '((B + C)/2)/A',
- APDEX_DELTA_SPAN_METRICS = '(B + C/2)/A',
+ APDEX_DELTA_SPAN_METRICS = '((B + C)/2)/A',
  APDEX_CUMULATIVE_SPAN_METRICS = '((B + C)/2)/A',
 }
 

diff --git a/frontend/src/container/MetricsApplication/utils.ts b/frontend/src/container/MetricsApplication/utils.ts
@@ -33,6 +33,8 @@ export const getNearestHighestBucketValue = (
  value: number,
  buckets: number[],
 ): string => {
+ // sort the buckets
+ buckets.sort((a, b) => a - b);
  const nearestBucket = buckets.find((bucket) => bucket >= value);
  return nearestBucket?.toString() || '+Inf';
 };