[Ingest Manager] Add more Fleet concurrency tests #71744 #72338

jfsiii · 2020-07-17T20:19:43Z

Summary

The limited concurrency is enforced by a global preAuth interceptor. limited_concurrency.ts exports createLimitedPreAuthHandler which allows to configure the "middleware" then make calls to it with mock data;

Looking for 👀& feedback on the approach & two JS/TS issues:

(1) see // @ts-ignore error re: mockPreAuthToolkit return type comments
(2)

TypeError: Invalid event target for request.events.aborted$

  console.warn
    TypeError: Invalid event target
        at setupSubscription (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/observable/fromEvent.ts:229:11)
        at Observable._subscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/observable/fromEvent.ts:204:5)
        at Observable.Object.<anonymous>.Observable._trySubscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:238:19)
        at Observable.Object.<anonymous>.Observable.subscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:219:14)
        at TakeOperator.Object.<anonymous>.TakeOperator.call (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/operators/take.ts:72:19)
        at Observable.Object.<anonymous>.Observable.subscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:214:25)
        at ThrowIfEmptyOperator.Object.<anonymous>.ThrowIfEmptyOperator.call (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/operators/throwIfEmpty.ts:48:19)
        at Observable.Object.<anonymous>.Observable.subscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:214:25)
        at TakeUntilOperator.Object.<anonymous>.TakeUntilOperator.call (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/operators/takeUntil.ts:64:21)
        at Observable.Object.<anonymous>.Observable.subscribe (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:214:25)
        at /Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:360:12
        at new Promise (<anonymous>)
        at Observable.toPromise (/Users/jfsiii/work/kibana/node_modules/rxjs/src/internal/Observable.ts:358:12)
        at preAuthHandler (/Users/jfsiii/work/kibana/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.ts:71:29)
        at Object.test (/Users/jfsiii/work/kibana/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts:113:11)
        at Promise (/Users/jfsiii/work/kibana/node_modules/jest-circus/build/utils.js:198:28)
        at new Promise (<anonymous>)
        at callAsyncCircusFn (/Users/jfsiii/work/kibana/node_modules/jest-circus/build/utils.js:162:10)
        at _callCircusTest (/Users/jfsiii/work/kibana/node_modules/jest-circus/build/run.js:205:40)

      69 |     // requests.events.aborted$ has a bug (but has test which explicitly verifies) where it's fired even when the request completes
      70 |     // https://github.com/elastic/kibana/pull/70495#issuecomment-656288766
    > 71 |     request.events.aborted$.toPromise().then(() => {
         |                             ^
      72 |       maxCounter.decrease();
      73 |     });
      74 |

      at Observable.Object.<anonymous>.Observable._trySubscribe (../node_modules/rxjs/src/internal/Observable.ts:247:17)
      at Observable.Object.<anonymous>.Observable.subscribe (../node_modules/rxjs/src/internal/Observable.ts:219:14)
      at TakeOperator.Object.<anonymous>.TakeOperator.call (../node_modules/rxjs/src/internal/operators/take.ts:72:19)
      at Observable.Object.<anonymous>.Observable.subscribe (../node_modules/rxjs/src/internal/Observable.ts:214:25)
      at ThrowIfEmptyOperator.Object.<anonymous>.ThrowIfEmptyOperator.call (../node_modules/rxjs/src/internal/operators/throwIfEmpty.ts:48:19)
      at Observable.Object.<anonymous>.Observable.subscribe (../node_modules/rxjs/src/internal/Observable.ts:214:25)
      at TakeUntilOperator.Object.<anonymous>.TakeUntilOperator.call (../node_modules/rxjs/src/internal/operators/takeUntil.ts:64:21)
      at Observable.Object.<anonymous>.Observable.subscribe (../node_modules/rxjs/src/internal/Observable.ts:214:25)
      at ../node_modules/rxjs/src/internal/Observable.ts:360:12
      at Observable.toPromise (../node_modules/rxjs/src/internal/Observable.ts:358:12)
      at preAuthHandler (plugins/ingest_manager/server/routes/limited_concurrency.ts:71:29)
      at Object.test (plugins/ingest_manager/server/routes/limited_concurrency.test.ts:113:11)

(2) seems to prevent decrease() from being called in the tests, but it is called in the app code.

Checklist

Unit or functional tests were updated or added to match the most common scenarios

jfsiii · 2020-07-18T00:17:28Z

@elasticmachine merge upstream

elasticmachine · 2020-07-20T17:24:12Z

Pinging @elastic/ingest-management (Team:Ingest Management)

jfsiii · 2020-07-20T17:29:55Z

@elastic/kibana-platform Can someone take a look at the two TS/JS issues I mention in the description? Let me know if I can give more information or pointers for any changes I should make to my code or platform code to fix/avoid them.

jfsiii · 2020-07-20T17:30:43Z

@elasticmachine merge upstream

pgayvallet · 2020-07-21T14:51:24Z

1/ mockPreAuthToolkit return type

We mixed something up when we added the preAuth hook, the mock doesnt return the correct thing:

kibana/src/core/server/http/http_service.mock.ts

Lines 178 to 181 in 0ea414c

    
           const createOnPreAuthToolkitMock = (): jest.Mocked<OnPreRoutingToolkit> => ({ 
        
             next: jest.fn(), 
        
             rewriteUrl: jest.fn(), 
        
           });

2/ TypeError: Invalid event target for request.events.aborted$

I confirm I can reproduce the error

import { httpServerMock } from './http_server.mocks';

describe('foo', () => {
  it('bar', async () => {
    const req = httpServerMock.createKibanaRequest();
    await req.events.aborted$.toPromise();
  });
});

causes

 TypeError: Invalid event target
        at setupSubscription (/Users/pierregayvallet/DEV/workspaces/elastic/kibana/node_modules/rxjs/src/internal/observable/fromEvent.ts:229:11)
        at Observable._subscribe (/Users/pierregayvallet/DEV/workspaces/elastic/kibana/node_modules/rxjs/src/internal/observable/fromEvent.ts:204:5)
        at Observable.Object.<anonymous>.Observable._trySubscribe (/Users/pierregayvallet/DEV/workspaces/elastic/kibana/node_modules/rxjs/src/internal/Observable.ts:238:19)

3/ 2) seems to prevent decrease() from being called in the tests, but it is called in the app code.

Fixing the mock implementation to no longer throw is quite easy, however you have to keep in mind that the req.events.aborted$ observable will never emit from a mocked request in a jest unit test environment, meaning that decrease will not be called anyway.

cc @restrry

pgayvallet · 2020-07-21T15:04:50Z

Created #72663

jfsiii · 2020-07-21T20:59:02Z

@jen-huang wdyt?

jen-huang

This test suite looks good based on the above limitations that we have.

Fixing the mock implementation to no longer throw is quite easy, however you have to keep in mind that the req.events.aborted$ observable will never emit from a mocked request in a jest unit test environment, meaning that decrease will not be called anyway.

@pgayvallet How can we prevent TypeError: Invalid event target from being thrown? @jfsiii I'd like to fix this aspect before merging, as the current error causes the test suite output to be quite noisy.

jen-huang · 2020-07-21T22:57:58Z

x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts

+    });
+
+    const mockRequest = httpServerMock.createKibanaRequest({
+      path: '/no/match',


based on the description, this looks like it should have a non-matching routeTags specified?

It could have tags which do not match or, like this case, no tags at all. I could add some

mshustov · 2020-07-22T07:24:24Z

How can we prevent TypeError: Invalid event target from being thrown?

@jen-huang Isn't it fixed in #72663 ?

pgayvallet · 2020-07-22T07:37:20Z

Isn't it fixed in #72663 ?

It is, and the PR has just been merged. Could you please merge master and confirm both issues are resolved?

jfsiii · 2020-07-22T11:54:36Z

@jen-huang since the doesn't require any changes to the test code I'd like to merge now

jfsiii · 2020-07-22T12:14:16Z

@elasticmachine merge upstream

jen-huang

I misunderstood where the work needed to be done for the error not to be thrown :)

LGTM. Thanks for adding these tests!

kibanamachine · 2020-07-22T21:09:18Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: d46a81d

Build metrics

✅ unchanged

History

💚 Build #63570 succeeded 506c2c0
💚 Build #63060 succeeded 8881112
💚 Build #62796 succeeded 9c1a868
💔 Build #62751 failed bea0807

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* master: (35 commits) Migrated karma tests to jest (elastic#72649) Migrate status page app to core (elastic#72017) Failing test: Jest Tests.src/plugins/vis_type_vega/public (elastic#71834) Fix Firefox TSVB flaky test with switch index patterns (elastic#72882) [ML] Fixing link to index management from file data visualizer (elastic#72863) test: 💍 add test for sub-expression variables (elastic#71644) fix bug (elastic#72809) [keystore] use get_keystore in server cli (elastic#72954) Show step number instead of incomplete step. (elastic#72866) Fix bug where user can't add an exception when "close alert" is checked (elastic#72919) [Monitoring] Fix issues displaying alerts (elastic#72891) [Ingest Manager] Add more Fleet concurrency tests elastic#71744 (elastic#72338) [Security Solution][Exceptions] - Update UI exceptions builder nested logic (elastic#72490) disable renovate masterIssue [ML] API integration tests for UPDATE data frame analytics endpoint (elastic#72710) [Uptime] Fix accessibility issue in Uptime app nav links (elastic#72926) [Maps] fix removing global filter from layer can cause app to start thrashing (elastic#72763) [Maps] fix blended layer aggregation error when using composite aggregation (elastic#72759) fix unexpected arguments to unload command Limits the upload size of lists to 9 meg size (elastic#72898) ...

jen-huang · 2020-07-23T17:51:44Z

Don't forget backport :) As this is adding more test coverage (rather than fixing an existing test that impacts other branches, etc), I updated the label to just 7.10 instead of all the way back to 7.9.

kibanamachine · 2020-07-23T22:38:44Z

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 72338 or prevent reminders by adding the backport:skip label.

kibanamachine · 2020-07-24T22:48:43Z

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

…3213) * Refactor to make more testable. Add more tests. * Remove ts-ignores. Add comment re: testing limitation Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>

John Schulz added 2 commits July 16, 2020 08:43

Pushing failing test for eyes

b956c61

Refactor to make more testable. Add more tests.

bea0807

jfsiii added Team:Fleet Team label for Observability Data Collection Fleet team [zube]: In Progress labels Jul 17, 2020

Merge branch 'master' into 71744-more-fleet-concurrency-tests

9c1a868

jfsiii marked this pull request as ready for review July 20, 2020 17:24

jfsiii requested a review from a team July 20, 2020 17:24

Merge branch 'master' into 71744-more-fleet-concurrency-tests

8881112

jfsiii added release_note:skip Skip the PR/issue when compiling release notes v7.9.0 v8.0.0 labels Jul 20, 2020

pgayvallet mentioned this pull request Jul 21, 2020

fix preAuth/preRouting mocks #72663

Merged

jen-huang reviewed Jul 21, 2020

View reviewed changes

Merge branch 'master' into 71744-more-fleet-concurrency-tests

506c2c0

jen-huang approved these changes Jul 22, 2020

View reviewed changes

Remove ts-ignores. Add comment re: testing limitation

d46a81d

jfsiii merged commit 1343643 into elastic:master Jul 22, 2020

jen-huang removed the v7.9.0 label Jul 22, 2020

jen-huang added the v7.10.0 label Jul 22, 2020

jfsiii mentioned this pull request Jul 23, 2020

[Ingest Manager] Add tests for the limited concurrency routes #71744

Closed

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jul 23, 2020

jfsiii mentioned this pull request Jul 24, 2020

[7.x] [Ingest Manager] Add more Fleet concurrency tests #71744 (#72338) #73213

Merged

kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jul 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Ingest Manager] Add more Fleet concurrency tests #71744 #72338

[Ingest Manager] Add more Fleet concurrency tests #71744 #72338

jfsiii commented Jul 17, 2020 •

edited

Loading

jfsiii commented Jul 18, 2020

elasticmachine commented Jul 20, 2020

jfsiii commented Jul 20, 2020

jfsiii commented Jul 20, 2020

pgayvallet commented Jul 21, 2020 •

edited

Loading

pgayvallet commented Jul 21, 2020

jfsiii commented Jul 21, 2020

jen-huang left a comment

jen-huang Jul 21, 2020

jfsiii Jul 22, 2020

mshustov commented Jul 22, 2020

pgayvallet commented Jul 22, 2020

jfsiii commented Jul 22, 2020

jfsiii commented Jul 22, 2020

jen-huang left a comment

kibanamachine commented Jul 22, 2020

jen-huang commented Jul 23, 2020

kibanamachine commented Jul 23, 2020

kibanamachine commented Jul 24, 2020

[Ingest Manager] Add more Fleet concurrency tests #71744 #72338

[Ingest Manager] Add more Fleet concurrency tests #71744 #72338

Conversation

jfsiii commented Jul 17, 2020 • edited Loading

Summary

Checklist

jfsiii commented Jul 18, 2020

elasticmachine commented Jul 20, 2020

jfsiii commented Jul 20, 2020

jfsiii commented Jul 20, 2020

pgayvallet commented Jul 21, 2020 • edited Loading

pgayvallet commented Jul 21, 2020

jfsiii commented Jul 21, 2020

jen-huang left a comment

Choose a reason for hiding this comment

jen-huang Jul 21, 2020

Choose a reason for hiding this comment

jfsiii Jul 22, 2020

Choose a reason for hiding this comment

mshustov commented Jul 22, 2020

pgayvallet commented Jul 22, 2020

jfsiii commented Jul 22, 2020

jfsiii commented Jul 22, 2020

jen-huang left a comment

Choose a reason for hiding this comment

kibanamachine commented Jul 22, 2020

💚 Build Succeeded

Build metrics

History

jen-huang commented Jul 23, 2020

kibanamachine commented Jul 23, 2020

kibanamachine commented Jul 24, 2020

jfsiii commented Jul 17, 2020 •

edited

Loading

pgayvallet commented Jul 21, 2020 •

edited

Loading