mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
JaegerDS: Remove whitespace from traceID in query (#95786)
This commit is contained in:
parent
2c57ecc085
commit
bd8da0cf25
@ -101,6 +101,22 @@ describe('JaegerDatasource', () => {
|
||||
expect(mock).toHaveBeenCalledWith({ url: `${defaultSettings.url}/api/traces/a%2Fb` });
|
||||
});
|
||||
|
||||
it('should trim whitespace from traceid', async () => {
|
||||
const mock = setupFetchMock({ data: [testResponse] });
|
||||
const ds = new JaegerDatasource(defaultSettings);
|
||||
const query = {
|
||||
...defaultQuery,
|
||||
targets: [
|
||||
{
|
||||
query: 'a/b ',
|
||||
refId: '1',
|
||||
},
|
||||
],
|
||||
};
|
||||
await lastValueFrom(ds.query(query));
|
||||
expect(mock).toHaveBeenCalledWith({ url: `${defaultSettings.url}/api/traces/a%2Fb` });
|
||||
});
|
||||
|
||||
it('returns empty response if trace id is not specified', async () => {
|
||||
const ds = new JaegerDatasource(defaultSettings);
|
||||
const response = await lastValueFrom(
|
||||
|
@ -79,7 +79,7 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
|
||||
let { start, end } = this.getTimeRange(options.range);
|
||||
|
||||
if (target.queryType !== 'search' && target.query) {
|
||||
let url = `/api/traces/${encodeURIComponent(this.templateSrv.replace(target.query, options.scopedVars))}`;
|
||||
let url = `/api/traces/${encodeURIComponent(this.templateSrv.replace(target.query.trim(), options.scopedVars))}`;
|
||||
if (this.traceIdTimeParams) {
|
||||
url += `?start=${start}&end=${end}`;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user