Skip to content

Commit 305fa6e

Browse files
committed
Update getUsageForCollection (#71609)
1 parent f74340f commit 305fa6e

3 files changed

Lines changed: 77 additions & 2 deletions

File tree

src/plugins/telemetry_collection_manager/server/plugin.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
UsageStatsPayload,
3838
StatsCollectionContext,
3939
} from './types';
40-
40+
import { isClusterOptedIn } from './util';
4141
import { encryptTelemetry } from './encryption';
4242

4343
interface TelemetryCollectionPluginsDepsSetup {
@@ -205,7 +205,9 @@ export class TelemetryCollectionManagerPlugin
205205
return usageData;
206206
}
207207

208-
return encryptTelemetry(usageData, { useProdKey: this.isDistributable });
208+
return encryptTelemetry(usageData.filter(isClusterOptedIn), {
209+
useProdKey: this.isDistributable,
210+
});
209211
}
210212
} catch (err) {
211213
this.logger.debug(
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import { isClusterOptedIn } from './util';
21+
22+
const createMockClusterUsage = (plugins: any) => {
23+
return {
24+
stack_stats: {
25+
kibana: { plugins },
26+
},
27+
};
28+
};
29+
30+
describe('isClusterOptedIn', () => {
31+
it('returns true if cluster has opt_in_status: true', () => {
32+
const mockClusterUsage = createMockClusterUsage({ telemetry: { opt_in_status: true } });
33+
const result = isClusterOptedIn(mockClusterUsage);
34+
expect(result).toBe(true);
35+
});
36+
it('returns false if cluster has opt_in_status: false', () => {
37+
const mockClusterUsage = createMockClusterUsage({ telemetry: { opt_in_status: false } });
38+
const result = isClusterOptedIn(mockClusterUsage);
39+
expect(result).toBe(false);
40+
});
41+
it('returns false if cluster has opt_in_status: undefined', () => {
42+
const mockClusterUsage = createMockClusterUsage({ telemetry: {} });
43+
const result = isClusterOptedIn(mockClusterUsage);
44+
expect(result).toBe(false);
45+
});
46+
it('returns false if cluster stats is malformed', () => {
47+
expect(isClusterOptedIn(createMockClusterUsage({}))).toBe(false);
48+
expect(isClusterOptedIn({})).toBe(false);
49+
expect(isClusterOptedIn(undefined)).toBe(false);
50+
});
51+
});
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
export const isClusterOptedIn = (clusterUsage: any): boolean => {
21+
return clusterUsage?.stack_stats?.kibana?.plugins?.telemetry?.opt_in_status === true;
22+
};

0 commit comments

Comments
 (0)