Repository navigation
[SDT-0002]: (SSC side) move ServiceContext from SSC to SDT implementation - #92
Merged
kukushechkin merged 11 commits intoOct 12, 2026
Merged
Conversation
kukushechkin
marked this pull request as ready for review
September 24, 2026 12:32
kukushechkin
requested review from
FranzBusch,
czechboy0,
heckj,
ktoso and
slashmo
September 24, 2026 12:33
FranzBusch
reviewed
Sep 24, 2026
kukushechkin
commented
Sep 24, 2026
| ), | ||
| ], | ||
| dependencies: [ | ||
| .package( |
Contributor
Author
There was a problem hiding this comment.
Should be changed before merging. And this defines the sequence of merges — SDT first, SSC follows.
czechboy0
reviewed
Sep 24, 2026
czechboy0
approved these changes
Sep 25, 2026
heckj
reviewed
Sep 25, 2026
Contributor
Author
|
Also, |
Closed
czechboy0
added a commit
to apple/swift-distributed-tracing
that referenced
this pull request
Oct 12, 2026
Move `ServiceContext` from swift-service-context as `Instrumentation.InstrumentationContext`. Implements SDT-0002, companion to apple/swift-service-context#92. ## Motivation: `ServiceContext` lived in its own package mainly for swift-distributed-tracing users, adding release overhead for little benefit. The name also reads as server-specific, discouraging non-server adoption. ## Modifications: - Moved `ServiceContext` to `Instrumentation`. - Renamed `ServiceContext`/`ServiceContextKey`/`AnyServiceContextKey` to `InstrumentationContext`/`InstrumentationContextKey`/`AnyInstrumentationContextKey`, keeping deprecated typealiases for old symbols. ## Result: Existing code keeps compiling unchanged. Direct dependents using the old names get a deprecation warning with a fix-it; swift-service-context dependents get none, by design. `diagnose-api-breaking-changes` reports breaking changes across `Tracing`/`Instrumentation`/`InMemoryTracing`, all "type changed to `Instrumentation.InstrumentationContext`". This is expected — typealiases are transparent to the type system, so this shows up no matter which name call sites use, and we don't target ABI stability here, only source-compatibility. --------- Co-authored-by: Joseph Heck <j_heck@apple.com> Co-authored-by: Honza Dvorsky <honza@apple.com>
kukushechkin
force-pushed
the
move-service-context-to-sdt
branch
from
October 12, 2026 13:30
1d205d1 to
789833f
Compare
slashmo
reviewed
Oct 12, 2026
slashmo
left a comment
slashmo
left a comment
Member
There was a problem hiding this comment.
Looks good to go to me once we tagged 1.6.0 in Swift Distributed Tracing.
Contributor
Author
|
Dependency updated for swift-distributed-tracing 1.6.0 |
This was referenced Oct 12, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Turn this package into a thin compatibility layer over swift-distributed-tracing.
Motivation:
Companion to apple/swift-distributed-tracing#240.
ServiceContext's implementation moved there, renamed toTracingContext. This package now re-exports it instead of owning it.Modifications:
ServiceContextModulere-exports itsContextStoragemodule and declares its own non-deprecatedServiceContext/ServiceContextKey/AnyServiceContextKeytypealiases.Result:
import ServiceContextModulekeeps working with no code changes and no deprecation warning, even in a file that also importsTracingdirectly. New code should depend on swift-distributed-tracing and useTracingContextinstead.