Move discovery and attachStream outside of the client context

[alex268]

No description provided.

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 61.28%. Comparing base (699d3fe) to head (da6b944).

Additional details and impacted files

@@             Coverage Diff              @@
##             master     #531      +/-   ##
============================================
+ Coverage     61.23%   61.28%   +0.05%     
- Complexity     2311     2314       +3     
============================================
  Files           328      328              
  Lines         13515    13520       +5     
  Branches       1352     1352              
============================================
+ Hits           8276     8286      +10     
+ Misses         4600     4597       -3     
+ Partials        639      637       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.