From 5f923be2bf67deadab90dcd328e84bee8a9b41cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Tue, 9 Jun 2020 22:08:51 +0200 Subject: [PATCH] Plugins: move jaeger trace type to grafana data (#25403) * Plugins: move jaeger trace type to grafana data * Remove unnecessary type from tsconfig --- packages/grafana-data/src/types/index.ts | 1 + .../types/trace.tsx => grafana-data/src/types/trace.ts} | 0 packages/jaeger-ui-components/package.json | 1 + packages/jaeger-ui-components/src/ScrollManager.tsx | 2 +- .../src/TracePageHeader/SpanGraph/index.tsx | 2 +- .../src/TracePageHeader/TracePageHeader.tsx | 2 +- .../src/TraceTimelineViewer/ReferencesButton.tsx | 2 +- .../src/TraceTimelineViewer/SpanBar.tsx | 2 +- .../src/TraceTimelineViewer/SpanBarRow.tsx | 2 +- .../TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx | 2 +- .../src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx | 2 +- .../TraceTimelineViewer/SpanDetail/AccordianReferences.tsx | 2 +- .../src/TraceTimelineViewer/SpanDetail/DetailState.tsx | 2 +- .../src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx | 2 +- .../src/TraceTimelineViewer/SpanDetail/index.tsx | 2 +- .../src/TraceTimelineViewer/SpanDetailRow.tsx | 2 +- .../src/TraceTimelineViewer/SpanTreeOffset.tsx | 2 +- .../src/TraceTimelineViewer/VirtualizedTraceView.tsx | 2 +- .../jaeger-ui-components/src/TraceTimelineViewer/index.tsx | 2 +- .../jaeger-ui-components/src/TraceTimelineViewer/utils.tsx | 2 +- packages/jaeger-ui-components/src/model/link-patterns.tsx | 2 +- packages/jaeger-ui-components/src/model/span.tsx | 2 +- packages/jaeger-ui-components/src/model/trace-viewer.ts | 2 +- .../src/model/transform-trace-data.tsx | 2 +- packages/jaeger-ui-components/src/types/index.tsx | 3 +-- packages/jaeger-ui-components/src/url/ReferenceLink.tsx | 2 +- packages/jaeger-ui-components/src/utils/filter-spans.tsx | 2 +- .../jaeger-ui-components/src/utils/span-ancestor-ids.tsx | 2 +- packages/jaeger-ui-components/tsconfig.json | 6 +++++- public/app/features/explore/TraceView/TraceView.test.tsx | 3 ++- public/app/features/explore/TraceView/TraceView.tsx | 7 +------ .../features/explore/TraceView/useChildrenState.test.ts | 2 +- public/app/features/explore/TraceView/useChildrenState.ts | 2 +- .../app/features/explore/TraceView/useDetailState.test.ts | 2 +- public/app/features/explore/TraceView/useDetailState.ts | 3 ++- public/app/features/explore/TraceView/useSearch.test.ts | 2 +- public/app/features/explore/TraceView/useSearch.ts | 3 ++- public/app/plugins/datasource/jaeger/QueryField.tsx | 3 +-- public/app/plugins/datasource/zipkin/utils/testData.ts | 2 +- public/app/plugins/datasource/zipkin/utils/transforms.ts | 2 +- 40 files changed, 46 insertions(+), 44 deletions(-) rename packages/{jaeger-ui-components/src/types/trace.tsx => grafana-data/src/types/trace.ts} (100%) diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts index 00e6547812f..030afa62e6e 100644 --- a/packages/grafana-data/src/types/index.ts +++ b/packages/grafana-data/src/types/index.ts @@ -24,6 +24,7 @@ export * from './fieldColor'; export * from './theme'; export * from './orgs'; export * from './flot'; +export * from './trace'; import * as AppEvents from './appEvents'; import { AppEvent } from './appEvents'; diff --git a/packages/jaeger-ui-components/src/types/trace.tsx b/packages/grafana-data/src/types/trace.ts similarity index 100% rename from packages/jaeger-ui-components/src/types/trace.tsx rename to packages/grafana-data/src/types/trace.ts diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 70c8b882a23..8d578e81870 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -14,6 +14,7 @@ "typescript": "3.7.5" }, "dependencies": { + "@grafana/data": "7.1.0-pre.0", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/hoist-non-react-statics": "^3.3.1", diff --git a/packages/jaeger-ui-components/src/ScrollManager.tsx b/packages/jaeger-ui-components/src/ScrollManager.tsx index 83c1842a59c..2db53120aa1 100644 --- a/packages/jaeger-ui-components/src/ScrollManager.tsx +++ b/packages/jaeger-ui-components/src/ScrollManager.tsx @@ -13,7 +13,7 @@ // limitations under the License. import { TNil } from './types'; -import { Span, SpanReference, Trace } from './types/trace'; +import { Span, SpanReference, Trace } from '@grafana/data'; /** * `Accessors` is necessary because `ScrollManager` needs to be created by diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx b/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx index 93e3037a3b9..c12dbc8a401 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx +++ b/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx @@ -19,7 +19,7 @@ import CanvasSpanGraph from './CanvasSpanGraph'; import TickLabels from './TickLabels'; import ViewingLayer from './ViewingLayer'; import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '../..'; -import { Span, Trace } from '../..'; +import { Span, Trace } from '@grafana/data'; import { ubPb2, ubPx2, ubRelative } from '../../uberUtilityStyles'; const DEFAULT_HEIGHT = 60; diff --git a/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx b/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx index 55ded1a4eba..7a3dd387420 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx +++ b/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx @@ -27,7 +27,7 @@ import LabeledList from '../common/LabeledList'; import TraceName from '../common/TraceName'; import { getTraceName } from '../model/trace-viewer'; import { TNil } from '../types'; -import { Trace } from '..'; +import { Trace } from '@grafana/data'; import { formatDatetime, formatDuration } from '../utils/date'; import { getTraceLinks } from '../model/link-patterns'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.tsx index b3d09ba0aee..f0338aac74d 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.tsx @@ -15,7 +15,7 @@ import React from 'react'; import { css } from 'emotion'; import NewWindowIcon from '../common/NewWindowIcon'; -import { SpanReference } from '../types/trace'; +import { SpanReference } from '@grafana/data'; import { UITooltip, UIDropdown, UIMenuItem, UIMenu, TooltipPlacement } from '../uiElementsContext'; import ReferenceLink from '../url/ReferenceLink'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx index 1d58cc22957..0fcd15735b2 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx @@ -22,7 +22,7 @@ import AccordianLogs from './SpanDetail/AccordianLogs'; import { ViewedBoundsFunctionType } from './utils'; import { TNil } from '../types'; -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; import { UIPopover } from '../uiElementsContext'; import { createStyle } from '../Theme'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx index 7de0d687c59..e7d227f7ad9 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx @@ -28,7 +28,7 @@ import SpanBar from './SpanBar'; import Ticks from './Ticks'; import { TNil } from '../types'; -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; import { autoColor, createStyle, Theme, withTheme } from '../Theme'; const getStyles = createStyle((theme: Theme) => { diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx index 023190bb3e2..1bbd2d78ae6 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx @@ -21,7 +21,7 @@ import cx from 'classnames'; import * as markers from './AccordianKeyValues.markers'; import KeyValuesTable from './KeyValuesTable'; import { TNil } from '../../types'; -import { KeyValuePair, Link } from '../../types/trace'; +import { KeyValuePair, Link } from '@grafana/data'; import { autoColor, createStyle, Theme, useTheme } from '../../Theme'; import { uAlignIcon, uTxEllipsis } from '../../uberUtilityStyles'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx index 64ba3b68523..43b9c433902 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx @@ -21,7 +21,7 @@ import { css } from 'emotion'; import AccordianKeyValues from './AccordianKeyValues'; import { formatDuration } from '../utils'; import { TNil } from '../../types'; -import { Log, KeyValuePair, Link } from '../../types/trace'; +import { Log, KeyValuePair, Link } from '@grafana/data'; import { autoColor, createStyle, Theme, useTheme } from '../../Theme'; import { uAlignIcon, ubMb1 } from '../../uberUtilityStyles'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx index 12c8ba91652..0e1a1d793ae 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx @@ -18,7 +18,7 @@ import cx from 'classnames'; import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; import IoIosArrowRight from 'react-icons/lib/io/ios-arrow-right'; -import { SpanReference } from '../../types/trace'; +import { SpanReference } from '@grafana/data'; import ReferenceLink from '../../url/ReferenceLink'; import { createStyle } from '../../Theme'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx index 76e64a39166..d0883f89a02 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Log } from '../../types/trace'; +import { Log } from '@grafana/data'; /** * Which items of a {@link SpanDetail} component are expanded. diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx index 0a56bc4fd9f..3583938d221 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx @@ -20,7 +20,7 @@ import cx from 'classnames'; import CopyIcon from '../../common/CopyIcon'; import { TNil } from '../../types'; -import { KeyValuePair, Link } from '../../types/trace'; +import { KeyValuePair, Link } from '@grafana/data'; import { UIDropdown, UIIcon, UIMenu, UIMenuItem } from '../../uiElementsContext'; import { autoColor, createStyle, Theme, useTheme } from '../../Theme'; import { ubInlineBlock, uWidth100 } from '../../uberUtilityStyles'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx index 39d886dc694..1e1307ddb59 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx @@ -25,7 +25,7 @@ import CopyIcon from '../../common/CopyIcon'; import LabeledList from '../../common/LabeledList'; import { TNil } from '../../types'; -import { KeyValuePair, Link, Log, Span } from '../../types/trace'; +import { KeyValuePair, Link, Log, Span } from '@grafana/data'; import AccordianReferences from './AccordianReferences'; import { autoColor, createStyle, Theme, useTheme } from '../../Theme'; import { UIDivider } from '../../uiElementsContext'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx index 06cfe887276..ae8a4331033 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx @@ -21,7 +21,7 @@ import SpanTreeOffset from './SpanTreeOffset'; import TimelineRow from './TimelineRow'; import { autoColor, createStyle, Theme, withTheme } from '../Theme'; -import { Log, Span, KeyValuePair, Link } from '../types/trace'; +import { Log, Span, KeyValuePair, Link } from '@grafana/data'; const getStyles = createStyle((theme: Theme) => { return { diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx index b06518b19f6..2c875d5f60f 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx @@ -19,7 +19,7 @@ import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; import { css } from 'emotion'; import cx from 'classnames'; -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; import spanAncestorIds from '../utils/span-ancestor-ids'; import { autoColor, createStyle, Theme, withTheme } from '../Theme'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx index 8820a24b31e..8a2fcf9a818 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx @@ -29,7 +29,7 @@ import { import { Accessors } from '../ScrollManager'; import { getColorByKey } from '../utils/color-generator'; import { TNil } from '../types'; -import { Log, Span, Trace, KeyValuePair, Link } from '../types/trace'; +import { Log, Span, Trace, KeyValuePair, Link } from '@grafana/data'; import TTraceTimeline from '../types/TTraceTimeline'; import { createStyle, Theme, withTheme } from '../Theme'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx index 4e19093b7c9..59bb423468c 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx @@ -21,7 +21,7 @@ import { merge as mergeShortcuts } from '../keyboard-shortcuts'; import { Accessors } from '../ScrollManager'; import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from './types'; import { TNil } from '../types'; -import { Span, Trace, Log, KeyValuePair, Link } from '../types/trace'; +import { Span, Trace, Log, KeyValuePair, Link } from '@grafana/data'; import TTraceTimeline from '../types/TTraceTimeline'; import { autoColor, createStyle, Theme, withTheme } from '../Theme'; import ExternalLinkContext from '../url/externalLinkContext'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx index 6ea0c3742c1..5b433293da2 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; export type ViewedBoundsFunctionType = (start: number, end: number) => { start: number; end: number }; /** diff --git a/packages/jaeger-ui-components/src/model/link-patterns.tsx b/packages/jaeger-ui-components/src/model/link-patterns.tsx index f07d329c565..e0ec8cc579e 100644 --- a/packages/jaeger-ui-components/src/model/link-patterns.tsx +++ b/packages/jaeger-ui-components/src/model/link-patterns.tsx @@ -17,7 +17,7 @@ import memoize from 'lru-memoize'; import { getConfigValue } from '../utils/config/get-config'; import { getParent } from './span'; import { TNil } from '../types'; -import { Span, Link, KeyValuePair, Trace } from '..'; +import { Span, Link, KeyValuePair, Trace } from '@grafana/data'; const parameterRegExp = /#\{([^{}]*)\}/g; diff --git a/packages/jaeger-ui-components/src/model/span.tsx b/packages/jaeger-ui-components/src/model/span.tsx index 16ee980a43d..026961502e0 100644 --- a/packages/jaeger-ui-components/src/model/span.tsx +++ b/packages/jaeger-ui-components/src/model/span.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; /** * Searches the span.references to find 'CHILD_OF' reference type or returns null. diff --git a/packages/jaeger-ui-components/src/model/trace-viewer.ts b/packages/jaeger-ui-components/src/model/trace-viewer.ts index cc881b5ad0a..62b9591cd1a 100644 --- a/packages/jaeger-ui-components/src/model/trace-viewer.ts +++ b/packages/jaeger-ui-components/src/model/trace-viewer.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Span } from '../types'; +import { Span } from '@grafana/data'; export function getTraceName(spans: Span[]): string { const span = spans.filter(sp => !sp.references || !sp.references.length)[0]; diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx b/packages/jaeger-ui-components/src/model/transform-trace-data.tsx index 0c041f06fa6..679b9be13c9 100644 --- a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx +++ b/packages/jaeger-ui-components/src/model/transform-trace-data.tsx @@ -17,7 +17,7 @@ import _isEqual from 'lodash/isEqual'; // @ts-ignore import { getTraceSpanIdsAsTree } from '../selectors/trace'; import { getConfigValue } from '../utils/config/get-config'; -import { KeyValuePair, Span, SpanData, Trace, TraceData } from '../types/trace'; +import { KeyValuePair, Span, SpanData, Trace, TraceData } from '@grafana/data'; // @ts-ignore import TreeNode from '../utils/TreeNode'; diff --git a/packages/jaeger-ui-components/src/types/index.tsx b/packages/jaeger-ui-components/src/types/index.tsx index a99b5b1a295..f972d613284 100644 --- a/packages/jaeger-ui-components/src/types/index.tsx +++ b/packages/jaeger-ui-components/src/types/index.tsx @@ -13,9 +13,8 @@ // limitations under the License. import { ApiError } from './api-error'; -import { Trace } from './trace'; +import { Trace } from '@grafana/data'; -export * from './trace'; export { default as TTraceTimeline } from './TTraceTimeline'; export { default as TNil } from './TNil'; diff --git a/packages/jaeger-ui-components/src/url/ReferenceLink.tsx b/packages/jaeger-ui-components/src/url/ReferenceLink.tsx index e96f1e482a0..e82889281f0 100644 --- a/packages/jaeger-ui-components/src/url/ReferenceLink.tsx +++ b/packages/jaeger-ui-components/src/url/ReferenceLink.tsx @@ -13,7 +13,7 @@ // limitations under the License. import React from 'react'; -import { SpanReference } from '../types/trace'; +import { SpanReference } from '@grafana/data'; import ExternalLinkContext from './externalLinkContext'; type ReferenceLinkProps = { diff --git a/packages/jaeger-ui-components/src/utils/filter-spans.tsx b/packages/jaeger-ui-components/src/utils/filter-spans.tsx index 9891efe460e..a68219f2deb 100644 --- a/packages/jaeger-ui-components/src/utils/filter-spans.tsx +++ b/packages/jaeger-ui-components/src/utils/filter-spans.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { KeyValuePair, Span } from '../types/trace'; +import { KeyValuePair, Span } from '@grafana/data'; import { TNil } from '../types'; export default function filterSpans(textFilter: string, spans: Span[] | TNil) { diff --git a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx b/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx index eb9aa435540..f5a163c1585 100644 --- a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx +++ b/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx @@ -16,7 +16,7 @@ import _find from 'lodash/find'; import _get from 'lodash/get'; import { TNil } from '../types'; -import { Span } from '../types/trace'; +import { Span } from '@grafana/data'; function getFirstAncestor(span: Span): Span | TNil { return _get( diff --git a/packages/jaeger-ui-components/tsconfig.json b/packages/jaeger-ui-components/tsconfig.json index 8508b52fc8d..5b30420a3e4 100644 --- a/packages/jaeger-ui-components/tsconfig.json +++ b/packages/jaeger-ui-components/tsconfig.json @@ -1,4 +1,8 @@ { + "compilerOptions": { + "baseUrl": "node_modules/@types", + "typeRoots": ["node_modules/@types"] + }, "extends": "@grafana/tsconfig", - "include": ["src/**/*.ts*", "typings"] + "include": ["src/**/*.ts*", "typings", "../../public/app/types/jquery/*.ts"] } diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx index f9c47853ec6..bba8a452f7d 100644 --- a/public/app/features/explore/TraceView/TraceView.test.tsx +++ b/public/app/features/explore/TraceView/TraceView.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TraceView } from './TraceView'; -import { SpanData, TraceData, TracePageHeader, TraceTimelineViewer } from '@jaegertracing/jaeger-ui-components'; +import { TracePageHeader, TraceTimelineViewer } from '@jaegertracing/jaeger-ui-components'; +import { TraceData, SpanData } from '@grafana/data'; function renderTraceView() { const wrapper = shallow(); diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx index 3c2dba39178..f6e5f71870f 100644 --- a/public/app/features/explore/TraceView/TraceView.tsx +++ b/public/app/features/explore/TraceView/TraceView.tsx @@ -1,14 +1,8 @@ import React, { useCallback, useMemo, useState } from 'react'; import { - KeyValuePair, - Link, - Span, - SpanData, ThemeOptions, ThemeProvider, ThemeType, - Trace, - TraceData, TracePageHeader, TraceTimelineViewer, transformTraceData, @@ -22,6 +16,7 @@ import { useChildrenState } from './useChildrenState'; import { useDetailState } from './useDetailState'; import { useHoverIndentGuide } from './useHoverIndentGuide'; import { colors, useTheme } from '@grafana/ui'; +import { TraceData, SpanData, Trace, Span, KeyValuePair, Link } from '@grafana/data'; type Props = { trace: TraceData & { spans: SpanData[] }; diff --git a/public/app/features/explore/TraceView/useChildrenState.test.ts b/public/app/features/explore/TraceView/useChildrenState.test.ts index a71dadd44ca..5fc32021db1 100644 --- a/public/app/features/explore/TraceView/useChildrenState.test.ts +++ b/public/app/features/explore/TraceView/useChildrenState.test.ts @@ -1,6 +1,6 @@ import { renderHook, act } from '@testing-library/react-hooks'; import { useChildrenState } from './useChildrenState'; -import { Span } from '@jaegertracing/jaeger-ui-components'; +import { Span } from '@grafana/data'; describe('useChildrenState', () => { describe('childrenToggle', () => { diff --git a/public/app/features/explore/TraceView/useChildrenState.ts b/public/app/features/explore/TraceView/useChildrenState.ts index c1558182ab6..dd8d4308e0c 100644 --- a/public/app/features/explore/TraceView/useChildrenState.ts +++ b/public/app/features/explore/TraceView/useChildrenState.ts @@ -1,5 +1,5 @@ import { useCallback, useState } from 'react'; -import { Span } from '@jaegertracing/jaeger-ui-components'; +import { Span } from '@grafana/data'; /** * Children state means whether spans are collapsed or not. Also provides some functions to manipulate that state. diff --git a/public/app/features/explore/TraceView/useDetailState.test.ts b/public/app/features/explore/TraceView/useDetailState.test.ts index f3076f031dc..fdbd1e5ab1e 100644 --- a/public/app/features/explore/TraceView/useDetailState.test.ts +++ b/public/app/features/explore/TraceView/useDetailState.test.ts @@ -1,5 +1,5 @@ import { renderHook, act } from '@testing-library/react-hooks'; -import { Log } from '@jaegertracing/jaeger-ui-components'; +import { Log } from '@grafana/data'; import { useDetailState } from './useDetailState'; describe('useDetailState', () => { diff --git a/public/app/features/explore/TraceView/useDetailState.ts b/public/app/features/explore/TraceView/useDetailState.ts index 4e10874515e..1db1bd44e83 100644 --- a/public/app/features/explore/TraceView/useDetailState.ts +++ b/public/app/features/explore/TraceView/useDetailState.ts @@ -1,5 +1,6 @@ import { useCallback, useState } from 'react'; -import { DetailState, Log } from '@jaegertracing/jaeger-ui-components'; +import { DetailState } from '@jaegertracing/jaeger-ui-components'; +import { Log } from '@grafana/data'; /** * Keeps state of the span detail. This means whether span details are open but also state of each detail subitem diff --git a/public/app/features/explore/TraceView/useSearch.test.ts b/public/app/features/explore/TraceView/useSearch.test.ts index 4bfca13e27b..50e831d5ff2 100644 --- a/public/app/features/explore/TraceView/useSearch.test.ts +++ b/public/app/features/explore/TraceView/useSearch.test.ts @@ -1,6 +1,6 @@ import { renderHook, act } from '@testing-library/react-hooks'; import { useSearch } from './useSearch'; -import { Span } from '@jaegertracing/jaeger-ui-components'; +import { Span } from '@grafana/data'; describe('useSearch', () => { it('returns matching span IDs', async () => { diff --git a/public/app/features/explore/TraceView/useSearch.ts b/public/app/features/explore/TraceView/useSearch.ts index a2f7bd614dd..87a1ebfd259 100644 --- a/public/app/features/explore/TraceView/useSearch.ts +++ b/public/app/features/explore/TraceView/useSearch.ts @@ -1,5 +1,6 @@ import { useMemo, useState } from 'react'; -import { Span, filterSpans } from '@jaegertracing/jaeger-ui-components'; +import { filterSpans } from '@jaegertracing/jaeger-ui-components'; +import { Span } from '@grafana/data'; /** * Controls the state of search input that highlights spans if they match the search string. diff --git a/public/app/plugins/datasource/jaeger/QueryField.tsx b/public/app/plugins/datasource/jaeger/QueryField.tsx index 6023fe63925..47da78e9c63 100644 --- a/public/app/plugins/datasource/jaeger/QueryField.tsx +++ b/public/app/plugins/datasource/jaeger/QueryField.tsx @@ -2,9 +2,8 @@ import React from 'react'; import { JaegerDatasource, JaegerQuery } from './datasource'; import { ButtonCascader, CascaderOption } from '@grafana/ui'; -import { AppEvents, ExploreQueryFieldProps } from '@grafana/data'; +import { AppEvents, ExploreQueryFieldProps, Span, TraceData } from '@grafana/data'; import { appEvents } from '../../../core/core'; -import { Span, TraceData } from '@jaegertracing/jaeger-ui-components'; const ALL_OPERATIONS_KEY = '__ALL__'; const NO_TRACES_KEY = '__NO_TRACES__'; diff --git a/public/app/plugins/datasource/zipkin/utils/testData.ts b/public/app/plugins/datasource/zipkin/utils/testData.ts index dc2d9ece27a..b6ba6b36cde 100644 --- a/public/app/plugins/datasource/zipkin/utils/testData.ts +++ b/public/app/plugins/datasource/zipkin/utils/testData.ts @@ -1,4 +1,4 @@ -import { SpanData, TraceData } from '@jaegertracing/jaeger-ui-components'; +import { SpanData, TraceData } from '@grafana/data'; import { ZipkinSpan } from '../types'; export const zipkinResponse: ZipkinSpan[] = [ diff --git a/public/app/plugins/datasource/zipkin/utils/transforms.ts b/public/app/plugins/datasource/zipkin/utils/transforms.ts index 16e65e1dad7..c69f6d162e4 100644 --- a/public/app/plugins/datasource/zipkin/utils/transforms.ts +++ b/public/app/plugins/datasource/zipkin/utils/transforms.ts @@ -1,7 +1,7 @@ import { identity } from 'lodash'; import { keyBy } from 'lodash'; import { ZipkinAnnotation, ZipkinEndpoint, ZipkinSpan } from '../types'; -import { KeyValuePair, Log, Process, SpanData, TraceData } from '@jaegertracing/jaeger-ui-components'; +import { KeyValuePair, Log, Process, SpanData, TraceData } from '@grafana/data'; /** * Transforms response to format similar to Jaegers as we use Jaeger ui on the frontend.