Skip to content

Commit

Permalink
Reverting unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ymao1 committed May 25, 2021
1 parent 0be04d6 commit a01134c
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ describe('taskRunner', () => {
ownerId: '234',
taskType: 'foo',
params: {},
traceparent: '',
};

beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ beforeAll(() => {
actionTaskParamsId: '3',
},
taskType: 'actions:1',
traceparent: '',
};
taskRunnerFactory = new TaskRunnerFactory(mockedActionExecutor);
mockedActionExecutor.initialize(actionExecutorInitializerParams);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,5 @@ function mockTask() {
user: undefined,
version: '123',
ownerId: '123',
traceparent: '',
};
}
1 change: 0 additions & 1 deletion x-pack/plugins/task_manager/server/lib/fill_pool.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ describe('fillPool', () => {
taskType: '',
params: {},
ownerId: null,
traceparent: '',
}));

test('fills task pool with all claimed tasks until fetchAvailableTasks stream closes', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,6 @@ const mockTaskInstance = (overrides: Partial<ConcreteTaskInstance> = {}): Concre
alertId: '1',
},
ownerId: null,
traceparent: '',
...overrides,
});

Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/task_manager/server/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,6 @@ export interface ConcreteTaskInstance extends TaskInstance {
* The random uuid of the Kibana instance which claimed ownership of the task last
*/
ownerId: string | null;

/**
* The serialized traceparent string of the current APM transaction or span.
*/
traceparent: string;
}

export type SerializedConcreteTaskInstance = Omit<
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/task_manager/server/task_store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,6 @@ function taskInstanceToAttributes(doc: TaskInstance): SerializedConcreteTaskInst
retryAt: (doc.retryAt && doc.retryAt.toISOString()) || null,
runAt: (doc.runAt || new Date()).toISOString(),
status: (doc as ConcreteTaskInstance).status || 'idle',
traceparent: (doc as ConcreteTaskInstance).traceparent || '',
} as SerializedConcreteTaskInstance;
}

Expand All @@ -438,7 +437,6 @@ export function savedObjectToConcreteTaskInstance(
retryAt: savedObject.attributes.retryAt ? new Date(savedObject.attributes.retryAt) : null,
state: parseJSONField(savedObject.attributes.state, 'state', savedObject.id),
params: parseJSONField(savedObject.attributes.params, 'params', savedObject.id),
traceparent: savedObject.attributes.traceparent,
};
}

Expand Down

0 comments on commit a01134c

Please sign in to comment.