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.

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

[Remote Clock] Wait for first tick and recalculate historical request bounds #5433

Merged
merged 26 commits into from
Jul 7, 2022
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7f6274a
finshed updated to ES6 class
jvigliotta Jun 17, 2022
f9886d9
added request intercept functionality to telemetry api, added a reque…
jvigliotta Jun 17, 2022
4d38d82
added in git error handling so I can build viper locally
jvigliotta Jun 17, 2022
9fedb79
fix typo
jvigliotta Jun 17, 2022
c54f459
da bug n
jvigliotta Jun 17, 2022
24aae5b
da bug n
jvigliotta Jun 17, 2022
ccc134a
da bug n
jvigliotta Jun 17, 2022
1af963a
Merge branch 'release/2.0.5' into telemetry-request-interceptor
jvigliotta Jun 24, 2022
b9bafbe
modifying the interceptor loop
jvigliotta Jun 24, 2022
6f1bb75
modifying request to use await to better track what IS GOING ON
jvigliotta Jun 24, 2022
252e0a3
Merge branch 'release/2.0.5' into telemetry-request-interceptor
ozyx Jul 1, 2022
52e8486
Recalculate bounds if remote-clock not ready
ozyx Jul 1, 2022
9e0e773
teeny tiny lint fix
ozyx Jul 5, 2022
ee5c307
code review comments
ozyx Jul 6, 2022
f66a93e
Fix TelemetryAPI tests
ozyx Jul 6, 2022
7873fbc
Merge branch 'release/2.0.5' into telemetry-request-interceptor
ozyx Jul 6, 2022
158bfae
Fix a bunch of tests
ozyx Jul 6, 2022
a697960
Verify new bounds in e2e instead of unit tests
ozyx Jul 7, 2022
3c5aaec
I accidentally the wrong test
ozyx Jul 7, 2022
72ee1da
Merge branch 'release/2.0.5' into telemetry-request-interceptor
ozyx Jul 7, 2022
f29341b
update test title
ozyx Jul 7, 2022
64b4b35
Merge branch 'release/2.0.5' into telemetry-request-interceptor
akhenry Jul 7, 2022
8da039a
Ensure all arguments make it to the provider
ozyx Jul 7, 2022
da56412
add remoteClock e2e test stub
ozyx Jul 7, 2022
03d59b3
Merge branch 'release/2.0.5' into telemetry-request-interceptor
ozyx Jul 7, 2022
45afaed
Merge branch 'release/2.0.5' into telemetry-request-interceptor
akhenry Jul 7, 2022
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
Prev Previous commit
Next Next commit
modifying request to use await to better track what IS GOING ON
  • Loading branch information
jvigliotta committed Jun 24, 2022
commit 6f1bb755ea19842052a33f92410e8dbf5864dcc2
29 changes: 14 additions & 15 deletions src/api/telemetry/TelemetryAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export default class TelemetryAPI {
* @returns {Promise.<object[]>} a promise for an array of
* telemetry data
*/
request(domainObject) {
async request(domainObject) {
console.log('request', domainObject.identifier.key);
if (this.noRequestProviderForAllObjects) {
return Promise.resolve([]);
Expand All @@ -278,20 +278,19 @@ export default class TelemetryAPI {
return this.handleMissingRequestProvider(domainObject);
}

return this.applyRequestInterceptors(domainObject.identifier, arguments[1]).then((args) => {
console.log('new args', args);
return provider.request(domainObject, args)
.catch((rejected) => {
if (rejected.name !== 'AbortError') {
this.openmct.notifications.error('Error requesting telemetry data, see console for details');
console.error(rejected);
}

return Promise.reject(rejected);
}).finally(() => {
this.requestAbortControllers.delete(abortController);
});
});
let args = await this.applyRequestInterceptors(domainObject.identifier, arguments[1]);

return provider.request(domainObject, args)
ozyx marked this conversation as resolved.
Show resolved Hide resolved
.catch((rejected) => {
if (rejected.name !== 'AbortError') {
this.openmct.notifications.error('Error requesting telemetry data, see console for details');
console.error(rejected);
}

return Promise.reject(rejected);
}).finally(() => {
this.requestAbortControllers.delete(abortController);
});
}

/**
Expand Down