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

[FIX ON MKI] x-pack/.../telemetry_config.ts #197036

Merged
merged 5 commits into from
Oct 21, 2024
Merged

[FIX ON MKI] x-pack/.../telemetry_config.ts #197036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0905641
[FIX ON MKI] `x-pack/.../telemetry_config.ts`
wayneseymour Oct 21, 2024
3a1d5d5
lower timeout, mv log msg, and fixup import
wayneseymour Oct 21, 2024
ea5808c
Merge branch 'main' of github.com:elastic/kibana into add-logging-and…
wayneseymour Oct 21, 2024
6610acc
fixup assertion due to switch from expect to kbn-expect
wayneseymour Oct 21, 2024
1b764cb
Use two expect libs and update tests accordingly.
wayneseymour Oct 21, 2024
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
1 change: 1 addition & 0 deletions packages/core/apps/core-apps-server-internal/src/core_app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ export class CoreAppsService {
this.configService.setDynamicConfigOverrides(persistedOverrides.attributes);
latestOverrideVersion = persistedOverrides.version;
}
this.logger.info('Succeeded in applying persisted dynamic config overrides');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd move this log info inside the IF to only log when a change is actually applied. Otherwise, we'll log it every poll-interval.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh that makes perfect sense

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3a1d5d5

} catch (err) {
// Potential failures:
// - The SO document does not exist (404 error) => no need to log
Expand Down
12 changes: 10 additions & 2 deletions x-pack/test_serverless/api_integration/test_suites/common/telemetry/telemetry_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
* 2.0.
*/

import { expect } from 'expect';
import { expect } from '@kbn/expect';
import { SupertestWithRoleScopeType } from '@kbn/test-suites-xpack/api_integration/deployment_agnostic/services';
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function telemetryConfigTest({ getService }: FtrProviderContext) {
const roleScopedSupertest = getService('roleScopedSupertest');
let supertestAdminWithApiKey: SupertestWithRoleScopeType;
let supertestAdminWithCookieCredentials: SupertestWithRoleScopeType;
const retry = getService('retry');
const retryTimeout = 180 * 1000;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, even a shorter timeout would be enough (we poll every 10s). 20s should be plenty.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3a1d5d5


describe('/api/telemetry/v2/config API Telemetry config', function () {
before(async () => {
Expand Down Expand Up @@ -71,7 +73,13 @@ export default function telemetryConfigTest({ getService }: FtrProviderContext)
.send({ 'telemetry.labels.journeyName': null })
.expect(200, { ok: true });

await supertestAdminWithApiKey.get('/api/telemetry/v2/config').expect(200, initialConfig);
await retry.tryForTime(retryTimeout, async function retryTelemetryConfigGetRequest() {
const { body } = await supertestAdminWithApiKey.get('/api/telemetry/v2/config').expect(200);
expect(body).to.eql(
initialConfig,
`Expected the response body to match the intitial config, but got: [${body}]`
);
});
});
});
}