EFF-706 Refactor multiple ServiceMap mutations to ServiceMap.mutate (#1740)

Author: tim-smart

.changeset/eff-706-servicemap-mutate.md

@@ -0,0 +1,6 @@
+---
+"effect": patch
+"@effect/opentelemetry": patch
+---
+
+Refactor call sites with multiple `ServiceMap` mutations to use `ServiceMap.mutate` for batched updates.

packages/effect/src/unstable/cluster/Entity.ts

@@ -524,10 +524,11 @@ export const makeTestClient: <Type extends string, Rpcs extends Rpc.Any, LA, LE,
           services: services as any,
           concurrency: options?.concurrency ?? 1,
           build: entity.protocol.toHandlers(handlers as any).pipe(
-            Effect.provideServices(services.pipe(
-              ServiceMap.add(CurrentRunnerAddress, runnerAddress),
-              ServiceMap.omit(Scope)
-            ))
+            Effect.provideServices(ServiceMap.mutate(services, (services) =>
+              services.pipe(
+                ServiceMap.add(CurrentRunnerAddress, runnerAddress),
+                ServiceMap.omit(Scope)
+              )))
           ) as any
         })
         return Effect.void

packages/effect/src/unstable/cluster/Sharding.ts

@@ -1279,11 +1279,12 @@ const make = Effect.gen(function*() {
         runnerAddress,
         sharding
       }).pipe(
-        Effect.provideServices(services.pipe(
-          ServiceMap.add(EntityReaper, reaper),
-          ServiceMap.add(Scope.Scope, scope),
-          ServiceMap.add(Snowflake.Generator, snowflakeGen)
-        ))
+        Effect.provideServices(ServiceMap.mutate(services, (services) =>
+          services.pipe(
+            ServiceMap.add(EntityReaper, reaper),
+            ServiceMap.add(Scope.Scope, scope),
+            ServiceMap.add(Snowflake.Generator, snowflakeGen)
+          )))
       ) as Effect.Effect<EntityManager.EntityManager>
       const state: EntityManagerState = {
         entity,

packages/effect/src/unstable/cluster/internal/entityManager.ts

@@ -155,12 +155,13 @@ export const make = Effect.fnUntraced(function*<
         // Initiate the behavior for the entity
         const handlers = yield* (entity.protocol.toHandlers(buildHandlers as any).pipe(
           Effect.provideService(CurrentLogAnnotations, {}),
-          Effect.provideServices(services.pipe(
-            ServiceMap.add(CurrentAddress, address),
-            ServiceMap.add(CurrentRunnerAddress, options.runnerAddress),
-            ServiceMap.add(KeepAliveLatch, keepAliveLatch),
-            ServiceMap.add(Scope.Scope, scope)
-          ))
+          Effect.provideServices(ServiceMap.mutate(services, (services) =>
+            services.pipe(
+              ServiceMap.add(CurrentAddress, address),
+              ServiceMap.add(CurrentRunnerAddress, options.runnerAddress),
+              ServiceMap.add(KeepAliveLatch, keepAliveLatch),
+              ServiceMap.add(Scope.Scope, scope)
+            )))
         ) as Effect.Effect<ServiceMap.ServiceMap<Rpc.ToHandler<Rpcs>>>)
 
         const server = yield* RpcServer.makeNoSerialization(entity.protocol, {

packages/effect/src/unstable/sql/SqlClient.ts

@@ -215,9 +215,11 @@ export const makeWithTransaction = <I, S>(options: {
                 Effect.flatMap(() =>
                   Effect.provideServices(
                     restore(effect),
-                    ServiceMap.add(services, options.transactionService, [conn, id]).pipe(
-                      ServiceMap.add(Tracer.ParentSpan, span)
-                    )
+                    ServiceMap.mutate(services, (services) =>
+                      services.pipe(
+                        ServiceMap.add(options.transactionService, [conn, id]),
+                        ServiceMap.add(Tracer.ParentSpan, span)
+                      ))
                   )
                 ),
                 Effect.exit,

packages/opentelemetry/src/Tracer.ts

@@ -101,22 +101,24 @@ export const makeExternalSpan = (options: {
   readonly traceFlags?: number | undefined
   readonly traceState?: string | Otel.TraceState | undefined
 }): Tracer.ExternalSpan => {
-  let annotations = ServiceMap.empty()
-
-  if (options.traceFlags !== undefined) {
-    annotations = ServiceMap.add(annotations, OtelTraceFlags, options.traceFlags)
-  }
+  const annotations = ServiceMap.mutate(ServiceMap.empty(), (annotations) => {
+    let next = annotations
+    if (options.traceFlags !== undefined) {
+      next = ServiceMap.add(next, OtelTraceFlags, options.traceFlags)
+    }
 
-  if (typeof options.traceState === "string") {
-    try {
-      const traceState = Otel.createTraceState(options.traceState)
-      annotations = ServiceMap.add(annotations, OtelTraceState, traceState)
-    } catch {
-      //
+    if (typeof options.traceState === "string") {
+      try {
+        next = ServiceMap.add(next, OtelTraceState, Otel.createTraceState(options.traceState))
+      } catch {
+        //
+      }
+    } else if (options.traceState) {
+      next = ServiceMap.add(next, OtelTraceState, options.traceState)
     }
-  } else if (options.traceState) {
-    annotations = ServiceMap.add(annotations, OtelTraceState, options.traceState)
-  }
+
+    return next
+  })
 
   return {
     _tag: "ExternalSpan",