fix span attributes for Stream.withSpan (#277)

Author: tim-smart

packages/discord-bot/package.json

@@ -9,13 +9,13 @@
   "devDependencies": {
     "@chat/discord": "workspace:*",
     "@chat/shared": "workspace:*",
-    "@effect/ai-openai": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/ai-openai@989d1cc",
-    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@989d1cc",
+    "@effect/ai-openai": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/ai-openai@e691909",
+    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@e691909",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
     "@types/node": "^24.10.1",
     "dfx": "^1.0.5",
-    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@989d1cc",
+    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@e691909",
     "fuzzysort": "^3.1.0",
     "glob": "^13.0.6",
     "html-entities": "^2.6.0",

packages/discord-bot/src/EffectRepo.ts

@@ -77,16 +77,19 @@ export class EffectRepo extends ServiceMap.Service<
         readonly pattern: string
         readonly glob?: string | undefined
       }) =>
-        Stream.unwrap(
-          Effect.map(repo, (repoPath) =>
+        repo.pipe(
+          Effect.map((repoPath) =>
             rg.search({
               directory: repoPath,
               pattern: options.pattern,
               glob: options.glob
-            }))
-        ).pipe(Stream.mapError((cause) => new EffectRepoError({ cause })))
+            })
+          ),
+          Stream.unwrap,
+          Stream.mapError((cause) => new EffectRepoError({ cause }))
+        )
 
-      const readFileRange = Effect.fn("EffectRepo.readFileRange")(
+      const readFileRange = Effect.fnUntraced(
         function*(options: {
           readonly path: string
           readonly startLine?: number | undefined
@@ -101,17 +104,29 @@ export class EffectRepo extends ServiceMap.Service<
           const end = options.endLine ?? lines.length
           return lines.slice(start, end).join("\n")
         },
-        Effect.mapError((cause) => new EffectRepoError({ cause }))
+        Effect.mapError((cause) => new EffectRepoError({ cause })),
+        Effect.withSpan("EffectRepo.readFileRange", (options) => ({
+          attributes: {
+            "file.path": options.path,
+            "file.startLine": options.startLine ?? 1,
+            "file.endLine": options.endLine ?? "EOF"
+          }
+        }))
       )
 
-      const globFiles = Effect.fn("EffectRepo.glob")(
+      const globFiles = Effect.fnUntraced(
         function*(options: { readonly pattern: string }) {
           const repoPath = yield* repo
           return yield* Effect.tryPromise(() =>
             glob(options.pattern, { cwd: repoPath })
           )
         },
-        Effect.mapError((cause) => new EffectRepoError({ cause }))
+        Effect.mapError((cause) => new EffectRepoError({ cause })),
+        Effect.withSpan("EffectRepo.glob", (options) => ({
+          attributes: {
+            "glob.pattern": options.pattern
+          }
+        }))
       )
 
       const llmsMd = yield* RcRef.make({

packages/discord/package.json

@@ -9,8 +9,8 @@
     "./*": "./src/*.ts"
   },
   "dependencies": {
-    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@989d1cc",
+    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@e691909",
     "dfx": "^1.0.5",
-    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@989d1cc"
+    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@e691909"
   }
 }

packages/shared/package.json

@@ -9,7 +9,7 @@
     "./*": "./src/*.ts"
   },
   "dependencies": {
-    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@989d1cc",
-    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@989d1cc"
+    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@e691909",
+    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@e691909"
   }
 }