Some fixes for the conflicts

Author: ericallam

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -460,7 +460,7 @@ export class SpanPresenter extends BasePresenter {
       eventStore,
       environmentId,
       spanId,
-      environmentId,
+      traceId,
       createdAt,
       completedAt ?? undefined,
       { includeDebugLogs: true }

apps/webapp/app/v3/eventRepository/eventRepository.server.ts

@@ -9,7 +9,6 @@ import {
   flattenAttributes,
   isExceptionSpanEvent,
   nanosecondsToMilliseconds,
-  omit,
   PRIMARY_VARIANT,
   SemanticInternalAttributes,
   SpanEvent,
@@ -42,10 +41,10 @@ import {
   generateTraceId,
   getDateFromNanoseconds,
   getNowInNanoseconds,
+  isEmptyObject,
   parseEventsField,
-  stripAttributePrefix,
   removePrivateProperties,
-  isEmptyObject,
+  stripAttributePrefix,
 } from "./common.server";
 import type {
   CompleteableTaskRun,
@@ -60,7 +59,6 @@ import type {
   SpanDetail,
   SpanDetailedSummary,
   SpanSummary,
-  TaskEventRecord,
   TraceAttributes,
   TraceDetailedSummary,
   TraceEventOptions,
@@ -824,13 +822,14 @@ export class EventRepository implements IEventRepository {
   ): Promise<string | undefined> {
     return await startActiveSpan("getSpanOriginalRunId", async (s) => {
       return await originalRunIdCache.swr(traceId, spanId, async () => {
-        const spanEvent = await this.#getSpanEvent(
+        const spanEvent = await this.#getSpanEvent({
           storeTable,
           spanId,
+          environmentId,
           startCreatedAt,
           endCreatedAt,
-          { includeDebugLogs: false }
-        );
+          options: { includeDebugLogs: false },
+        });
 
         if (!spanEvent) {
           return;