diff --git a/.changeset/new-ties-thank.md b/.changeset/new-ties-thank.md
new file mode 100644
index 000000000..848fac8ce
--- /dev/null
+++ b/.changeset/new-ties-thank.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/infra": patch
+---
+
+improve trace
diff --git a/packages/infra/_src/services/RepositoryBase.ts b/packages/infra/_src/services/RepositoryBase.ts
index 0d4a03a83..44b4da53f 100644
--- a/packages/infra/_src/services/RepositoryBase.ts
+++ b/packages/infra/_src/services/RepositoryBase.ts
@@ -198,7 +198,7 @@ export function makeRepo<
         }
         return r
       })
-        .withSpan("@effect-app/infra/Repository.make: " + name)
+        .withSpan("@effect-app/infra/Repository.make", { attributes: { modelName: name } })
         .withLogSpan("Repository.make: " + name)
     }
 
@@ -297,8 +297,9 @@ export function makeStore<
           make<PM, string, R, E>(
             pluralize(name),
             makeInitial
-              ? makeInitial
-                .map((_) => _.map(encodeToPM()))
+              ? (makeInitial
+                .map((_) => _.map(encodeToPM())))
+                .withSpan("@effect-app/infra/Repository.makeInitial")
               : undefined,
             {
               ...config,