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

[CT-1338] Add channel and id properties to error message on subscription failure. #2678

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

vincentwschau
Copy link
Contributor

@vincentwschau vincentwschau commented Jan 8, 2025

Changelist

Add channel and id to error messages returned when subscribing to a channel fails so clients can correctly retry the subscription.

Test Plan

Unit tests.

Author/Reviewer Checklist

  • If this PR has changes that result in a different app state given the same prior state and transaction list, manually add the state-breaking label.
  • If the PR has breaking postgres changes to the indexer add the indexer-postgres-breaking label.
  • If this PR isn't state-breaking but has changes that modify behavior in PrepareProposal or ProcessProposal, manually add the label proposal-breaking.
  • If this PR is one of many that implement a specific feature, manually label them all feature:[feature-name].
  • If you wish to for mergify-bot to automatically create a PR to backport your change to a release branch, manually add the label backport/[branch-name].
  • Manually add any of the following labels: refactor, chore, bug.

Summary by CodeRabbit

  • New Features

    • Enhanced error messaging for WebSocket subscriptions with optional channel and ID details
    • Improved error reporting to provide more context during subscription failures
  • Bug Fixes

    • Added additional parameters to error message generation to support more detailed error tracking
  • Refactor

    • Updated message creation functions to conditionally include channel and ID information
    • Modified error message interfaces to support more flexible error reporting

@vincentwschau vincentwschau requested a review from a team as a code owner January 8, 2025 21:21
Copy link

linear bot commented Jan 8, 2025

Copy link
Contributor

coderabbitai bot commented Jan 8, 2025

Walkthrough

The pull request introduces enhancements to error messaging in the WebSocket subscription system. Changes are focused on adding optional channel and id properties to error messages across multiple files. These modifications allow for more detailed error reporting by providing additional context about subscription failures, such as the specific channel and an identifier associated with the error.

Changes

File Change Summary
indexer/services/socks/__tests__/lib/subscriptions.test.ts Updated test cases to include channel and id in error message objects
indexer/services/socks/src/helpers/message.ts Modified message creation functions to support optional channel and id parameters
indexer/services/socks/src/lib/subscription.ts Updated subscribe method to pass channel and id in error message creation
indexer/services/socks/src/types.ts Extended ErrorMessage interface to include optional channel and id properties

Sequence Diagram

sequenceDiagram
    participant Client
    participant WebSocket
    participant SubscriptionHandler
    participant ErrorMessageGenerator

    Client->>WebSocket: Initiate Subscription
    WebSocket->>SubscriptionHandler: Subscribe Request
    alt Subscription Fails
        SubscriptionHandler->>ErrorMessageGenerator: Create Error Message
        ErrorMessageGenerator-->>SubscriptionHandler: Error Message with Channel & ID
        SubscriptionHandler->>Client: Send Detailed Error Message
    end
Loading

Poem

🐰 Errors hop with context clear,
Channel and ID now appear!
No more vague messages so bland,
Our WebSocket errors now expand 🌟
Debugging made simple, oh so neat! 🔍


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
indexer/services/socks/src/lib/subscription.ts (1)

175-176: Consider consistent usage of channel and id properties.

While the implementation is correct, there's an inconsistency in how the new properties are used. The first createErrorMessage call in the file (for invalid subscription) doesn't include these properties, while this one does. Consider adding them consistently across all error messages for better debugging capabilities.

-      createErrorMessage(
-        `Invalid subscription id for channel: (${channel}-${id})`,
-        connectionId,
-        messageId,
-      ),
+      createErrorMessage(
+        `Invalid subscription id for channel: (${channel}-${id})`,
+        connectionId,
+        messageId,
+        channel,
+        id,
+      ),
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2a79ca0 and 716eeb9.

📒 Files selected for processing (4)
  • indexer/services/socks/__tests__/lib/subscriptions.test.ts (2 hunks)
  • indexer/services/socks/src/helpers/message.ts (1 hunks)
  • indexer/services/socks/src/lib/subscription.ts (1 hunks)
  • indexer/services/socks/src/types.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (13)
  • GitHub Check: call-build-ecs-service-vulcan / (vulcan) Check docker image build
  • GitHub Check: call-build-ecs-service-socks / (socks) Check docker image build
  • GitHub Check: call-build-ecs-service-roundtable / (roundtable) Check docker image build
  • GitHub Check: call-build-ecs-service-ender / (ender) Check docker image build
  • GitHub Check: call-build-ecs-service-comlink / (comlink) Check docker image build
  • GitHub Check: check-build-auxo
  • GitHub Check: test / run_command
  • GitHub Check: check-build-bazooka
  • GitHub Check: lint
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: Analyze (go)
  • GitHub Check: run_command
  • GitHub Check: Summary
🔇 Additional comments (3)
indexer/services/socks/src/helpers/message.ts (1)

16-17: LGTM! Clean implementation of error message enhancement.

The addition of optional channel and id parameters to createErrorMessage and their inclusion in the return object is well-implemented and aligns with the PR objective.

Also applies to: 24-25

indexer/services/socks/src/types.ts (1)

70-71: LGTM! Type definitions properly updated.

The ErrorMessage interface is correctly updated with the new optional properties, maintaining type safety for the enhanced error messages.

indexer/services/socks/__tests__/lib/subscriptions.test.ts (1)

247-248: LGTM! Test coverage properly updated.

The test cases have been appropriately updated to verify the new error message properties, ensuring the changes are properly tested.

Also applies to: 283-284

@vincentwschau vincentwschau merged commit 4cdfae6 into main Jan 8, 2025
16 checks passed
@vincentwschau vincentwschau deleted the vincentc/add-channel-id-subscribe-error branch January 8, 2025 22:19
@vincentwschau
Copy link
Contributor Author

@Mergifyio backport release/indexer/v7.x

Copy link
Contributor

mergify bot commented Jan 8, 2025

backport release/indexer/v7.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jan 8, 2025
vincentwschau added a commit that referenced this pull request Jan 8, 2025
…ion failure. (backport #2678) (#2680)

Co-authored-by: vincentwschau <99756290+vincentwschau@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants