-
Notifications
You must be signed in to change notification settings - Fork 8
Add WebSocket failover counter metric and URL change logging #661
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
Draft
cawthorne
wants to merge
2
commits into
main
Choose a base branch
from
feature/ws-failover-observability-abnormal-closure
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -414,9 +414,10 @@ export class WebSocketTransport< | |
| // to determine minimum TTL of an open connection given no explicit connection errors. | ||
| if (connectionUnresponsive) { | ||
| this.streamHandlerInvocationsWithNoConnection += 1 | ||
| logger.trace( | ||
| `The connection is unresponsive, incremented streamHandlerIterationsWithNoConnection = ${this.streamHandlerInvocationsWithNoConnection}`, | ||
| logger.info( | ||
| `The connection is unresponsive (last message ${timeSinceLastMessage}ms ago), incremented failover counter to ${this.streamHandlerInvocationsWithNoConnection}`, | ||
| ) | ||
| metrics.get('wsConnectionFailoverCount').labels({ transport_name: this.name }).set(this.streamHandlerInvocationsWithNoConnection) | ||
| } | ||
|
|
||
| // We want to check if the URL we calculate is different from the one currently connected. | ||
|
|
@@ -431,9 +432,10 @@ export class WebSocketTransport< | |
| // Check if we should close the current connection | ||
| if (!connectionClosed && (urlChanged || connectionUnresponsive)) { | ||
| if (urlChanged) { | ||
| logger.info('Websocket URL has changed, closing connection to reconnect...') | ||
| censorLogs(() => | ||
| logger.debug( | ||
| `Websocket url has changed from ${this.currentUrl} to ${urlFromConfig}, closing connection...`, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this no longer close the connection?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It does, but that string got moved to the info level log, so it is always visible with info level logs. |
||
| `Websocket URL changed from ${this.currentUrl} to ${urlFromConfig}`, | ||
| ), | ||
| ) | ||
| } else { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see where this is reset to 0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't. The underlying variable it is meant to expose
streamHandlerInvocationsWithNoConnectionalso never resets. It just increments forever, and Tiingo uses modulo arithmetic on it, it is used in this PR:https://github.com/smartcontractkit/external-adapters-js/pull/4543/files (even before my changes).
Open to resetting it if there is a good reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if it should reset, but the description says "Resets to 0 when data flows successfully."