Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APM] Fix missing ML data, and NaN issue #34333

Merged
merged 4 commits into from
Apr 2, 2019
Merged

[APM] Fix missing ML data, and NaN issue #34333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc98f55
[APM] Fix missing ML data, and NaN issue
sorenlouv Apr 2, 2019
6e709e8
Fixed tests in setup_request
sorenlouv Apr 2, 2019
97e7729
Fix snapshots
sorenlouv Apr 2, 2019
2fd0960
Don’t remove first bucket
sorenlouv Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Don’t remove first bucket
  • Loading branch information
@sorenlouv
sorenlouv committed Apr 2, 2019
commit 2fd0960ebb6de5be06c30ec871a1708d9a81fc60
28 changes: 28 additions & 0 deletions ...m/server/lib/transactions/charts/get_timeseries_data/__snapshots__/transform.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Object {
"overallAvgDuration": 32861.15660262639,
"responseTimes": Object {
"avg": Array [
Object {
"x": 1528113600000,
"y": 26310.63483891513,
},
Object {
"x": 1528124400000,
"y": 26193.277795595466,
Expand Down Expand Up @@ -327,6 +331,10 @@ Object {
},
],
"p95": Array [
Object {
"x": 1528113600000,
"y": 82172.85648714812,
},
Object {
"x": 1528124400000,
"y": 80738.78571428556,
Expand Down Expand Up @@ -649,6 +657,10 @@ Object {
},
],
"p99": Array [
Object {
"x": 1528113600000,
"y": 293866.3866666665,
},
Object {
"x": 1528124400000,
"y": 293257.27333333343,
Expand Down Expand Up @@ -975,6 +987,10 @@ Object {
"tpmBuckets": Array [
Object {
"dataPoints": Array [
Object {
"x": 1528113600000,
"y": 82230,
},
Object {
"x": 1528124400000,
"y": 81460,
Expand Down Expand Up @@ -1300,6 +1316,10 @@ Object {
},
Object {
"dataPoints": Array [
Object {
"x": 1528113600000,
"y": 0,
},
Object {
"x": 1528124400000,
"y": 0,
Expand Down Expand Up @@ -1625,6 +1645,10 @@ Object {
},
Object {
"dataPoints": Array [
Object {
"x": 1528113600000,
"y": 5930,
},
Object {
"x": 1528124400000,
"y": 6065,
Expand Down Expand Up @@ -1950,6 +1974,10 @@ Object {
},
Object {
"dataPoints": Array [
Object {
"x": 1528113600000,
"y": 6045,
},
Object {
"x": 1528124400000,
"y": 6015,
Expand Down
24 changes: 12 additions & 12 deletions x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { first } from 'lodash';
import { timeseriesResponse } from './mock-responses/timeseries_response';
import {
ApmTimeSeriesResponse,
Expand All @@ -21,15 +20,6 @@ describe('timeseriesTransformer', () => {
});
});

it('should remove first bucket', () => {
const mockDates = timeseriesResponse.aggregations.transaction_results.buckets[0].timeseries.buckets.map(
bucket => bucket.key
);

expect(first(res.responseTimes.avg).x).not.toBe(first(mockDates));
expect(first(res.tpmBuckets[0].dataPoints).x).not.toBe(first(mockDates));
});

it('should have correct order', () => {
expect(res.tpmBuckets.map(bucket => bucket.key)).toEqual([
'HTTP 2xx',
Expand Down Expand Up @@ -108,11 +98,21 @@ describe('getTpmBuckets', () => {
const bucketSize = 10;
expect(getTpmBuckets(buckets, bucketSize)).toEqual([
{
dataPoints: [{ x: 1, y: 1200 }, { x: 2, y: 1800 }, { x: 3, y: 2400 }],
dataPoints: [
{ x: 0, y: 0 },
{ x: 1, y: 1200 },
{ x: 2, y: 1800 },
{ x: 3, y: 2400 }
],
key: 'HTTP 4xx'
},
{
dataPoints: [{ x: 1, y: 3000 }, { x: 2, y: 600 }, { x: 3, y: 1800 }],
dataPoints: [
{ x: 0, y: 0 },
{ x: 1, y: 3000 },
{ x: 2, y: 600 },
{ x: 3, y: 1800 }
],
key: 'HTTP 5xx'
}
]);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function getTpmBuckets(
) {
const buckets = transactionResultBuckets.map(
({ key: resultKey, timeseries }) => {
const dataPoints = timeseries.buckets.slice(1).map(bucket => {
const dataPoints = timeseries.buckets.map(bucket => {
return {
x: bucket.key,
y: round(bucket.doc_count * (60 / bucketSize), 1)
Expand All @@ -82,7 +82,7 @@ export function getTpmBuckets(
function getResponseTime(
responseTimeBuckets: ESResponse['aggregations']['response_times']['buckets'] = []
) {
return responseTimeBuckets.slice(1).reduce(
return responseTimeBuckets.reduce(
(acc, bucket) => {
const { '95.0': p95, '99.0': p99 } = bucket.pct.values;

Expand Down