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.

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 agent marks #25717

Merged
merged 2 commits into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Transaction } from 'x-pack/plugins/apm/typings/Transaction';
import { getAgentMarks } from './get_agent_marks';

describe('getAgentMarks', () => {
it('should sort the marks', () => {
it('should sort the marks by time', () => {
const transaction: Transaction = {
transaction: {
marks: {
Expand All @@ -33,4 +33,11 @@ describe('getAgentMarks', () => {
} as any;
expect(getAgentMarks(transaction)).toEqual([]);
});

it('should return empty array if agent marks are missing', () => {
const transaction: Transaction = {
transaction: { marks: {} }
} as any;
expect(getAgentMarks(transaction)).toEqual([]);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface AgentMark {
}

export function getAgentMarks(transaction: Transaction): AgentMark[] {
if (!transaction.transaction.marks) {
if (!(transaction.transaction.marks && transaction.transaction.marks.agent)) {
return [];
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/typings/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ interface Context {
}

interface Marks {
agent: {
agent?: {
[name: string]: number;
};
}
Expand Down