Skip to content

Commit

Permalink
[8.7] [data views] More efficient telemetry collection (#152298) (#15…
Browse files Browse the repository at this point in the history 
…3293)

# Backport

This will backport the following commits from `main` to `8.7`:
- [[data views] More efficient telemetry collection
(#152298)](#152298)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Matthew
Kime","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-03-20T12:52:55Z","message":"[data
views] More efficient telemetry collection (#152298)\n\n##
Summary\r\n\r\nTelemetry no longer makes field caps calls. Also batch
loads data view\r\nsaved objects.\r\n\r\nTo collect telemetry -
\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{\r\n}\r\n```\r\n\r\nAddresses:
https://github.com/elastic/sdh-kibana/issues/3389\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1892bf65352aa819cefb0408c507ad894edb8a16","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Feature:Data
Views","release_note:skip","Team:DataDiscovery","backport:prev-minor","v8.8.0"],"number":152298,"url":"https://github.com/elastic/kibana/pull/152298","mergeCommit":{"message":"[data
views] More efficient telemetry collection (#152298)\n\n##
Summary\r\n\r\nTelemetry no longer makes field caps calls. Also batch
loads data view\r\nsaved objects.\r\n\r\nTo collect telemetry -
\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{\r\n}\r\n```\r\n\r\nAddresses:
https://github.com/elastic/sdh-kibana/issues/3389\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1892bf65352aa819cefb0408c507ad894edb8a16"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/152298","number":152298,"mergeCommit":{"message":"[data
views] More efficient telemetry collection (#152298)\n\n##
Summary\r\n\r\nTelemetry no longer makes field caps calls. Also batch
loads data view\r\nsaved objects.\r\n\r\nTo collect telemetry -
\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{\r\n}\r\n```\r\n\r\nAddresses:
https://github.com/elastic/sdh-kibana/issues/3389\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1892bf65352aa819cefb0408c507ad894edb8a16"}}]}]
BACKPORT-->

Co-authored-by: Matthew Kime <[email protected]>
  • Loading branch information
@kibanamachine @mattkime
kibanamachine and mattkime authored Mar 20, 2023
1 parent db7a111 commit 05a3b04
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 90 deletions.
84 changes: 57 additions & 27 deletions src/plugins/data_views/server/register_index_pattern_usage_collection.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
updateMax,
getIndexPatternTelemetry,
} from './register_index_pattern_usage_collection';
import { DataViewsService } from '../common';
import { SavedObjectsClient } from '@kbn/core/server';

const scriptA = 'emit(0);';
const scriptB = 'emit(1);\nemit(2);';
Expand All @@ -22,17 +22,27 @@ const scriptedFieldA = { script: scriptA };
const scriptedFieldB = { script: scriptB };
const scriptedFieldC = { script: scriptC };

const runtimeFieldA = { runtimeField: { script: { source: scriptA } } };
const runtimeFieldB = { runtimeField: { script: { source: scriptB } } };
const runtimeFieldC = { runtimeField: { script: { source: scriptC } } };

const indexPatterns = {
getIds: async () => [1, 2, 3],
get: jest.fn().mockResolvedValue({
getScriptedFields: () => [],
fields: [],
const runtimeFieldA = { script: { source: scriptA } };
const runtimeFieldB = { script: { source: scriptB } };
const runtimeFieldC = { script: { source: scriptC } };

let returnedSavedObjects = [
{
attributes: {},
},
];

const savedObjects = {
createPointInTimeFinder: jest.fn().mockReturnValue({
find: jest.fn().mockImplementation(async function* () {
yield await Promise.resolve({
total: 3,
saved_objects: returnedSavedObjects,
});
}),
close: jest.fn(),
}),
} as any as DataViewsService;
} as any as SavedObjectsClient;

describe('index pattern usage collection', () => {
it('minMaxAvgLoC calculates min, max, and average ', () => {
Expand All @@ -59,7 +69,7 @@ describe('index pattern usage collection', () => {
};

it('when there are no runtime fields or scripted fields', async () => {
expect(await getIndexPatternTelemetry(indexPatterns)).toEqual({
expect(await getIndexPatternTelemetry(savedObjects)).toEqual({
indexPatternsCount: 3,
indexPatternsWithScriptedFieldCount: 0,
indexPatternsWithRuntimeFieldCount: 0,
Expand All @@ -75,12 +85,20 @@ describe('index pattern usage collection', () => {
});

it('when there are both runtime fields or scripted fields', async () => {
indexPatterns.get = jest.fn().mockResolvedValue({
getScriptedFields: () => [scriptedFieldA, scriptedFieldB, scriptedFieldC],
fields: [runtimeFieldA, runtimeFieldB, runtimeFieldC],
});
const dataView = {
attributes: {
fields: JSON.stringify([scriptedFieldA, scriptedFieldB, scriptedFieldC]),
runtimeFieldMap: JSON.stringify({
runtimeFieldA,
runtimeFieldB,
runtimeFieldC,
}),
},
};

returnedSavedObjects = [dataView, dataView, dataView];

expect(await getIndexPatternTelemetry(indexPatterns)).toEqual({
expect(await getIndexPatternTelemetry(savedObjects)).toEqual({
indexPatternsCount: 3,
indexPatternsWithScriptedFieldCount: 3,
indexPatternsWithRuntimeFieldCount: 3,
Expand All @@ -96,12 +114,20 @@ describe('index pattern usage collection', () => {
});

it('when there are only runtime fields', async () => {
indexPatterns.get = jest.fn().mockResolvedValue({
getScriptedFields: () => [],
fields: [runtimeFieldA, runtimeFieldB, runtimeFieldC],
});
const dataView = {
attributes: {
fields: JSON.stringify([]),
runtimeFieldMap: JSON.stringify({
runtimeFieldA,
runtimeFieldB,
runtimeFieldC,
}),
},
};

returnedSavedObjects = [dataView, dataView, dataView];

expect(await getIndexPatternTelemetry(indexPatterns)).toEqual({
expect(await getIndexPatternTelemetry(savedObjects)).toEqual({
indexPatternsCount: 3,
indexPatternsWithScriptedFieldCount: 0,
indexPatternsWithRuntimeFieldCount: 3,
Expand All @@ -117,12 +143,16 @@ describe('index pattern usage collection', () => {
});

it('when there are only scripted fields', async () => {
indexPatterns.get = jest.fn().mockResolvedValue({
getScriptedFields: () => [scriptedFieldA, scriptedFieldB, scriptedFieldC],
fields: [],
});
const dataView = {
attributes: {
fields: JSON.stringify([scriptedFieldA, scriptedFieldB, scriptedFieldC]),
runtimeFieldMap: JSON.stringify({}),
},
};

returnedSavedObjects = [dataView, dataView, dataView];

expect(await getIndexPatternTelemetry(indexPatterns)).toEqual({
expect(await getIndexPatternTelemetry(savedObjects)).toEqual({
indexPatternsCount: 3,
indexPatternsWithScriptedFieldCount: 3,
indexPatternsWithRuntimeFieldCount: 0,
Expand Down
140 changes: 77 additions & 63 deletions src/plugins/data_views/server/register_index_pattern_usage_collection.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@

import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
import { StartServicesAccessor } from '@kbn/core/server';
import { SavedObjectsClient } from '@kbn/core/server';
import { DataViewsContract } from '../common';
import { SavedObjectsClient, SavedObjectsCreatePointInTimeFinderOptions } from '@kbn/core/server';
import {
DATA_VIEW_SAVED_OBJECT_TYPE,
DataViewAttributes,
FieldSpec,
RuntimeField,
} from '../common';
import { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from './types';

interface CountSummary {
Expand All @@ -18,6 +23,8 @@ interface CountSummary {
avg?: number;
}

type DataViewFieldAttrs = Pick<DataViewAttributes, 'fields' | 'runtimeFieldMap'>;

interface IndexPatternUsage {
indexPatternsCount: number;
indexPatternsWithScriptedFieldCount: number;
Expand Down Expand Up @@ -57,17 +64,15 @@ export const updateMax = (currentMax: number | undefined, newVal: number): numbe
}
};

export async function getIndexPatternTelemetry(indexPatterns: DataViewsContract) {
const ids = await indexPatterns.getIds();

export async function getIndexPatternTelemetry(savedObjectsService: SavedObjectsClient) {
const countSummaryDefaults: CountSummary = {
min: undefined,
max: undefined,
avg: undefined,
};

const results = {
indexPatternsCount: ids.length,
indexPatternsCount: 0,
indexPatternsWithScriptedFieldCount: 0,
indexPatternsWithRuntimeFieldCount: 0,
scriptedFieldCount: 0,
Expand All @@ -80,60 +85,73 @@ export async function getIndexPatternTelemetry(indexPatterns: DataViewsContract)
},
};

await ids.reduce(async (col, id) => {
await col;
const ip = await indexPatterns.get(id);
const findOptions: SavedObjectsCreatePointInTimeFinderOptions = {
type: DATA_VIEW_SAVED_OBJECT_TYPE,
perPage: 1000,
fields: ['fields', 'runtimeFieldMap'],
};

const scriptedFields = ip.getScriptedFields();
const runtimeFields = ip.fields.filter((fld) => !!fld.runtimeField);
const finder = savedObjectsService.createPointInTimeFinder<DataViewFieldAttrs>(findOptions);

if (scriptedFields.length > 0) {
// increment counts
results.indexPatternsWithScriptedFieldCount++;
results.scriptedFieldCount += scriptedFields.length;
for await (const response of finder.find()) {
const { saved_objects: savedObjects, total } = response;
results.indexPatternsCount = total;

// calc LoC
results.perIndexPattern.scriptedFieldLineCount = minMaxAvgLoC(
scriptedFields.map((fld) => fld.script || '')
);

// calc field counts
results.perIndexPattern.scriptedFieldCount.min = updateMin(
results.perIndexPattern.scriptedFieldCount.min,
scriptedFields.length
);
results.perIndexPattern.scriptedFieldCount.max = updateMax(
results.perIndexPattern.scriptedFieldCount.max,
scriptedFields.length
);
results.perIndexPattern.scriptedFieldCount.avg =
results.scriptedFieldCount / results.indexPatternsWithScriptedFieldCount;
}

if (runtimeFields.length > 0) {
// increment counts
results.indexPatternsWithRuntimeFieldCount++;
results.runtimeFieldCount += runtimeFields.length;
savedObjects.forEach((obj) => {
const fields = obj.attributes?.fields ? JSON.parse(obj.attributes.fields) || [] : [];
const runtimeFieldsMap = obj.attributes?.runtimeFieldMap
? JSON.parse(obj.attributes.runtimeFieldMap) || {}
: {};
const scriptedFields: FieldSpec[] = fields.filter((fld: FieldSpec) => !!fld.script);
const runtimeFields: RuntimeField[] = Object.values(runtimeFieldsMap);

// calc LoC
const runtimeFieldScripts = runtimeFields.map(
(fld) => fld.runtimeField?.script?.source || ''
);
results.perIndexPattern.runtimeFieldLineCount = minMaxAvgLoC(runtimeFieldScripts);

// calc field counts
results.perIndexPattern.runtimeFieldCount.min = updateMin(
results.perIndexPattern.runtimeFieldCount.min,
runtimeFields.length
);
results.perIndexPattern.runtimeFieldCount.max = updateMax(
results.perIndexPattern.runtimeFieldCount.max,
runtimeFields.length
);
results.perIndexPattern.runtimeFieldCount.avg =
results.runtimeFieldCount / results.indexPatternsWithRuntimeFieldCount;
}
}, Promise.resolve());
if (scriptedFields.length > 0) {
// increment counts
results.indexPatternsWithScriptedFieldCount++;
results.scriptedFieldCount += scriptedFields.length;

// calc LoC
results.perIndexPattern.scriptedFieldLineCount = minMaxAvgLoC(
scriptedFields.map((fld) => fld.script || '')
);

// calc field counts
results.perIndexPattern.scriptedFieldCount.min = updateMin(
results.perIndexPattern.scriptedFieldCount.min,
scriptedFields.length
);
results.perIndexPattern.scriptedFieldCount.max = updateMax(
results.perIndexPattern.scriptedFieldCount.max,
scriptedFields.length
);
results.perIndexPattern.scriptedFieldCount.avg =
results.scriptedFieldCount / results.indexPatternsWithScriptedFieldCount;
}

if (runtimeFields.length > 0) {
// increment counts
results.indexPatternsWithRuntimeFieldCount++;
results.runtimeFieldCount += runtimeFields.length;

// calc LoC
const runtimeFieldScripts = runtimeFields.map((fld) => fld.script?.source || '');
results.perIndexPattern.runtimeFieldLineCount = minMaxAvgLoC(runtimeFieldScripts);

// calc field counts
results.perIndexPattern.runtimeFieldCount.min = updateMin(
results.perIndexPattern.runtimeFieldCount.min,
runtimeFields.length
);
results.perIndexPattern.runtimeFieldCount.max = updateMax(
results.perIndexPattern.runtimeFieldCount.max,
runtimeFields.length
);
results.perIndexPattern.runtimeFieldCount.avg =
results.runtimeFieldCount / results.indexPatternsWithRuntimeFieldCount;
}
});
}

return results;
}
Expand All @@ -153,14 +171,10 @@ export function registerIndexPatternsUsageCollector(
type: 'index-patterns',
isReady: () => true,
fetch: async () => {
const [{ savedObjects, elasticsearch }, , { dataViewsServiceFactory }] =
await getStartServices();
const indexPatternService = await dataViewsServiceFactory(
new SavedObjectsClient(savedObjects.createInternalRepository()),
elasticsearch.client.asInternalUser
);

return await getIndexPatternTelemetry(indexPatternService);
const [{ savedObjects }] = await getStartServices();

const savedObjectsService = new SavedObjectsClient(savedObjects.createInternalRepository());
return await getIndexPatternTelemetry(savedObjectsService);
},
schema: {
indexPatternsCount: { type: 'long' },
Expand Down

0 comments on commit 05a3b04

Please sign in to comment.