Skip to content

Merge upstream: Proxy browser OTLP traces through the server (#1739)#48

Merged
aaditagrawal merged 1 commit intomainfrom
merge/upstream-1739-otlp-trace-proxy
Apr 5, 2026
Merged

Merge upstream: Proxy browser OTLP traces through the server (#1739)#48
aaditagrawal merged 1 commit intomainfrom
merge/upstream-1739-otlp-trace-proxy

Conversation

@aaditagrawal
Copy link
Copy Markdown
Owner

What

Cherry-picks upstream commit 04a1ae77 (PR #1739) onto the fork.

Upstream changes

Proxies browser OTLP (OpenTelemetry) traces through the server instead of sending them directly from the browser. Adds:

  • clientTracing.ts on the web side to collect and batch browser-side spans
  • BrowserTraceCollector service on the server to receive and persist traces
  • HTTP endpoint on the server for trace ingestion
  • TraceRecord enhancements for browser span handling
  • Tests for the new trace proxy pipeline

Conflict resolution

None -- clean cherry-pick with no conflicts (13 files, +1010/-41).

Verification

  • bun typecheck passes (all 7 packages)
  • bun fmt and bun lint clean
  • server.test.ts passes (34 tests), LocalFileTracer.test.ts passes (2 tests)
  • client.test.ts passes (3 tests), wsTransport.test.ts passes (8 tests)

Co-authored-by: codex <codex@users.noreply.github.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 5, 2026

Warning

Rate limit exceeded

@aaditagrawal has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 11 minutes and 20 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 11 minutes and 20 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 44ffb9ba-f75a-4d1c-b0b5-31123f6728b0

📥 Commits

Reviewing files that changed from the base of the PR and between 0f789b5 and ab1cb58.

📒 Files selected for processing (13)
  • apps/server/src/http.ts
  • apps/server/src/observability/Layers/Observability.ts
  • apps/server/src/observability/LocalFileTracer.test.ts
  • apps/server/src/observability/LocalFileTracer.ts
  • apps/server/src/observability/Services/BrowserTraceCollector.ts
  • apps/server/src/observability/TraceRecord.ts
  • apps/server/src/server.test.ts
  • apps/server/src/server.ts
  • apps/web/src/observability/clientTracing.ts
  • apps/web/src/rpc/client.test.ts
  • apps/web/src/rpc/client.ts
  • apps/web/src/wsTransport.test.ts
  • apps/web/src/wsTransport.ts
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch merge/upstream-1739-otlp-trace-proxy

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XL 500-999 effective changed lines (test files excluded in mixed PRs). labels Apr 5, 2026
aaditagrawal added a commit that referenced this pull request Apr 5, 2026
This commit depends on clientTracing from upstream pingdotgg#1739 (OTLP trace proxy),
which is in a separate PR (#48). This stub provides the required exports
so this PR compiles independently. The real implementation from PR #48
will replace this stub when merged.
@aaditagrawal aaditagrawal merged commit fd42c42 into main Apr 5, 2026
8 checks passed
aaditagrawal added a commit that referenced this pull request Apr 5, 2026
Replace clientTracing stub with real implementation from #48 and
reconcile wsTransport changes from both OTLP tracing (#48) and
WS disconnect recovery (#49).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XL 500-999 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants