mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Tracing: Add some error handling to JaegerQueryField (#23599)
This commit is contained in:
29
public/app/plugins/datasource/jaeger/QueryField.test.tsx
Normal file
29
public/app/plugins/datasource/jaeger/QueryField.test.tsx
Normal file
@@ -0,0 +1,29 @@
|
||||
import React from 'react';
|
||||
import { JaegerQueryField } from './QueryField';
|
||||
import { shallow } from 'enzyme';
|
||||
import { JaegerDatasource, JaegerQuery } from './datasource';
|
||||
import { ButtonCascader } from '@grafana/ui';
|
||||
|
||||
describe('JaegerQueryField', function() {
|
||||
it('shows empty value if no services returned', function() {
|
||||
const dsMock: JaegerDatasource = {
|
||||
metadataRequest(url: string) {
|
||||
if (url.indexOf('/services') > 0) {
|
||||
return Promise.resolve([]);
|
||||
}
|
||||
throw new Error(`Unexpected url: ${url}`);
|
||||
},
|
||||
} as any;
|
||||
|
||||
const wrapper = shallow(
|
||||
<JaegerQueryField
|
||||
history={[]}
|
||||
datasource={dsMock}
|
||||
query={{ query: '1234' } as JaegerQuery}
|
||||
onRunQuery={() => {}}
|
||||
onChange={() => {}}
|
||||
/>
|
||||
);
|
||||
expect(wrapper.find(ButtonCascader).props().options[0].label).toBe('No traces found');
|
||||
});
|
||||
});
|
||||
@@ -2,7 +2,8 @@ import React from 'react';
|
||||
import { JaegerDatasource, JaegerQuery } from './datasource';
|
||||
import { ButtonCascader, CascaderOption } from '@grafana/ui';
|
||||
|
||||
import { ExploreQueryFieldProps } from '@grafana/data';
|
||||
import { AppEvents, ExploreQueryFieldProps } from '@grafana/data';
|
||||
import { appEvents } from '../../../core/core';
|
||||
|
||||
const ALL_OPERATIONS_KEY = '__ALL__';
|
||||
const NO_TRACES_KEY = '__NO_TRACES__';
|
||||
@@ -21,6 +22,8 @@ function getLabelFromTrace(trace: any): string {
|
||||
}
|
||||
|
||||
export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
private _isMounted: boolean;
|
||||
|
||||
constructor(props: Props, context: React.Context<any>) {
|
||||
super(props, context);
|
||||
this.state = {
|
||||
@@ -29,16 +32,24 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this._isMounted = true;
|
||||
this.getServices();
|
||||
}
|
||||
|
||||
componentWillUnmount(): void {
|
||||
this._isMounted = false;
|
||||
}
|
||||
|
||||
async getServices() {
|
||||
const url = '/api/services';
|
||||
const { datasource } = this.props;
|
||||
try {
|
||||
const res = await datasource.metadataRequest(url);
|
||||
if (res) {
|
||||
const services = res as string[];
|
||||
const services: string[] | null = await datasource.metadataRequest(url);
|
||||
if (!this._isMounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (services) {
|
||||
const serviceOptions: CascaderOption[] = services.sort().map(service => ({
|
||||
label: service,
|
||||
value: service,
|
||||
@@ -47,7 +58,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
this.setState({ serviceOptions });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
appEvents.emit(AppEvents.alertError, ['Failed to load services from Jaeger', error]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +67,10 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
if (selectedOptions.length === 1) {
|
||||
// Load operations
|
||||
const operations: string[] = await this.findOperations(service);
|
||||
if (!this._isMounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
const allOperationsOption: CascaderOption = {
|
||||
label: '[ALL]',
|
||||
value: ALL_OPERATIONS_KEY,
|
||||
@@ -85,6 +100,10 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
const operationValue = selectedOptions[1].value;
|
||||
const operation = operationValue === ALL_OPERATIONS_KEY ? '' : operationValue;
|
||||
const traces: any[] = await this.findTraces(service, operation);
|
||||
if (!this._isMounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
let traceOptions: CascaderOption[] = traces.map(trace => ({
|
||||
label: getLabelFromTrace(trace),
|
||||
value: trace.traceID,
|
||||
@@ -128,7 +147,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
try {
|
||||
return await datasource.metadataRequest(url);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
appEvents.emit(AppEvents.alertError, ['Failed to load operations from Jaeger', error]);
|
||||
}
|
||||
return [];
|
||||
};
|
||||
@@ -151,7 +170,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
try {
|
||||
return await datasource.metadataRequest(url, traceSearch);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
appEvents.emit(AppEvents.alertError, ['Failed to load traces from Jaeger', error]);
|
||||
}
|
||||
return [];
|
||||
};
|
||||
@@ -168,12 +187,13 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
render() {
|
||||
const { query, onChange } = this.props;
|
||||
const { serviceOptions } = this.state;
|
||||
const cascaderOptions = serviceOptions && serviceOptions.length ? serviceOptions : noTracesFoundOptions;
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="gf-form-inline gf-form-inline--nowrap">
|
||||
<div className="gf-form flex-shrink-0">
|
||||
<ButtonCascader options={serviceOptions} onChange={this.onSelectTrace} loadData={this.onLoadOptions}>
|
||||
<ButtonCascader options={cascaderOptions} onChange={this.onSelectTrace} loadData={this.onLoadOptions}>
|
||||
Traces
|
||||
</ButtonCascader>
|
||||
</div>
|
||||
@@ -199,4 +219,15 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
|
||||
}
|
||||
}
|
||||
|
||||
const noTracesFoundOptions = [
|
||||
{
|
||||
label: 'No traces found',
|
||||
value: 'no_traces',
|
||||
isLeaf: true,
|
||||
|
||||
// Cannot be disabled because then cascader shows 'loading' for some reason.
|
||||
// disabled: true,
|
||||
},
|
||||
];
|
||||
|
||||
export default JaegerQueryField;
|
||||
|
||||
@@ -26,7 +26,7 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery> {
|
||||
super(instanceSettings);
|
||||
}
|
||||
|
||||
async metadataRequest(url: string, params?: Record<string, any>) {
|
||||
async metadataRequest(url: string, params?: Record<string, any>): Promise<any> {
|
||||
const res = await this._request(url, params, { silent: true }).toPromise();
|
||||
return res.data.data;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user