effect 4.0.0-beta.42 → 4.0.0-beta.44

package/src/unstable/httpapi/HttpApiGroup.ts

@@ -2,10 +2,10 @@
  * @since 4.0.0
  */
 import type { NonEmptyReadonlyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { PathInput } from "../http/HttpRouter.ts"
 import type * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
 import type * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
@@ -38,7 +38,7 @@ export interface HttpApiGroup<
   readonly key: string
   readonly topLevel: TopLevel
   readonly endpoints: Record.ReadonlyRecord<string, Endpoints>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 
   /**
    * Add an `HttpApiEndpoint` to an `HttpApiGroup`.
@@ -61,7 +61,7 @@ export interface HttpApiGroup<
    * Endpoints added after this api is called **will not** have the middleware
    * applied.
    */
-  middleware<I extends HttpApiMiddleware.AnyId, S>(middleware: ServiceMap.Key<I, S>): HttpApiGroup<
+  middleware<I extends HttpApiMiddleware.AnyId, S>(middleware: Context.Key<I, S>): HttpApiGroup<
     Id,
     HttpApiEndpoint.AddMiddleware<Endpoints, I>,
     TopLevel
@@ -70,20 +70,20 @@ export interface HttpApiGroup<
   /**
    * Merge the annotations of an `HttpApiGroup` with the provided annotations.
    */
-  annotateMerge<I>(annotations: ServiceMap.ServiceMap<I>): HttpApiGroup<Id, Endpoints, TopLevel>
+  annotateMerge<I>(annotations: Context.Context<I>): HttpApiGroup<Id, Endpoints, TopLevel>
 
   /**
    * Add an annotation to an `HttpApiGroup`.
    */
-  annotate<I, S>(key: ServiceMap.Key<I, S>, value: S): HttpApiGroup<Id, Endpoints, TopLevel>
+  annotate<I, S>(key: Context.Key<I, S>, value: S): HttpApiGroup<Id, Endpoints, TopLevel>
 
   /**
    * For each endpoint in an `HttpApiGroup`, update the annotations with a new
-   * ServiceMap.
+   * Context.
    *
    * Note that this will only update the annotations before this api is called.
    */
-  annotateEndpointsMerge<I>(annotations: ServiceMap.ServiceMap<I>): HttpApiGroup<Id, Endpoints, TopLevel>
+  annotateEndpointsMerge<I>(annotations: Context.Context<I>): HttpApiGroup<Id, Endpoints, TopLevel>
 
   /**
    * For each endpoint in an `HttpApiGroup`, add an annotation.
@@ -91,7 +91,7 @@ export interface HttpApiGroup<
    * Note that this will only add the annotation to the endpoints before this api
    * is called.
    */
-  annotateEndpoints<I, S>(key: ServiceMap.Key<I, S>, value: S): HttpApiGroup<Id, Endpoints, TopLevel>
+  annotateEndpoints<I, S>(key: Context.Key<I, S>, value: S): HttpApiGroup<Id, Endpoints, TopLevel>
 }
 
 /**
@@ -247,23 +247,23 @@ const Proto = {
       annotations: this.annotations
     })
   },
-  annotateMerge<I>(this: AnyWithProps, annotations: ServiceMap.ServiceMap<I>) {
+  annotateMerge<I>(this: AnyWithProps, annotations: Context.Context<I>) {
     return makeProto({
       identifier: this.identifier,
       topLevel: this.topLevel,
       endpoints: this.endpoints,
-      annotations: ServiceMap.merge(this.annotations, annotations)
+      annotations: Context.merge(this.annotations, annotations)
     })
   },
-  annotate<I, S>(this: AnyWithProps, annotation: ServiceMap.Key<I, S>, value: S) {
+  annotate<I, S>(this: AnyWithProps, annotation: Context.Key<I, S>, value: S) {
     return makeProto({
       identifier: this.identifier,
       topLevel: this.topLevel,
       endpoints: this.endpoints,
-      annotations: ServiceMap.add(this.annotations, annotation, value)
+      annotations: Context.add(this.annotations, annotation, value)
     })
   },
-  annotateEndpointsMerge<I>(this: AnyWithProps, annotations: ServiceMap.ServiceMap<I>) {
+  annotateEndpointsMerge<I>(this: AnyWithProps, annotations: Context.Context<I>) {
     return makeProto({
       identifier: this.identifier,
       topLevel: this.topLevel,
@@ -271,7 +271,7 @@ const Proto = {
       annotations: this.annotations
     })
   },
-  annotateEndpoints<I, S>(this: AnyWithProps, annotation: ServiceMap.Key<I, S>, value: S) {
+  annotateEndpoints<I, S>(this: AnyWithProps, annotation: Context.Key<I, S>, value: S) {
     return makeProto({
       identifier: this.identifier,
       topLevel: this.topLevel,
@@ -292,7 +292,7 @@ const makeProto = <
   readonly identifier: Id
   readonly topLevel: TopLevel
   readonly endpoints: Record.ReadonlyRecord<string, Endpoints>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 }): HttpApiGroup<Id, Endpoints, TopLevel> => {
   function HttpApiGroup() {}
   Object.setPrototypeOf(HttpApiGroup, Proto)
@@ -316,5 +316,5 @@ export const make = <const Id extends string, const TopLevel extends boolean = f
     identifier,
     topLevel: options?.topLevel ?? false as any,
     endpoints: Record.empty(),
-    annotations: ServiceMap.empty()
+    annotations: Context.empty()
   }) as any

package/src/unstable/httpapi/HttpApiMiddleware.ts

@@ -1,12 +1,12 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
 import { hasProperty } from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import { Scope } from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { unhandled } from "../../Types.ts"
 import type * as HttpClientError from "../http/HttpClientError.ts"
 import type * as HttpClientRequest from "../http/HttpClientRequest.ts"
@@ -97,7 +97,7 @@ export interface ForClient<Id> {
  * @since 4.0.0
  * @category models
  */
-export interface AnyService extends ServiceMap.Key<any, any> {
+export interface AnyService extends Context.Key<any, any> {
   readonly [TypeId]: typeof TypeId
   readonly provides: any
   readonly error: ReadonlySet<Schema.Top>
@@ -213,9 +213,9 @@ export type ServiceClass<
     ([Config["security"]] extends [never] ? HttpApiMiddleware<Config["provides"], Config["error"], Config["requires"]>
       : HttpApiMiddlewareSecurity<Config["security"], Config["provides"], Config["error"], Config["requires"]>)
 > =
-  & ServiceMap.Service<Self, Service>
+  & Context.Service<Self, Service>
   & {
-    new(_: never): ServiceMap.ServiceClass.Shape<Id, Service> & {
+    new(_: never): Context.ServiceClass.Shape<Id, Service> & {
       readonly [TypeId]: {
         readonly error: Config["error"]
         readonly requires: Config["requires"]
@@ -279,7 +279,7 @@ export const Service = <
   const creationError = new Err()
   Err.stackTraceLimit = limit
 
-  class Service extends ServiceMap.Service<Self, any>()(id) {}
+  class Service extends Context.Service<Self, any>()(id) {}
   const self = Service as any
   Object.defineProperty(Service, "stack", {
     get() {
@@ -330,7 +330,7 @@ function getError(error: ErrorConstraint | undefined): ReadonlySet<Schema.Top> {
  * @category SchemaError transform
  */
 export const layerSchemaErrorTransform = <Id, E extends ErrorConstraint, Requires>(
-  service: ServiceMap.Service<Id, HttpApiMiddleware<never, E, Requires>>,
+  service: Context.Service<Id, HttpApiMiddleware<never, E, Requires>>,
   transform: (
     error: Schema.SchemaError,
     context: { readonly endpoint: HttpApiEndpoint.AnyWithProps; readonly group: HttpApiGroup.AnyWithProps }
@@ -358,7 +358,7 @@ export const layerSchemaErrorTransform = <Id, E extends ErrorConstraint, Require
  * @category client
  */
 export const layerClient = <Id extends AnyId, S, R, EX = never, RX = never>(
-  tag: ServiceMap.Key<Id, S>,
+  tag: Context.Key<Id, S>,
   service:
     | HttpApiMiddlewareClient<Error<Id>, Id[typeof TypeId]["clientError"], R>
     | Effect.Effect<
@@ -367,18 +367,18 @@ export const layerClient = <Id extends AnyId, S, R, EX = never, RX = never>(
       RX
     >
 ): Layer.Layer<ForClient<Id>, EX, R | Exclude<RX, Scope>> =>
-  Layer.effectServices(Effect.gen(function*() {
-    const services = (yield* Effect.services<R | Scope>()).pipe(
-      ServiceMap.omit(Scope)
-    ) as ServiceMap.ServiceMap<R>
+  Layer.effectContext(Effect.gen(function*() {
+    const services = (yield* Effect.context<R | Scope>()).pipe(
+      Context.omit(Scope)
+    ) as Context.Context<R>
     const middleware = Effect.isEffect(service) ? yield* service : service
-    return ServiceMap.makeUnsafe(
+    return Context.makeUnsafe(
       new Map([[
         `${tag.key}/Client`,
         (options: any) =>
-          Effect.updateServices(
+          Effect.updateContext(
             middleware(options),
-            (requestContext) => ServiceMap.merge(services, requestContext)
+            (requestContext) => Context.merge(services, requestContext)
           )
       ]])
     )

package/src/unstable/httpapi/HttpApiSecurity.ts

@@ -1,10 +1,10 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import { dual } from "../../Function.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import type { Redacted } from "../../Redacted.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { Covariant } from "../../Types.ts"
 
 const TypeId = "~effect/httpapi/HttpApiSecurity"
@@ -28,7 +28,7 @@ export declare namespace HttpApiSecurity {
     readonly [TypeId]: {
       readonly _A: Covariant<A>
     }
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }
 
   /**
@@ -91,7 +91,7 @@ const Proto = {
  */
 export const bearer: Bearer = Object.assign(Object.create(Proto), {
   _tag: "Bearer",
-  annotations: ServiceMap.empty()
+  annotations: Context.empty()
 })
 
 /**
@@ -116,7 +116,7 @@ export const apiKey = (options: {
     _tag: "ApiKey",
     key: options.key,
     in: options.in ?? "header",
-    annotations: ServiceMap.empty()
+    annotations: Context.empty()
   })
 
 /**
@@ -125,7 +125,7 @@ export const apiKey = (options: {
  */
 export const basic: Basic = Object.assign(Object.create(Proto), {
   _tag: "Basic",
-  annotations: ServiceMap.empty()
+  annotations: Context.empty()
 })
 
 /**
@@ -137,18 +137,18 @@ export const annotateMerge: {
    * @since 4.0.0
    * @category annotations
    */
-  <I>(annotations: ServiceMap.ServiceMap<I>): <A extends HttpApiSecurity>(self: A) => A
+  <I>(annotations: Context.Context<I>): <A extends HttpApiSecurity>(self: A) => A
   /**
    * @since 4.0.0
    * @category annotations
    */
-  <A extends HttpApiSecurity, I>(self: A, annotations: ServiceMap.ServiceMap<I>): A
+  <A extends HttpApiSecurity, I>(self: A, annotations: Context.Context<I>): A
 } = dual(
   2,
-  <A extends HttpApiSecurity, I>(self: A, annotations: ServiceMap.ServiceMap<I>): A =>
+  <A extends HttpApiSecurity, I>(self: A, annotations: Context.Context<I>): A =>
     Object.assign(Object.create(Proto), {
       ...self,
-      annotations: ServiceMap.merge(self.annotations, annotations)
+      annotations: Context.merge(self.annotations, annotations)
     })
 )
 
@@ -161,17 +161,17 @@ export const annotate: {
    * @since 4.0.0
    * @category annotations
    */
-  <I, S>(service: ServiceMap.Key<I, S>, value: S): <A extends HttpApiSecurity>(self: A) => A
+  <I, S>(service: Context.Key<I, S>, value: S): <A extends HttpApiSecurity>(self: A) => A
   /**
    * @since 4.0.0
    * @category annotations
    */
-  <A extends HttpApiSecurity, I, S>(self: A, service: ServiceMap.Key<I, S>, value: S): A
+  <A extends HttpApiSecurity, I, S>(self: A, service: Context.Key<I, S>, value: S): A
 } = dual(
   3,
-  <A extends HttpApiSecurity, I, S>(self: A, service: ServiceMap.Key<I, S>, value: S): A =>
+  <A extends HttpApiSecurity, I, S>(self: A, service: Context.Key<I, S>, value: S): A =>
     Object.assign(Object.create(Proto), {
       ...self,
-      annotations: ServiceMap.add(self.annotations, service, value)
+      annotations: Context.add(self.annotations, service, value)
     })
 )

package/src/unstable/httpapi/OpenApi.ts

@@ -3,6 +3,7 @@
  */
 import * as Arr from "../../Array.ts"
 import type { NonEmptyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import { constFalse } from "../../Function.ts"
 import * as JsonPatch from "../../JsonPatch.ts"
 import { escapeToken } from "../../JsonPointer.ts"
@@ -11,7 +12,6 @@ import * as Option from "../../Option.ts"
 import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
 import * as SchemaRepresentation from "../../SchemaRepresentation.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as HttpMethod from "../http/HttpMethod.ts"
 import * as HttpApi from "./HttpApi.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
@@ -24,38 +24,38 @@ import type { HttpApiSecurity } from "./HttpApiSecurity.ts"
  * @since 4.0.0
  * @category annotations
  */
-export class Identifier extends ServiceMap.Service<Identifier, string>()("effect/httpapi/OpenApi/Identifier") {}
+export class Identifier extends Context.Service<Identifier, string>()("effect/httpapi/OpenApi/Identifier") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Title extends ServiceMap.Service<Title, string>()("effect/httpapi/OpenApi/Title") {}
+export class Title extends Context.Service<Title, string>()("effect/httpapi/OpenApi/Title") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Version extends ServiceMap.Service<Version, string>()("effect/httpapi/OpenApi/Version") {}
+export class Version extends Context.Service<Version, string>()("effect/httpapi/OpenApi/Version") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Description extends ServiceMap.Service<Description, string>()("effect/httpapi/OpenApi/Description") {}
+export class Description extends Context.Service<Description, string>()("effect/httpapi/OpenApi/Description") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class License extends ServiceMap.Service<License, OpenAPISpecLicense>()("effect/httpapi/OpenApi/License") {}
+export class License extends Context.Service<License, OpenAPISpecLicense>()("effect/httpapi/OpenApi/License") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
 export class ExternalDocs
-  extends ServiceMap.Service<ExternalDocs, OpenAPISpecExternalDocs>()("effect/httpapi/OpenApi/ExternalDocs")
+  extends Context.Service<ExternalDocs, OpenAPISpecExternalDocs>()("effect/httpapi/OpenApi/ExternalDocs")
 {}
 
 /**
@@ -63,40 +63,38 @@ export class ExternalDocs
  * @category annotations
  */
 export class Servers
-  extends ServiceMap.Service<Servers, ReadonlyArray<OpenAPISpecServer>>()("effect/httpapi/OpenApi/Servers")
+  extends Context.Service<Servers, ReadonlyArray<OpenAPISpecServer>>()("effect/httpapi/OpenApi/Servers")
 {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Format extends ServiceMap.Service<Format, string>()("effect/httpapi/OpenApi/Format") {}
+export class Format extends Context.Service<Format, string>()("effect/httpapi/OpenApi/Format") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Summary extends ServiceMap.Service<Summary, string>()("effect/httpapi/OpenApi/Summary") {}
+export class Summary extends Context.Service<Summary, string>()("effect/httpapi/OpenApi/Summary") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Deprecated extends ServiceMap.Service<Deprecated, boolean>()("effect/httpapi/OpenApi/Deprecated") {}
+export class Deprecated extends Context.Service<Deprecated, boolean>()("effect/httpapi/OpenApi/Deprecated") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export class Override
-  extends ServiceMap.Service<Override, Record<string, unknown>>()("effect/httpapi/OpenApi/Override")
-{}
+export class Override extends Context.Service<Override, Record<string, unknown>>()("effect/httpapi/OpenApi/Override") {}
 
 /**
  * @since 4.0.0
  * @category annotations
  */
-export const Exclude = ServiceMap.Reference<boolean>("effect/httpapi/OpenApi/Exclude", {
+export const Exclude = Context.Reference<boolean>("effect/httpapi/OpenApi/Exclude", {
   defaultValue: constFalse
 })
 
@@ -106,24 +104,24 @@ export const Exclude = ServiceMap.Reference<boolean>("effect/httpapi/OpenApi/Exc
  * @since 4.0.0
  * @category annotations
  */
-export class Transform extends ServiceMap.Service<
+export class Transform extends Context.Service<
   Transform,
   (openApiSpec: Record<string, any>) => Record<string, any>
 >()("effect/httpapi/OpenApi/Transform") {}
 
-const servicesPartial = <Tags extends Record<string, ServiceMap.Key<any, any> | ServiceMap.Key<never, any>>>(
+const servicesPartial = <Tags extends Record<string, Context.Key<any, any> | Context.Key<never, any>>>(
   tags: Tags
 ): (
   options: {
-    readonly [K in keyof Tags]?: ServiceMap.Service.Shape<Tags[K]> | undefined
+    readonly [K in keyof Tags]?: Context.Service.Shape<Tags[K]> | undefined
   }
-) => ServiceMap.ServiceMap<never> => {
+) => Context.Context<never> => {
   const entries = Object.entries(tags)
   return (options) => {
-    let context = ServiceMap.empty()
+    let context = Context.empty()
     for (const [key, tag] of entries) {
       if (options[key] !== undefined) {
-        context = ServiceMap.add(context, tag as any, options[key]!)
+        context = Context.add(context, tag as any, options[key]!)
       }
     }
     return context
@@ -150,7 +148,7 @@ export const annotations: (
     readonly exclude?: boolean | undefined
     readonly transform?: ((openApiSpec: Record<string, any>) => Record<string, any>) | undefined
   }
-) => ServiceMap.ServiceMap<never> = servicesPartial({
+) => Context.Context<never> = servicesPartial({
   identifier: Identifier,
   title: Title,
   version: Version,
@@ -174,11 +172,11 @@ const apiCache = new WeakMap<HttpApi.Any, OpenAPISpec>()
  * callback function to it. If the tag is not found, the function does nothing.
  */
 function processAnnotation<Services, S, I>(
-  ctx: ServiceMap.ServiceMap<Services>,
-  annotation: ServiceMap.Key<I, S>,
+  ctx: Context.Context<Services>,
+  annotation: Context.Key<I, S>,
   f: (s: S) => void
 ) {
-  const o = ServiceMap.getOption(ctx, annotation)
+  const o = Context.getOption(ctx, annotation)
   if (Option.isSome(o)) {
     f(o.value)
   }
@@ -269,11 +267,11 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
 
   HttpApi.reflect(api, {
     onGroup({ group }) {
-      if (ServiceMap.get(group.annotations, Exclude)) {
+      if (Context.get(group.annotations, Exclude)) {
         return
       }
       let tag: OpenAPISpecTag = {
-        name: ServiceMap.getOrElse(group.annotations, Title, () => group.identifier)
+        name: Context.getOrElse(group.annotations, Title, () => group.identifier)
       }
       processAnnotation(group.annotations, Description, (description) => {
         tag.description = description
@@ -291,12 +289,12 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
       spec.tags.push(tag)
     },
     onEndpoint({ endpoint, group, mergedAnnotations, middleware }) {
-      if (ServiceMap.get(mergedAnnotations, Exclude)) {
+      if (Context.get(mergedAnnotations, Exclude)) {
         return
       }
       let op: OpenAPISpecOperation = {
-        tags: [ServiceMap.getOrElse(group.annotations, Title, () => group.identifier)],
-        operationId: ServiceMap.getOrElse(
+        tags: [Context.getOrElse(group.annotations, Title, () => group.identifier)],
+        operationId: Context.getOrElse(
           endpoint.annotations,
           Identifier,
           () => group.topLevel ? endpoint.name : `${group.identifier}.${endpoint.name}`
@@ -667,7 +665,7 @@ const makeSecurityScheme = (security: HttpApiSecurity): OpenAPISecurityScheme =>
       }
     }
     case "Bearer": {
-      const format = ServiceMap.getOption(security.annotations, Format).pipe(
+      const format = Context.getOption(security.annotations, Format).pipe(
         Option.map((format) => ({ bearerFormat: format })),
         Option.getOrUndefined
       )

package/src/unstable/observability/OtlpExporter.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import { Clock } from "../../Clock.ts"
+import * as Context from "../../Context.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
 import * as Fiber from "../../Fiber.ts"
@@ -9,7 +10,6 @@ import * as Num from "../../Number.ts"
 import * as Option from "../../Option.ts"
 import * as Schedule from "../../Schedule.ts"
 import * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Headers from "../../unstable/http/Headers.ts"
 import * as HttpClient from "../../unstable/http/HttpClient.ts"
 import * as HttpClientError from "../../unstable/http/HttpClientError.ts"
@@ -53,14 +53,14 @@ export const make: (
   never,
   HttpClient.HttpClient | Scope.Scope
 > = Effect.fnUntraced(function*(options) {
-  const services = yield* Effect.services<Scope.Scope | HttpClient.HttpClient>()
-  const clock = ServiceMap.get(services, Clock)
-  const scope = ServiceMap.get(services, Scope.Scope)
+  const services = yield* Effect.context<Scope.Scope | HttpClient.HttpClient>()
+  const clock = Context.get(services, Clock)
+  const scope = Context.get(services, Scope.Scope)
   const runFork = Effect.runForkWith(services)
   const exportInterval = Duration.max(Duration.fromInputUnsafe(options.exportInterval), Duration.zero)
   let disabledUntil: number | undefined = undefined
 
-  const client = HttpClient.filterStatusOk(ServiceMap.get(services, HttpClient.HttpClient)).pipe(
+  const client = HttpClient.filterStatusOk(Context.get(services, HttpClient.HttpClient)).pipe(
     HttpClient.retryTransient({ schedule: policy, times: 3 })
   )
 

package/src/unstable/observability/OtlpMetrics.ts

@@ -79,7 +79,7 @@ export const make: (options: {
     name: OtlpResource.serviceNameUnsafe(resource)
   }
 
-  const services = yield* Effect.services<never>()
+  const services = yield* Effect.context<never>()
 
   // State for delta temporality tracking
   let previousExportTimeNanos: bigint = startTimeNanos

package/src/unstable/observability/OtlpSerialization.ts

@@ -1,8 +1,8 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Layer from "../../Layer.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as HttpBody from "../http/HttpBody.ts"
 import * as otlpProtobuf from "./internal/otlpProtobuf.ts"
 import type { LogsData } from "./OtlpLogger.ts"
@@ -13,7 +13,7 @@ import type { TraceData } from "./OtlpTracer.ts"
  * @since 4.0.0
  * @category Services
  */
-export class OtlpSerialization extends ServiceMap.Service<OtlpSerialization, {
+export class OtlpSerialization extends Context.Service<OtlpSerialization, {
   readonly traces: (data: TraceData) => HttpBody.HttpBody
   readonly metrics: (data: MetricsData) => HttpBody.HttpBody
   readonly logs: (data: LogsData) => HttpBody.HttpBody

package/src/unstable/observability/OtlpTracer.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.ts"
+import type * as Context from "../../Context.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
 import type * as Exit from "../../Exit.ts"
@@ -9,7 +10,6 @@ import { flow } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type * as Scope from "../../Scope.ts"
-import type * as ServiceMap from "../../ServiceMap.ts"
 import * as Tracer from "../../Tracer.ts"
 import type { ExtractTag, Mutable } from "../../Types.ts"
 import type * as Headers from "../http/Headers.ts"
@@ -152,7 +152,7 @@ type RemainingSpanImpl = Omit<Tracer.Span, (keyof typeof SpanProto) | "traceId"
 const makeSpan = (options: {
   readonly name: string
   readonly parent: Option.Option<Tracer.AnySpan>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
   readonly status: Tracer.SpanStatus
   readonly attributes: ReadonlyMap<string, unknown>
   readonly links: ReadonlyArray<Tracer.SpanLink>

package/src/unstable/observability/PrometheusMetrics.ts

@@ -27,10 +27,10 @@
  *
  * @since 4.0.0
  */
+import type * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as Metric from "../../Metric.ts"
-import type * as ServiceMap from "../../ServiceMap.ts"
 import * as HttpRouter from "../http/HttpRouter.ts"
 import * as HttpServerResponse from "../http/HttpServerResponse.ts"
 
@@ -114,7 +114,7 @@ export interface HttpOptions extends FormatOptions {
  */
 export const format: (options?: FormatOptions | undefined) => Effect.Effect<string> = Effect.fnUntraced(
   function*(options) {
-    const services = yield* Effect.services<never>()
+    const services = yield* Effect.context<never>()
     return formatUnsafe(services, options)
   }
 )
@@ -122,17 +122,17 @@ export const format: (options?: FormatOptions | undefined) => Effect.Effect<stri
 /**
  * Synchronously format all metrics in the registry to Prometheus exposition format.
  *
- * This is a low-level function that requires access to the service map.
+ * This is a low-level function that requires access to the context.
  * Most users should use `format` instead.
  *
  * @since 4.0.0
  * @category Formatting
  */
 export const formatUnsafe = (
-  services: ServiceMap.ServiceMap<never>,
+  context: Context.Context<never>,
   options?: FormatOptions | undefined
 ): string => {
-  const snapshot = Metric.snapshotUnsafe(services)
+  const snapshot = Metric.snapshotUnsafe(context)
   const prefix = options?.prefix ? sanitizeMetricName(options.prefix) + "_" : ""
   const mapper = options?.metricNameMapper ?? ((name: string) => name)
   const lines: Array<string> = []