Stabilize span origin e2e snapshots

Author: Qard

e2e/helpers/normalize.ts

@@ -283,6 +283,16 @@ function normalizeObject(
         return [[key, tokenFor(tokenMaps.ids, entry, "signature")]];
       }
 
+      if (
+        key === "environment" &&
+        entry &&
+        typeof entry === "object" &&
+        !Array.isArray(entry) &&
+        "type" in entry
+      ) {
+        return [];
+      }
+
       return [[key, normalizeValue(entry as Json, tokenMaps, options, key)]];
     }),
   );

e2e/scenarios/trace-context-and-continuation/__snapshots__/late-update-payloads.json

@@ -3,7 +3,14 @@
     "context": {
       "caller_filename": "<repo>/e2e/scenarios/trace-context-and-continuation/scenario.ts",
       "caller_functionname": "main",
-      "caller_lineno": 0
+      "caller_lineno": 0,
+      "span_origin": {
+        "instrumentation": {
+          "name": "braintrust-js-logger"
+        },
+        "name": "braintrust.sdk.javascript",
+        "version": "<xact:1>"
+      }
     },
     "created": "<timestamp>",
     "id": "<span:1>",

e2e/scenarios/trace-primitives-basic/__snapshots__/request-flow.json

@@ -38,7 +38,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "main",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "id": "<span:2>",
@@ -71,7 +78,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "logger.traced.name",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "id": "<span:6>",
@@ -106,7 +120,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "logger.traced.name",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "error": "basic boom\n\nError: basic boom\n    at logger.traced.name (<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts:0:0)\n    at <repo>/js/dist/index.mjs:0:0\n    at AsyncLocalStorage.run (node:<internal>:0:0)\n    at BraintrustContextManager.runInContext (<repo>/js/dist/index.mjs:0:0)\n    at withCurrent (<repo>/js/dist/index.mjs:0:0)\n    at <repo>/js/dist/index.mjs:0:0\n    at runCatchFinally (<repo>/js/dist/index.mjs:0:0)\n    at Logger.traced (<repo>/js/dist/index.mjs:0:0)\n    at main (<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts:0:0)\n    at runMain (<repo>/e2e/helpers/scenario-runtime.ts:0:0)",
@@ -143,7 +164,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "main",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "id": "<span:2>",
@@ -176,7 +204,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "logger.traced.name",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "id": "<span:6>",
@@ -211,7 +246,14 @@
           "context": {
             "caller_filename": "<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts",
             "caller_functionname": "logger.traced.name",
-            "caller_lineno": 0
+            "caller_lineno": 0,
+            "span_origin": {
+              "instrumentation": {
+                "name": "braintrust-js-logger"
+              },
+              "name": "braintrust.sdk.javascript",
+              "version": "<xact:1>"
+            }
           },
           "created": "<timestamp>",
           "error": "basic boom\n\nError: basic boom\n    at logger.traced.name (<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts:0:0)\n    at <repo>/js/dist/index.mjs:0:0\n    at AsyncLocalStorage.run (node:<internal>:0:0)\n    at BraintrustContextManager.runInContext (<repo>/js/dist/index.mjs:0:0)\n    at withCurrent (<repo>/js/dist/index.mjs:0:0)\n    at <repo>/js/dist/index.mjs:0:0\n    at runCatchFinally (<repo>/js/dist/index.mjs:0:0)\n    at Logger.traced (<repo>/js/dist/index.mjs:0:0)\n    at main (<repo>/e2e/scenarios/trace-primitives-basic/scenario.ts:0:0)\n    at runMain (<repo>/e2e/helpers/scenario-runtime.ts:0:0)",