Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/webapp/app/services/runsReplicationInstance.server.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ClickHouse } from "@internal/clickhouse";
import { RunsReplicationService } from "./runsReplicationService.server";
import { singleton } from "~/utils/singleton";
import invariant from "tiny-invariant";
import { env } from "~/env.server";
import { metricsRegister } from "~/metrics.server";
import { singleton } from "~/utils/singleton";
import { provider } from "~/v3/tracer.server";
import { logger } from "./logger.server";
import { RunsReplicationService } from "./runsReplicationService.server";

export const runsReplicationInstance = singleton(
"runsReplicationInstance",
Expand Down Expand Up @@ -49,6 +49,7 @@ function initializeRunsReplicationInstance() {
leaderLockRetryIntervalMs: env.RUN_REPLICATION_LEADER_LOCK_RETRY_INTERVAL_MS,
ackIntervalSeconds: env.RUN_REPLICATION_ACK_INTERVAL_SECONDS,
logLevel: env.RUN_REPLICATION_LOG_LEVEL,
tracer: provider.getTracer("runs-replication-service"),
});

if (env.RUN_REPLICATION_ENABLED === "1") {
Expand Down
4 changes: 3 additions & 1 deletion apps/webapp/app/v3/tracer.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class CustomWebappSampler implements Sampler {
}
}

export const { tracer, logger: otelLogger } = singleton("tracer", getTracer);
export const { tracer, logger: otelLogger, provider } = singleton("tracer", getTracer);

export async function startActiveSpan<T>(
name: string,
Expand Down Expand Up @@ -155,6 +155,7 @@ function getTracer() {
return {
tracer: trace.getTracer("trigger.dev", "3.3.12"),
logger: logs.getLogger("trigger.dev", "3.3.12"),
provider: new NodeTracerProvider(),
};
}

Expand Down Expand Up @@ -260,6 +261,7 @@ function getTracer() {
return {
tracer: provider.getTracer("trigger.dev", "3.3.12"),
logger: logs.getLogger("trigger.dev", "3.3.12"),
provider,
};
}

Expand Down