diff --git a/eslint-suppressions.json b/eslint-suppressions.json index 821cc84639f..6c4be9d5384 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -3017,11 +3017,6 @@ "count": 1 } }, - "public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx": { - "no-barrel-files/no-barrel-files": { - "count": 1 - } - }, "public/app/features/explore/TraceView/components/common/SearchBarInput.tsx": { "react-prefer-function-component/react-prefer-function-component": { "count": 1 diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx index 48891aae1cd..778743894cb 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx @@ -25,13 +25,14 @@ import { SpanBarOptions } from '../settings/SpanBarSettings'; import TNil from '../types/TNil'; import { SpanLinkFunc } from '../types/links'; import { TraceSpan, CriticalPathSection } from '../types/trace'; +import { formatDuration } from '../utils/date'; import SpanBar from './SpanBar'; import { SpanLinksMenu } from './SpanLinks'; import SpanTreeOffset from './SpanTreeOffset'; import Ticks from './Ticks'; import TimelineRow from './TimelineRow'; -import { formatDuration, ViewedBoundsFunctionType } from './utils'; +import { ViewedBoundsFunctionType } from './utils'; const spanBarClassName = 'spanBar'; const spanBarLabelClassName = 'spanBarLabel'; diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx index b708b7f3ec8..efb36f26948 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx @@ -21,7 +21,7 @@ import { Trans } from '@grafana/i18n'; import { Counter, Icon, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; -import { formatDuration } from '../utils'; +import { formatDuration } from '../../utils/date'; import AccordianKeyValues from './AccordianKeyValues'; diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx index f65d347c241..cad24717242 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -jest.mock('../utils'); +jest.mock('../../utils/date'); import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; @@ -25,7 +25,7 @@ import { pyroscopeProfileIdTagKey } from '../../../createSpanLink'; import traceGenerator from '../../demo/trace-generators'; import transformTraceData from '../../model/transform-trace-data'; import { TraceSpanReference } from '../../types/trace'; -import { formatDuration } from '../utils'; +import { formatDuration } from '../../utils/date'; import DetailState from './DetailState'; diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx index 19ddc677310..85a15233995 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx @@ -41,7 +41,7 @@ import LabeledList from '../../common/LabeledList'; import { KIND, LIBRARY_NAME, LIBRARY_VERSION, STATUS, STATUS_MESSAGE, TRACE_STATE } from '../../constants/span'; import { SpanLinkFunc } from '../../types/links'; import { TraceProcess, TraceSpan, TraceSpanReference } from '../../types/trace'; -import { formatDuration } from '../utils'; +import { formatDuration } from '../../utils/date'; import AccordianKeyValues from './AccordianKeyValues'; import AccordianLogs from './AccordianLogs'; diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx index 81c255bcba6..99df256f5c0 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx @@ -21,8 +21,7 @@ import { useStyles2 } from '@grafana/ui'; import { autoColor } from '../Theme'; import TNil from '../types/TNil'; - -import { formatDuration } from './utils'; +import { formatDuration } from '../utils/date'; const getStyles = (theme: GrafanaTheme2) => ({ Ticks: css({ diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx index 3a03cbffdf6..a87a1f16db9 100644 --- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx @@ -122,5 +122,3 @@ export const isKindClient = (span: TraceSpan): Boolean => { } return span.tags.some(({ key, value }) => key === 'span.kind' && value === 'client'); }; - -export { formatDuration } from '../utils/date';