Skip to content

feat(chproxy): Update logging and correctly handle SIGs#2945

Merged
imeyer merged 4 commits intomainfrom
chproxy-update-logging-and-handle-signals
Mar 11, 2025
Merged

feat(chproxy): Update logging and correctly handle SIGs#2945
imeyer merged 4 commits intomainfrom
chproxy-update-logging-and-handle-signals

Conversation

@imeyer
Copy link
Contributor

@imeyer imeyer commented Mar 11, 2025

  • Implemented log/slog
  • Add setupLogger() function to output to STDOUT in JSON format
  • Replace most log functios with appropriate logger calls
  • Wrap http server in a goroutine so that it will catch and handle the signals appropriately

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • Enhancement (small improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How should this be tested?

Build chproxy with go build -o chproxy then start the process.. send SIGTERM or SIGINT... you should see

{"time":"2025-03-11T15:07:13.403042+09:00","level":"INFO","msg":"flushing from ticker"}
^C{"time":"2025-03-11T15:07:14.72035+09:00","level":"INFO","msg":"shutdown complete"}

Summary by CodeRabbit

  • Refactor
    • Streamlined the application startup process to ensure a more consistent and robust initialization. This internal adjustment reinforces stability at launch without altering the user interface.
  • Documentation
    • Updated the formatting of "required" fields in the OpenAPI JSON file for improved readability, consolidating multiple lines into a single line format.

- Implemented log/slog
- Add setupLogger() function to output to STDOUT in JSON format
- Replace most log functios with appropriate logger calls
- Wrap http server in a goroutine so that it will catch and handle
  the signals appropriately

Signed-off-by: Ian Meyer (imeyer) <k@imeyer.io>
@changeset-bot
Copy link

changeset-bot bot commented Mar 11, 2025

⚠️ No Changeset found

Latest commit: 09c9a6c

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link

vercel bot commented Mar 11, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
engineering ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 11, 2025 6:26am
play ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 11, 2025 6:26am
www ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 11, 2025 6:26am
1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
dashboard ⬜️ Ignored (Inspect) Visit Preview Mar 11, 2025 6:26am

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 11, 2025

📝 Walkthrough

Walkthrough

The changes involve the removal of a redundant call to setupLogger() from the main function and its addition to the init function. This ensures that the logger is set up prior to any other initialization tasks, including the retrieval of environment variables. The logging setup remains unchanged, and no modifications were made to any exported or public entities.

Changes

File Change Summary
apps/chproxy/main.go Removed redundant setupLogger() call from main and added the call in init to configure logging early.
go/api/openapi.json Reformatted "required" fields in multiple schema definitions from array format to single line format.

Sequence Diagram(s)

sequenceDiagram
    participant Init
    participant Logger
    participant Main
    Note over Init: Application Startup
    Init->>Logger: setupLogger()
    Note right of Logger: Logger is configured before other tasks
    Main->>Env: Retrieve environment variables
Loading

Suggested reviewers

  • chronark

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 8475365 and 09c9a6c.

📒 Files selected for processing (1)
  • go/api/openapi.json (15 hunks)
✅ Files skipped from review due to trivial changes (1)
  • go/api/openapi.json
⏰ Context from checks skipped due to timeout of 90000ms (16)
  • GitHub Check: Test Packages / Test ./packages/rbac
  • GitHub Check: Test Packages / Test ./packages/nextjs
  • GitHub Check: Test Packages / Test ./packages/cache
  • GitHub Check: Test Packages / Test ./packages/api
  • GitHub Check: Test Packages / Test ./internal/clickhouse
  • GitHub Check: Test Packages / Test ./internal/resend
  • GitHub Check: Test Packages / Test ./internal/keys
  • GitHub Check: Test Packages / Test ./internal/id
  • GitHub Check: Test Packages / Test ./internal/hash
  • GitHub Check: Test Packages / Test ./internal/billing
  • GitHub Check: Test Go API Local / test_agent_local
  • GitHub Check: Test Agent Local / test_agent_local
  • GitHub Check: Test API / API Test Local
  • GitHub Check: Build / Build
  • GitHub Check: autofix
  • GitHub Check: Analyze (javascript-typescript)

🪧 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.
  • @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.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 11, 2025

Thank you for following the naming conventions for pull request titles! 🙏

@vercel vercel bot temporarily deployed to Preview – play March 11, 2025 06:14 Inactive
@vercel vercel bot temporarily deployed to Preview – engineering March 11, 2025 06:14 Inactive
Copy link
Contributor Author

imeyer commented Mar 11, 2025

@chronark this came about because i was fixing a typo in the logging (invaldu.. which then led me to realize the http.ListenAndServe() blocks cause it wasn't running in a goroutine.. this improves logging for me and should behave better in prod 🙂

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: 2

🧹 Nitpick comments (1)
apps/chproxy/main.go (1)

216-223: Good implementation of HTTP server with signal handling.

Running the HTTP server in a goroutine allows the main thread to properly handle signals (SIGTERM and SIGINT). However, consider implementing graceful shutdown for the server.

go func() {
	logger.Info("listening", slog.String("port", PORT))
	if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
		logger.Error("failed to start server", slog.String("error", err.Error()))
		os.Exit(1)
	}
}()

<-ctx.Done()
+// Implement graceful shutdown with timeout
+shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 10*time.Second)
+defer shutdownCancel()
+if err := srv.Shutdown(shutdownCtx); err != nil {
+	logger.Error("server shutdown error", slog.String("error", err.Error()))
+}
close(buffer)
<-done
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a31e5da and edfb35d.

📒 Files selected for processing (1)
  • apps/chproxy/main.go (8 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (17)
  • GitHub Check: Test Packages / Test ./packages/rbac
  • GitHub Check: Test Packages / Test ./packages/nextjs
  • GitHub Check: Test Packages / Test ./packages/hono
  • GitHub Check: Test Packages / Test ./packages/cache
  • GitHub Check: Test Packages / Test ./packages/api
  • GitHub Check: Test Packages / Test ./internal/clickhouse
  • GitHub Check: Test Packages / Test ./internal/resend
  • GitHub Check: Test Packages / Test ./internal/keys
  • GitHub Check: Test Packages / Test ./internal/hash
  • GitHub Check: Test Packages / Test ./internal/encryption
  • GitHub Check: Test Packages / Test ./internal/billing
  • GitHub Check: Test Go API Local / test_agent_local
  • GitHub Check: Test Agent Local / test_agent_local
  • GitHub Check: Test API / API Test Local
  • GitHub Check: autofix
  • GitHub Check: Build / Build
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (10)
apps/chproxy/main.go (10)

8-8: Good import choice for structured logging.

Using log/slog for structured logging is appropriate as it's the standard package for structured logging in Go since Go 1.21, providing better observability.


28-28: Good practice using a global logger instance.

Using a global logger variable makes it accessible throughout the application, ensuring consistent logging format.


31-44: Well-structured logger setup function.

The setupLogger function is well-designed, setting up JSON logging appropriately with:

  1. JSON output to stdout
  2. Disabling source code information
  3. Setting up the global instance
  4. Setting it as the default logger
  5. Logging startup information with structured fields

This ensures consistent structured logging throughout the application.


98-100: Good structured logging for successful persistence.

The structured logging approach with relevant fields (count and query) provides clear context for successful operations.


106-109: Comprehensive error logging for persistence failures.

Good use of structured logging to capture all relevant information for debugging persistence issues:

  • HTTP response body
  • Status code
  • The query being executed

This will make troubleshooting much easier.


134-136: Well-structured batch flush error logging.

Good implementation of structured logging for batch flush errors with appropriate context.


165-165: Clear log message for flush events.

The log message clearly explains why flushing is occurring (max size reached).


169-169: Clear log message for ticker-based flushing.

The log message clearly identifies the source of the flush event (ticker).


182-184: Security-focused logging for authorization failures.

Good practice including both expected and received authorization headers in logs, helping to diagnose authentication issues.


229-229: Clear shutdown completion message.

Good practice to log when shutdown is complete, providing confirmation that the application terminated gracefully.

@vercel vercel bot temporarily deployed to Preview – www March 11, 2025 06:17 Inactive
@vercel vercel bot temporarily deployed to Preview – engineering March 11, 2025 06:17 Inactive
@vercel vercel bot temporarily deployed to Preview – play March 11, 2025 06:18 Inactive
imeyer added 2 commits March 11, 2025 15:19
- Missing a return after http.Error when the request body can’t be read

Signed-off-by: Ian Meyer (imeyer) <k@imeyer.io>
Signed-off-by: Ian Meyer (imeyer) <k@imeyer.io>
@imeyer imeyer force-pushed the chproxy-update-logging-and-handle-signals branch from 1043c78 to 8475365 Compare March 11, 2025 06:21
@vercel vercel bot temporarily deployed to Preview – www March 11, 2025 06:22 Inactive
@vercel vercel bot temporarily deployed to Preview – engineering March 11, 2025 06:22 Inactive
@vercel vercel bot temporarily deployed to Preview – play March 11, 2025 06:23 Inactive
Copy link
Contributor Author

imeyer commented Mar 11, 2025

the autofix.ci thing is a bit.. odd.. makes me have to force push and that's generally a bad thing in a repo others are collaborating on 🤷

@vercel vercel bot temporarily deployed to Preview – play March 11, 2025 06:24 Inactive
@vercel vercel bot temporarily deployed to Preview – engineering March 11, 2025 06:24 Inactive
@vercel vercel bot temporarily deployed to Preview – www March 11, 2025 06:26 Inactive
@chronark chronark changed the title chproxy: Update logging and correctly handle SIGs feat(chproxy): Update logging and correctly handle SIGs Mar 11, 2025
@imeyer imeyer added this pull request to the merge queue Mar 11, 2025
Merged via the queue into main with commit 5730726 Mar 11, 2025
29 of 31 checks passed
@imeyer imeyer deleted the chproxy-update-logging-and-handle-signals branch March 11, 2025 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants