Skip to content

feat(weave): migrate remaining 10 files to @traced (PR-7b2)#7202

Draft
amwarrier wants to merge 1 commit into
aravind/weave-trace/otel-migration-pr-7b1from
aravind/weave-trace/otel-migration-pr-7b2
Draft

feat(weave): migrate remaining 10 files to @traced (PR-7b2)#7202
amwarrier wants to merge 1 commit into
aravind/weave-trace/otel-migration-pr-7b1from
aravind/weave-trace/otel-migration-pr-7b2

Conversation

@amwarrier

Copy link
Copy Markdown
Contributor

Summary

Stacked on PR-7b1. Sub-PR 3 of 4 in the migration.

Removes ddtrace from the remaining 10 files in weave/trace_server/ (everything except datadog.py, which PR-7c handles).

Changes

  • 17 @ddtrace.tracer.wrap@traced
  • 2 with ddtrace.tracer.trace(...) blocks → _tracer.start_as_current_span(...)
  • 3 span.set_tag / set_tagsset_attribute / set_attributes
  • 1 ddtrace.tracer.current_root_span()trace.get_current_span(), with if root_span.is_recording(): check (since get_current_span() returns a no-op span rather than None when no span is active)
  • All 10 import ddtrace statements removed

Files touched

File wraps trace set_tag current_root
base64_content_conversion.py 1
clickhouse/utilities.py 1
eval_results_helpers.py 6
kafka.py 1
parallel_bucket_uploads.py 1
project_version/clickhouse_project_version.py 1 1
project_version/project_version.py 1
ttl_settings.py 1 1 3
usage_utils.py 1
workers/evaluate_model_worker/evaluate_model_worker.py 4

After this PR

The only remaining import ddtrace in the repo is inside weave/trace_server/datadog.py, which PR-7c rewrites + drops the dep from pyproject.toml.

🤖 Generated with Claude Code

@amwarrier amwarrier force-pushed the aravind/weave-trace/otel-migration-pr-7b1 branch from f3bceb9 to 213dfe7 Compare June 12, 2026 16:06
Stacked on PR-7b1. Removes ddtrace from the rest of weave/trace_server/
except datadog.py (PR-7c). Covers:

  - 17 @ddtrace.tracer.wrap -> @Traced
  - 2 with ddtrace.tracer.trace(...) blocks -> _tracer.start_as_current_span(...)
  - 3 span.set_tag/set_tags -> set_attribute/set_attributes (inside migrated blocks)
  - 1 ddtrace.tracer.current_root_span() -> trace.get_current_span()
    (with `if root_span.is_recording():` check, since get_current_span() returns
    a no-op span rather than None when no span is active)

Files touched:
  - weave/trace_server/base64_content_conversion.py (1 wrap)
  - weave/trace_server/clickhouse/utilities.py (1 wrap)
  - weave/trace_server/eval_results_helpers.py (6 wraps)
  - weave/trace_server/kafka.py (1 wrap)
  - weave/trace_server/parallel_bucket_uploads.py (1 wrap)
  - weave/trace_server/project_version/clickhouse_project_version.py (1 wrap + current_root_span)
  - weave/trace_server/project_version/project_version.py (1 trace block)
  - weave/trace_server/ttl_settings.py (1 wrap + 1 trace block + 3 set_tag)
  - weave/trace_server/usage_utils.py (1 wrap)
  - weave/trace_server/workers/evaluate_model_worker/evaluate_model_worker.py (4 wraps)

After this PR, the only remaining `import ddtrace` is in
weave/trace_server/datadog.py, which PR-7c rewrites + finally removes
the ddtrace dep from pyproject.toml.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@amwarrier amwarrier force-pushed the aravind/weave-trace/otel-migration-pr-7b2 branch from 6036a72 to d54aad8 Compare June 12, 2026 16:07
@codecov

codecov Bot commented Jun 12, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 94.44444% with 2 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...rver/project_version/clickhouse_project_version.py 66.66% 1 Missing and 1 partial ⚠️

📢 Thoughts on this report? Let us know!

amwarrier added a commit that referenced this pull request Jun 12, 2026
…ated)

Integrated commit for testing in wandb/core's weave-trace image on
wandbench-small. Represents the combined effect of upstream PRs:
  - #7196 (PR-7a): @Traced + @traced_generator in weave/trace_server/tracing.py
  - #7201 (PR-7b1): 47 wraps in clickhouse_trace_server_batched.py
  - #7202 (PR-7b2): 17 wraps + 2 trace blocks + 3 set_tag + 1 current_root in 10 files
  - #7203 (PR-7c): inline DogStatsD in datadog.py, drop ddtrace dep from pyproject.toml

This branch sits on top of the wandb/core-pinned submodule SHA so the
weave-trace image build picks up only PR-7 changes — no unrelated
upstream drift.

After this commit, `grep -rn "import ddtrace\|from ddtrace"` returns empty
across weave/trace_server/. Only docstring/comment references remain.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
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.

1 participant