diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.test.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.test.js index 523698ad5a..b75762acd4 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.test.js +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.test.js @@ -175,8 +175,11 @@ describe('', () => { it('when click on DownloadResults then call download function', () => { const originalBlob = global.Blob; - global.Blob = function (text, options) { - return { text, options }; + global.Blob = class { + constructor(text, options) { + this.text = text; + this.options = options; + } }; URL.createObjectURL = jest.fn(); URL.revokeObjectURL = jest.fn(); diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.tsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.tsx index 53d09aba7c..575006f3ca 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.tsx +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.tsx @@ -93,6 +93,11 @@ const SelectSort = reduxForm({ export const sortFormSelector = formValueSelector('traceResultsSort'); +// export for tests +export function createBlob(rawTraces: TraceData[]) { + return new Blob([`{"data":${JSON.stringify(rawTraces)}}`], { type: 'application/json' }); +} + export class UnconnectedSearchResults extends React.PureComponent { static defaultProps = { skipMessage: false, spanLinks: undefined, queryOfResults: undefined }; @@ -239,9 +244,5 @@ export class UnconnectedSearchResults extends React.PureComponent { if (val.attribute === 'name') return ( onClickOption(row.hasSubgroupValue, row.name)} style={{ borderLeft: `4px solid ${row.color || `transparent`}`, diff --git a/packages/jaeger-ui/src/demo/trace-generators.js b/packages/jaeger-ui/src/demo/trace-generators.js index 5cd1782ca5..d81df90cde 100644 --- a/packages/jaeger-ui/src/demo/trace-generators.js +++ b/packages/jaeger-ui/src/demo/trace-generators.js @@ -14,8 +14,6 @@ import Chance from 'chance'; -import { getSpanId } from '../selectors/span'; - const chance = new Chance(); export const SERVICE_LIST = ['serviceA', 'serviceB', 'serviceC', 'serviceD', 'serviceE', 'serviceF']; @@ -40,7 +38,7 @@ function getParentSpanId(span, levels) { // pick the correct nesting level if allocated by the levels calculation levels.forEach((level, idx) => { - if (level.indexOf(getSpanId(span)) >= 0) { + if (level.indexOf(span.spanID) >= 0) { nestingLevel = idx; } }); @@ -50,7 +48,7 @@ function getParentSpanId(span, levels) { /* this simulates the hierarchy created by CHILD_OF tags */ function attachReferences(spans, depth, spansPerLevel) { - let levels = [[getSpanId(spans[0])]]; + let levels = [[spans[0].spanID]]; const duplicateLevelFilter = currentLevels => span => !currentLevels.find(level => level.indexOf(span.spanID) >= 0); @@ -60,7 +58,7 @@ function attachReferences(spans, depth, spansPerLevel) { if (remainingSpans.length <= 0) break; const newLevel = chance .pickset(remainingSpans, spansPerLevel || chance.integer({ min: 4, max: 8 })) - .map(getSpanId); + .map(span => span.spanID); levels.push(newLevel); } diff --git a/packages/jaeger-ui/src/selectors/span.js b/packages/jaeger-ui/src/selectors/span.js deleted file mode 100644 index 940a8e1407..0000000000 --- a/packages/jaeger-ui/src/selectors/span.js +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -export const getSpanId = span => span.spanID; diff --git a/packages/jaeger-ui/src/selectors/span.test.js b/packages/jaeger-ui/src/selectors/span.test.js deleted file mode 100644 index b6802f1d17..0000000000 --- a/packages/jaeger-ui/src/selectors/span.test.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as spanSelectors from './span'; -import traceGenerator from '../demo/trace-generators'; - -const generatedTrace = traceGenerator.trace({ numberOfSpans: 45 }); - -it('getSpanId() should return the name of the span', () => { - const span = generatedTrace.spans[0]; - - expect(spanSelectors.getSpanId(span)).toBe(span.spanID); -}); diff --git a/packages/jaeger-ui/src/selectors/trace.test.js b/packages/jaeger-ui/src/selectors/trace.test.js index 10297d220a..c8daaec26e 100644 --- a/packages/jaeger-ui/src/selectors/trace.test.js +++ b/packages/jaeger-ui/src/selectors/trace.test.js @@ -13,7 +13,6 @@ // limitations under the License. import { followsFromRef } from './trace.fixture'; -import { getSpanId } from './span'; import * as traceSelectors from './trace'; import traceGenerator from '../demo/trace-generators'; @@ -21,7 +20,7 @@ const generatedTrace = traceGenerator.trace({ numberOfSpans: 45 }); describe('getTraceSpanIdsAsTree()', () => { const getTraceSpansAsMap = trace => - trace.spans.reduce((map, span) => map.set(getSpanId(span), span), new Map()); + trace.spans.reduce((map, span) => map.set(span.spanID, span), new Map()); it('builds the tree properly', () => { const tree = traceSelectors.getTraceSpanIdsAsTree(generatedTrace); const spanMap = getTraceSpansAsMap(generatedTrace); diff --git a/packages/jaeger-ui/tsconfig.lint.json b/packages/jaeger-ui/tsconfig.lint.json index ef66a22ccb..c2aac22772 100644 --- a/packages/jaeger-ui/tsconfig.lint.json +++ b/packages/jaeger-ui/tsconfig.lint.json @@ -51,7 +51,6 @@ "src/reducers/services.js", "src/reducers/trace.js", "src/selectors/dependencies.js", - "src/selectors/span.js", "src/selectors/trace.js", "src/utils/configure-store.js", "src/utils/sort.js",